Some more work on routing