broke everything, major refactoring, rebuilt the model setup