checkpoint
rm meta cruft
A complete mess, but works (more than before!)

Yay.
minor cleanup