More upnp work - minor refactoring, discovering
each other, hard-coded