Index: firmware/source/sys_main.c
===================================================================
diff -u -r97e24856b80f612b2556fb9a599e40659710822a -r1467e388082a0d4c9e4b7e03b689a70ba42862db
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 97e24856b80f612b2556fb9a599e40659710822a)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 1467e388082a0d4c9e4b7e03b689a70ba42862db)
@@ -68,11 +68,13 @@
 #include "AlarmLamp.h"
 #include "Battery.h"
 #include "BloodFlow.h"
+#include "BloodLeak.h"
 #include "Buttons.h"
 #include "CommBuffers.h"
 #include "CPLD.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
+#include "FluidLeak.h"
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "Interrupts.h"
@@ -87,6 +89,7 @@
 #include "TaskBG.h"
 #include "Timers.h"
 #include "Valves.h"
+#include "Voltages.h"
 #include "WatchdogMgmt.h"
 
 static void initProcessor( void );
@@ -151,7 +154,6 @@
         etpwmSetCmpA( etpwmREG7, etpwmREG7->TBPRD / 3 );
         etpwmStartTBCLK();
     canInit();      // CAN1 = CAN, re-purposing CAN2 and CAN3 Rx and Tx pins as GPIO
-        //canEnableloopback( canREG1, External_Lbk );  // TODO - debug code
     sciInit();      // SCI1 used for PC serial interface, SCI2 used for FPGA serial interface
     i2cInit();      // I2C used for battery charger interface.
     dmaEnable();    // Enable DMA
@@ -176,6 +178,7 @@
     initInternalADC();
     initBattery();
     initRTC();
+    initNVDataMgmt();
     // Initialize services
     initCommBuffers();
     initFPGA();
@@ -185,8 +188,11 @@
     initWatchdogMgmt();
     // Initialize monitors
     initAccel();
+    initBloodLeak();
     initButtons();
+    initFluidLeak();
     initPresOccl();
+    initVoltagesMonitor();
     // Initialize controllers
     initAirTrap();
     initAlarmLamp();