Index: firmware/source/sys_main.c
===================================================================
diff -u -r22f7bcd7e26dc6be337fdb6adbc9281e8f60dbbc -r5bec978fa9cce89bbf8c559f0844b7528a10c0d1
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 22f7bcd7e26dc6be337fdb6adbc9281e8f60dbbc)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 5bec978fa9cce89bbf8c559f0844b7528a10c0d1)
@@ -47,6 +47,7 @@
 
 /* Include Files */
 
+#include <HDCommon.h>
 #include "sys_common.h"
 
 /* USER CODE BEGIN (1) */
@@ -60,17 +61,21 @@
 #include "sci.h"
 #include "rti.h"
 
-#include "Common.h"
+#include "HDCommon.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
 #include "CommBuffers.h"
 #include "CPLD.h"
 #include "DialInFlow.h"
+#include "DialOutFlow.h"
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "MsgQueues.h"
+#include "NVDataMgmt.h"
 #include "OperationModes.h"
+#include "PresOccl.h"
+#include "RTC.h"
 #include "SafetyShutdown.h"
 #include "SystemComm.h"
 #include "TaskBG.h"
@@ -134,9 +139,9 @@
         etpwmSetCmpA( etpwmREG1, 0 );
         etpwmSetCmpA( etpwmREG2, 0 );
         etpwmSetCmpA( etpwmREG3, 0 );
-        etpwmSetCmpA( etpwmREG4, 0 );
-        etpwmSetCmpA( etpwmREG6, 0 );
-        etpwmSetCmpA( etpwmREG7, 0 );
+        etpwmSetCmpA( etpwmREG4, etpwmREG4->TBPRD / 3 );
+        etpwmSetCmpA( etpwmREG6, etpwmREG6->TBPRD / 3 );
+        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
@@ -156,19 +161,23 @@
 {
     initAlarmMgmt();
     initTimers();
-    initSafetyShutdown();
     initCPLD();
-    initInternalADC();
-    initBloodFlow();
-    initDialInFlow();
-    initAlarmLamp();
-    initButtons();
+    initSafetyShutdown();
     initWatchdogMgmt();
     initFPGA();
+    initAlarmLamp();
+    initButtons();
+    initInternalADC();
     initCommBuffers();
     initMsgQueues();
     initSystemComm();
+    initPresOccl();
+    initBloodFlow();
+    initDialInFlow();
+    initDialOutFlow();
     initOperationModes();
+    initRTC();
+    initNVDataMgmt();
 }
 
 /*************************************************************************