Redesigned everything and switched to a basic MVC model