Working on specs, of which there are a few new failures after my recent merge...  Will work on this more in a bit.