Simplify mechanism for routing
Merge pull request #1 from tandrewnichols/refactor-routing

Simplify mechanism for routing