Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -r683c2d895d5d41048447be1e35db604ebe4b466e -rd43342d306686299b04c45c78f9a8636ab0062fa
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 683c2d895d5d41048447be1e35db604ebe4b466e)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision d43342d306686299b04c45c78f9a8636ab0062fa)
@@ -449,14 +449,14 @@
                 self.demoCountdownId = MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS
                 # aggregate
                 # PreTreatmentDrySelfTestsStates.NUM_OF_DRY_SELF_TESTS_STATES * 2
-                self.demoGroupCounter = -self.demoCounter
-                self.demoGroupCount = 13 * self.demoCount  # aggregate counter   TBD! calc the 13
+                self.demoGroupCounter = -self.demoCounter  # start displayed timer progressing with the Counter
+                self.demoGroupCount = PreTreatmentDrySelfTestsStates.NUM_OF_DRY_SELF_TESTS_STATES.value * self.demoCount  # aggregate counter   TBD! calc the 13
 
             elif msg_id == MsgIds.MSG_ID_UI_START_PRIME_REQUEST.value:  # _60 x3C  'Start Prime'
                 self.demoSelection = 10  # continue on, picking up from previous state setup by selection 9
                 self.demoCount = 5
                 self.demoCounter    = self.demoCount        # TBD! creates illusion of starting
-                self.demoGroupCount = 12 * self.demoCount  # aggregate counter
+                self.demoGroupCount = PreTreatmentPrimeStates.NUM_OF_HD_PRIME_STATES.value  * self.demoCount  # aggregate counter
                 self.demoGroupCounter = 0  # aggregate counter  TBD SHOULD be handled by previous group end logic (?)
 
             # TREATMENT: PATIENT CONNECT --------------------------------------
@@ -701,7 +701,7 @@
             if self.demoSelection != 0:  # TBD
                 if self.demoTimedIncValue is not None:
                     self.demoTimedIncValue += 1
-
+            # RESET INIT TO STANDBY -------------------------------------------
             if self.demoSelection == 1:  # TBD Reset to start INIT
                 rsp_id = MsgIds.MSG_ID_HD_OP_MODE
                 rsp_payload = integer_to_bytearray(HDOpModes.MODE_INIT.value)
@@ -715,7 +715,7 @@
                 rsp_payload = integer_to_bytearray(HDOpModes.MODE_STAN.value)
                 rsp_payload += integer_to_bytearray(HDStandbyStates.STANDBY_START_STATE.value)
                 self.demoSelection = 0  # wait for user
-
+            # PRETREATMENT ----------------------------------------------------
             elif self.demoSelection == 4:  # <TBD Filter Flush
                 rsp_id = MsgIds.MSG_ID_HD_OP_MODE
                 rsp_payload = integer_to_bytearray(HDOpModes.MODE_PRET.value)
@@ -743,7 +743,7 @@
                 self.demoSelection = 0  # wait for user
                 self.demoCountdownChannel = None  # release to use default
                 self.demoCountdownId = None
-
+            # CONSUMABLES -----------------------------------------------------
             elif self.demoSelection == 6:  # Consumable Self Tests
                 rsp_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE
                 rsp_payload = struct.pack(
@@ -827,7 +827,7 @@
                 else:
                     self.demoCountdownId = MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS
                     # TBD setup above: self.demoGroupCount = 14 * 4  # aggregate counter
-
+            # DIALYSATE PRIME CIRCUITS ----------------------------------------
             elif self.demoSelection == 10:  # Prime circuits with dialysate
                 rsp_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE
                 rsp_payload = struct.pack(
@@ -845,13 +845,16 @@
 
                 )
                 self.demoCountdownId = MsgIds.MSG_ID_HD_PRIMING_STATUS_DATA
-                self.demoGroupCount = 12 * 5  # aggregate count up to  TBD! cleanup numbers
+                self.demoGroupCount = PreTreatmentPrimeStates.NUM_OF_HD_PRIME_STATES.value * 5  # aggregate count up to  TBD! cleanup numbers
                 if self.demoTimedIncValue == PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE.value:
                     self.demoSelection = 0  # Wait for User
                     # self.demoGroupCounter = 0  # aggregate counter
+                # TBD! could skip HD_PRIME_PAUSE?
                 elif self.demoTimedIncValue >= PreTreatmentPrimeStates.NUM_OF_HD_PRIME_STATES.value - 1:
-                    self.demoTimedIncValue = None
-                    self.demoSelection = 11
+                    self.demoTimedIncValue = None   ## TBD!!
+                    self.demoSelection = 11  # on next countdown transition
+                    self.demoCount = 0                           # immediate timeout  # TBD!! Hack to make counter neat
+                    self.demoGroupCounter = self.demoGroupCount  # aggregate counter
                 # TBD else:
                 # TBD    self.demoCountdownId = MsgIds.MSG_ID_HD_PRIMING_STATUS_DATA  # TBD! need an aggregate time/timer
 
@@ -875,8 +878,8 @@
                 self.demoSelection = 0  # Then wait for User
                 self.demoGroupCount = None  # clear aggregate count
 
-
-            ## START TREATMENT  GROUP -------------------------------------------------
+            #
+            ## START TREATMENT  GROUP -----------------------------------------
             elif self.demoSelection == 20:  # Start Treatment
                 rsp_id = MsgIds.MSG_ID_HD_OP_MODE
                 rsp_payload = integer_to_bytearray(HDOpModes.MODE_TREA.value)