Removed JSRoutes, completed most of the functionality