Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rbb80dbac26147ab08413efa91007f7ffed43c38f -r4179eaf9c16e3607ce8abd961f154c2aaab2dffd
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision bb80dbac26147ab08413efa91007f7ffed43c38f)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4179eaf9c16e3607ce8abd961f154c2aaab2dffd)
@@ -191,7 +191,12 @@
 void checkInFromDG( void )
 {
     dgIsCommunicating = TRUE;
-    timeOfLastDGCheckIn = getMSTimerCount();
+    timeOfLastDGCheckIn = getMSTimerCount();
+
+    if ( TRUE == isAlarmActive( ALARM_ID_DG_COMM_TIMEOUT ) )
+    {
+        clearAlarm( ALARM_ID_DG_COMM_TIMEOUT );
+    }
 }
 
 /*********************************************************************//**
@@ -933,6 +938,7 @@
     }
     if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
     {
+        activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
         dgIsCommunicating = FALSE;
     }
 }
@@ -1179,8 +1185,8 @@
             handleTreatmentParametersFromUI( message );
             break;
 
-        case MSG_ID_UI_START_TREATMENT:
-            handleUIStartTreatmentMsg( message );
+        case MSG_ID_UI_INITIATE_TREATMENT_REQUEST:
+            handleInitiateTreatmentRequest( message );
             break;
 
         case MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS:
@@ -1211,6 +1217,38 @@
             handleTreatmentEndCmd( message );
             break;
 
+        case MSG_ID_UI_SAMPLE_WATER_CMD:
+            handleSampleWaterCmd( message );
+            break;
+
+        case MSG_ID_UI_SAMPLE_WATER_RESULT:
+            handleSampleWaterResult( message );
+            break;
+
+        case MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM:
+            handleConsumableInstallConfirm( message );
+            break;
+
+        case MSG_ID_UI_INSTALLATION_CONFIRM:
+            handleInstallationConfirm( message );
+            break;
+
+        case MSG_ID_UI_START_PRIME_REQUEST:
+            handleStartPrimeCmd( message );
+            break;
+
+        case MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST:
+            handleContinueToTreatmentCmd( message );
+            break;
+
+        case MSG_ID_UI_PATIENT_CONNECTION_CONFIRM:
+            handlePatientConnectionConfirmCmd( message );
+            break;
+
+        case MSG_ID_UI_START_TREATMENT_REQUEST:
+            handleStartTreatmentRequest( message );
+            break;
+
         case MSG_ID_DG_COMMAND_RESPONSE:
             handleDGCmdResp( message );
             break;