Index: firmware/source/sys_main.c
===================================================================
diff -u -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 -r4638fd77792d0c7ecbeca3c84369cbed6c2ecee1
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 4638fd77792d0c7ecbeca3c84369cbed6c2ecee1)
@@ -61,13 +61,17 @@
 #include "rti.h"
 
 #include "DGCommon.h"
+#include "Accel.h"
 #include "AlarmMgmt.h"
 #include "CommBuffers.h"
+#include "ConductivitySensors.h"
+#include "ConcentratePumps.h"
 #include "CPLD.h"
 #include "DrainPump.h"
 #include "FPGA.h"
 #include "Heaters.h"
 #include "InternalADC.h"
+#include "Interrupts.h"
 #include "LoadCell.h"
 #include "MsgQueues.h"
 #include "OperationModes.h"
@@ -80,6 +84,7 @@
 #include "TaskBG.h"
 #include "TemperatureSensors.h"
 #include "Timers.h"
+#include "UVReactors.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
 
@@ -110,9 +115,7 @@
     initTasks();        // setup and start the scheduled tasks
 
     // start task background (will not return)
-#ifndef _VECTORCAST_
     taskBackground();
-#endif
 
 /* USER CODE END */
 
@@ -126,9 +129,8 @@
  * @brief initProcessor
  * The initProcessor function initializes and configures the processor \n
  * peripherals.
- * @details
- * Inputs : none
- * Outputs : Processor peripherals initialized and configured.
+ * @details Inputs: none
+ * @details Outputs: Processor peripherals initialized and configured.
  * @return none
  *************************************************************************/
 static void initProcessor( void )
@@ -152,9 +154,8 @@
 /*************************************************************************
  * @brief initSoftware
  * The initSoftware function calls all software module initialize functions.
- * @details
- * Inputs : none
- * Outputs : All modules initialized.
+ * @details Inputs: none
+ * @details Outputs: All modules initialized.
  * @return none
  *************************************************************************/
 static void initSoftware( void )
@@ -164,15 +165,20 @@
     initCPLD();
     initAlarmMgmt();
     initWatchdogMgmt();
+    initInterrupts();
     initFPGA();
     initInternalADC();
     initPressures();
     initLoadCell();
     initValves();
     initHeaters();
     initTemperatureSensors();
+    initConductivitySensors();
+    initConcentratePump();
     initROPump();
     initDrainPump();
+    initUVReactors();
+    initAccel();
     initRTC();
     initCommBuffers();
     initMsgQueues();
@@ -184,9 +190,8 @@
 /*************************************************************************
  * @brief initHardware
  * The initHardware function initializes and configures external hardware.
- * @details
- * Inputs : none
- * Outputs : External hardware initialized and configured.
+ * @details Inputs: none
+ * @details Outputs: External hardware initialized and configured.
  * @return none
  *************************************************************************/
 static void initHardware( void )
@@ -196,9 +201,8 @@
 /*************************************************************************
  * @brief initTasks
  * The initTasks function sets up and starts the scheduled tasks.
- * @details
- * Inputs : none
- * Outputs : Scheduled tasks set up and started.
+ * @details Inputs: none
+ * @details Outputs: Scheduled tasks set up and started.
  * @return none
  *************************************************************************/
 static void initTasks( void )
@@ -207,7 +211,7 @@
     rtiInit();
     rtiEnableNotification( rtiNOTIFICATION_COMPARE0 | rtiNOTIFICATION_COMPARE1 | rtiNOTIFICATION_COMPARE3 );
     rtiStartCounter( rtiCOUNTER_BLOCK0 );
-    // the timer task (and other comm related interrupts) require FIQ enabled
+    // the timer task requires FIQ enabled
     _enable_FIQ();
     // the general and priority tasks require IRQ enabled
     _enable_IRQ();