Look ma no routers
Merge pull request #1 from Kurtz1993/stuff

Look ma no routers