Index: firmware/source/sys_main.c
===================================================================
diff -u -r03d752c607e90f52e2f0b05a2ebd01283ed3f033 -r711ff90b0aab45c4acde333f4c9f11be9b62f383
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 03d752c607e90f52e2f0b05a2ebd01283ed3f033)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 711ff90b0aab45c4acde333f4c9f11be9b62f383)
@@ -46,6 +46,7 @@
 /* USER CODE END */
 
 /* Include Files */
+
 #include "sys_common.h"
 
 /* USER CODE BEGIN (1) */
@@ -62,22 +63,37 @@
 
 #include "AlarmMgmtDD.h"
 #include "BloodLeak.h"
+#include "BoostPump.h"
 #include "CommBuffers.h"
 #include "Conductivity.h"
 #include "ConcentratePumps.h"
 #include "DDCommon.h"
 #include "DialysatePumps.h"
+#include "Flow.h"
+#include "FlowSensor.h"
+#include "FluidPump.h"
+#include "FlushConcentrate.h"
+#include "FlushFilter.h"
+#include "FlushPermeate.h"
+#include "FPModeFault.h"
+#include "FPModeInitPOST.h"
+#include "FPModeStandby.h"
+#include "FPOperationModes.h"
 #include "FpgaDD.h"
 #include "FPInterface.h"
 #include "Heaters.h"
 #include "Interrupts.h"
 #include "Level.h"
+#include "ModeGenPermeateDefeatured.h"
+#include "ModePreGenPermeateDefeatured.h"
+#include "ModeGenPermeate.h"
+#include "ModePreGenPermeate.h"
 #include "MsgQueues.h"
 #include "OperationModes.h"
-#ifdef __PUMPTEST__
-#include "PistonPumpControl.h"
-#endif
+#include "PermeateTank.h"
 #include "Pressure.h"
+#include "RinsePump.h"
+#include "ROPump.h"
 #include "SafetyShutdown.h"
 #include "SystemCommDD.h"
 #include "TaskBG.h"
@@ -88,6 +104,7 @@
 #include "Ultrafiltration.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
+#include "WaterQualityMonitor.h"
 
 static void initProcessor( void );
 static void initSoftware( void );
@@ -186,9 +203,35 @@
     initTDInterface();
     initFPInterface();
     initUltrafiltration();
-#ifdef __PUMPTEST__
-    initPistonPump();
-#endif
+    initRinsePump();
+
+    // FP Modules
+
+    // FP Controllers
+    initBoostPump();
+    initPermeateTank();
+    initROPump();
+
+    // FP Drivers
+    initFlowSensor();
+    initFluidPump();
+
+    // FP Monitors
+    initFlow();
+    initWaterQualityMonitor();
+
+    // FP Modes
+    initFPOperationModes();
+    initFPInitAndPOSTMode();
+    initFPFaultMode();
+    initFPStandbyMode();
+    initPreGenPermeateDefeaturedMode();
+    initPreGenPMode();
+    initGenPermeateMode();
+    initGenPermeateDefeaturedMode();
+    initFilterFlush();
+    initConcentrateFlush();
+    initPermeateFlush();
 }
 
 /*************************************************************************