Updates to multi-device logic

Update to process on finding a single device