Got device discovery working