Added some routing and controller stuff