Index: firmware/source/sys_main.c
===================================================================
diff -u -r07a5add2dff254f7be3699e4efac2b99d3554847 -r5bec978fa9cce89bbf8c559f0844b7528a10c0d1
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 07a5add2dff254f7be3699e4efac2b99d3554847)
+++ 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,24 +61,25 @@
 #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 "Dialysis.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"
 #include "Timers.h"
-#include "TreatmentStop.h"
 #include "WatchdogMgmt.h"
 
 static void initProcessor( void );
@@ -137,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
@@ -172,9 +174,10 @@
     initPresOccl();
     initBloodFlow();
     initDialInFlow();
-    initDialysis();
-    initTreatmentStop();
+    initDialOutFlow();
     initOperationModes();
+    initRTC();
+    initNVDataMgmt();
 }
 
 /*************************************************************************