Refactor 2022 #28

I came across a few more pieces from when I was experimenting with random textures and surfaces. After some minor clean up, they are ready to publish.