ES6: Most controllers converted over now.