Add device (server) work in progress