Infrastructure building part 2

- More work to the routing discovery class