Add device, need to fix file attachments