Merge pull request #71 from dirvine/routing_v2

Routing v2
WIP