Added some TODOs to controller.py.