Working on controller, unfinished state