Migrate to the new routing engine

@r0mant @russjones please review 
yep