Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r766708fceb0bdf1af8c7897df29d4f5036bfd3db -r6419179374edcd65da462de84e8aeaefb7e20320
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
@@ -16,12 +16,13 @@
 ***************************************************************************/
 
 #include "AirTrap.h"
-#include "AlarmLamp.h"
+#include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "CPLD.h"
 #include "DGInterface.h"
 #include "DialInFlow.h"
-#include "DialOutFlow.h"
+#include "DialOutFlow.h"
+#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "PresOccl.h"
 #include "SystemComm.h"
@@ -55,24 +56,27 @@
 
     // Check in with watchdog manager
     checkInWithWatchdogMgmt( TASK_GENERAL );  // Do this first to keep timing consistent with watchdog management
-
+
     // Manage data received from other sub-systems
     execSystemCommRx();
 
     // Prevent most processing until UI has started communicating
 #ifndef SIMULATE_UI
-    if ( TRUE == uiCommunicated() )
+    if ( TRUE == uiCommunicated() )
 #endif
-    {
+    {
+#ifndef BOARD_WITH_NO_HARDWARE
         // Monitor DG
         execDGInterfaceMonitor();
 
         // Monitor pressure/occlusion sensors
-        execPresOccl();
+        execPresOccl();
+#endif
 
         // Run operation mode state machine
         execOperationModes();
 
+#ifndef BOARD_WITH_NO_HARDWARE
         // Control air trap valve
         execAirTrapController();
 
@@ -83,13 +87,19 @@
         execDialInFlowController();
 
         // Control dialysate outlet pump
-        execDialOutFlowController();
+        execDialOutFlowController();
+#endif
 
         // Manage RTC
-        execRTC();
-
+        execRTC();
+
+        // Manage NVDataMgmt process record state machine
+        execNVDataMgmtProcessRecord();
+
+#ifndef RM46_EVAL_BOARD_TARGET
         // Manage alarm state
-        execAlarmMgmt();
+        execAlarmMgmt();
+#endif
 
         // Manage data to be transmitted to other sub-systems
         execSystemCommTx();