Edited some of the model classes with Alex