Snapshot of this afternoons OMM work.

This builds and runs but has a bunch of loose ends to be dealt with shortly...
File renames to track class name changes and other cleanup.