More work on DNS.

Temp commit, doesn't compile, need to do some work at home