More work on the logging and found a duplicate function in the DeviceTemplate stuff.  Need to revisit it later too tired right now.  #61 #317