Index: firmware/source/sys_main.c
===================================================================
diff -u -r1240b612f790f931825aba86ec37f37eccce9336 -r2e56d2d983becc4b15bd296d583e046e061a5719
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 1240b612f790f931825aba86ec37f37eccce9336)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 2e56d2d983becc4b15bd296d583e046e061a5719)
@@ -77,6 +77,7 @@
 #include "DialOutFlow.h"
 #include "FluidLeak.h"
 #include "FPGA.h"
+#include "Integrity.h"
 #include "InternalADC.h"
 #include "Interrupts.h"
 #include "MsgQueues.h"
@@ -85,6 +86,7 @@
 #include "PresOccl.h"
 #include "RTC.h"
 #include "SafetyShutdown.h"
+#include "Switches.h"
 #include "SyringePump.h"
 #include "SystemComm.h"
 #include "TaskBG.h"
@@ -179,9 +181,9 @@
     initInternalADC();
     initBattery();
     initRTC();
-    initNVDataMgmt();
     // Initialize services
     initCommBuffers();
+    initIntegrity();
     initFPGA();
     initMsgQueues();
     initNVDataMgmt();
@@ -195,6 +197,7 @@
     initFluidLeak();
     initPresOccl();
     initVoltagesMonitor();
+    initSwitches();
     // Initialize controllers
     initAirTrap();
     initAlarmLamp();