Some more changes.

Still pondering dns.Conn and a dns.Dial