Index: leahi.pro
===================================================================
diff -u -r48150735f4c4d84647ade9162ebb9757af9d87a0 -r9409e95998fd4e181b5c8a5b87c6757fac1ee0f1
--- leahi.pro	(.../leahi.pro)	(revision 48150735f4c4d84647ade9162ebb9757af9d87a0)
+++ leahi.pro	(.../leahi.pro)	(revision 9409e95998fd4e181b5c8a5b87c6757fac1ee0f1)
@@ -60,6 +60,7 @@
     sources/model/td \
     sources/model/td/data \
     sources/model/td/data/treatment \
+    sources/model/td/data/pretreatment \
     sources/model/td/data/treatmentlog \
     sources/model/td/data/pretreatment \
     sources/model/td/alarm \
@@ -188,8 +189,8 @@
     sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.h \
-    sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \
@@ -203,8 +204,6 @@
     sources/model/td/data/MTDValvesData.h \
     sources/model/td/data/MTDVoltageData.h \
     sources/model/td/data/MWaterSampleData.h \
-    sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \
-    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.h \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \
     sources/model/td/data/treatment/MTreatmentHDFData.h \
@@ -236,6 +235,9 @@
     sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \
     sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \
     sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.h \
+    \ # ---------- Models - TD - Data - Pre-Treatment
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \
+    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Models - TD - Adjustment - In-Treatment                      //// ----- @LEAHIZED
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \
@@ -276,7 +278,6 @@
     sources/view/fp/data/VFPROPumpData.h \
     sources/view/fp/data/VFPRORejectionPercentageData.h \
     sources/view/fp/data/VFPTemperatureData.h \
-    sources/view/settings/VAdjustRoWaterMode.h \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
     sources/view/settings/VAdvancedInstitutionalRecord.h \
     sources/view/settings/VRoWaterMode.h \
@@ -574,10 +575,10 @@
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \
     sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.cpp \
-    sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \
     sources/model/td/data/MTDAirBubbleData.cpp \
@@ -590,8 +591,6 @@
     sources/model/td/data/MTDValvesData.cpp \
     sources/model/td/data/MTDVoltageData.cpp \
     sources/model/td/data/MWaterSampleData.cpp \
-    sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \
-    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
     sources/model/td/data/MTDSyringePumpData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \
@@ -646,6 +645,9 @@
     sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \
     sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \
     sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp \
+    \ # ---------- Models - Data - States
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \
+    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
     \ # ---------- Models - TD - Adjustment - In-Treatment
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \
@@ -765,7 +767,6 @@
     sources/view/VGeneralEvent.cpp \
     sources/device/DeviceView.cpp \
     \ # ---------- Views - TD - States Data
-    sources/view/settings/VAdjustRoWaterMode.cpp \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
     sources/view/settings/VAdvancedInstitutionalRecord.cpp \
     sources/view/settings/VRoWaterMode.cpp \
@@ -794,8 +795,8 @@
     sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
     sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
     sources/view/td/data/treatment/VTreatmentBloodPrimeData.cpp \
-    sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp \
     sources/view/td/data/treatment/VTreatmentHDFData.cpp \
+    sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp \
     sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \
     sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \
     sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \
Index: leahi.qrc
===================================================================
diff -u -r4c32cadadd4c8abdee1eab4ef6425f356f863547 -r9409e95998fd4e181b5c8a5b87c6757fac1ee0f1
--- leahi.qrc	(.../leahi.qrc)	(revision 4c32cadadd4c8abdee1eab4ef6425f356f863547)
+++ leahi.qrc	(.../leahi.qrc)	(revision 9409e95998fd4e181b5c8a5b87c6757fac1ee0f1)
@@ -46,8 +46,8 @@
         <file alias="AlarmDialog.qml">sources/gui/qml/dialogs/AlarmDialog.qml</file>
         <file alias="DryDemoDialog.qml">sources/gui/qml/dialogs/DryDemoDialog.qml</file>
         <file alias="ConfirmPasswordDialog.qml">sources/gui/qml/dialogs/ConfirmPasswordDialog.qml</file>
-        <file alias="DryBicartDisconnectDialog.qml">sources/gui/qml/dialogs/DryBicartDisconnectDialog.qml</file>
         <file alias="CalibrationDialog.qml">sources/gui/qml/dialogs/CalibrationDialog.qml</file>
+        <file alias="DryBicartDisconnectDialog.qml">sources/gui/qml/dialogs/DryBicartDisconnectDialog.qml</file>
     </qresource>
     <qresource prefix="/dialogs/diagnostics">
         <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml</file>
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r4c32cadadd4c8abdee1eab4ef6425f356f863547 -r9409e95998fd4e181b5c8a5b87c6757fac1ee0f1
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 4c32cadadd4c8abdee1eab4ef6425f356f863547)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 9409e95998fd4e181b5c8a5b87c6757fac1ee0f1)
@@ -261,11 +261,10 @@
     case Gui::GuiActionType::ID_AdjustSalineReq                         : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData                        ); break;
     case Gui::GuiActionType::ID_AdjustVitalsReq                         : INTERPRET_TRSMT_MT_MESSAGE(AdjustVitalsRequestData                        ); break;
     case Gui::GuiActionType::ID_AdjustHeparinReq                        : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData                       ); break;
-    case Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustDryBicartDisconnectRequestData           ); break;
     case Gui::GuiActionType::ID_AdjustHDFStateReq                       : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFStateRequestData                      ); break;
     case Gui::GuiActionType::ID_AdjustAutoSubReq                        : INTERPRET_TRANSMIT_MESSAGE(AdjustAutoSubRequestData                       ); break;
     case Gui::GuiActionType::ID_AdjustHDFReq                            : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFRequestData                           ); break;
-
+    case Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustDryBicartDisconnectRequestData           ); break;
     // in-treatment - ultrafiltration
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData          ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData           ); break;
@@ -572,10 +571,10 @@
     case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp     : ok = notify<Model::MAdjustIsolatedUFDurationEditResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp   ); break;
     case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp       : ok = notify<Model::MAdjustIsolatedUFVolumeEditResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp     ); break;
     case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp          : ok = notify<Model::MAdjustIsolatedUFConfirmResponse           >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp        ); break;
-    case Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp        : ok = notify<Model::MAdjustDryBicartDisconnectResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp      ); break;
     case Gui::GuiActionType::ID_AdjsutHDFStateRsp                   : ok = notify<Model::MAdjustHDFStateResponse                    >(vMessage, vData, Gui::GuiActionType::ID_AdjsutHDFStateRsp                 ); break;
     case Gui::GuiActionType::ID_AdjustAutoSubRsp                    : ok = notify<Model::MAdjustAutoSubResponse                     >(vMessage, vData, Gui::GuiActionType::ID_AdjustAutoSubRsp                  ); break;
     case Gui::GuiActionType::ID_AdjustHDFRsp                        : ok = notify<Model::MAdjustHDFResponse                         >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDFRsp                      ); break;
+    case Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp        : ok = notify<Model::MAdjustDryBicartDisconnectResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp      ); break;
 
     // ----- Post-Treatment Adjust
     case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp   : ok = notify<Model::MAdjustPatientDisconnectionConfirmResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp ); break;
Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -rb67c15152e0bd979d3a96f44abcea23d22dcd735 -r9409e95998fd4e181b5c8a5b87c6757fac1ee0f1
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision b67c15152e0bd979d3a96f44abcea23d22dcd735)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 9409e95998fd4e181b5c8a5b87c6757fac1ee0f1)
@@ -115,8 +115,6 @@
             setPage ( _pretreatmentPrime )
             break
         case PreTreatmentStack.Step.Prime:
-            if ( _pretreatmentPrime.timeCircleProgressValue === 0 ) { vPreTreatmentAdjustmentDisposablesPrime.doPrime();        }
-            setPage ( _pretreatmentCreate )
             break
         case PreTreatmentStack.Step.CreateRx:
             _pretreatmentCreate.confirmButtonClicked()
@@ -179,7 +177,7 @@
 //        case PreTreatmentStack.Step.SelfTests:        // TODO set when implementing self test/ prime
 //            return _pretreatmentSelfTests.isComplete
 //        case PreTreatmentStack.Step.Prime:
-//            return _pretreatmentPrime.isComplete
+//            return false
         case PreTreatmentStack.Step.CreateRx:
             return _pretreatmentCreate.confirmReady()
         default:
@@ -247,16 +245,16 @@
         function onGoToPreviousStep ()  { setPage ( _pretreatmentConcentrates  )}
     }
 
-    // priming
-    Connections { target: vPreTreatmentAdjustmentDisposablesPrime
-        function onAdjustmentTriggered                              ( vValue ) {
-            if ( vPreTreatmentAdjustmentDisposablesPrime.adjustment_Accepted ) {
-                _pretreatmentPrime.reasonText = ""
-            } else {
-                _pretreatmentPrime.reasonText = vPreTreatmentAdjustmentDisposablesPrime.text()
-            }
-        }
-    }
+    // priming - TODO check if needed. may not need
+//    Connections { target: vPreTreatmentAdjustmentDisposablesPrime
+//        function onAdjustmentTriggered                              ( vValue ) {
+//            if ( vPreTreatmentAdjustmentDisposablesPrime.adjustment_Accepted ) {
+//                _pretreatmentPrime.reasonText = ""
+//            } else {
+//                _pretreatmentPrime.reasonText = vPreTreatmentAdjustmentDisposablesPrime.text()
+//            }
+//        }
+//    }
 
     // creat rx
     Connections{ target: vTreatmentCreate
Index: sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml
===================================================================
diff -u -r48150735f4c4d84647ade9162ebb9757af9d87a0 -r9409e95998fd4e181b5c8a5b87c6757fac1ee0f1
--- sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml	(.../TreatmentHDFComponent.qml)	(revision 48150735f4c4d84647ade9162ebb9757af9d87a0)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml	(.../TreatmentHDFComponent.qml)	(revision 9409e95998fd4e181b5c8a5b87c6757fac1ee0f1)
@@ -21,9 +21,9 @@
 import "qrc:/pages/treatment"
 
 TreatmentSection { id: _root
-    color           : Colors.panelBackgroundColor
-    header.color    : Colors.heparinSectionHeader
-    enableDropShadow: false
+    color               : Colors.panelBackgroundColor
+    header.color        : Colors.heparinSectionHeader
+    enableDropShadow    : false
     header {
         title           :  qsTr("Hemodiafiltration") + " (" + qsTr("HDF") + ")"
         showPauseResume : true