Index: firmware/source/sys_main.c
===================================================================
diff -u -r1c80d60fe6a95297a8a8033a3c7eade53e72779a -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 1c80d60fe6a95297a8a8033a3c7eade53e72779a)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -60,14 +60,14 @@
 #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"
@@ -78,7 +78,6 @@
 #include "SystemComm.h"
 #include "TaskBG.h"
 #include "Timers.h"
-#include "TreatmentStop.h"
 #include "WatchdogMgmt.h"
 
 static void initProcessor( void );
@@ -138,9 +137,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
@@ -173,8 +172,7 @@
     initPresOccl();
     initBloodFlow();
     initDialInFlow();
-    initDialysis();
-    initTreatmentStop();
+    initDialOutFlow();
     initOperationModes();
     initRTC();
 }