Zach's changes to models.py