Refactored models. Everything should be working as before. Maybe. 60% of the time works every time