Added the controller as well :-/