Started work towards an object model. It builds, but tests are unchanged
Finished changing to object model.