Index: sources/drydemo/StateController.h
===================================================================
diff -u -r6e845078107f7d15a3e471be421d5bce31fc51da -ra271469db538bfc35eba9a56308760893ecbc68e
--- sources/drydemo/StateController.h	(.../StateController.h)	(revision 6e845078107f7d15a3e471be421d5bce31fc51da)
+++ sources/drydemo/StateController.h	(.../StateController.h)	(revision a271469db538bfc35eba9a56308760893ecbc68e)
@@ -37,6 +37,7 @@
         bool requestTreatmentReset;
         // Treatment time variable(s)
         quint32 treatmentElapsedTimeMS;
+        bool isTreatmentComplete;
         // Fluid bolus
         Fluid_Bolus_States fluidBolusState;
         float accumFluidBolusDeliveredML;
@@ -57,12 +58,17 @@
         // Alarm variables
         Alarm_List activeAlarm;
         // Rinseback variables
-        Rinseback_States rinsebackStates;
+        Rinseback_States rinsebackState;
         quint32 rinsebackFlowMLPM;
-        float accumRinsebackVolML;
-        float additionalRinsebackVolML;
+        float rinsebackAccumVolML;
+        float rinsebackAdditionalVolML;
         bool isRinsebackComplete;
         quint32 rinsebackTimerCounter;
+        quint32 rinsebackAdditionalTimerCounter;
+        float   rinsebackTgtVolPlusAddVolML;
+        // Recirculation variables
+        bool hasRecircBeenRequested;
+        Recirculate_States recircState;
     };
 
     struct Treatment_Params {
@@ -98,6 +104,7 @@
     QList<QVariantList> _broadcastMessages;
     QList<QVariantList> _sendMessages;
     QHash<Can::MessageID, QVariant> _treatmentRcvdMessages;
+    QHash<Generic_Confirm_Id, QVariantList> _uiConfirmMessages;
     QRandomGenerator _randNumGenerator;
     Treatment_Params _treatmentParams;
     Treatment_Status_Vars _treatmentStatus;
@@ -132,6 +139,8 @@
 
     // Standby methods
     void handleInitiateTreatmentRequestMessage(State_Status &status);
+    void handleUIConfirmMessage(const Generic_Confirm_Id confirmID, State_Status &status);
+    bool hasUIConfirmMessageTimedout(const Generic_Confirm_Id confirmID);
     void handleSendUIConfirmationMessage(const Generic_Confirm_Id confirmID, const Generic_Confirm_Command confirmCmd, const Reject_Reasons rejectReason = REQUEST_REJECT_REASON_NONE);
 
     // Blood prime methods
@@ -170,6 +179,11 @@
     void handleRinsebackDelivery();
     void handleRinsebackBroadcastData(const Broadcast_Type BCType);
 
+    // Treatment recirculation methods
+    void initializeRecirc();
+    void handleRecircRequestMessage();
+    void handleRecircBroadcastData(const Broadcast_Type BCType);
+
     // Treatment end methods
 
 };