Initial application changes to support new model
Forgot to add stuff