Index: firmware/source/sys_main.c
===================================================================
diff -u -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd -r647ed0beef9e4aeefb3a0bc0267254dd36cfe685
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 647ed0beef9e4aeefb3a0bc0267254dd36cfe685)
@@ -68,12 +68,15 @@
 #include "InternalADC.h"
 #include "MsgQueues.h"
 #include "OperationModes.h"
+#include "Reservoirs.h"
 #include "RTC.h"
 #include "SafetyShutdown.h"
 #include "SystemComm.h"
 #include "TaskBG.h"
+#include "TemperatureSensors.h"
 #include "Timers.h"
 #include "WatchdogMgmt.h"
+#include "Heaters.h"
 
 static void initProcessor( void );
 static void initSoftware( void );
@@ -130,11 +133,12 @@
     mibspiInit();   // configure MIBSPI3 and re-purpose MIBSPI1 & 5 pins for GPIO
     etpwmInit();    // configure PWMs
         etpwmSetCmpA( etpwmREG1, 0 );
-        etpwmSetCmpA( etpwmREG2, 0 );
+        etpwmSetCmpB( etpwmREG1, 0 );
+        etpwmSetCmpB( etpwmREG2, 0 );
         etpwmSetCmpA( etpwmREG3, 0 );
-        etpwmSetCmpA( etpwmREG4, 0 );
         etpwmSetCmpA( etpwmREG6, 0 );
-        etpwmSetCmpA( etpwmREG7, 0 );
+        etpwmSetCmpB( etpwmREG6, 0 );
+        etpwmStartTBCLK();
     canInit();      // CAN1 = CAN, re-purposing CAN2 and CAN3 Rx and Tx pins as GPIO
     sciInit();      // SCI1 used for PC serial interface, SCI2 used for FPGA serial interface
     dmaEnable();    // enable DMA
@@ -161,7 +165,10 @@
     initCommBuffers();
     initMsgQueues();
     initSystemComm();
+    initReservoirs();
     initOperationModes();
+    initTemperatureSensors();
+    initHeaters();
 }
 
 /*************************************************************************