Experiments towards trying to clean up routing

Nothing successful, but checking it in commented out for the time
being...