Routing

might be ready for a good 'ol pull request