Rewrite controller.py since it wasn't very cool
Merge branch 'FakeControllerRewrite' into PlugNPlay