Finished Assignment: Added modified model classes.