Switch to MDNS
Refactored