Updated more of the models, added a todo list