Initial UPNP commit