have device logic go in withDevices