Worked on updating the models a bit