second commit, working the DNS stuff