Refactored app. Changed data loading logic. Still have: error with 'changing data model'