Some New Work Which Needs Merging

Tracking branch at https://code.loganite.ca/greg/scratch/-/tree/t/some-new-work-which-needs-merging