Index: firmware/source/sys_main.c
===================================================================
diff -u -rd5574e12aa9638c933d11b9bee8d5cf024864440 -r9b91228c0cb3eee3f06cfab4436e812722187839
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision d5574e12aa9638c933d11b9bee8d5cf024864440)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 9b91228c0cb3eee3f06cfab4436e812722187839)
@@ -47,6 +47,8 @@
 
 /* Include Files */
 
+
+
 #include "sys_common.h"
 
 /* USER CODE BEGIN (1) */
@@ -61,28 +63,33 @@
 #include "system.h"
 #include "sys_dma.h"
 
-#include "AlarmMgmtRO.h"
+#include "AlarmMgmtFP.h"
+#include "BoostPump.h"
 #include "CommBuffers.h"
 #include "Conductivity.h"
 #include "DDInterface.h"
-#include "FilterFlush.h"
 #include "Flow.h"
-#include "FpgaRO.h"
+#include "FlushConcentrate.h"
+#include "FlushFilter.h"
+#include "FlushPermeate.h"
+#include "FpgaFP.h"
+#include "FPModeFault.h"
+#include "FPModeInitPOST.h"
+#include "FPModeStandby.h"
+#include "FPOperationModes.h"
 #include "InternalADC.h"
 #include "Interrupts.h"
 #include "Level.h"
-#include "MembraneFlush.h"
-#include "ModeFault.h"
-#include "ModeInitPOST.h"
-#include "ModeStandby.h"
-#include "ModeWaterGen.h"
-#include "ModeWaterPreGen.h"
+#include "ModeGenPermeateDefeatured.h"
+#include "ModePreGenPermeateDefeatured.h"
+#include "ModeGenPermeate.h"
+#include "ModePreGenPermeate.h"
 #include "MsgQueues.h"
-#include "OperationModes.h"
+#include "PermeateTank.h"
 #include "Pressure.h"
 #include "ROPump.h"
 #include "SafetyShutdown.h"
-#include "SystemCommRO.h"
+#include "SystemCommFP.h"
 #include "TaskBG.h"
 #include "Temperature.h"
 #include "Timers.h"
@@ -162,16 +169,15 @@
  *************************************************************************/
 static void initSoftware( void )
 {
-
     // Tasks and Core
     initSemaphores();
     initTimers();
     initSafetyShutdown();
-    initAlarmMgmtRO();
+    initAlarmMgmtFP();
     initWatchdogMgmt();
     initCommBuffers();
     initMsgQueues();
-    initSystemCommRO();
+    initSystemCommFP();
     initTestConfigs();
 
     // Services
@@ -185,11 +191,12 @@
     initFluidPump();
     initInternalADC();
     initPressureSensor();
-    initTemperatureSensors();
 
     // Controllers
     initROPump();
+    initBoostPump();
     initValves();
+    initPermeateTank();
 
     // Monitors
     initConductivity();
@@ -200,11 +207,16 @@
 
     // Modes
     initOperationModes();
-    initGenWaterMode();
-    initStandbyMode();
     initInitAndPOSTMode();
     initFaultMode();
-    initPreGenWMode();
+    initStandbyMode();
+    initPreGenPermeateDefeaturedMode();
+    initPreGenPMode();
+    initGenPermeateMode();
+    initGenPermeateDefeaturedMode();
+    initFilterFlush();
+    initConcentrateFlush();
+    initPermeateFlush();
 }
 
 /*************************************************************************