Revamped model, making the app much more stable and myself, as a developer, much happier