I got rid of all the async code. Things are still very unhappy when having add_devices call update for me. I've put the update call back into the device the way I had it as it seems to work reliably.    I'd like to move all things to async eventually, as that seems to be the new hotness? :)