Fix issues and clean up a bit
Refactor
Create new models