Index: denali.pro.user
===================================================================
diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53
--- denali.pro.user	(.../denali.pro.user)	(revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7)
+++ denali.pro.user	(.../denali.pro.user)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2020-11-20T20:11:29. -->
+<!-- Written by QtCreator 4.10.0, 2020-11-20T22:53:49. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -89,7 +89,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.5 GCC 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.5 GCC 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5125.gcc_64_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">2</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -1185,7 +1185,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Profile</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>
Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
@@ -38,6 +38,7 @@
 #include "VTreatmentRanges.h"
 #include "VHDOperationModeData.h"
 #include "VTreatmentSalineData.h"
+#include "VTreatmentHeparinData.h"
 #include "VHDTreatmentStatesData.h"
 
 #include "VDGDrainPumpData.h"
@@ -58,6 +59,7 @@
 #include "VTreatmentAdjustmentUltrafiltrationEdit.h"
 #include "VTreatmentAdjustmentUltrafiltrationConfirm.h"
 #include "VTreatmentAdjustmentSaline.h"
+#include "VTreatmentAdjustmentHeparin.h"
 #include "VTreatmentAdjustmentPressuresLimits.h"
 
 namespace Gui {
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
@@ -25,6 +25,7 @@
 import VTreatmentAdjustmentUltrafiltrationEdit      0.1
 import VTreatmentAdjustmentUltrafiltrationConfirm   0.1
 import VTreatmentAdjustmentPressuresLimits          0.1
+import VTreatmentAdjustmentHeparin                  0.1
 
 //  Qml imports
 import "qrc:/globals"
@@ -50,6 +51,7 @@
     VTreatmentAdjustmentUltrafiltrationEdit     { id: vTreatmentAdjustmentUltrafiltrationEdit       }
     VTreatmentAdjustmentUltrafiltrationConfirm  { id: vTreatmentAdjustmentUltrafiltrationConfirm    }
     VTreatmentAdjustmentPressuresLimits         { id: vTreatmentAdjustmentPressuresLimits           }
+    VTreatmentAdjustmentHeparin                 { id: vTreatmentAdjustmentHeparin                   }
 
     // ultrafiltration state information bar properties
     readonly property bool   isUFPaused         : vHDTreatmentStates.ufPaused
Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
===================================================================
diff -u -r820a00638e0573a5b0c51ed0b3e38d605d4400be -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53
--- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml	(.../TreatmentFluid.qml)	(revision 820a00638e0573a5b0c51ed0b3e38d605d4400be)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml	(.../TreatmentFluid.qml)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
@@ -69,7 +69,7 @@
     Text { id: _fluidText
         anchors {
             top: _startFluidButton.bottom
-            topMargin: 20
+            topMargin: 15
 
         }
         width: parent.width
@@ -117,7 +117,7 @@
         anchors {
             left        : parent.left
             top         : _fluidText.bottom
-            topMargin   : 15
+            topMargin   : 10
         }
         width   : parent.width
         height  : Variables.progressbarFluidHeight
@@ -134,7 +134,7 @@
         anchors {
             left        : parent.left
             top         : _fluidProgressBar.bottom
-            topMargin   : 15
+            topMargin   : 10
         }
         width: parent.width
         text: qsTr("Cumulative Delivered")
Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml
===================================================================
diff -u -r820a00638e0573a5b0c51ed0b3e38d605d4400be -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53
--- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 820a00638e0573a5b0c51ed0b3e38d605d4400be)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
@@ -17,7 +17,7 @@
 import QtQuick 2.12
 
 // Project
-//// import VTreatmentHeparin 0.1;
+import VTreatmentHeparin 0.1;
 
 //  Qml imports
 import "qrc:/globals"
@@ -56,11 +56,9 @@
     ////                                                         _private.textStart
     unit        : Variables.unitTextSaline
 
-    //// valueTarget    : vTreatmentHeparin.target || vTreatmentAdjustmentSaline.target
-    //// valueCumulative: vTreatmentHeparin.cumulative .toFixed(0)
-    //// valueDelivered : vTreatmentHeparin.delivered  .toFixed(0)
+    valueDelivered: vTreatmentHeparin.cumulative // this is the cumulative volume of the Heparin bolus and despensing.
     ////
-    //// VTreatmentHeparin  { id: vTreatmentHeparin }
+    VTreatmentHeparin  { id: vTreatmentHeparin }
     ////
     //// onClicked: {
     ////     vTreatmentAdjustmentSaline.doAdjustment()
Index: sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.h
===================================================================
diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53
--- sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.h	(.../MTreatmentAdjustHeparinResponse.h)	(revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7)
+++ sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.h	(.../MTreatmentAdjustHeparinResponse.h)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
@@ -32,7 +32,7 @@
  *
  * | MSG  | CAN ID | M.Box | Type | Ack | Src | Dest | Description      |
  * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------:|
- * |0x1400| 0x020  | 6     | Rsp  | Y   | HD  | UI   | Heparin Response |
+ * |0x4C00| 0x020  | 6     | Rsp  | Y   | HD  | UI   | Heparin Response |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/hd/data/MTreatmentHeparinData.h
===================================================================
diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53
--- sources/model/hd/data/MTreatmentHeparinData.h	(.../MTreatmentHeparinData.h)	(revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7)
+++ sources/model/hd/data/MTreatmentHeparinData.h	(.../MTreatmentHeparinData.h)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
@@ -36,7 +36,7 @@
  *
  * | Payload  ||
  * |          ||
- * | #1:(U32) | \ref Data::mCumulative |
+ * | #1:(F32) | \ref Data::mCumulative |
  *
  * \sa Data
  * \sa MAdjustHeparinReq        : Heparin Request
Index: sources/model/hd/data/MTreatmentStatesData.cpp
===================================================================
diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53
--- sources/model/hd/data/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7)
+++ sources/model/hd/data/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
@@ -27,10 +27,10 @@
 
 bool MTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mSubMode    ))
-    if (GetValue(vByteArray, index, _data.mUFState    ))
-    if (GetValue(vByteArray, index, _data.mSalineState))
-    if (GetValue(vByteArray, index, _data.mSalineState))
+    if (GetValue(vByteArray, index, _data.mSubMode     ))
+    if (GetValue(vByteArray, index, _data.mUFState     ))
+    if (GetValue(vByteArray, index, _data.mSalineState ))
+    if (GetValue(vByteArray, index, _data.mHeparinState))
         return true ;
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
Index: sources/view/VView.h
===================================================================
diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53
--- sources/view/VView.h	(.../VView.h)	(revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b)
+++ sources/view/VView.h	(.../VView.h)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
@@ -112,6 +112,7 @@
     REGISTER_TYPE( VTreatmentTime                               ) \
     REGISTER_TYPE( VTreatmentRanges                             ) \
     REGISTER_TYPE( VTreatmentSaline                             ) \
+    REGISTER_TYPE( VTreatmentHeparin                            ) \
     REGISTER_TYPE( VHDOperationMode                             ) \
     REGISTER_TYPE( VHDTreatmentStates                           ) \
                                                                   \
@@ -131,6 +132,7 @@
     REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit      ) \
     REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm   ) \
     REGISTER_TYPE( VTreatmentAdjustmentSaline                   ) \
+    REGISTER_TYPE( VTreatmentAdjustmentHeparin                  ) \
     REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits          ) \
     REGISTER_TYPE( VTreatmentCreate                             ) \
     REGISTER_TYPE( VPriming                                     ) \