Model.py: Continuing the refactor out of world.py
Interestingly, the only reason this didn't error before was due to model.pyc