Another truckload of changes, mainly cleanup..

but also has a few actual changes.

Need to put some thought in to the persistence classes
next, rather than just flailing at the keyboard.