A bunch of uncomitted work of indeterminate origin

Found this sitting on my hard drive, uncomitted. Preserving it for posterity!