Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -ra6684f5a4c807bf27996b9521c6d0f9f7c85d9f5 -rcb586152197059cb52c33474f5b9be0855bbad51
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision a6684f5a4c807bf27996b9521c6d0f9f7c85d9f5)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision cb586152197059cb52c33474f5b9be0855bbad51)
@@ -25,7 +25,8 @@
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "Reservoirs.h"
-#include "ROPump.h"
+#include "ROPump.h"
+#include "RTC.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
@@ -72,8 +73,11 @@
     checkInWithWatchdogMgmt( TASK_GENERAL );  // do this first to keep timing consistent with watchdog management
 
     // manage data received from other sub-systems
-    execSystemCommRx();
+    execSystemCommRx();
 
+    // Control and monitor RTC
+    execRTC();
+
     // monitor concentrate pumps
     //execConcentratePumpMonitor();
 
@@ -109,7 +113,7 @@
     execOperationModes();
 
     // Run non-volatile data management calibration state machine
-    execNVDataMgmtCalibration();
+    execNVDataMgmtProcessRecord();
 
     // manage data to be transmitted to other sub-systems
     execSystemCommTx();