Updated controllers

These are the most updated working versions of the controllers.