WIP: mega commit
WIP: device discovery