Cleaning up & commenting code. Just tested fire listeners with adding a new device. New device does not have listeners added to it. Need to write another function to add listeners to it."