Subroute navigation

I would like to take care of that in a subsequent change with more testing.