Controller Update

It should be complete, let me know if you see any issues.