Routing table refactor - still to be tested - commit for API use only