Rearrange and clean up, beginnings of tests.

Etc...   Blah blah.