wip on improvements towards routing