WIP routing

Opening the PR on @ymeine behalf for discussion :)