Added a controller, some stuff and some more stuff