Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -rb3774ad1df35c613de1c09bef40a55eb0ce4af36 -r2dab2b0329a56006e07cd36a3883ed099d7a367a
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision b3774ad1df35c613de1c09bef40a55eb0ce4af36)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 2dab2b0329a56006e07cd36a3883ed099d7a367a)
@@ -23,7 +23,9 @@
 from .modules.heaters import DDHeaters
 from .modules.levels import DDLevels
 from .modules.piston_pump import DDPistonPumps
+from .modules.post_gen_dialysate import DDPostGenDialysate
 from .modules.pressure_sensors import DDPressureSensors
+from .modules.pre_gen_dialysate import DDPreGenDialysate
 from .modules.temperature_sensors import DDTemperatureSensors
 from .modules.valves import DDValves
 
@@ -120,7 +122,9 @@
         self.heaters = DDHeaters(self.can_interface, self.logger)
         self.levels = DDLevels(self.can_interface, self.logger)
         self.piston_pumps = DDPistonPumps(self.can_interface, self.logger)
+        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.temperature_sensors = DDTemperatureSensors(self.can_interface, self.logger)
         self.valves = DDValves(self.can_interface, self.logger)
 
Index: leahi_dialin/dd/modules/post_gen_dialysate.py
===================================================================
diff -u -r252b89bc37ea3f3e104671dfa2c59231bffc7e52 -r2dab2b0329a56006e07cd36a3883ed099d7a367a
--- leahi_dialin/dd/modules/post_gen_dialysate.py	(.../post_gen_dialysate.py)	(revision 252b89bc37ea3f3e104671dfa2c59231bffc7e52)
+++ leahi_dialin/dd/modules/post_gen_dialysate.py	(.../post_gen_dialysate.py)	(revision 2dab2b0329a56006e07cd36a3883ed099d7a367a)
@@ -24,7 +24,7 @@
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
-class DDGenDialysate(AbstractSubSystem):
+class DDPostGenDialysate(AbstractSubSystem):
     """
     Gen Dialysate
 
Index: leahi_dialin/dd/modules/pre_gen_dialysate.py
===================================================================
diff -u -r4356d86fbeba5afa08ebe258b9ad271f345e1b82 -r2dab2b0329a56006e07cd36a3883ed099d7a367a
--- leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision 4356d86fbeba5afa08ebe258b9ad271f345e1b82)
+++ leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision 2dab2b0329a56006e07cd36a3883ed099d7a367a)
@@ -24,7 +24,7 @@
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
-class DDGenDialysate(AbstractSubSystem):
+class DDPreGenDialysate(AbstractSubSystem):
     """
     Gen Dialysate
 
Index: leahi_dialin/dd/proxies/td_proxy.py
===================================================================
diff -u -r807865a69903d012ecf8c2867b9fe91c26b1cc08 -r2dab2b0329a56006e07cd36a3883ed099d7a367a
--- leahi_dialin/dd/proxies/td_proxy.py	(.../td_proxy.py)	(revision 807865a69903d012ecf8c2867b9fe91c26b1cc08)
+++ leahi_dialin/dd/proxies/td_proxy.py	(.../td_proxy.py)	(revision 2dab2b0329a56006e07cd36a3883ed099d7a367a)
@@ -98,7 +98,6 @@
         byp = integer_to_bytearray(bypass)
         acd = integer_to_bytearray(acid)
         bic = integer_to_bytearray(bicarb)
-        #payload = bic +acd + byp + temp + uf + dial + stt
         payload = stt + dial + uf + temp + byp + acd + bic
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
                                               message_id=MsgIds.MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA.value,
Index: leahi_dialin/td/proxies/dd_proxy.py
===================================================================
diff -u -red37b7bb23aba19839c0c52610c669360914f5c1 -r2dab2b0329a56006e07cd36a3883ed099d7a367a
--- leahi_dialin/td/proxies/dd_proxy.py	(.../dd_proxy.py)	(revision ed37b7bb23aba19839c0c52610c669360914f5c1)
+++ leahi_dialin/td/proxies/dd_proxy.py	(.../dd_proxy.py)	(revision 2dab2b0329a56006e07cd36a3883ed099d7a367a)
@@ -38,25 +38,3 @@
         self.logger = logger
 
         # no current registered call back methods
-
-    def cmd_td_send_dd_gen_dialysate_request(self, start: bool = 0, dial_rate: float = 0, uf_rate: float = 0,
-                                             dial_temp: float = 0, bypass: int = 0, acid: int = 0, bicarb: int = 0):
-        """
-        Constructs and sends a TD gen dialysate request to the DD.
-
-        @return: none
-        """
-        stt = integer_to_bytearray(start)
-        dial = float_to_bytearray(dial_rate)
-        uf = float_to_bytearray(uf_rate)
-        temp = float_to_bytearray(dial_temp)
-        byp = integer_to_bytearray(bypass)
-        acd = integer_to_bytearray(acid)
-        bic = integer_to_bytearray(bicarb)
-        payload = bic +acd + byp + temp + uf + dial + stt
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.td_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA.value,
-                                              payload=payload)
-
-        self.logger.debug("Sending TD gen dialysate data request to DD.")
-        self.can_interface.send(message, 0)
\ No newline at end of file