Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r52f3c502552558e0b35b23bf15dd75905fdce916 -re0412efcf85964a18ec52ad80f233c45998eb45a
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 52f3c502552558e0b35b23bf15dd75905fdce916)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision e0412efcf85964a18ec52ad80f233c45998eb45a)
@@ -89,9 +89,6 @@
     {Gui::GuiActionType::ID_AlarmUserActionReq              ,   1 * 4       }, // 1 parameter  each 4bytes
 
     // ----
-    {Gui::GuiActionType::ID_StartTreatmentReq               ,   1 * 4       }, // 1 parameters each 4bytes
-    {Gui::GuiActionType::ID_StartTreatmentRsp               ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_ConfirmTreatmentReq             ,   1 * 4       }, // 1 parameters each 4bytes
     {Gui::GuiActionType::ID_TreatmentRanges                 ,   6 * 4       }, // 6 parameters each 4bytes
 
     // ----
@@ -103,10 +100,6 @@
     {Gui::GuiActionType::ID_AdjustDurationRsp               ,   4 * 4       }, // 4 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq    ,   1 * 4       }, // 1 parameter  each 4bytes
-    {Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp    ,   3 * 4       }, // 3 parameters each 4bytes
-
-    // ----
     {Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq   ,   1 * 4       }, // 1 parameter  each 4bytes
     {Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp   ,   3 * 4       }, // 3 parameter  each 4bytes
 
@@ -122,18 +115,46 @@
     {Gui::GuiActionType::ID_AdjustPressuresLimitsReq        ,   4 * 4       }, // 4 parameter  each 4bytes
     {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp        ,   6 * 4       }, // 6 parameters each 4bytes
 
-    // ---
-    {Gui::GuiActionType::ID_CreateTreatmentReq              ,   17 * 4      }, // 17 parameters, each 4 bytes
-    {Gui::GuiActionType::ID_CreateTreatmentRsp              ,   18 * 4      }, // 18 parameters, each 4 bytes
+    // Pre-Treatment
+    // Create Parameters
+    // Pre-Treatment Initiate Treatment
+    {Gui::GuiActionType::ID_AdjustInitTreatmentReq          ,   1 * 4       }, // 1 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustInitTreatmentRsp          ,   2 * 4       }, // 2 parameters each 4bytes
+    // Pre-Treatment Treatment Parameters Validation/Confirm
+    {Gui::GuiActionType::ID_AdjustParametersValidationReq   ,  17 * 4       }, //17 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustParametersValidationRsp   ,  18 * 4       }, //18 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustParametersConfirmReq      ,   1 * 4       }, // 1 parameters each 4bytes
+    // Pre-Treatment Water Sample
+    {Gui::GuiActionType::ID_DGFilterFlushData               ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustWaterSampleReq            ,   1 * 4       }, // 1 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustWaterSampleRsp            ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustWaterSampleResultReq      ,   1 * 4       }, // 1 parameters each 4bytes
+    // Pre-Treatment Consumables Installation Confirm
+    {Gui::GuiActionType::ID_AdjustConsumablesConfirmReq     ,   0 * 4       }, // 0 parameters each 4bytes
+    // Pre-Treatment SelfTest NoCartridge Progress Data
+    {Gui::GuiActionType::ID_SelfTestNoCartridgeData         ,   2 * 4       }, // 2 parameters each 4bytes
+    // Pre-Treatment Disposables Installation Confirm
+    {Gui::GuiActionType::ID_AdjustDisposablesConfirmReq     ,   0 * 4       }, // 0 parameters each 4bytes
+    // Pre-Treatment SelfTest Dry Progress Data
+    {Gui::GuiActionType::ID_SelfTestDryData                 ,   2 * 4       }, // 2 parameters each 4bytes
+    // Pre-Treatment Disposable Priming
+    {Gui::GuiActionType::ID_AdjustDisposablesPrimeReq       ,   0 * 4       }, // 0 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp       ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_DisposablesPrimeData            ,   2 * 4       }, // 2 parameters each 4bytes
+    // Pre-Treatment Ultrafiltration initial volume
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq    ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp    ,   3 * 4       }, // 3 parameters each 4bytes
+    // Pre-Treatment Patient Connection Begin
+    {Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq ,   0 * 4       }, // 0 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp ,   2 * 4       }, // 2 parameters each 4bytes
+    // Pre-Treatment Patient Connection Confirm
+    {Gui::GuiActionType::ID_AdjustPatientConnectionConfirmReq,   0 * 4       }, // 0 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp,   2 * 4       }, // 2 parameters each 4bytes
+    // Pre-Treatment Start Treatment
+    {Gui::GuiActionType::ID_AdjustStartTreatmentReq         ,   0 * 4       }, // 1 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustStartTreatmentRsp         ,   2 * 4       }, // 2 parameters each 4bytes
 
 
-    // Pre-Treatment Progress Data
-    {Gui::GuiActionType::ID_DGFilterFlush                   ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_SelfTestNoCartridge             ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_SelfTestDry                     ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_DisposablesPrime                ,   2 * 4       }, // 2 parameters each 4bytes
-
-
     // ----
     {Gui::GuiActionType::ID_AdjustSalineReq                 ,   1 * 4       }, // 1 parameter  each 4bytes
     {Gui::GuiActionType::ID_AdjustSalineRsp                 ,   3 * 4       }, // 3 parameters each 4bytes
@@ -165,8 +186,8 @@
     {Gui::GuiActionType::ID_Acknow                          ,   0           },
     {Gui::GuiActionType::ID_AcknowGeneric                   ,   1           },
 
-    {Gui::GuiActionType::ID_HDDebugText                     ,   40 + 1      }, // ASCII text - 40 bytes + null term
-    {Gui::GuiActionType::ID_DGDebugText                     ,   40 + 1      }, // ASCII text - 40 bytes + null term
+    {Gui::GuiActionType::ID_HDDebugText                     ,  40 + 1       }, // ASCII text - 40 bytes + null term
+    {Gui::GuiActionType::ID_DGDebugText                     ,  40 + 1       }, // ASCII text - 40 bytes + null term
 
 };