First commit of the new routing solution