Index: firmware/App/HDCommon.h
===================================================================
diff -u -r7665e7b142961a50c5e77c44877247366a374526 -r3c5e31fbbcb7639c868894e9560cf68433f7d30a
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 7665e7b142961a50c5e77c44877247366a374526)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 3c5e31fbbcb7639c868894e9560cf68433f7d30a)
@@ -38,8 +38,9 @@
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
 //    #define DISABLE_ALARM_AUDIO             1           // Disable alarm audio
     #define SKIP_POST                       1           // Skip POST tests - all pass
-//    #define LIMITED_NVDATA_CRC_CHECKS       1           // Only perform POST CRC checks on nv-data records that are implemented so far
+    #define DONT_SKIP_NV_POST               1
     #define DISABLE_AIR_TRAP_LEVELING       1           // Disable air trap level control
+    #define DISABLE_CAL_CHECK
 //    #define DISABLE_3WAY_VALVES             1           // Disable 3-way valves
 //    #define TST_3WAY_VALVES_ALWAYS_OPEN     1           // After POST and homing, open all 4 valves
 //    #define DISABLE_ACCELS                  1           // Disable accelerometer POST and monitoring
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -ra95967003ef6168c6cb3c0d35b9219936645eae6 -r3c5e31fbbcb7639c868894e9560cf68433f7d30a
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision a95967003ef6168c6cb3c0d35b9219936645eae6)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 3c5e31fbbcb7639c868894e9560cf68433f7d30a)
@@ -103,12 +103,12 @@
         case POST_STATE_START:
             postState = POST_STATE_WATCHDOG;
 #ifdef SKIP_POST
-#ifndef BOARD_WITH_NO_HARDWARE
             postState = POST_STATE_COMPLETED;
-#else
+#endif
+#ifdef DONT_SKIP_NV_POST
+            // Only run NVDataMgmt POST
             postState = POST_STATE_NVDATAMGMT;
 #endif
-#endif
             break;
 
         case POST_STATE_WATCHDOG:
@@ -132,8 +132,13 @@
             break;
 
         case POST_STATE_BLOOD_FLOW:
+#ifdef DONT_SKIP_NV_POST
+            // Skip the rest of the POSTs
+            postState = POST_STATE_COMPLETED;
+#else
             testStatus = execBloodFlowTest();
             postState = handlePOSTStatus( testStatus );
+#endif
             break;
 
         case POST_STATE_DIALYSATE_FLOW:
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -ra95967003ef6168c6cb3c0d35b9219936645eae6 -r3c5e31fbbcb7639c868894e9560cf68433f7d30a
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision a95967003ef6168c6cb3c0d35b9219936645eae6)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 3c5e31fbbcb7639c868894e9560cf68433f7d30a)
@@ -62,19 +62,22 @@
 
     // Prevent most processing until UI has started communicating
 #ifndef SIMULATE_UI
-    if ( TRUE == uiCommunicated() )
+    //if ( TRUE == uiCommunicated() )
+    if ( TRUE ) //TODO remove
 #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();
 
Index: firmware/source/sys_main.c
===================================================================
diff -u -ree4aba56d1581f160a48fe51326b93c50bdd892d -r3c5e31fbbcb7639c868894e9560cf68433f7d30a
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision ee4aba56d1581f160a48fe51326b93c50bdd892d)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 3c5e31fbbcb7639c868894e9560cf68433f7d30a)
@@ -172,6 +172,7 @@
     initSafetyShutdown();
     initInternalADC();
     initRTC();
+    initNVDataMgmt();
     // Initialize services
     initCommBuffers();
     initFPGA();