Index: dialin/common/__init__.py
===================================================================
diff -u -r1dcdd74a0515845ccde2be8271d3576b9ca80033 -r77f757df822e74058abe3e146f6a8d4c3678e049
--- dialin/common/__init__.py	(.../__init__.py)	(revision 1dcdd74a0515845ccde2be8271d3576b9ca80033)
+++ dialin/common/__init__.py	(.../__init__.py)	(revision 77f757df822e74058abe3e146f6a8d4c3678e049)
@@ -7,4 +7,5 @@
                       PreTreatmentRecircStates,
                       PreTreatmentNoCartSelfTestStates,
                       PreTreatmentDrySelfTestStates,
-                      PreTreatmentPrimeStates)
+                      PreTreatmentPrimeStates,
+                      PostTreatmentStates)
Index: dialin/common/hd_defs.py
===================================================================
diff -u -r1dcdd74a0515845ccde2be8271d3576b9ca80033 -r77f757df822e74058abe3e146f6a8d4c3678e049
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 1dcdd74a0515845ccde2be8271d3576b9ca80033)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 77f757df822e74058abe3e146f6a8d4c3678e049)
@@ -75,12 +75,12 @@
 class PreTreatmentDrySelfTestStates(DialinEnum):
     DRY_SELF_TESTS_START_STATE = 0
     DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE = 1
-    DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE = 2
-    DRY_SELF_TESTS_AIR_TRAP_STATE = 3
-    DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE = 4
-    DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE = 5
-    DRY_SELF_TESTS_PRESSURE_SENSORS_STATE = 6
-    DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE = 7
+    DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE = 2
+    DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE = 3
+    DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE = 4
+    DRY_SELF_TESTS_PRESSURE_SENSORS_STATE = 5
+    DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE = 6
+    DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE = 7
     DRY_SELF_TESTS_STOPPED_STATE = 8
     DRY_SELF_TESTS_COMPLETE_STATE = 9
 
@@ -103,3 +103,10 @@
 class PreTreatmentRecircStates(DialinEnum):
     PRE_TREATMENT_RECIRC_STATE = 0
     PRE_TREATMENT_RECIRC_STOPPED_STATE = 1
+
+@unique
+class PostTreatmentStates(DialinEnum):
+    HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE = 0
+    HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE = 1
+    HD_POST_TREATMENT_VERIFY_STATE = 2
+
Index: dialin/common/msg_defs.py
===================================================================
diff -u -r4e0bf0b10bac641750ac24b32cbc1f2f438fb1be -r77f757df822e74058abe3e146f6a8d4c3678e049
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 4e0bf0b10bac641750ac24b32cbc1f2f438fb1be)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 77f757df822e74058abe3e146f6a8d4c3678e049)
@@ -123,6 +123,10 @@
     MSG_ID_UI_PATIENT_CONNECTION_CONFIRM = 0x66                 # UI user has confirmed patient connection completed
     MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE = 0x67        # HD response to user confirmation of patient connection
     MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM = 0x68                 # UI user has confirmed consumable install
+    MSG_ID_UI_START_TREATMENT_REQUEST = 0x71                    # UI user has requested to start treatment
+    MSG_ID_HD_START_TREATMENT_RESPONSE = 0x72                   # response to user request to start treatment
+    MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM = 0x73                 # UI user has confirmed disposable removal
+    MSG_ID_HD_TREATMENT_LOG_DATA = 0x74                         # HD sends treatment log data to UI message
 
     MSG_ID_CAN_ERROR_COUNT = 0x999                              # test code in support of EMC testing
 
Index: dialin/hd/ui_proxy.py
===================================================================
diff -u -r0b4c9b6e916085cf79c916c0c7c04b953f40e709 -r77f757df822e74058abe3e146f6a8d4c3678e049
--- dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision 0b4c9b6e916085cf79c916c0c7c04b953f40e709)
+++ dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision 77f757df822e74058abe3e146f6a8d4c3678e049)
@@ -1784,3 +1784,29 @@
         self.logger.debug("Sending user continue to treatment request to HD.")
         self.can_interface.send(message, 0)
 
+    def cmd_ui_start_treatment_request(self):
+        """
+        Constructs and sends a ui start treatment request message
+
+        @return: none
+        """
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_UI_START_TREATMENT_REQUEST.value)
+
+        self.logger.debug("Sending user start treatment request to HD.")
+        self.can_interface.send(message, 0)
+
+    def cmd_ui_disposable_removal_confirm(self):
+        """
+        Constructs and sends a ui disposable removal confirm message
+
+        @return: none
+        """
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM.value)
+
+        self.logger.debug("Sending user disposable removal confirm msg to HD.")
+        self.can_interface.send(message, 0)
+