New implementation of the routes

Still not working though