Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r60e0fc291e3897ab9b86aee7181eeb6d6dd7d35f -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 60e0fc291e3897ab9b86aee7181eeb6d6dd7d35f)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -26,6 +26,7 @@
 #include "OperationModes.h"
 #include "PresOccl.h"
 #include "RTC.h"
+#include "Switches.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
@@ -59,7 +60,7 @@
     checkInWithWatchdogMgmt( TASK_GENERAL );  // Do this first to keep timing consistent with watchdog management
 
     // Manage data received from other sub-systems
-    execSystemCommRx();
+    execSystemCommRx();
 
     // Prevent most processing until UI has started communicating
 #ifndef SIMULATE_UI
@@ -80,6 +81,10 @@
         execOperationModes();
 
 #ifndef BOARD_WITH_NO_HARDWARE
+
+        // Manage RTC
+        execRTC();
+
         // Control air trap valve
         execAirTrapController();
 
@@ -91,11 +96,11 @@
 
         // Control dialysate outlet pump (keep after call to BP and DPi controllers)
         execDialOutFlowController();
-#endif
-
-        // Manage RTC
-        execRTC();
 
+        // Monitor switches
+        execSwitches();
+#endif
+
         // Manage NVDataMgmt process record state machine
         execNVDataMgmtProcessRecord();