Index: denali.pro
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- denali.pro	(.../denali.pro)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ denali.pro	(.../denali.pro)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -61,6 +61,7 @@
     sources/ApplicationController.h \
     \ # ---------- Models ----------
     sources/model/MModel.h \
+    sources/model/MAbstractProgressData.h \
     sources/model/MAbstract.h \
     sources/model/MPowerOff.h \
     sources/model/MStartTreatmentResponse.h \
@@ -93,6 +94,10 @@
     sources/model/hd/data/MHDOperationModeData.h \
     sources/model/hd/data/MPreTreatmentStatesData.h \
     sources/model/hd/data/MTreatmentStatesData.h \
+    \ # ---------- Models - HD - Data - Pre-Treatment - Progress
+    sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.h \
+    sources/model/hd/data/MPreTreatmentSelfTestDryData.h \
+    sources/model/hd/data/MPreTreatmentPrimeData.h \
     \ # ---------- Models - HD - Data
     sources/model/hd/data/MHDAccelerometerData.h \
     sources/model/hd/data/MTreatmentTimeData.h \
@@ -105,9 +110,10 @@
     sources/model/hd/data/MTreatmentRinsebackData.h \
     sources/model/hd/data/MTreatmentRecirculateData.h \
     sources/model/hd/data/MTreatmentBloodPrimeData.h \
-    sources/model/hd/data/MPrimingData.h \
     \ # ---------- Models - DG - Adjustment
     sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h \
+    \ # ---------- Models - DG - Data - Pre-Treatment - Progress
+    sources/model/dg/data/MDGFilterFlushData.h \
     \ # ---------- Models - DG - Data
     sources/model/dg/data/MDGDrainPumpData.h \
     sources/model/dg/data/MDGHeatersData.h \
@@ -138,7 +144,6 @@
     sources/view/VEventSpy.h \
     sources/view/VView.h \
     sources/view/VPowerOff.h \
-    sources/view/VPriming.h \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.h \
     \ # ---------- Views - HD - Adjustment
@@ -158,10 +163,14 @@
     sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentEnd.h \
-    \ # ---------- Views - HD - States Data
+    \ # ---------- Views - HD - Data - States
     sources/view/hd/data/VHDOperationModeData.h \
-    sources/view/hd/data/VPreTreatmentStatesData.h \
     sources/view/hd/data/VHDTreatmentStatesData.h \
+    sources/view/hd/data/VPreTreatmentStatesData.h \
+    \ # ---------- Views - HD - Data - Pre-Treatment - Progress
+    sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h \
+    sources/view/hd/data/VPreTreatmentSelfTestDryData.h \
+    sources/view/hd/data/VPreTreatmentPrimeData.h \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.h \
     sources/view/hd/data/VTreatmentTime.h \
@@ -175,6 +184,8 @@
     sources/view/hd/data/VTreatmentRinsebackData.h \
     sources/view/hd/data/VTreatmentRecirculateData.h \
     sources/view/hd/data/VTreatmentBloodPrimeData.h \
+    \ # ---------- Views - DG - Data - Pre-Treatment - Progress
+    sources/view/dg/data/VDGFilterFlushData.h \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGOperationModeData.h \
     sources/view/dg/data/VDGDrainPumpData.h \
@@ -212,6 +223,7 @@
     sources/ApplicationController.cpp \
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
+    sources/model/MAbstractProgressData.cpp \
     sources/model/MPowerOff.cpp \
     sources/model/MHDDebugText.cpp \
     sources/model/MStartTreatmentResponse.cpp \
@@ -238,7 +250,11 @@
     sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp \
-    \ # ---------- Models - HD - States Data
+    \ # ---------- Models - HD - Data - Pre-Treatment - Progress
+    sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.cpp \
+    sources/model/hd/data/MPreTreatmentSelfTestDryData.cpp \
+    sources/model/hd/data/MPreTreatmentPrimeData.cpp \
+    \ # ---------- Models - HD - Data - States
     sources/model/hd/data/MHDOperationModeData.cpp \
     sources/model/hd/data/MPreTreatmentStatesData.cpp \
     sources/model/hd/data/MTreatmentStatesData.cpp \
@@ -254,9 +270,10 @@
     sources/model/hd/data/MTreatmentRinsebackData.cpp \
     sources/model/hd/data/MTreatmentRecirculateData.cpp \
     sources/model/hd/data/MTreatmentBloodPrimeData.cpp \
-    sources/model/hd/data/MPrimingData.cpp \
     \ # ---------- Models - DG - Adjustment
     sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp \
+    \ # ---------- Models - DG - Data - Pre-Treatment - Progress
+    sources/model/dg/data/MDGFilterFlushData.cpp \
     \ # ---------- Models - DG - Data
     sources/model/dg/data/MDGDrainPumpData.cpp \
     sources/model/dg/data/MDGHeatersData.cpp \
@@ -284,7 +301,6 @@
     sources/view/VTreatmentCreate.cpp \
     sources/view/VTreatmentBegin.cpp \
     sources/view/VEventSpy.cpp \
-    sources/view/VPriming.cpp \
     sources/view/VPowerOff.cpp \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.cpp \
@@ -305,6 +321,10 @@
     sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp \
+    \ # ---------- Views - HD - Data - Pre-Treatment - Progress
+    sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp \
+    sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp \
+    sources/view/hd/data/VPreTreatmentPrimeData.cpp \
     \ # ---------- Views - HD - States Data
     sources/view/hd/data/VHDOperationModeData.cpp \
     sources/view/hd/data/VPreTreatmentStatesData.cpp \
@@ -322,6 +342,8 @@
     sources/view/hd/data/VTreatmentRinsebackData.cpp \
     sources/view/hd/data/VTreatmentRecirculateData.cpp \
     sources/view/hd/data/VTreatmentBloodPrimeData.cpp \
+    \ # ---------- Views - DG - Data - Pre-Treatment - Progress
+    sources/view/dg/data/VDGFilterFlushData.cpp \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGDrainPumpData.cpp \
     sources/view/dg/data/VDGHeatersData.cpp \