Index: firmware/source/sys_main.c
===================================================================
diff -u -r4fb1e15d35f6b968bab5620909c30baec98bfd4e -r333e2d0c0462dcb4343a279420949cce716ebab7
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 4fb1e15d35f6b968bab5620909c30baec98bfd4e)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 333e2d0c0462dcb4343a279420949cce716ebab7)
@@ -46,54 +46,46 @@
 /* USER CODE END */
 
 /* Include Files */
-
 #include "sys_common.h"
 
 /* USER CODE BEGIN (1) */
-#include "system.h"
-#include "sys_dma.h"
 #include "adc.h"
 #include "can.h"
 #include "etpwm.h"
 #include "gio.h"
 #include "het.h"
 #include "mibspi.h"
-#include "sci.h"
 #include "rti.h"
+#include "sci.h"
+#include "system.h"
+#include "sys_dma.h"
 
-#include "DDCommon.h"
-#include "AlarmMgmt.h"
+#include "AlarmMgmtDD.h"
 #include "CommBuffers.h"
-//#include "ConductivitySensors.h"
-//#include "ConcentratePumps.h"
-//#include "CPLD.h"
-//#include "DrainPump.h"
-//#include "Fans.h"
-//#include "FluidLeak.h"
-//#include "FlowSensors.h"
-#include "FPGA.h"
-#include "FPGADD.h"
-//#include "Heaters.h"
-//#include "Integrity.h"
-//#include "InternalADC.h"
+#include "Conductivity.h"
+#include "ConcentratePumps.h"
+#include "DDCommon.h"
+#include "DialysatePumps.h"
+#include "FpgaDD.h"
+#include "Heaters.h"
 #include "Interrupts.h"
+#include "Level.h"
 #include "MsgQueues.h"
-//#include "NVDataMgmt.h"
 #include "OperationModes.h"
-//#include "Pressures.h"
-//#include "ROPump.h"
-//#include "RTC.h"
+#ifdef __PUMPTEST__
+#include "PistonPumpControl.h"
+#endif
+#include "Pressure.h"
+#include "ROInterface.h"
 #include "SafetyShutdown.h"
-//#include "Switches.h"
-#include "SystemComm.h"
+#include "SystemCommDD.h"
 #include "TaskBG.h"
-//#include "TemperatureSensors.h"
-//#include "Thermistors.h"
+#include "TDInterface.h"
 #include "Timers.h"
+#include "Temperature.h"
 #include "Utilities.h"
-//#include "UVReactors.h"
-//#include "Valves.h"
-//#include "Voltages.h"
+#include "Ultrafiltration.h"
+#include "Valves.h"
 #include "WatchdogMgmt.h"
 
 static void initProcessor( void );
@@ -176,29 +168,25 @@
     initWatchdogMgmt();
     initInterrupts();
     initFPGADD();
-    //initCPLD();
-    //initInternalADC();
-    //initFlowSensors();
-    //initPressures();
-    //initLoadCell();
-    //initNVDataMgmt();
-    //initValves();
-    //initHeaters();
-    //initTemperatureSensors();
-    //initConductivitySensors();
-    //initConcentratePump();
-    //initFans();
-    //initThermistors();
-    //initVoltagesMonitor();
-    //initROPump();
-    //initDrainPump();
-    //initSwitches();
+    initPressure();
+    initConductivity();
+    initValves();
+    initHeaters();
+    initTemperature();
+    initConcentratePump();
+    initDialysatePump();
+    initLevels();
     initCommBuffers();
     initMsgQueues();
     initSystemComm();
     initOperationModes();
-    //initIntegrity();
     initTestConfigs();
+    initTDInterface();
+    initROInterface();
+    initUltrafiltration();
+#ifdef __PUMPTEST__
+    initPistonPump();
+#endif
 }
 
 /*************************************************************************