Index: dialin/common/hd_defs.py
===================================================================
diff -u -r8c1ae1a592e02562ad9bded9ea2bd199fa80f4bf -rb26c4ef28e3de01b33a88be75cb53be3ad02afa3
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 8c1ae1a592e02562ad9bded9ea2bd199fa80f4bf)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision b26c4ef28e3de01b33a88be75cb53be3ad02afa3)
@@ -127,6 +127,23 @@
 
 
 @unique
+class PreTreatmentWetSelfTesStates(DialinEnum):
+    WET_SELF_TESTS_START_STATE = 0
+    WET_SELF_TESTS_SETUP_STATE = 1
+    WET_SELF_TESTS_BUBBLES_STATE = 2
+    WET_SELF_TESTS_PRIME_CHECK_STATE = 3
+    WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE = 4
+    WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE = 5
+    WET_SELF_TESTS_FIRST_DISPLACEMENT_STATE = 6
+    WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE = 7
+    WET_SELF_TESTS_SECOND_DISPLACEMENT_SETUP_STATE = 8
+    WET_SELF_TESTS_SECOND_DISPLACEMENT_STATE = 9
+    WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE = 10
+    WET_SELF_TESTS_STOPPED_STATE = 11
+    WET_SELF_TESTS_COMPLETE_STATE = 12
+
+
+@unique
 class PreTreatmentPrimeStates(DialinEnum):
     HD_PRIME_START_STATE = 0
     HD_PRIME_WAIT_FOR_USER_START_STATE = 1
Index: dialin/common/msg_ids.py
===================================================================
diff -u -r1622d0556ec346a146bcee29d6f9d278d1e97bf0 -rb26c4ef28e3de01b33a88be75cb53be3ad02afa3
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 1622d0556ec346a146bcee29d6f9d278d1e97bf0)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision b26c4ef28e3de01b33a88be75cb53be3ad02afa3)
@@ -8,7 +8,7 @@
 # @file    msg_ids.py
 #
 # @author  (last)      Micahel Garthwaite
-# @date    (last)      22-Feb-2022
+# @date    (last)      09-Mar-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  06-Apr-2021
 #
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 -rb26c4ef28e3de01b33a88be75cb53be3ad02afa3
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision b26c4ef28e3de01b33a88be75cb53be3ad02afa3)
@@ -7,8 +7,8 @@
 #
 # @file    hemodialysis_device.py
 #
-# @author  (last)      Dara Navaei
-# @date    (last)      01-Mar-2022
+# @author  (last)      Micahel Garthwaite
+# @date    (last)      09-Mar-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
@@ -151,6 +151,7 @@
         self.hd_events = HDEvents(self.can_interface, self.logger)
         self.hd_reservoirs = HDReservoirs(self.can_interface, self.logger)
         self.sw_configs = HDSoftwareConfigs(self.can_interface, self.logger)
+        self.post_treatment = HDPostTreatment(self.can_interface, self.logger)
 
     def get_operation_mode(self):
         """
Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -r6eee2c84e5451f3f4ee4c71d53459ba578c8eeac -rb26c4ef28e3de01b33a88be75cb53be3ad02afa3
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 6eee2c84e5451f3f4ee4c71d53459ba578c8eeac)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision b26c4ef28e3de01b33a88be75cb53be3ad02afa3)
@@ -8,7 +8,7 @@
 # @file    hd_simulator.py
 #
 # @author  (last)      Micahel Garthwaite
-# @date    (last)      22-Feb-2022
+# @date    (last)      09-Mar-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  06-Aug-2020
 #
@@ -1261,7 +1261,7 @@
                                           timeout_countdown: int, is_completed: bool) -> None:
         """
         the rinseback state change Response message method
-        | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description             | #1:(F32)           | #2:(F32)            | #3:(U32)         | #4:(U32)                 | #5:(U32)                     | #5:(U32)                  |
+        | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description             | #1:(F32)           | #2:(F32)            | #3:(U32)         | #4:(U32)                 | #5:(U32)                     | #6:(U32)                  |
         |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:            |:--:                |:--:                 |:--:              |:--:                      |:--:                          |:--:                       |
         |0x5600| 0x020  | 6   | 1Hz    | N   | HD  | UI  | Rinseback progress data | \ref Data::mTarget | \ref Data::mCurrent | \ref Data::mRate | \ref Data::mTimeoutTotal | \ref Data::mTimeoutCountDown | \ref Data::is_completed   |