Routing feature

Good to merge