Added a controller and connections fixed