Merge pull request #14 from dysFunctions/router

Router
router work