Should at least add a todo: to check the fields/methods on the devicestorage object as well