Consolidation of model types complete, app is again fully functional