Merge pull request #6 from ccummings/wip

Wip
Adding routing