DHT PR

This PR will be for CR and conversation on the DHT.