initial controller commit, minor changes to model.py classes