Changed where we find devices and added a few comments. Michael's first
look with Travis in Kerkhoff