Index: firmware/source/sys_main.c
===================================================================
diff -u -r30f049651877229042e3f8700c8596e5b9a1e0f4 -r6419179374edcd65da462de84e8aeaefb7e20320
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 30f049651877229042e3f8700c8596e5b9a1e0f4)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
@@ -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,12 +66,14 @@
 #include "Accel.h"
 #include "AirTrap.h"
 #include "AlarmLamp.h"
+#include "Battery.h"
 #include "BloodFlow.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"
@@ -80,6 +83,7 @@
 #include "PresOccl.h"
 #include "RTC.h"
 #include "SafetyShutdown.h"
+#include "SyringePump.h"
 #include "SystemComm.h"
 #include "TaskBG.h"
 #include "Timers.h"
@@ -148,8 +152,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
 }
 
@@ -170,7 +174,9 @@
     initCPLD();
     initSafetyShutdown();
     initInternalADC();
+    initBattery();
     initRTC();
+    initNVDataMgmt();
     // Initialize services
     initCommBuffers();
     initFPGA();
@@ -188,7 +194,9 @@
     initBloodFlow();
     initDialInFlow();
     initDialOutFlow();
+    initSyringePump();
     initValves();
+    initFluidLeak();
     // Initialize modes
     initOperationModes();
     // Initialize async interrupt handlers