Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rc548570b37339819da825092dd07c7081437f30b -rc48a99d2d1c852adcc986253b6c420a90dab7bfe
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c548570b37339819da825092dd07c7081437f30b)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c48a99d2d1c852adcc986253b6c420a90dab7bfe)
@@ -21,6 +21,8 @@
 #include "DrainPump.h"
 #include "LoadCell.h"
 #include "MsgQueues.h"
+#include "ModeStandby.h"
+#include "ModeRecirculate.h"
 #include "OperationModes.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
@@ -705,20 +707,38 @@
     {
         BOOL startingTreatment;
 
-        result = TRUE;
         memcpy( &startingTreatment, message->payload, sizeof(U32) );
 
         if ( MODE_STAN == getCurrentOperationMode() && TRUE == startingTreatment )
         {
-            requestNewOperationMode( MODE_CIRC );
+            result = requestDGStart();
         }
         else if ( MODE_CIRC == getCurrentOperationMode() && FALSE == startingTreatment )
         {
-            requestNewOperationMode( MODE_STAN );
+            result = requestDGStop();
         }
-        else
+    }
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
+}
+
+/*************************************************************************
+ * @brief
+ * The handleSampleWaterCmd function handles a sample water command from the HD.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSampleWaterCmd( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == 0 )
+    {
+        if ( MODE_STAN == getCurrentOperationMode() )
         {
-            result = FALSE;
+            result = requestWaterSample();
         }
     }
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
@@ -912,3 +932,45 @@
     // respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
+
+// MSG_ID_PRESSURE_OVERRIDE:
+void handleTestPressureSensorOverrideRequest( MESSAGE_T *message )
+{
+
+}
+
+// MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE:
+void handleTestPressureDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
+{
+
+}
+
+// MSG_ID_RO_PUMP_SET_PT_OVERRIDE:
+void handleTestROPumpSetPointOverrideRequest( MESSAGE_T *message )
+{
+
+}
+
+// MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
+void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message )
+{
+
+}
+
+// MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
+void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
+{
+
+}
+
+// MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE:
+void handleTestDrainPumpSetPointOverrideRequest( MESSAGE_T *message )
+{
+
+}
+
+// MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
+void handleTestDrainPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
+{
+
+}