Shuffled some code around.
Added some utilities to address.
Added some discovery utilities.
Start of a simpler discovery implementation.