Index: leahi.qrc
===================================================================
diff -u -re5576e4397ed640fec2a936dc5e42c773870b29a -rb0370d82c7653eca5347374aa3f6b02a188c8fe7
--- leahi.qrc	(.../leahi.qrc)	(revision e5576e4397ed640fec2a936dc5e42c773870b29a)
+++ leahi.qrc	(.../leahi.qrc)	(revision b0370d82c7653eca5347374aa3f6b02a188c8fe7)
@@ -53,6 +53,12 @@
         <file alias="HeaderbarPrescription.qml">sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml</file>
         <file alias="HeaderbarInformation.qml">sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml</file>
     </qresource>
+    <qresource prefix="/dialogs/watersample">
+        <file alias="WaterSampleDialog.qml">sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml</file>
+        <file alias="WaterSampleBase.qml">sources/gui/qml/dialogs/watersample/WaterSampleBase.qml</file>
+        <file alias="WaterSamplePage.qml">sources/gui/qml/dialogs/watersample/WaterSamplePage.qml</file>
+        <file alias="WaterSampleDialysatePage.qml">sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml</file>
+    </qresource>
     <qresource prefix="/images">
         <file alias="iLogoD">resources/images/Logo d.png</file>
         <file alias="iLogoDiality">resources/images/Logo DialityT.png</file>
@@ -112,6 +118,7 @@
         <file alias="iVolume">resources/images/Volume.png</file>
         <file alias="iWaterSampleFail">resources/images/water_sample_fail.png</file>
         <file alias="iWaterSamplePass">resources/images/water_sample_pass.png</file>
+        <file alias="iWaterSample">resources/images/water_sample.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -252,11 +259,9 @@
     <qresource prefix="/pages/pretreatment">
         <file alias="PreTreatmentBase.qml">sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml</file>
         <file alias="PreTreatmentStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml</file>
-        <file alias="PreTreatmentWaterSample.qml">sources/gui/qml/pages/pretreatment/PreTreatmentWaterSample.qml</file>
         <file alias="PreTreatmentSelfTests.qml">sources/gui/qml/pages/pretreatment/PreTreatmentSelfTests.qml</file>
         <file alias="PreTreatmentPrime.qml">sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml</file>
         <file alias="PreTreatmentInstallStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml</file>
-        <file alias="PreTreatmentUltrafiltration.qml">sources/gui/qml/pages/pretreatment/PreTreatmentUltrafiltration.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment/create">
         <file alias="PreTreatmentCreate.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml</file>
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -ref583f0056a0fb8c66a64e132be159719b2bc2f6 -rb0370d82c7653eca5347374aa3f6b02a188c8fe7
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision b0370d82c7653eca5347374aa3f6b02a188c8fe7)
@@ -10,8 +10,8 @@
     property alias titleText                : _title.text
     property alias loggedUser               : _loggedInUser.text
     readonly property int currentScreen     : _headerMenu.currentScreen
-    property alias statusColor              : _headerMenu.statusColor
     property bool isCreateRx                : false     // set in slot in parent
+    property bool isHeparinFeatured         : vSettings.heparinSyringePump
 
     width   : Variables.applicationWidth
     height  : Variables.headerHeight
@@ -22,6 +22,16 @@
         GradientStop { position: 0.8; color: Qt.darker (Colors.backgroundMain, 1.2) }
     }
 
+    enum TreatmentScreen {
+        Treatment   = 0,
+        Trends      = 1,
+        Heparin     = 2,
+        HDF         = 3
+    }
+
+    onIsHeparinFeaturedChanged  : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured)
+    Component.onCompleted       : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured)
+
     function vitalsRecorded() { _vitalsButton.pulseAnimation.start() }
 
     MouseArea { id: _mouseArea
@@ -131,22 +141,14 @@
             bottom      : parent.bottom
             bottomMargin: hidden || disable ? height * -1 : 0
         }
-        height  : parent.height
-        width   : parent.width / 2 // gives the width of the headerbar menu
+        height          : parent.height
+        width           : parent.width / 2 // gives the width of the headerbar menu
         hidden          : true
         titlePixelSize  : 32
         backgroundColor : Colors.transparent
         highlightHeight : 15
-        model           : _model
-        isMainTreatment : true
-        onHiddenChanged: { if (hidden) { index = 0 } }
-
-        ListModel { id: _model
-            ListElement {   text: qsTr("Treatment");    visible: true;      screen:  0      }   // MainMenu.Treatment
-            ListElement {   text: qsTr("Trends");       visible: true;      screen:  1      }   // MainMenu.Trends
-            ListElement {   text: qsTr("Heparin");      visible: true;      screen:  2      }   // MainMenu.Heparin
-            ListElement {   text: qsTr("HDF");          visible: false;     screen:  3      }   // MainMenu.HDF
-        }
+        model           : vListModel.headerbarModel
+        onHiddenChanged : { if (hidden) { index = 0 } }
     }
 
     Row { id: _headerButtonRow
Index: sources/gui/qml/main.qml
===================================================================
diff -u -ref583f0056a0fb8c66a64e132be159719b2bc2f6 -rb0370d82c7653eca5347374aa3f6b02a188c8fe7
--- sources/gui/qml/main.qml	(.../main.qml)	(revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision b0370d82c7653eca5347374aa3f6b02a188c8fe7)
@@ -35,6 +35,8 @@
 import VTDSwitches                                          0.1
 import VTDEjector                                           0.1
 import VTDTemperature                                       0.1
+import VListModel                                           0.1
+
 // POST
 import VHDPOSTData                                          0.1
 import VDGPOSTData                                          0.1
@@ -235,6 +237,7 @@
     VTDSwitches                                         { id: vTDSwitches                                           }
     VTDEjector                                          { id: vTDEjector                                            }
     VTDTemperature                                      { id: vTDTemperature                                        }
+    VListModel                                          { id: vListModel                                            }
 
     VTreatmentDialysateFlow                             { id: vTreatmentDialysateFlow                               }
     VTreatmentIsolatedUF                                { id: vTreatmentIsolatedUF                                  }
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r45ce5cd058a8d0239d486e0ab4b057731f7dba76 -rb0370d82c7653eca5347374aa3f6b02a188c8fe7
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision b0370d82c7653eca5347374aa3f6b02a188c8fe7)
@@ -104,6 +104,12 @@
     VALUESET(bool       , parametersValidated                           , 0)
     VALUESET(bool       , parametersConfirmed                           , 0)
 
+    VALUESET(qint32     , dryBicabCartridgeSize                         , 0)
+    VALUESET(qint32     , bicarbFinalDialysateComposition               , 0)
+    VALUESET(qint32     , sodiumFinalDialysateComposition               , 0)
+    VALUESET(qint32     , actualRORejectionPercentage                   , 0)
+
+
     PROPERTY(QString    , txCode                                        ,"")
 
     TRIGGER(quint32     , bloodFlowRateRejectReason                     , 0)