Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 -r5078ad4a3a95a7ae34b7166d6e6228f5d5c74aba
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 5078ad4a3a95a7ae34b7166d6e6228f5d5c74aba)
@@ -23,9 +23,11 @@
 from .constants import RESET
 from .drain_pump import DGDrainPump
 from .fans import Fans
+from .dialysate_fill import DialysateFill
 from .dialysate_flow_sensor import DialysateFlowSensor
 from .fluid_leak import DGFluidLeak
 from .flush import FlushMode
+from .gen_idle import GenIdle
 from .hd_proxy import DGHDProxy
 from .heat_disinfect import HeatDisinfect
 from .heaters import Heaters
@@ -160,11 +162,13 @@
         self.chemical_disinfect = ChemicalDisinfect(self.can_interface, self.logger)
         self.concentrate_pumps = ConcentratePumps(self.can_interface, self.logger)
         self.conductivity_sensors = ConductivitySensors(self.can_interface, self.logger)
+        self.dialysate_fill = DialysateFill(self.can_interface, self.logger)
         self.dialysate_flow_sensor = DialysateFlowSensor(self.can_interface, self.logger)
         self.drain_pump = DGDrainPump(self.can_interface, self.logger)
         self.fans = Fans(self.can_interface, self.logger)
         self.fluid_leak = DGFluidLeak(self.can_interface, self.logger)
         self.flush = FlushMode(self.can_interface, self.logger)
+        self.gen_idle = GenIdle(self.can_interface, self.logger)
         self.hd_proxy = DGHDProxy(self.can_interface, self.logger)
         self.heat_disinfect = HeatDisinfect(self.can_interface, self.logger)
         self.heaters = Heaters(self.can_interface, self.logger)
Index: dialin/dg/ro_pump.py
===================================================================
diff -u -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 -r5078ad4a3a95a7ae34b7166d6e6228f5d5c74aba
--- dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309)
+++ dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision 5078ad4a3a95a7ae34b7166d6e6228f5d5c74aba)
@@ -62,7 +62,7 @@
         self.ro_pump_state = 0
         self.target_flow_lpm = 0.0
         self.feedback_duty_cycle_pct = 0.0
-        self.measured_raw_flow_rate_mlp = 0.0
+        self.measured_raw_flow_rate_with_conc_pumps_mlp = 0.0
 
     def get_target_pressure(self):
         """
@@ -102,10 +102,10 @@
 
         @return: The RO pump measured raw flow rate in mL/min
         """
-        return self.measured_raw_flow_rate_mlp
+        return self.measured_raw_flow_rate_with_conc_pumps_mlp
 
     @publish(["target_pressure_psi", "measured_flow_rate_lpm", "pwm_duty_cycle_pct", "ro_pump_state",
-              "feedback_duty_cycle_pct", "measured_raw_flow_rate_mlp"])
+              "feedback_duty_cycle_pct", "measured_raw_flow_rate_with_conc_pumps_mlp"])
     def _handler_ro_pump_sync(self, message):
         """
         Handles published ro pump data messages.  RO pump data are captured
@@ -127,7 +127,7 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
         self.feedback_duty_cycle_pct = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.measured_raw_flow_rate_mlp = struct.unpack('f', bytearray(
+        self.measured_raw_flow_rate_with_conc_pumps_mlp = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
 
         self.ro_pump_state = ROPumpStates(ro_state).name