Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r4b25bf00656b9067a13541014fa1333386a7ed95 -r35179cc5895f6b7b9b1f8338754836898514a14e
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 4b25bf00656b9067a13541014fa1333386a7ed95)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 35179cc5895f6b7b9b1f8338754836898514a14e)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      21-Nov-2022
+* @date    (last)      21-Dec-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -25,9 +25,6 @@
 #include "FluidLeak.h"
 #include "LoadCell.h"
 #include "MessageSupport.h"
-#include "ModeChemicalDisinfect.h"
-#include "ModeFlush.h"
-#include "ModeHeatDisinfect.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "Reservoirs.h"
@@ -169,6 +166,12 @@
 // MSG_ID_HD_REQUEST_DG_USAGE_INFO
 void handleHDRequestDGUsageInfo( MESSAGE_T * message );
 
+// MSG_ID_DG_SET_SERVICE_TIME
+void handleSetDGServiceTime( MESSAGE_T *message );
+
+// MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL
+void handleStartStopDGHeatDisinfectActiveCool( MESSAGE_T* message );
+
 // MSG_ID_REQUEST_CPLD_STATUS
 void handleCpldStatusRequest( MESSAGE_T *message );
 
@@ -346,6 +349,9 @@
 // MSG_ID_DG_START_STOP_CHEM_DSINFECT
 BOOL handleStartStopDGChemicalDisinfect( MESSAGE_T *message );
 
+// MSG_ID_DG_START_STOP_CHEM_DISINFECT_FLUSH
+BOOL handleStartStopDGChemicalDisinfectFlush( MESSAGE_T *message );
+
 // MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE
 void handleSetDGOpModeBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
@@ -439,6 +445,18 @@
 // MSG_ID_DG_VALVES_SENSED_STATE_OVERRIDE
 void handleTestDGValvesSensedStateOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_NV_RECORD_CRC_OVERRIDE
+void handleTestDGNVRecordCRCOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_CONC_PUMP_PARK_STATUS_OVERRIDE
+void handleTestDGConcPumpParkStatusOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE
+void handleTestDGConcPumpParkFaultStatusOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_CONC_PUMP_PARK_COMMAND
+void handleTestDGConcPumpParkCommandRequest( MESSAGE_T *message );
+
 // MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE
 void handleTestDGFillModeBroadcastOverrideRequest( MESSAGE_T *message );