Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r5cc57a6d8eb3721811a2d6ace3176b7074c52fe8 -r1275f9e92eb1ab0cd1b321c0c8eb940524e22117
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 5cc57a6d8eb3721811a2d6ace3176b7074c52fe8)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 1275f9e92eb1ab0cd1b321c0c8eb940524e22117)
@@ -40,6 +40,8 @@
 #include "StateTxBloodPrime.h"
 #include "StateTxDialysis.h"
 #include "StateTxPaused.h"
+#include "StateTxRinseback.h"
+#include "StateTxRecirc.h"
 #include "Switches.h"
 #include "SyringePump.h"
 #include "SystemCommTD.h"
@@ -135,6 +137,9 @@
     { MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST,             &handleAutoEjectRequest },
     { MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE,                            &handleUpdateAvailable },
     { MSG_ID_UI_FLUID_BOLUS_REQUEST,                                    &handleFluidBolusRequest },
+    { MSG_ID_UI_RINSEBACK_CMD_REQUEST,                                  &signalRinsebackUserAction },
+    { MSG_ID_UI_RECIRCULATE_REQUEST,                                    &signalTreatmentRecircUserAction },
+    { MSG_ID_UI_GENERIC_CONFIRMATION_RESULT_RESPONSE,                   &handleUIConfirmation },
     { MSG_ID_TD_SOFTWARE_RESET_REQUEST,                                 &testTDSoftwareResetRequest },
     { MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,                                &testBubbleDetectOverride },
     { MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testBubblesDataPublishIntervalOverride },
@@ -217,6 +222,8 @@
     { MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST,         &testSyringePumpADCReadCounterOverride },
     { MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST,             &testHeparinBolusTargetRateOverride },
     { MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST,          &testCalibrateForceSensor },
+    { MSG_ID_TD_RINSEBACK_VOLUME_OVERRIDE,                              &testRinsebackVolumeOverride },
+    { MSG_ID_TD_RINSEBACK_PUBLISH_INTERVAL_OVERRIDE_REQUEST,            &testRinsebackPublishIntervalOverride },
 };
 
 /// Number of entries in the message handling function lookup table.
@@ -737,6 +744,64 @@
 
 /*********************************************************************//**
  * @brief
+ * The sendConfirmationRequest function constructs and transmits a
+ * confirmation request message to the UI.
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @param requestID ID of the confirmation being requested
+ * @param requestType Type of confirmation being requested
+ * @param rejectReason Reason for reject if type is reject, 0 otherwise
+ * @return none
+ *************************************************************************/
+void sendConfirmationRequest( GENERIC_CONFIRM_ID_T requestID, GENERIC_CONFIRM_COMMAND_T requestType, U32 rejectReason )
+{
+    GENERIC_CONFIRMATION_REQUEST_T payload;
+
+    payload.requestID       = (U32)requestID;
+    payload.requestType     = (U32)requestType;
+    payload.rejectReason    = rejectReason;
+    payload.genericPayload1 = 0.0F;
+    payload.genericPayload2 = 0.0F;
+    payload.genericPayload3 = 0.0F;
+    payload.genericPayload4 = 0.0F;
+
+    sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*)&payload, sizeof( GENERIC_CONFIRMATION_REQUEST_T ) );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleUIConfirmationResponse function handles a UI response for a
+ * confirmation request.
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @param message pointer to the received confirmation response message
+ * @return TRUE if message handled successfully, FALSE if not
+ *************************************************************************/
+BOOL handleUIConfirmation( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( ( 2U * sizeof(U32) ) == message->hdr.payloadLen )
+    {
+        U32 requestID;
+        U32 status;
+
+        memcpy( &requestID, message->payload, sizeof(U32) );
+        memcpy( &status, message->payload + sizeof(U32), sizeof(U32) );
+
+        if ( ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == ( CONFIRMATION_REQUEST_STATUS_T)status ) ||
+             ( CONFIRMATION_REQUEST_STATUS_REJECTED == ( CONFIRMATION_REQUEST_STATUS_T)status ) )
+        {
+            setConfirmationRequestStatus( ( GENERIC_CONFIRM_ID_T )requestID, ( CONFIRMATION_REQUEST_STATUS_T)status );
+            result = TRUE;
+        }
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The testTDSoftwareResetRequest function handles a request to reset the
  * TD firmware processor.
  * @note If reset is successful, this function will not return.