Add Device almost finished