Forgot about the controllers after some refactoring