Adding .controller, part of #232