Comment these out for the moment.
Begin RENAMING ALL THE THINGS.
Fixup...
Whoops, we don't need this!
Add some infrastructure for tests...
Various fixups...
Oof.  Inputs... outputs... why should they match again??
Line up whitespace a bit better.