Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -r1f7b5ac840adf6740b023706fcb73691c33a9be7 -re324174eeb74c1630c6e913e7dfb65246924cd1f
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 1f7b5ac840adf6740b023706fcb73691c33a9be7)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision e324174eeb74c1630c6e913e7dfb65246924cd1f)
@@ -26,12 +26,14 @@
 from .modules.gen_dialysate import DDGenDialysate
 from .modules.heaters import DDHeaters
 from .modules.levels import DDLevels
+from .modules.mixing_cntrl import DDDialysateMixing
 from .modules.post_gen_dialysate import DDPostGenDialysate
 from .modules.pressure_sensors import DDPressureSensors
 from .modules.pre_gen_dialysate import DDPreGenDialysate
 from .modules.rinse_pump import DDRinsePump
 from .modules.records import DDRecords
 from .modules.spent_chamber_fill import DDSpentChamberFill
+from .modules.substitution_pump import DDSubstitutionPump
 from .modules.temperature_sensors import DDTemperatureSensors
 from .modules.dd_test_configs import DDTestConfig
 from .modules.ultrafiltration import DDUltrafiltration
@@ -126,6 +128,7 @@
         self.conductivity_sensors = DDConductivitySensors(self.can_interface, self.logger)  #: The Conductivity Sensors module
         self.dialysate_pumps = DDDialysatePumps(self.can_interface, self.logger)            #: The Dialysate Pumps module
         self.drybicart = DDDryBicart(self.can_interface, self.logger)                       #: The Dry Bicarb module
+        self.dialysate_mixing = DDDialysateMixing(self.can_interface, self.logger)          #: The Dialysate mixing module
         self.events = DDEvents(self.can_interface, self.logger)                             #: The Events module
         self.gen_dialysate = DDGenDialysate(self.can_interface, self.logger)                #: The Generate Dialysate module
         self.heaters = DDHeaters(self.can_interface, self.logger)                           #: The Heaters module
@@ -136,6 +139,7 @@
         self.rinse_pump = DDRinsePump(self.can_interface, self.logger)                      #: The Rinse Pump module
         self.records = DDRecords(self.can_interface, self.logger)                           #: The Records (System, Service, Calibration, Institutional, Usage Information) module
         self.spent_chamber_fill = DDSpentChamberFill(self.can_interface, self.logger)       #: The Spent Chamber module
+        self.substitution_pump = DDSubstitutionPump(self.can_interface, self.logger)        #: The Substitution Pump module
         self.temperature_sensors = DDTemperatureSensors(self.can_interface, self.logger)    #: The Temperature Sensors module
         self.test_configs = DDTestConfig(self.can_interface, self.logger)                   #: The Test Configs module
         self.ultrafiltration = DDUltrafiltration(self.can_interface, self.logger)           #: The Ultrafiltration module