More routing work
Merge pull request #8 from ccummings/wip

More routing work