Lots of changes, redid the entire models.py