Allow named routes in router
Simplified routing, can now have named routes
Fix merge conflicts