Added the controller, database and router stuff