Routing v2

Interim commit for routing_table API