Worked on the models and the other stuff