Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -rac344e50f31d776075a64f775b38244531f880d6 -rba2793fd2b970fc89af085f1dfe4e8b6fe408353
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision ac344e50f31d776075a64f775b38244531f880d6)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision ba2793fd2b970fc89af085f1dfe4e8b6fe408353)
@@ -114,7 +114,9 @@
     MSG_ID_DD_UF_DATA = 0x5C
     MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D
     MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x5E
-    MSG_ID_DD_BLOOD_LEAK_DATA = 0x60
+    MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F
+    MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60
+    MSG_ID_DD_BLOOD_LEAK_DATA = 0x61
 
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
 
@@ -244,18 +246,28 @@
     MSG_ID_DD_HEATERS_PWM_PERIOD_OVERRIDE_REQUEST = 0xA03C
     MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03D
     MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E
-    MSG_ID_DD_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA03F
-    MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA040
-    MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA041
+    MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0xA03F
+    MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA040
+    MSG_ID_DD_AVAILABLE_TO_USE_4 = 0xA041
     MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xA042
     MSG_ID_DD_SET_TEST_CONFIGURATION = 0xA043
-    MSG_ID_DD_GET_TEST_CONFIGURATION = 0XA044
-    MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS = 0XA045
+    MSG_ID_DD_GET_TEST_CONFIGURATION = 0xA044
+    MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS = 0xA045
+    MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA047
+    MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST = 0xA048
+    MSG_ID_DD_BLOOD_LEAK_SET_TO_EMBEDDED_MODE_REQUEST = 0xA049
+    MSG_ID_DD_BLOOD_LEAK_SET_EMBEDDED_MODE_CMD_REQUEST = 0xA04A
+    MSG_ID_DD_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST = 0xA04B
+    MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST = 0xA04C
+    MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST = 0xA04D
+    MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST = 0xA04E
 
     MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00
     MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01
     MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02
+    # Placeholder message
     MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03
+    MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xAF04
 
     MSG_ID_FP_TESTER_LOGIN_REQUEST = 0xB000
     MSG_ID_FP_SOFTWARE_RESET_REQUEST = 0xB001
Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -r592d7ab1f37bc69648bd75f3e0886a6fc6f5043e -rba2793fd2b970fc89af085f1dfe4e8b6fe408353
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 592d7ab1f37bc69648bd75f3e0886a6fc6f5043e)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision ba2793fd2b970fc89af085f1dfe4e8b6fe408353)
@@ -17,6 +17,7 @@
 
 from .modules.alarms import DDAlarms
 from .modules.balancing_chamber import DDBalancingChamber
+from .modules.blood_leak import DDBloodLeak
 from .modules.concentrate_pump import DDConcentratePumps
 from .modules.conductivity_sensors import DDConductivitySensors
 from .modules.constants import NO_RESET, RESET
@@ -28,6 +29,7 @@
 from .modules.post_gen_dialysate import DDPostGenDialysate
 from .modules.pressure_sensors import DDPressureSensors
 from .modules.pre_gen_dialysate import DDPreGenDialysate
+from .modules.spent_chamber_fill import DDSpentChamberFill
 from .modules.temperature_sensors import DDTemperatureSensors
 from .modules.dd_test_configs import DDTestConfig
 from .modules.ultrafiltration import DDUltrafiltration
@@ -112,6 +114,7 @@
         # Create command groups
         self.alarms = DDAlarms(self.can_interface, self.logger)
         self.balancing_chamber = DDBalancingChamber(self.can_interface, self.logger)
+        self.blood_leak = DDBloodLeak(self.can_interface, self.logger)
         self.concentrate_pumps = DDConcentratePumps(self.can_interface, self.logger)
         self.conductivity_sensors = DDConductivitySensors(self.can_interface, self.logger)
         self.dialysate_pumps = DDDialysatePumps(self.can_interface, self.logger)
@@ -122,6 +125,7 @@
         self.post_gen_dialysate = DDPostGenDialysate(self.can_interface, self.logger)
         self.pressure_sensors = DDPressureSensors(self.can_interface, self.logger)
         self.pre_gen_dialysate = DDPreGenDialysate(self.can_interface, self.logger)
+        self.spent_chamber_fill = DDSpentChamberFill(self.can_interface, self.logger)
         self.temperature_sensors = DDTemperatureSensors(self.can_interface, self.logger)
         self.test_configs = DDTestConfig(self.can_interface, self.logger)
         self.ultrafiltration = DDUltrafiltration(self.can_interface, self.logger)