Switched application to use new model and DB
Refactor model and some code