diff --git a/sc200-pull.py b/sc200-pull.py
index 9a86b11..5a00415 100755
--- a/sc200-pull.py
+++ b/sc200-pull.py
@@ -269,15 +269,38 @@ def Loader():
 
 def Output():
     c = db.cursor()
+    fieldNames = ['IP'] + Settings
     with open('/tmp/sc200.csv', 'w', newline='') as outFile:
-        csvWriter = csv.writer(outFile, delimiter=',', quotechar='"',
+        csvWriter = csv.DictWriter(outFile, fieldnames=fieldNames,
+            delimiter=',', quotechar='"',
             quoting=csv.QUOTE_MINIMAL)
-        c.execute('''SELECT * FROM SettingsValues ORDER BY IP''')
-        csvWriter.writerow([col[0] for col in c.description])
-        for row in c:
-            csvWriter.writerow(row)
+
+        csvWriter.writeheader()
+
+        c.execute('''SELECT DISTINCT IP FROM SettingsValues ORDER BY IP''')
+        for Row in c:
+            IP = Row
+            print((('''SELECT SettingsID, Value
+            FROM SettingsValues WHERE IP = \'%s\'''' % IP)))
+            row = c.execute('''SELECT SettingsID, Value
+                FROM SettingsValues WHERE IP = \'%s\'''' % IP)
+            print(((row)))
+
     outFile.close()
 
+
+        #csvWriter.writerow()
+
+    #c = db.cursor()
+    #with open('/tmp/sc200.csv', 'w', newline='') as outFile:
+        #csvWriter = csv.writer(outFile, delimiter=',', quotechar='"',
+            #quoting=csv.QUOTE_MINIMAL)
+        #c.execute('''SELECT * FROM SettingsValues ORDER BY IP''')
+        #csvWriter.writerow([col[0] for col in c.description])
+        #for row in c:
+            #csvWriter.writerow(row)
+    #outFile.close()
+
     #with open('/tmp/sc200-alarms.csv', 'w', newline='') as outFile:
         #csvWriter = csv.writer(outFile, delimiter=',', quotechar='"',
             #quoting=csv.QUOTE_MINIMAL)