Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml
===================================================================
diff -u -r1da0c41020664b642359f3cd5d58a2fdc36774a2 -r85ccb77b7343cb0ba133b6c13585e95a23ac237e
--- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml	(.../EndTreatmentRecirculateStack.qml)	(revision 1da0c41020664b642359f3cd5d58a2fdc36774a2)
+++ 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
@@ -43,10 +44,6 @@
     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).
-
     onVisibleChanged: {
         if (visible) {
             _headerBar.titleText = stackView.currentItem.headerTitle ?? ""
@@ -64,58 +61,41 @@
     }
 
     component ButtonStartRecirculate    : TouchRect {
-        visible                         : treatmentTimeLeft
         text.text                       : qsTr("Start Recirculation")
         isDefault                       : true
         height                          : Variables.defaultButtonHeight
         onClicked                       : confirmDisconnectClicked()
     }
 
-    component ButtonResume              :   TouchRect {
+    component ButtonResume              : TouchRect {
         text.text                       : qsTr("Resume Treatment")
         isDefault                       : true
         height                          : Variables.defaultButtonHeight
     }
 
-    component RecirculateBase           : EndTreatmentBase {
-        property bool  confirmVisible   : false
-
-        header.confirmVisible           : confirmVisible
-        instructionBased                : true
-        hasTimeout                      : timeoutTotal
-        timeoutValue                    : timeoutCountdown
-
-        footer {
-            width                       : parent.width / 2
-            height                      : Variables.defaultButtonHeight
-            childrenWidth               : Variables.defaultButtonWidth
-        }
-    }
-
     // Disconnect
-    RecirculateBase                 { id: _recirculateDisconnect
+    EndTreatmentBase                 { id: _recirculateDisconnect
         headerTitle                     : qsTr("Recirculate Set Up")
-        footer.children                   : [
+        instructionBased                : true
+        footer.children                 : [
             ButtonEndTreatment          {},
             ButtonStartRecirculate      {}
-
         ]
     }
 
     // Recirculate
-    RecirculateBase                 { id: _recirculateRecirculate
-        headerTitle                     : qsTr("Recirculate In Progress")
-        instructionBased                : false
-        footer.children                   : [
+    EndTreatmentRecirculateProgress { id: _recirculateProgress
+        footer.children                 : [
             ButtonEndTreatment          {   textColor: Colors.offWhite              },
             ButtonResume                {   onClicked: reconnectClicked()           }  /// doReconnect
         ]
     }
 
     // Reconnect
-    RecirculateBase                 { id: _recirculateReconnect
+    EndTreatmentBase                 { id: _recirculateReconnect
         headerTitle                     : qsTr("Reconnect To Patient")
-        footer.children                   : [
+        instructionBased                : true
+        footer.children                 : [
             ButtonEndTreatment          {                                           },
             ButtonResume                {   onClicked: confirmReconnectClicked()    }  // /doConfirmReconnect
         ]
@@ -129,7 +109,7 @@
 
     Connections { target: vTDTreatmentStates
         function onRcDisconnectChanged          ( vValue ) { page( _recirculateDisconnect   , vValue   )} // set up
-        function onRcStartedChanged             ( vValue ) { page( _recirculateRecirculate  , vValue   )} // in progress
+        function onRcStartedChanged             ( vValue ) { page( _recirculateProgress     , vValue   )} // in progress
 //        function onRcStoppedChanged             ( vValue ) { page( _recirculateStopped      , vValue   )} // complete
         function onRcReconnectChanged           ( vValue ) { page( _recirculateReconnect    , vValue   )} // disconnect
     }
@@ -141,7 +121,7 @@
             // 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();
+            _recirculateProgress    .reasonText = vTreatmentAdjustmentRecirculate.text();
 //            _recirculateStopped     .reasonText = vTreatmentAdjustmentRecirculate.text();
             _recirculateReconnect   .reasonText = vTreatmentAdjustmentRecirculate.text();
         }