Merge pull request #38 from maryschmidt/router

Router
just in case
no redirects yet