Add support for the Draft E1.31 discovery protocol.

Add a TODO(simon)