Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -refb1d2a271b1b06b7fd133beaa5ab4728e58f610 -r407868f303202b857482e27fa78108c81c568dd7
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision efb1d2a271b1b06b7fd133beaa5ab4728e58f610)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 407868f303202b857482e27fa78108c81c568dd7)
@@ -32,6 +32,7 @@
 from .modules.spent_chamber_fill import DDSpentChamberFill
 from .modules.substitution_pump import DDSubstitutionPump
 from .modules.drybicart import DDDryBicart
+from .modules.mixing_cntrl import DDDialysateMixing
 from .modules.temperature_sensors import DDTemperatureSensors
 from .modules.dd_test_configs import DDTestConfig
 from .modules.ultrafiltration import DDUltrafiltration
@@ -126,6 +127,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
Index: leahi_dialin/td/modules/syringe_pump.py
===================================================================
diff -u -refb1d2a271b1b06b7fd133beaa5ab4728e58f610 -r407868f303202b857482e27fa78108c81c568dd7
--- leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision efb1d2a271b1b06b7fd133beaa5ab4728e58f610)
+++ leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision 407868f303202b857482e27fa78108c81c568dd7)
@@ -80,7 +80,6 @@
         @param message:  published syringe pump data message
         @return: None
         """
-
         msg_list = []
         msg_list.append(('self.syringe_pump_state',             DataTypes.U32))
         msg_list.append(('self.heparin_state',                  DataTypes.U32))
@@ -98,44 +97,8 @@
         msg_list.append(('self.syringe_pump_adc_read_counter',  DataTypes.U08))
 
         self.process_into_vars(decoder_list = msg_list,
-                                        message = message)
-        sta = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
-        hep = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
-        srt = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
-        mrt = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
-        pos = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
-        vol = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
-        hom = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
-        det = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
-        frc = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))
-        saf = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))
-        sts = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))
+                               message = message)
 
-        self.syringe_pump_state = sta[0]
-        self.heparin_state = hep[0]
-        self.syringe_pump_set_rate_ml_hr = srt[0]
-        self.syringe_pump_meas_rate_ml_hr = mrt[0]
-        self.syringe_pump_position = pos[0]
-        self.syringe_pump_volume_ml = vol[0]
-        self.syringe_pump_home_v = hom[0]
-        self.syringe_pump_switch_v = det[0]
-        self.syringe_pump_force_v = frc[0]
-        self.syringe_pump_safety_volume_ml = saf[0]
-        self.syringe_pump_status = (sts[0] & 0xFF000000) >> 24
-        self.syringe_pump_encoder_status = (sts[0] & 0x00FF0000) >> 16
-        self.syringe_pump_adc_dac_status = (sts[0] & 0x0000FF00) >> 8
-        self.syringe_pump_adc_read_counter = (sts[0] & 0x000000FF)
         self.td_syringe_pump_timestamp = timestamp