Index: firmware/source/sys_main.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -r2e56d2d983becc4b15bd296d583e046e061a5719
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 2e56d2d983becc4b15bd296d583e046e061a5719)
@@ -68,13 +68,16 @@
 #include "AlarmLamp.h"
 #include "Battery.h"
 #include "BloodFlow.h"
+#include "BloodLeak.h"
+#include "Bubble.h"
 #include "Buttons.h"
 #include "CommBuffers.h"
 #include "CPLD.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
 #include "FluidLeak.h"
 #include "FPGA.h"
+#include "Integrity.h"
 #include "InternalADC.h"
 #include "Interrupts.h"
 #include "MsgQueues.h"
@@ -83,11 +86,13 @@
 #include "PresOccl.h"
 #include "RTC.h"
 #include "SafetyShutdown.h"
+#include "Switches.h"
 #include "SyringePump.h"
 #include "SystemComm.h"
 #include "TaskBG.h"
 #include "Timers.h"
 #include "Valves.h"
+#include "Voltages.h"
 #include "WatchdogMgmt.h"
 
 static void initProcessor( void );
@@ -176,18 +181,23 @@
     initInternalADC();
     initBattery();
     initRTC();
-    initNVDataMgmt();
     // Initialize services
     initCommBuffers();
+    initIntegrity();
     initFPGA();
     initMsgQueues();
     initNVDataMgmt();
     initSystemComm();
     initWatchdogMgmt();
     // Initialize monitors
     initAccel();
+    initBloodLeak();
+    initBubbles();
     initButtons();
+    initFluidLeak();
     initPresOccl();
+    initVoltagesMonitor();
+    initSwitches();
     // Initialize controllers
     initAirTrap();
     initAlarmLamp();
@@ -196,7 +206,6 @@
     initDialOutFlow();
     initSyringePump();
     initValves();
-    initFluidLeak();
     // Initialize modes
     initOperationModes();
     // Initialize async interrupt handlers