Implemented controller to get test working