Implement @limhoff-r7 spec wizardry

I still have some Pendings I'm not sure how to get rid of.