ES6: More controllers converted over
ES6: Mega update of controllers