Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rf6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493 -r036a75d76ab01912646a480b935d97187a231a19
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 036a75d76ab01912646a480b935d97187a231a19)
@@ -28,10 +28,14 @@
 #include "DDInterface.h"
 #include "LevelSensors.h"
 #include "Messaging.h"
+#include "ModeTxParams.h"
+#include "ModeStandby.h"
 #include "OperationModes.h"
 #include "PAL.h"
 #include "Pressures.h"
 #include "RotaryValve.h"
+#include "StateTxDialysis.h"
+#include "StateTxPaused.h"
 #include "Switches.h"
 #include "SystemCommTD.h"
 #include "Utilities.h"
@@ -85,6 +89,11 @@
 static const U16 MSG_FUNCTION_HANDLER_LOOKUP[] = {
     MSG_ID_DD_OP_MODE_DATA,
     MSG_ID_DD_PRESSURES_DATA,
+    MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE,
+    MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE,
+    MSG_ID_UI_TREATMENT_PARAMS_CONFIRMED,
+    MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW,
+    MSG_ID_UI_UF_PAUSE_RESUME_REQUEST,
     MSG_ID_TESTER_LOGIN_REQUEST,
     MSG_ID_TD_SOFTWARE_RESET_REQUEST,
     MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,
@@ -128,13 +137,20 @@
     MSG_ID_TD_BLOOD_PUMP_MEASURED_MOTOR_SPEED_OVERRIDE_REQUEST,
     MSG_ID_TD_BLOOD_PUMP_MEASURED_ROTOR_SPEED_OVERRIDE_REQUEST,
     MSG_ID_TD_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE_REQUEST,
-    MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST
+    MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST,
+    MSG_ID_TD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST
 };
 
 /// Message handling function table
 static const MsgFuncPtr MSG_FUNCTION_HANDLERS[] = {
     &setDDOpMode,
     &setDialysatePressure,
+    &validateAndSetTreatmentParameters,
+    &validateAndSetUFVolume,
+    &signalUserConfirmationOfTreatmentParameters,
+    &signalUserInitiateTreatment,
+    &signalPauseResumeUF,
     &handleTesterLogInRequest,
     &testTDSoftwareResetRequest,
     &testBubbleDetectOverride,
@@ -178,7 +194,9 @@
     &testMeasuredBloodPumpSpeedOverride,
     &testMeasuredBloodPumpRotorSpeedOverride,
     &testBloodPumpRotorCountOverride,
-    &testTMPOverride
+    &testTMPOverride,
+    &testSetOpModePublishIntervalOverride,
+    &testSetOperationMode
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))
@@ -228,6 +246,9 @@
 #ifdef TEST_AIR_TRAP_ALPHA_TESTING
     return 0;
 #endif
+#ifdef TEST_PINCH_VALVES
+    return 0;
+#endif
 
     // Check to see if tester has requested this message not be transmited
     if ( TRUE == isTestingActivated() )