Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r38e8e85e6add1c4f798af6ada4a45cc7db547f3e -rc14a0220256e92a6339a444a3e1bc85e159ccce3
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 38e8e85e6add1c4f798af6ada4a45cc7db547f3e)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c14a0220256e92a6339a444a3e1bc85e159ccce3)
@@ -26,7 +26,8 @@
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
 #include "Dialysis.h"
-#include "Prime.h"
+#include "FluidLeak.h"
+#include "Prime.h"
 #include "ModePostTreat.h"
 #include "ModeTreatment.h"
 #include "MsgQueues.h"
@@ -95,17 +96,20 @@
 // MSG_ID_DG_RESERVOIR_DATA:
 void handleDGReservoirData( MESSAGE_T *message );
 
-// MSG_ID_UI_START_TREATMENT
-void handleUIStartTreatmentMsg( MESSAGE_T *message );
+// MSG_ID_UI_START_TREATMENT_REQUEST
+void handleStartTreatmentRequest( MESSAGE_T *message );
 
+// MSG_ID_UI_INITIATE_TREATMENT_REQUEST
+void handleInitiateTreatmentRequest( MESSAGE_T *message );
+
 // MSG_ID_HD_START_TREATMENT_RESPONSE
 BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason );
 
 // MSG_ID_UI_NEW_TREATMENT_PARAMS
 void handleTreatmentParametersFromUI( MESSAGE_T *message );
 
 // MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE
-BOOL sendTreatmentParametersResponseMsg( BOOL rejected, U08 *rejectReasons, U32 byteLength );
+BOOL sendTreatmentParametersResponseMsg( BOOL accepted, U08 *rejectReasons, U32 byteLength );
 
 // MSG_ID_UI_SET_UF_VOLUME_PARAMETER
 void handleUFVolumeSetRequest( MESSAGE_T *message );
@@ -168,7 +172,7 @@
 void handleHeparinCommandRequest( MESSAGE_T *message );
 
 // MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE
-BOOL sendHeparinCommandResponse( U32 accepted, U32 rejReason, U32 heparinDeliveryState );
+BOOL sendHeparinCommandResponse( U32 accepted, U32 rejReason );
 
 // MSG_ID_UI_RINSEBACK_CMD
 void handlRinsebackCmd( MESSAGE_T *message );
@@ -308,9 +312,21 @@
 // MSG_ID_HD_AIR_TRAP_DATA
 BOOL broadcastAirTrapData( AIR_TRAP_LEVELS_T lowerLevel, AIR_TRAP_LEVELS_T upperLevel );
 
+// MSG_ID_HD_FLUID_LEAK_STATE
+BOOL broadcastFluidLeakState( FLUID_LEAK_STATES_T state );
+
 // MSG_ID_HD_PRIMING_STATUS_DATA
 BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr );
 
+// MSG_ID_HD_SEND_CALIBRATION_RECORD
+BOOL sendHDCalibrationRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress );
+
+// MSG_ID_HD_SEND_SYSTEM_RECORD
+BOOL sendHDSystemRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress );
+
+// MSG_ID_Hd_SEND_SERVICE_RECORD
+BOOL sendHDServiceRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* srvcRcrdAddress );
+
 #ifdef EMC_TEST_BUILD
 // MSG_ID_CAN_ERROR_COUNT
 BOOL broadcastCANErrorCount( U32 count );
@@ -497,9 +513,36 @@
 // MSG_ID_HD_AIR_TRAP_LEVEL_SENSOR_OVERRIDE
 void handleSetAirTrapLevelSensorOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE
+void handleSetFluidLeakBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE
+void handleSetFluidLeakStateDetectorOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_SUPER_CLEAR_ALARMS_CMD
 void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_REQUEST_CALIBRATION_DATA
+void handleTestHDCalibrationDataRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_CALIBRATION_RECORD
+void handleSetHDCalibrationRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_GET_CALIBRATION_RECORD
+void handleGetHDCalibrationRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_SYSTEM_RECORD
+void handleSetHDSystemRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_GET_SYSTEM_RECORD
+void handleGetHDSystemRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_GET_SERVICE_RECORD
+void handleGetHDServiceRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_SERVICE_RECORD
+void handleSetHDServiceRecord( MESSAGE_T *message );
+
 // MSG_ID_HD_SET_OP_MODE_REQUEST
 void handleTestSetOpModeRequest( MESSAGE_T *message );