Pushing todays changes, most of the model classes are done now