Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml
===================================================================
diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r85ccb77b7343cb0ba133b6c13585e95a23ac237e
--- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml	(.../EndTreatmentRecirculateStack.qml)	(revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml	(.../EndTreatmentRecirculateStack.qml)	(revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e)
@@ -20,6 +20,7 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/pages/endtreatment/recirculate"
 
 /*!
  * \brief   the end treatment recirculate stack screen
@@ -34,106 +35,83 @@
     signal reconnectClicked         ()
     signal confirmDisconnectClicked ()
     signal confirmReconnectClicked  ()
-    signal recirculateBackClicked   ()
+//    signal recirculateResumeClicked()
     signal treatmentEndClicked      ()
 
-    onReconnectClicked                          : vTreatmentAdjustmentRecirculate.doReconnect           () //84.0
-    onConfirmReconnectClicked                   : vTreatmentAdjustmentRecirculate.doConfirmReconnect    () //84.1
-    onRecirculateBackClicked                    : vTreatmentAdjustmentRecirculate.doResume              () //84.2
-    onTreatmentEndClicked                       : vTreatmentAdjustmentRecirculate.doTreatmentEnd        () //84.3
-    onConfirmDisconnectClicked                  : vTreatmentAdjustmentRecirculate.doConfirmDisconnect   () //84.4
+    onReconnectClicked                          : vTreatmentAdjustmentRecirculate.doReconnect           () //84.0  ///< User requests to re-connect to system (stop re-circulating, clamp arterial and venous lines)
+    onConfirmReconnectClicked                   : vTreatmentAdjustmentRecirculate.doConfirmReconnect    () //84.1  ///< User confirms patient connected, lines un-shunted to return to treatment
+//    onRecirculateResumeClicked                  : vTreatmentAdjustmentRecirculate.doResume              () //84.2  ///< User requests to resume re-circulation
+    onTreatmentEndClicked                       : vTreatmentAdjustmentRecirculate.doTreatmentEnd        () //84.3  ///< User requests to end treatment
+    onConfirmDisconnectClicked                  : vTreatmentAdjustmentRecirculate.doConfirmDisconnect   () //84.4  ///< User confirms patient disconnected, lines shunted to begin re-circulation
 
-    readonly property bool  timeoutTotal        : vTreatmentRecirculate .timeoutTotal
-    readonly property int   timeoutCountdown    : vTreatmentRecirculate .timeoutCountDown * 60
-    readonly property bool  treatmentTimeLeft   : true // vTreatmentTime        .time_IsLeft // regarding the conversation with Sean (04/23/2023).
-
-    component ButtonBackToRecirculate   : TouchRect {
-        text.text                       : qsTr("BACK TO RECIRCULATE")
-        onClicked                       : recirculateBackClicked()
+    onVisibleChanged: {
+        if (visible) {
+            _headerBar.titleText = stackView.currentItem.headerTitle ?? ""
+        }
+        else {
+            _headerBar.titleText = ""
+        }
     }
 
     component ButtonEndTreatment        : TouchRect {
-        visible                         : treatmentTimeLeft
-        text.text                       : qsTr("END TREATMENT")
+        text.text                       : qsTr("End Treatment")
+        height                          : Variables.defaultButtonHeight
+        textColor                       : borderColor
         onClicked                       : treatmentEndClicked()
     }
 
-    component ButtonReconnect           : TouchRect {
-        text.text                       : qsTr("RESUME TREATMENT")
+    component ButtonStartRecirculate    : TouchRect {
+        text.text                       : qsTr("Start Recirculation")
         isDefault                       : true
-        onClicked                       : reconnectClicked()
+        height                          : Variables.defaultButtonHeight
+        onClicked                       : confirmDisconnectClicked()
     }
 
-    component RecirculateBase           : EndTreatmentBase {
-        property alias footerButtons    : _footer.children
-        property bool  confirmVisible   : false
-
-        header.confirmVisible           : confirmVisible
-        instructionBased                : true
-        hasTimeout                      : timeoutTotal
-        timeoutValue                    : timeoutCountdown
-
-        footer {
-            width                       : parent.width
-            height                      : Variables.touchRectHeight
-        }
-
-        FooterStatic                { id: _footer
-            childrenWidth               : 300
-            anchors.fill                : parent.footer
-        }
+    component ButtonResume              : TouchRect {
+        text.text                       : qsTr("Resume Treatment")
+        isDefault                       : true
+        height                          : Variables.defaultButtonHeight
     }
 
     // Disconnect
-    RecirculateBase                 { id: _recirculateDisconnect
-        title.text                      : qsTr("Recirculate Disconnect")
-        confirmVisible                  : true
-        onConfirmClicked                : confirmDisconnectClicked()
-        footerButtons                   : [
+    EndTreatmentBase                 { id: _recirculateDisconnect
+        headerTitle                     : qsTr("Recirculate Set Up")
+        instructionBased                : true
+        footer.children                 : [
             ButtonEndTreatment          {},
-            Item                        {}, // button placeholder to align the buttons
-            Item                        {}  // button placeholder to align the buttons
+            ButtonStartRecirculate      {}
         ]
     }
 
     // Recirculate
-    RecirculateBase                 { id: _recirculateRecirculate
-        title.text                      : qsTr("Recirculate")
-        footerButtons                   : [
-            ButtonEndTreatment          {},
-            ButtonReconnect             {},
-            Item                        {} // button placeholder to align the buttons
+    EndTreatmentRecirculateProgress { id: _recirculateProgress
+        footer.children                 : [
+            ButtonEndTreatment          {   textColor: Colors.offWhite              },
+            ButtonResume                {   onClicked: reconnectClicked()           }  /// doReconnect
         ]
     }
 
-    // Stopped
-    RecirculateBase                 { id: _recirculateStopped
-        title.text                      : qsTr("Recirculate Stopped")
-        footerButtons                   : [
-            ButtonEndTreatment          {},
-            ButtonBackToRecirculate     {},
-            Item                        {} // button placeholder to align the buttons
-
+    // Reconnect
+    EndTreatmentBase                 { id: _recirculateReconnect
+        headerTitle                     : qsTr("Reconnect To Patient")
+        instructionBased                : true
+        footer.children                 : [
+            ButtonEndTreatment          {                                           },
+            ButtonResume                {   onClicked: confirmReconnectClicked()    }  // /doConfirmReconnect
         ]
     }
 
-    // Reconnect
-    RecirculateBase                 { id: _recirculateReconnect
-        title.text                      : qsTr("Recirculate Reconnect")
-        confirmVisible                  : true
-        onConfirmClicked                : confirmReconnectClicked()
-        footerButtons                   : [
-            ButtonEndTreatment          {},
-            ButtonBackToRecirculate     {},
-            Item                        {} // button placeholder to align the buttons
-        ]
+    Connections                     { target: stackView
+        function onCurrentItemChanged() {
+            _headerBar.titleText = stackView.currentItem.headerTitle ?? ""
+        }
     }
 
     Connections { target: vTDTreatmentStates
-        function onRcDisconnectChanged          ( vValue ) { page( _recirculateDisconnect   , vValue   )}
-        function onRcStartedChanged             ( vValue ) { page( _recirculateRecirculate  , vValue   )}
-        function onRcStoppedChanged             ( vValue ) { page( _recirculateStopped      , vValue   )}
-        function onRcReconnectChanged           ( vValue ) { page( _recirculateReconnect    , vValue   )}
+        function onRcDisconnectChanged          ( vValue ) { page( _recirculateDisconnect   , vValue   )} // set up
+        function onRcStartedChanged             ( vValue ) { page( _recirculateProgress     , vValue   )} // in progress
+//        function onRcStoppedChanged             ( vValue ) { page( _recirculateStopped      , vValue   )} // complete
+        function onRcReconnectChanged           ( vValue ) { page( _recirculateReconnect    , vValue   )} // disconnect
     }
 
     Connections { target: vTreatmentAdjustmentRecirculate
@@ -143,8 +121,8 @@
             // so it's fine to set all at the same time
             // and let them cleared for their own message when each get visible.
             _recirculateDisconnect  .reasonText = vTreatmentAdjustmentRecirculate.text();
-            _recirculateRecirculate .reasonText = vTreatmentAdjustmentRecirculate.text();
-            _recirculateStopped     .reasonText = vTreatmentAdjustmentRecirculate.text();
+            _recirculateProgress    .reasonText = vTreatmentAdjustmentRecirculate.text();
+//            _recirculateStopped     .reasonText = vTreatmentAdjustmentRecirculate.text();
             _recirculateReconnect   .reasonText = vTreatmentAdjustmentRecirculate.text();
         }
     }