First crack at zeroconf
Restructured program