Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r18b2243bcd623987781d4a67fabd4122ebe83ec7 -r0bc2d3976315c12417c992717621a0284bbedef4
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 18b2243bcd623987781d4a67fabd4122ebe83ec7)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 0bc2d3976315c12417c992717621a0284bbedef4)
@@ -209,34 +209,49 @@
     MSG_ID_DD_NVM_SYSTEM_RECORD_RESPONSE = 0xBB
     MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD = 0xBC
     MSG_ID_DD_NVM_SERVICE_RECORD_RESPONSE = 0xBD
-    MSG_ID_DD_NVM_SET_SERVICE_RECORD = 0xBE
+    MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD = 0xBE
     MSG_ID_DD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0xBF
-    MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD = 0xC0
+    MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD = 0xC0
     MSG_ID_DD_NVM_USAGE_INFO_RECORD_RESPONSE = 0xC1
-    MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD = 0xC2
+    MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD = 0xC2
     MSG_ID_DD_NVM_CAL_PRESSURE_SENSOR_RESPONSE = 0xC3
-    MSG_ID_DD_NVM_SET_CAL_PRESSURE_SENSOR = 0xC4
+    MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR = 0xC4
     MSG_ID_DD_NVM_CAL_TEMP_SENSOR_RESPONSE = 0xC5
-    MSG_ID_DD_NVM_SET_CAL_TEMP_SENSOR = 0xC6
+    MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR = 0xC6
     MSG_ID_DD_NVM_CAL_CONC_PUMP_RESPONSE = 0xC7
-    MSG_ID_DD_NVM_SET_CAL_CONC_PUMP = 0xC8
+    MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP = 0xC8
     MSG_ID_DD_NVM_CAL_D12_PUMP_RESPONSE = 0xC9
-    MSG_ID_DD_NVM_SET_CAL_D12_PUMP = 0xCA
+    MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP = 0xCA
     MSG_ID_DD_NVM_CAL_D48_PUMP_RESPONSE = 0xCB
-    MSG_ID_DD_NVM_SET_CAL_D48_PUMP = 0xCC
+    MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP = 0xCC
     MSG_ID_DD_NVM_CAL_ACID_CONCENTRATE_RESPONSE = 0xCD
-    MSG_ID_DD_NVM_SET_CAL_ACID_CONCENTRATE = 0xCE
+    MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE = 0xCE
     MSG_ID_DD_NVM_CAL_BICARB_CONCENTRATE_RESPONSE = 0xCF
-    MSG_ID_DD_NVM_SET_CAL_BICARB_CONCENTRATE = 0xD0
+    MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE = 0xD0
     MSG_ID_DD_NVM_CAL_ACCEL_SENSOR_RESPONSE = 0xD1
-    MSG_ID_DD_NVM_SET_CAL_ACCEL_SENSOR = 0xD2
+    MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR = 0xD2
     MSG_ID_DD_NVM_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0xD3
-    MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR = 0xD4
+    MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR = 0xD4
     MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0xD5
     MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xD6
 
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
 
+
+
+    MSG_ID_UI_TD_NVM_GET_RECORD_REQUEST = 0x100
+    MSG_ID_TD_NVM_SYSTEM_RECORD_RESPONSE = 0x101
+    MSG_ID_UI_TD_NVM_SET_SYSTEM_RECORD = 0x102
+    MSG_ID_TD_NVM_SERVICE_RECORD_RESPONSE = 0x103
+    MSG_ID_UI_TD_NVM_SET_SERVICE_RECORD = 0x104
+    MSG_ID_TD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0x105
+    MSG_ID_UI_TD_NVM_SET_INSTITUTIONAL_RECORD = 0x106
+    MSG_ID_TD_NVM_USAGE_INFO_RECORD_RESPONSE = 0x107
+    MSG_ID_UI_TD_NVM_SET_USAGE_INFO_RECORD = 0x108
+    MSG_ID_TD_NVM_CAL_RESPONSE = 0x109
+    MSG_ID_UI_TD_NVM_SET_CAL_RECORD = 0x10A
+    MSG_ID_TD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0x10B
+
     MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000
     MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001
     MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002