Rough V1 of new routing mechanism #4