Added some classes, updated control.py

control.py now makes use of new classes