#44 working on merging the Devices screen and scenario 1a. Not finished.