Major refactor of entire UPNP system

OK, so not really.