DHT integration pass #1