WIP: device discovery 2