further routing accommodations

continued work on the accomodations for the new routing model