changed functionality to use routers
Merge branch 'routeBranch'