Index: firmware/source/sys_main.c
===================================================================
diff -u -r30f049651877229042e3f8700c8596e5b9a1e0f4 -rd6c75118f4e5792b40b744a0b29e44c78368a469
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 30f049651877229042e3f8700c8596e5b9a1e0f4)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision d6c75118f4e5792b40b744a0b29e44c78368a469)
@@ -71,6 +71,7 @@
 #include "CPLD.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
+#include "FluidLeak.h"
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "Interrupts.h"
@@ -80,6 +81,7 @@
 #include "PresOccl.h"
 #include "RTC.h"
 #include "SafetyShutdown.h"
+#include "SyringePump.h"
 #include "SystemComm.h"
 #include "TaskBG.h"
 #include "Timers.h"
@@ -148,7 +150,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
     dmaEnable();    // Enable DMA
 }
@@ -171,6 +172,7 @@
     initSafetyShutdown();
     initInternalADC();
     initRTC();
+    initNVDataMgmt();
     // Initialize services
     initCommBuffers();
     initFPGA();
@@ -188,7 +190,9 @@
     initBloodFlow();
     initDialInFlow();
     initDialOutFlow();
+    initSyringePump();
     initValves();
+    initFluidLeak();
     // Initialize modes
     initOperationModes();
     // Initialize async interrupt handlers