Work on controller and routes