To-do list
Add upnp discovery code (for later)