Redo router talk
Merge pull request #41 from calebthompson/master

Redo router talk