More sensible routing

The routing we had before was a bit dump, and caused problems in production, so I've gone with this approach. Not sure how "Rail
s-y" it is, but it works and seems pretty elegant, so I'm happy anyway....