Index: firmware/source/sys_main.c
===================================================================
diff -u -r7d24ef2e6a4130b3a049e6106a0371fc6503271f -r7a9cfc7590be84e1c4af6a04ca92c598d49cf9de
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 7d24ef2e6a4130b3a049e6106a0371fc6503271f)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 7a9cfc7590be84e1c4af6a04ca92c598d49cf9de)
@@ -46,6 +46,7 @@
 /* USER CODE END */
 
 /* Include Files */
+
 #include "sys_common.h"
 
 /* USER CODE BEGIN (1) */
@@ -62,20 +63,45 @@
 
 #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 "DryBiCart.h"
+#include "Flow.h"
+#include "FlowSensor.h"
+#include "FluidPump.h"
+#include "FPModeFault.h"
+#include "FPModeInitPOST.h"
+#include "FPModeStandby.h"
+#include "FPOperationModes.h"
 #include "FpgaDD.h"
 #include "FPInterface.h"
 #include "Heaters.h"
+#include "Integrity.h"
 #include "Interrupts.h"
 #include "Level.h"
+#include "MixingControl.h"
+#include "ModeGenPermeateDefeatured.h"
+#include "ModePreGenPermeateDefeatured.h"
+#include "ModeGenPermeate.h"
+#include "ModePreGenPermeate.h"
 #include "MsgQueues.h"
+#include "NVMgmt.h"
 #include "OperationModes.h"
+#include "PermeateTank.h"
 #include "Pressure.h"
+#include "RinsePump.h"
+#include "ROPump.h"
 #include "SafetyShutdown.h"
+#include "StateFlushConcentrate.h"
+#include "StateFlushFilter.h"
+#include "StateFlushFilterDefeatured.h"
+#include "StateFlushPermeate.h"
+#include "StateInletPressureCheck.h"
+#include "SubstitutionPump.h"
 #include "SystemCommDD.h"
 #include "TaskBG.h"
 #include "TDInterface.h"
@@ -85,6 +111,7 @@
 #include "Ultrafiltration.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
+#include "WaterQualityMonitor.h"
 
 static void initProcessor( void );
 static void initSoftware( void );
@@ -166,6 +193,7 @@
     initWatchdogMgmt();
     initInterrupts();
     initFPGADD();
+    initNVMgmt();
     initPressure();
     initConductivity();
     initValves();
@@ -183,6 +211,41 @@
     initTDInterface();
     initFPInterface();
     initUltrafiltration();
+    initRinsePump();
+    initDryBiCart();
+    initSubstitutionPump();
+    initMixingControl();
+    initIntegrity();
+
+    // 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();
+    initInletPressureCheck();
+    initFilterFlushDefeatured();
+    initFilterFlush();
+    initConcentrateFlush();
+    initPermeateFlush();
 }
 
 /*************************************************************************