Add ONE new device at a time, breaks if you add more without saving first
Fix adding more new devices before saving the first new one
Remove TODO