Index: firmware/source/sys_main.c
===================================================================
diff -u -ree4aba56d1581f160a48fe51326b93c50bdd892d -r04f033af4174bf41a7aa0ff9ccaae45b77472e01
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision ee4aba56d1581f160a48fe51326b93c50bdd892d)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 04f033af4174bf41a7aa0ff9ccaae45b77472e01)
@@ -54,6 +54,7 @@
 #include "sys_dma.h"
 #include "adc.h"
 #include "can.h"
+#include "i2c.h"
 #include "etpwm.h"
 #include "gio.h"
 #include "het.h"
@@ -65,7 +66,9 @@
 #include "Accel.h"
 #include "AirTrap.h"
 #include "AlarmLamp.h"
+#include "Battery.h"
 #include "BloodFlow.h"
+#include "BloodLeak.h"
 #include "Buttons.h"
 #include "CommBuffers.h"
 #include "CPLD.h"
@@ -81,6 +84,7 @@
 #include "PresOccl.h"
 #include "RTC.h"
 #include "SafetyShutdown.h"
+#include "SyringePump.h"
 #include "SystemComm.h"
 #include "TaskBG.h"
 #include "Timers.h"
@@ -149,8 +153,8 @@
         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
 }
 
@@ -171,7 +175,9 @@
     initCPLD();
     initSafetyShutdown();
     initInternalADC();
+    initBattery();
     initRTC();
+    initNVDataMgmt();
     // Initialize services
     initCommBuffers();
     initFPGA();
@@ -181,16 +187,18 @@
     initWatchdogMgmt();
     // Initialize monitors
     initAccel();
+    initBloodLeak();
     initButtons();
+    initFluidLeak();
     initPresOccl();
     // Initialize controllers
     initAirTrap();
     initAlarmLamp();
     initBloodFlow();
     initDialInFlow();
     initDialOutFlow();
+    initSyringePump();
     initValves();
-    initFluidLeak();
     // Initialize modes
     initOperationModes();
     // Initialize async interrupt handlers