WIP
Finished model refactoring