wip: simplifying routes