Commit amended to undo change to device list management, still working through that merge request. Want to work this one in first. Changes by Adam Honse <calcprogrammer1@gmail.com>
Commit amended by Adam Honse <calcprogrammer1@gmail.com> due to merging from a different branch.