Final diagram commit (hopefully).

10 files changed, 3780 insertions, 1623 deletions

diff --git a/EventMaker/Design/AddEvent.sequencediagram b/EventMaker/Design/AddEvent.sequencediagram
index e239aaf..aae7a25 100644
--- a/EventMaker/Design/AddEvent.sequencediagram
+++ b/EventMaker/Design/AddEvent.sequencediagram
@@ -105,26 +105,26 @@
               <executionOccurrenceSpecificationMoniker Id="f95793f1-a420-4f01-9c3e-e6156612ed59" LastKnownName="ExecutionOccurrenceSpecification12" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification Id="f1b4dac7-657d-4381-913b-4f68241b375e" name="ExecutionOccurrenceSpecification2">
-            <elementDefinition Id="739cb067-6313-4e79-ac54-dad923a71f24" />
+          <executionOccurrenceSpecification Id="86af0112-07e2-4334-a14c-e45357581015" name="ExecutionOccurrenceSpecification5">
+            <elementDefinition Id="59ec5e03-806d-411c-a6f9-de6ed50e45e2" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="0ef62aba-43f5-48d7-ab91-84ea5800b1f6" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="c8d5c843-b4a5-41cd-b903-f06672b62e1d" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="b417fa1d-cf3b-4fdb-a194-5c50bc9f9323" LastKnownName=": CreateEventPage" />
+              <lifelineMoniker Id="355b9cce-8145-4c1a-8af3-4c0a75c82de7" LastKnownName=": EventViewModel" />
             </covered>
           </executionOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="86af0112-07e2-4334-a14c-e45357581015" name="ExecutionOccurrenceSpecification5">
-            <elementDefinition Id="59ec5e03-806d-411c-a6f9-de6ed50e45e2" />
+          <executionOccurrenceSpecification Id="f1b4dac7-657d-4381-913b-4f68241b375e" name="ExecutionOccurrenceSpecification2">
+            <elementDefinition Id="739cb067-6313-4e79-ac54-dad923a71f24" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="c8d5c843-b4a5-41cd-b903-f06672b62e1d" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="0ef62aba-43f5-48d7-ab91-84ea5800b1f6" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="355b9cce-8145-4c1a-8af3-4c0a75c82de7" LastKnownName=": EventViewModel" />
+              <lifelineMoniker Id="b417fa1d-cf3b-4fdb-a194-5c50bc9f9323" LastKnownName=": CreateEventPage" />
             </covered>
           </executionOccurrenceSpecification>
           <messageOccurrenceSpecification Id="427c6c2a-7103-407b-8884-96aecbec4039" name="MessageOccurrenceSpecification5">
@@ -152,7 +152,6 @@
             </start>
             <nestedOccurrences>
               <messageOccurrenceSpecificationMoniker Id="ecf6487c-35d6-4e88-ab18-ae2f5aa6fb25" LastKnownName="MessageOccurrenceSpecification8" />
-              <messageOccurrenceSpecificationMoniker Id="e6ad778d-3d68-4f3d-a98d-e973fc070dd1" LastKnownName="MessageOccurrenceSpecification13" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification Id="f0b6c96f-7ec6-4ad1-a73c-392bccb7d6c2" name="ExecutionOccurrenceSpecification4">
@@ -189,55 +188,6 @@
               <lifelineMoniker Id="355b9cce-8145-4c1a-8af3-4c0a75c82de7" LastKnownName=": EventViewModel" />
             </covered>
           </messageOccurrenceSpecification>
-          <behaviorExecutionSpecification Id="8fe5d193-4b3a-44ed-bf99-1d6526555b1b" name="BehaviorExecutionSpecification7">
-            <elementDefinition Id="bc7c8b8a-fe63-4dde-aee9-13a1784100ce" />
-            <coveredLifelines>
-              <lifelineMoniker Id="2bc92a75-7b4d-4e2d-b1d6-5fdb7453f658" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker Id="953e0a56-9bb5-49f7-b0e9-509df00f4240" LastKnownName="ExecutionOccurrenceSpecification14" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker Id="cc18ea8d-333a-4ff6-818d-902273144697" LastKnownName="ExecutionOccurrenceSpecification13" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker Id="e29723e1-97f5-429b-b3c6-73c39d790778" LastKnownName="MessageOccurrenceSpecification14" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification Id="cc18ea8d-333a-4ff6-818d-902273144697" name="ExecutionOccurrenceSpecification13">
-            <elementDefinition Id="c7a9431e-cb8b-4c18-8749-9b8e8f268e95" />
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="741e228c-b7c7-47cd-8a6d-8c4ac0c9c4f8" LastKnownName="ExecutionEvent" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker Id="2bc92a75-7b4d-4e2d-b1d6-5fdb7453f658" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="e29723e1-97f5-429b-b3c6-73c39d790778" name="MessageOccurrenceSpecification14">
-            <elementDefinition Id="dd7801ab-f88d-44e8-9e27-1bd5fc2fd24b" />
-            <covered>
-              <lifelineMoniker Id="2bc92a75-7b4d-4e2d-b1d6-5fdb7453f658" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="e6ad778d-3d68-4f3d-a98d-e973fc070dd1" name="MessageOccurrenceSpecification13">
-            <elementDefinition Id="00c95165-0e2e-42b5-b0c4-92bf6dfdb877" />
-            <covered>
-              <lifelineMoniker Id="5f81e4a1-3fd8-4857-aaea-01933801e66b" LastKnownName="EventCatalogSingleton" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="953e0a56-9bb5-49f7-b0e9-509df00f4240" name="ExecutionOccurrenceSpecification14">
-            <elementDefinition Id="edb5f27a-2cc9-400a-bf3e-eb5f271f1f62" />
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="05af83ca-7ba3-473d-8710-38d4e9c542f5" LastKnownName="ExecutionEvent" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker Id="2bc92a75-7b4d-4e2d-b1d6-5fdb7453f658" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-            </covered>
-          </executionOccurrenceSpecification>
           <executionOccurrenceSpecification Id="c23d1cbd-0887-4854-8712-40ff316270a8" name="ExecutionOccurrenceSpecification8">
             <elementDefinition Id="2afb1614-e404-4763-8478-7b0324574fcb" />
             <event>
@@ -262,7 +212,6 @@
             </start>
             <nestedOccurrences>
               <messageOccurrenceSpecificationMoniker Id="f243cce6-c664-42c7-b999-d2ecb8b397ea" LastKnownName="MessageOccurrenceSpecification16" />
-              <messageOccurrenceSpecificationMoniker Id="64c72e8d-b037-4359-aed9-26b1b1dcf6bb" LastKnownName="MessageOccurrenceSpecification17" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification Id="de9dbaeb-c751-458b-9d11-b4a5e5a8032e" name="ExecutionOccurrenceSpecification15">
@@ -276,54 +225,16 @@
               <lifelineMoniker Id="e9fa219c-27dc-4182-a2fa-cfad4db49426" LastKnownName="PersistencyServices" />
             </covered>
           </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="27aefe22-60a0-454f-93ef-78ab149e354e" name="MessageOccurrenceSpecification15">
-            <elementDefinition Id="06bd0e00-cfa5-4d51-9b2c-5023ba17e4d3" />
-            <covered>
-              <lifelineMoniker Id="5f81e4a1-3fd8-4857-aaea-01933801e66b" LastKnownName="EventCatalogSingleton" />
-            </covered>
-          </messageOccurrenceSpecification>
           <messageOccurrenceSpecification Id="f243cce6-c664-42c7-b999-d2ecb8b397ea" name="MessageOccurrenceSpecification16">
             <elementDefinition Id="773cc808-ab31-40c7-a954-22f27add010d" />
             <covered>
               <lifelineMoniker Id="e9fa219c-27dc-4182-a2fa-cfad4db49426" LastKnownName="PersistencyServices" />
             </covered>
           </messageOccurrenceSpecification>
-          <behaviorExecutionSpecification Id="ca76754b-69d3-4b31-bebd-94bf507ee268" name="BehaviorExecutionSpecification9">
-            <elementDefinition Id="7edc9865-b4bf-4a20-a1e7-e61d99474163" />
-            <coveredLifelines>
-              <lifelineMoniker Id="185e41fb-e4be-44e4-b41a-69d52d43f41d" LastKnownName="_eventsFile : StorageFile" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker Id="f448d03b-654d-49d5-973e-9f30d3bf17b3" LastKnownName="ExecutionOccurrenceSpecification18" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker Id="75868520-5987-4ad8-a6ed-26fed7dcb8eb" LastKnownName="ExecutionOccurrenceSpecification17" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker Id="b9d02c5b-e3a4-4357-933f-924c63d80dce" LastKnownName="MessageOccurrenceSpecification18" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification Id="75868520-5987-4ad8-a6ed-26fed7dcb8eb" name="ExecutionOccurrenceSpecification17">
-            <elementDefinition Id="f8d10164-4310-4e72-8a85-63444ff0dd0e" />
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="c46c26fa-c9cd-4ea3-9878-0440266db67b" LastKnownName="ExecutionEvent" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker Id="185e41fb-e4be-44e4-b41a-69d52d43f41d" LastKnownName="_eventsFile : StorageFile" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="b9d02c5b-e3a4-4357-933f-924c63d80dce" name="MessageOccurrenceSpecification18">
-            <elementDefinition Id="4e10ccd3-a062-4f6a-b838-b6db3b821536" />
-            <covered>
-              <lifelineMoniker Id="185e41fb-e4be-44e4-b41a-69d52d43f41d" LastKnownName="_eventsFile : StorageFile" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="64c72e8d-b037-4359-aed9-26b1b1dcf6bb" name="MessageOccurrenceSpecification17">
-            <elementDefinition Id="2e1df5b3-da79-4f18-8283-74ec4a3646e8" />
+          <messageOccurrenceSpecification Id="27aefe22-60a0-454f-93ef-78ab149e354e" name="MessageOccurrenceSpecification15">
+            <elementDefinition Id="06bd0e00-cfa5-4d51-9b2c-5023ba17e4d3" />
             <covered>
-              <lifelineMoniker Id="e9fa219c-27dc-4182-a2fa-cfad4db49426" LastKnownName="PersistencyServices" />
+              <lifelineMoniker Id="5f81e4a1-3fd8-4857-aaea-01933801e66b" LastKnownName="EventCatalogSingleton" />
             </covered>
           </messageOccurrenceSpecification>
           <executionOccurrenceSpecification Id="50a7e864-f5b4-4db9-8c0a-a19a1c1cd34e" name="ExecutionOccurrenceSpecification16">
@@ -343,17 +254,6 @@
               <lifelineMoniker Id="355b9cce-8145-4c1a-8af3-4c0a75c82de7" LastKnownName=": EventViewModel" />
             </covered>
           </messageOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="f448d03b-654d-49d5-973e-9f30d3bf17b3" name="ExecutionOccurrenceSpecification18">
-            <elementDefinition Id="c5f98e2f-d457-4e09-82f9-1b8837e60a2c" />
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="836f3e2f-bf74-40b1-bd1f-603ebf3a052d" LastKnownName="ExecutionEvent" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker Id="185e41fb-e4be-44e4-b41a-69d52d43f41d" LastKnownName="_eventsFile : StorageFile" />
-            </covered>
-          </executionOccurrenceSpecification>
           <behaviorExecutionSpecification Id="807de99a-04ce-4bba-983b-80647808e386" name="BehaviorExecutionSpecification5">
             <elementDefinition Id="16ed5561-f2f4-4301-90f2-fdec886ba35c" />
             <coveredLifelines>
@@ -367,6 +267,7 @@
             </start>
             <nestedOccurrences>
               <messageOccurrenceSpecificationMoniker Id="35450799-d795-41a5-977c-2860f295f007" LastKnownName="MessageOccurrenceSpecification10" />
+              <messageOccurrenceSpecificationMoniker Id="234ed9cb-6f37-48ac-b394-95d575c5c9ce" LastKnownName="MessageOccurrenceSpecification21" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification Id="a111805e-efc0-4a15-a4d2-3b0a209bb930" name="ExecutionOccurrenceSpecification9">
@@ -386,6 +287,44 @@
               <lifelineMoniker Id="355b9cce-8145-4c1a-8af3-4c0a75c82de7" LastKnownName=": EventViewModel" />
             </covered>
           </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="3478056f-0688-48c3-88b4-6d47c5b0bebb" name="BehaviorExecutionSpecification11">
+            <elementDefinition Id="717c3b85-5d18-40c5-9b7f-ba9c94101aaa" />
+            <coveredLifelines>
+              <lifelineMoniker Id="0f846951-325e-4583-bf8b-c8ecacfb73d3" LastKnownName=": Event" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="b2083234-3b75-49d2-8256-70975c5643a0" LastKnownName="ExecutionOccurrenceSpecification22" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="d3bad3a2-ce11-4a7d-b655-eadb6b1db017" LastKnownName="ExecutionOccurrenceSpecification21" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="a85ea360-447c-420c-89ce-582e48fe2643" LastKnownName="MessageOccurrenceSpecification22" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="d3bad3a2-ce11-4a7d-b655-eadb6b1db017" name="ExecutionOccurrenceSpecification21">
+            <elementDefinition Id="a3869255-e686-4c4c-97de-72f6397b6fff" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="9f363698-c8bf-4f5c-aebd-670d4637baa9" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="0f846951-325e-4583-bf8b-c8ecacfb73d3" LastKnownName=": Event" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="a85ea360-447c-420c-89ce-582e48fe2643" name="MessageOccurrenceSpecification22">
+            <elementDefinition Id="02833c3d-68c1-402e-984d-d99836fd7717" />
+            <covered>
+              <lifelineMoniker Id="0f846951-325e-4583-bf8b-c8ecacfb73d3" LastKnownName=": Event" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="234ed9cb-6f37-48ac-b394-95d575c5c9ce" name="MessageOccurrenceSpecification21">
+            <elementDefinition Id="5ff3b465-94ac-4f34-8315-c388042f6af5" />
+            <covered>
+              <lifelineMoniker Id="355b9cce-8145-4c1a-8af3-4c0a75c82de7" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
           <executionOccurrenceSpecification Id="8e6d4b85-c8f3-4ff1-ada9-3096bbdfc0a5" name="ExecutionOccurrenceSpecification10">
             <elementDefinition Id="ea6aa558-f9bf-4193-a891-49d7cdc39c9b" />
             <event>
@@ -397,6 +336,17 @@
               <lifelineMoniker Id="355b9cce-8145-4c1a-8af3-4c0a75c82de7" LastKnownName=": EventViewModel" />
             </covered>
           </executionOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="b2083234-3b75-49d2-8256-70975c5643a0" name="ExecutionOccurrenceSpecification22">
+            <elementDefinition Id="a35b7ff0-95ef-4ac0-8cd2-7ffa59880bcb" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="423cc10f-29a1-428a-97e9-6cdd287a439c" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="0f846951-325e-4583-bf8b-c8ecacfb73d3" LastKnownName=": Event" />
+            </covered>
+          </executionOccurrenceSpecification>
           <messageOccurrenceSpecification Id="ef2a7ca3-0d2f-41fd-8683-1211002d6808" name="MessageOccurrenceSpecification11">
             <elementDefinition Id="9ce3bd0b-5beb-4199-a773-a8cb105497f2" />
             <covered>
@@ -546,11 +496,14 @@
               <executionOccurrenceSpecificationMoniker Id="461d121a-47b2-4426-a734-436f0471e85b" LastKnownName="ExecutionOccurrenceSpecification20" />
             </topLevelOccurrences>
           </lifeline>
-          <lifeline Id="2bc92a75-7b4d-4e2d-b1d6-5fdb7453f658" name="Events : ObservableCollection&lt;Event&gt;" isActor="false" lifelineDisplayName="Events : ObservableCollection&lt;Event&gt;">
-            <elementDefinition Id="b1db110f-6b40-4b88-8b82-9e78817b4bda" />
+          <lifeline Id="0f846951-325e-4583-bf8b-c8ecacfb73d3" name=": Event" isActor="false" lifelineDisplayName=": Event">
+            <elementDefinition Id="b7dc1317-a87b-4092-b32c-94312944a9fc" />
+            <represents>
+              <propertyMoniker Id="037281c6-de41-45e6-ba07-5ccd492434bf" />
+            </represents>
             <topLevelOccurrences>
-              <executionOccurrenceSpecificationMoniker Id="cc18ea8d-333a-4ff6-818d-902273144697" LastKnownName="ExecutionOccurrenceSpecification13" />
-              <executionOccurrenceSpecificationMoniker Id="953e0a56-9bb5-49f7-b0e9-509df00f4240" LastKnownName="ExecutionOccurrenceSpecification14" />
+              <executionOccurrenceSpecificationMoniker Id="d3bad3a2-ce11-4a7d-b655-eadb6b1db017" LastKnownName="ExecutionOccurrenceSpecification21" />
+              <executionOccurrenceSpecificationMoniker Id="b2083234-3b75-49d2-8256-70975c5643a0" LastKnownName="ExecutionOccurrenceSpecification22" />
             </topLevelOccurrences>
           </lifeline>
           <lifeline Id="e9fa219c-27dc-4182-a2fa-cfad4db49426" name="PersistencyServices" isActor="false" lifelineDisplayName="PersistencyServices">
@@ -560,13 +513,6 @@
               <executionOccurrenceSpecificationMoniker Id="50a7e864-f5b4-4db9-8c0a-a19a1c1cd34e" LastKnownName="ExecutionOccurrenceSpecification16" />
             </topLevelOccurrences>
           </lifeline>
-          <lifeline Id="185e41fb-e4be-44e4-b41a-69d52d43f41d" name="_eventsFile : StorageFile" isActor="false" lifelineDisplayName="_eventsFile : StorageFile">
-            <elementDefinition Id="0dce1dc5-abca-41cb-bd04-e10ceafacab3" />
-            <topLevelOccurrences>
-              <executionOccurrenceSpecificationMoniker Id="75868520-5987-4ad8-a6ed-26fed7dcb8eb" LastKnownName="ExecutionOccurrenceSpecification17" />
-              <executionOccurrenceSpecificationMoniker Id="f448d03b-654d-49d5-973e-9f30d3bf17b3" LastKnownName="ExecutionOccurrenceSpecification18" />
-            </topLevelOccurrences>
-          </lifeline>
         </lifelines>
         <messages>
           <message Id="667d4e1c-927c-452f-9e48-a5903ce2e454" name="NavigateToPageAction" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
@@ -605,15 +551,6 @@
               <messageOccurrenceSpecificationMoniker Id="ecf6487c-35d6-4e88-ab18-ae2f5aa6fb25" LastKnownName="MessageOccurrenceSpecification8" />
             </receiveEvent>
           </message>
-          <message Id="0f8cac56-960e-496e-9400-d678ce81af68" name="Add(newEvent)" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
-            <elementDefinition Id="a8ea4b51-d026-4971-bf68-88cfd4c87ddf" />
-            <sendEvent>
-              <messageOccurrenceSpecificationMoniker Id="e6ad778d-3d68-4f3d-a98d-e973fc070dd1" LastKnownName="MessageOccurrenceSpecification13" />
-            </sendEvent>
-            <receiveEvent>
-              <messageOccurrenceSpecificationMoniker Id="e29723e1-97f5-429b-b3c6-73c39d790778" LastKnownName="MessageOccurrenceSpecification14" />
-            </receiveEvent>
-          </message>
           <message Id="cff24687-95bf-487f-b911-9cf7901570a2" name="SaveEventsAsJsonAsync(Events)" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
             <elementDefinition Id="77b036ff-5211-43b2-8560-68b027d92964" />
             <sendEvent>
@@ -623,22 +560,22 @@
               <messageOccurrenceSpecificationMoniker Id="f243cce6-c664-42c7-b999-d2ecb8b397ea" LastKnownName="MessageOccurrenceSpecification16" />
             </receiveEvent>
           </message>
-          <message Id="ee446f30-6c55-48f0-9da9-03ca6acd2c7e" name="File.WriteAllText(_eventsFile)" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
-            <elementDefinition Id="17e00c66-9eb1-438f-9c30-a124de09306b" />
+          <message Id="ef1713e8-4703-43e0-8209-296fc8624adf" name="CleanTemplate" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="true">
+            <elementDefinition Id="72f566c0-834d-49f6-9be5-a5bd941e1719" />
             <sendEvent>
-              <messageOccurrenceSpecificationMoniker Id="64c72e8d-b037-4359-aed9-26b1b1dcf6bb" LastKnownName="MessageOccurrenceSpecification17" />
+              <messageOccurrenceSpecificationMoniker Id="e81bb216-8282-4fea-a814-2c500274dfb1" LastKnownName="MessageOccurrenceSpecification9" />
             </sendEvent>
             <receiveEvent>
-              <messageOccurrenceSpecificationMoniker Id="b9d02c5b-e3a4-4357-933f-924c63d80dce" LastKnownName="MessageOccurrenceSpecification18" />
+              <messageOccurrenceSpecificationMoniker Id="35450799-d795-41a5-977c-2860f295f007" LastKnownName="MessageOccurrenceSpecification10" />
             </receiveEvent>
           </message>
-          <message Id="ef1713e8-4703-43e0-8209-296fc8624adf" name="CleanTemplate" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="true">
-            <elementDefinition Id="72f566c0-834d-49f6-9be5-a5bd941e1719" />
+          <message Id="846e83e6-548b-49f4-8d9d-0b6e519d68fe" name="EventTemplate=new Event" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
+            <elementDefinition Id="6acef0c4-9da5-457a-8dbd-e76378989f8f" />
             <sendEvent>
-              <messageOccurrenceSpecificationMoniker Id="e81bb216-8282-4fea-a814-2c500274dfb1" LastKnownName="MessageOccurrenceSpecification9" />
+              <messageOccurrenceSpecificationMoniker Id="234ed9cb-6f37-48ac-b394-95d575c5c9ce" LastKnownName="MessageOccurrenceSpecification21" />
             </sendEvent>
             <receiveEvent>
-              <messageOccurrenceSpecificationMoniker Id="35450799-d795-41a5-977c-2860f295f007" LastKnownName="MessageOccurrenceSpecification10" />
+              <messageOccurrenceSpecificationMoniker Id="a85ea360-447c-420c-89ce-582e48fe2643" LastKnownName="MessageOccurrenceSpecification22" />
             </receiveEvent>
           </message>
           <message Id="ca469aa8-651d-4c10-8d53-4f85ac7f9a19" name="SortEvents" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="true">
@@ -660,6 +597,14 @@
             </receiveEvent>
           </message>
         </messages>
+        <ownedAttributesInternal>
+          <property Id="037281c6-de41-45e6-ba07-5ccd492434bf" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
+            <elementDefinition Id="3e00e8b4-c13d-4385-a472-5fa385c76af2" />
+            <type_NamedElement>
+              <referencedTypeMoniker Id="5bfd334e-392d-492e-ba8f-477017ee541b" LastKnownName="Event" />
+            </type_NamedElement>
+          </property>
+        </ownedAttributesInternal>
       </interaction>
     </packageHasNamedElement>
     <packageHasNamedElement>
@@ -713,16 +658,6 @@
       </executionEvent>
     </packageHasNamedElement>
     <packageHasNamedElement>
-      <executionEvent Id="741e228c-b7c7-47cd-8a6d-8c4ac0c9c4f8" name="ExecutionEvent">
-        <elementDefinition Id="2fc8bb7c-330c-4cb4-9a1f-13d4ce4bff2e" />
-      </executionEvent>
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent Id="05af83ca-7ba3-473d-8710-38d4e9c542f5" name="ExecutionEvent">
-        <elementDefinition Id="53e07674-c131-49bd-88ed-6d8f5bb45843" />
-      </executionEvent>
-    </packageHasNamedElement>
-    <packageHasNamedElement>
       <executionEvent Id="20dd4c9c-687e-435b-a8c1-d69c6ac7fcd4" name="ExecutionEvent">
         <elementDefinition Id="fe345da2-2c5a-46ff-8c9c-12b9015021f1" />
       </executionEvent>
@@ -733,16 +668,6 @@
       </executionEvent>
     </packageHasNamedElement>
     <packageHasNamedElement>
-      <executionEvent Id="c46c26fa-c9cd-4ea3-9878-0440266db67b" name="ExecutionEvent">
-        <elementDefinition Id="4e400a43-58cc-4fc7-a42d-a796a6783255" />
-      </executionEvent>
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent Id="836f3e2f-bf74-40b1-bd1f-603ebf3a052d" name="ExecutionEvent">
-        <elementDefinition Id="c9a3a49b-a33e-48e6-875a-e1472b7d32f1" />
-      </executionEvent>
-    </packageHasNamedElement>
-    <packageHasNamedElement>
       <executionEvent Id="1d4c5cbd-66c5-41c9-b6d4-05571609fd81" name="ExecutionEvent">
         <elementDefinition Id="6fe5b95d-1caf-402b-bfce-70faa4432895" />
       </executionEvent>
@@ -762,6 +687,21 @@
         <elementDefinition Id="d5343369-8b53-4a57-b5ba-c7ed06643660" />
       </executionEvent>
     </packageHasNamedElement>
+    <packageHasNamedElement>
+      <referencedType Id="5bfd334e-392d-492e-ba8f-477017ee541b" name="Event" isAbstract="false" isLeaf="false" cachedFullName="Design::Event">
+        <elementDefinition Id="760f646f-837b-4a99-aa04-8b3e628b4189" />
+      </referencedType>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="9f363698-c8bf-4f5c-aebd-670d4637baa9" name="ExecutionEvent">
+        <elementDefinition Id="6a813149-4012-450e-84c8-ad0564b55319" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="423cc10f-29a1-428a-97e9-6cdd287a439c" name="ExecutionEvent">
+        <elementDefinition Id="ca9c94dd-e209-4268-ba09-ddbea9a329d7" />
+      </executionEvent>
+    </packageHasNamedElement>
   </packagedElements>
   <package Id="385ee7fc-2111-4253-bfc3-59543fe5ec40" name="Design">
     <elementDefinition Id="1bc1064b-b630-4768-9d3b-c772ca559686" />
diff --git a/EventMaker/Design/AddEvent.sequencediagram.layout b/EventMaker/Design/AddEvent.sequencediagram.layout
index a183bb2..d2e2a10 100644
--- a/EventMaker/Design/AddEvent.sequencediagram.layout
+++ b/EventMaker/Design/AddEvent.sequencediagram.layout
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<sequenceDesignerDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 12.75, 9.125" name="AddEvent">
+<sequenceDesignerDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 11, 9.125" name="AddEvent">
   <SequenceDesignerModelMoniker Id="81de8f1f-e199-4c3b-a607-27bb5bdab314" />
   <nestedChildShapes>
     <lifelineShape Id="0826bdad-1dfb-42ae-89e6-7a8f69c879bc" absoluteBounds="4.1958333333333329, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
@@ -30,10 +30,10 @@
         <umlExecutionSpecificationShape Id="db221277-dc2a-4f19-8967-e958beb3f281" absoluteBounds="5.5958333333333332, 2.3916666666666662, 0.15, 6.1875000000000018" customColor="184, 204, 215" visualStyleMode="Modified">
           <behaviorExecutionSpecificationMoniker Id="93ee9dec-0cdf-4d10-bd33-c76fd29f0542" LastKnownName="BehaviorExecutionSpecification3" />
           <relativeChildShapes>
-            <umlExecutionSpecificationShape Id="70968274-e98d-4ebb-a2d1-e804673b2f21" absoluteBounds="5.6708333333333334, 6.0062500000000005, 0.15, 1.3145833333333332" customColor="184, 204, 215" visualStyleMode="Modified">
+            <umlExecutionSpecificationShape Id="70968274-e98d-4ebb-a2d1-e804673b2f21" absoluteBounds="5.6708333333333334, 6.19375, 0.15, 1.1270833333333341" customColor="184, 204, 215" visualStyleMode="Modified">
               <behaviorExecutionSpecificationMoniker Id="7377b582-e00d-43f6-ac59-f48e978b028f" LastKnownName="BehaviorExecutionSpecification6" />
             </umlExecutionSpecificationShape>
-            <umlExecutionSpecificationShape Id="e5b859fd-ec8b-4c72-b04c-321b8780976e" absoluteBounds="5.6708333333333334, 4.9062500000000009, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+            <umlExecutionSpecificationShape Id="e5b859fd-ec8b-4c72-b04c-321b8780976e" absoluteBounds="5.6708333333333334, 4.90625, 0.15, 0.73749999999999982" customColor="184, 204, 215" visualStyleMode="Modified">
               <behaviorExecutionSpecificationMoniker Id="807de99a-04ce-4bba-983b-80647808e386" LastKnownName="BehaviorExecutionSpecification5" />
             </umlExecutionSpecificationShape>
           </relativeChildShapes>
@@ -53,56 +53,26 @@
         <umlExecutionSpecificationShape Id="bf6efee7-d709-4683-9056-e685c77b1e64" absoluteBounds="6.9958333333333336, 2.691666666666666, 0.15, 0.89999999999999947" customColor="184, 204, 215" visualStyleMode="Modified">
           <behaviorExecutionSpecificationMoniker Id="583c1102-86db-4ea8-b1fe-266f282e8101" LastKnownName="BehaviorExecutionSpecification4" />
         </umlExecutionSpecificationShape>
-        <umlExecutionSpecificationShape Id="be7fc322-8cae-4179-9d18-c6466f3a8f21" absoluteBounds="6.9958333333333336, 6.30625, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+        <umlExecutionSpecificationShape Id="be7fc322-8cae-4179-9d18-c6466f3a8f21" absoluteBounds="6.9958333333333336, 6.4937499999999995, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
           <behaviorExecutionSpecificationMoniker Id="69d7efc9-580d-4267-b948-81bc0d8b90b4" LastKnownName="BehaviorExecutionSpecification10" />
         </umlExecutionSpecificationShape>
       </relativeChildShapes>
     </lifelineShape>
-    <lifelineShape Id="5bff9fbe-4ed4-4564-8daf-aacf8bca3669" absoluteBounds="8.5625, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
-      <lifelineMoniker Id="2bc92a75-7b4d-4e2d-b1d6-5fdb7453f658" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-      <relativeChildShapes>
-        <lifelineHoverShape Id="3e0d5c3a-81f1-4b8d-b15a-0da5d963fdf7" absoluteBounds="8.5625, 1, 0, 7">
-          <lifelineMoniker Id="2bc92a75-7b4d-4e2d-b1d6-5fdb7453f658" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-        </lifelineHoverShape>
-        <umlLifelineHeadShape Id="3c8542ff-cc09-48bf-aac5-566e5ccc91c3" absoluteBounds="7.6375, 0.6, 2, 0.4" customColor="White" visualStyleMode="Modified">
-          <lifelineMoniker Id="2bc92a75-7b4d-4e2d-b1d6-5fdb7453f658" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-          <relativeChildShapes />
-        </umlLifelineHeadShape>
-        <umlExecutionSpecificationShape Id="9aa5490a-680a-496b-a4ef-e89dd48da826" absoluteBounds="8.5625, 2.9916666666666658, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
-          <behaviorExecutionSpecificationMoniker Id="8fe5d193-4b3a-44ed-bf99-1d6526555b1b" LastKnownName="BehaviorExecutionSpecification7" />
-        </umlExecutionSpecificationShape>
-      </relativeChildShapes>
-    </lifelineShape>
-    <lifelineShape Id="28190b8c-f689-4885-99c1-6616745d17d5" absoluteBounds="10.097916666666666, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
+    <lifelineShape Id="28190b8c-f689-4885-99c1-6616745d17d5" absoluteBounds="9.4104166666666664, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
       <lifelineMoniker Id="e9fa219c-27dc-4182-a2fa-cfad4db49426" LastKnownName="PersistencyServices" />
       <relativeChildShapes>
-        <lifelineHoverShape Id="05da7d8a-7878-4589-8691-af4696a093c8" absoluteBounds="10.097916666666666, 1, 0, 7">
+        <lifelineHoverShape Id="05da7d8a-7878-4589-8691-af4696a093c8" absoluteBounds="9.4104166666666664, 1, 0, 7">
           <lifelineMoniker Id="e9fa219c-27dc-4182-a2fa-cfad4db49426" LastKnownName="PersistencyServices" />
         </lifelineHoverShape>
-        <umlLifelineHeadShape Id="9a0639e6-c9f8-4369-b0f2-c5956e5cd577" absoluteBounds="9.6729166666666657, 0.6, 1, 0.4" customColor="White" visualStyleMode="Modified">
+        <umlLifelineHeadShape Id="9a0639e6-c9f8-4369-b0f2-c5956e5cd577" absoluteBounds="8.9854166666666657, 0.6, 1, 0.4" customColor="White" visualStyleMode="Modified">
           <lifelineMoniker Id="e9fa219c-27dc-4182-a2fa-cfad4db49426" LastKnownName="PersistencyServices" />
           <relativeChildShapes />
         </umlLifelineHeadShape>
-        <umlExecutionSpecificationShape Id="7d0e68fc-d448-4332-b875-6fd71f2b744f" absoluteBounds="10.097916666666666, 3.8916666666666653, 0.15, 0.65833333333333455" customColor="184, 204, 215" visualStyleMode="Modified">
+        <umlExecutionSpecificationShape Id="7d0e68fc-d448-4332-b875-6fd71f2b744f" absoluteBounds="9.4104166666666664, 3.8916666666666653, 0.15, 0.65833333333333455" customColor="184, 204, 215" visualStyleMode="Modified">
           <behaviorExecutionSpecificationMoniker Id="24c49a98-5f18-4d3e-9774-92453dde6e75" LastKnownName="BehaviorExecutionSpecification8" />
         </umlExecutionSpecificationShape>
       </relativeChildShapes>
     </lifelineShape>
-    <lifelineShape Id="06519dce-d54b-40de-8029-c76d87abcca6" absoluteBounds="11.935416666666667, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
-      <lifelineMoniker Id="185e41fb-e4be-44e4-b41a-69d52d43f41d" LastKnownName="_eventsFile : StorageFile" />
-      <relativeChildShapes>
-        <lifelineHoverShape Id="2a0a8fcb-631a-40fb-b234-65353b5ff5a3" absoluteBounds="11.935416666666667, 1, 0, 7">
-          <lifelineMoniker Id="185e41fb-e4be-44e4-b41a-69d52d43f41d" LastKnownName="_eventsFile : StorageFile" />
-        </lifelineHoverShape>
-        <umlLifelineHeadShape Id="3e953d4e-08a1-451e-83da-e107b996abe6" absoluteBounds="11.510416666666666, 0.6, 1, 0.4" customColor="White" visualStyleMode="Modified">
-          <lifelineMoniker Id="185e41fb-e4be-44e4-b41a-69d52d43f41d" LastKnownName="_eventsFile : StorageFile" />
-          <relativeChildShapes />
-        </umlLifelineHeadShape>
-        <umlExecutionSpecificationShape Id="861fed7c-1df8-46b9-b024-70c98136a179" absoluteBounds="11.935416666666667, 4.25, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
-          <behaviorExecutionSpecificationMoniker Id="ca76754b-69d3-4b31-bebd-94bf507ee268" LastKnownName="BehaviorExecutionSpecification9" />
-        </umlExecutionSpecificationShape>
-      </relativeChildShapes>
-    </lifelineShape>
     <lifelineShape Id="19ca5a64-ec62-4b18-bed6-769885c5ca6a" absoluteBounds="1.025, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
       <lifelineMoniker Id="6ac16416-e4b0-4bbc-b894-ae3913022d1e" LastKnownName=": EventPage" />
       <relativeChildShapes>
@@ -158,35 +128,21 @@
         <umlExecutionSpecificationShapeMoniker Id="bf6efee7-d709-4683-9056-e685c77b1e64" />
       </nodes>
     </asyncMessageConnector>
-    <asyncSelfMessageConnector edgePoints="[(5.74583333333333 : 5.75625); (5.99583333333333 : 5.75625); (5.99583333333333 : 6.00625); (5.82083333333333 : 6.00625)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+    <asyncSelfMessageConnector edgePoints="[(5.74583333333333 : 5.94375); (5.99583333333333 : 5.94375); (5.99583333333333 : 6.19375); (5.82083333333333 : 6.19375)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
         <umlExecutionSpecificationShapeMoniker Id="db221277-dc2a-4f19-8967-e958beb3f281" />
         <umlExecutionSpecificationShapeMoniker Id="70968274-e98d-4ebb-a2d1-e804673b2f21" />
       </nodes>
     </asyncSelfMessageConnector>
-    <asyncMessageConnector edgePoints="[(7.14583333333333 : 2.99166666666667); (8.5625 : 2.99166666666667)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
-      <relativeChildShapes />
-      <nodes>
-        <umlExecutionSpecificationShapeMoniker Id="bf6efee7-d709-4683-9056-e685c77b1e64" />
-        <umlExecutionSpecificationShapeMoniker Id="9aa5490a-680a-496b-a4ef-e89dd48da826" />
-      </nodes>
-    </asyncMessageConnector>
-    <asyncMessageConnector edgePoints="[(7.07083333333333 : 3.89166666666667); (10.0979166666667 : 3.89166666666667)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+    <asyncMessageConnector edgePoints="[(7.07083333333333 : 3.89166666666667); (9.41041666666667 : 3.89166666666667)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
         <lifelineShapeMoniker Id="2c658ef4-ab88-4182-a403-c1610d69d3f3" />
         <umlExecutionSpecificationShapeMoniker Id="7d0e68fc-d448-4332-b875-6fd71f2b744f" />
       </nodes>
     </asyncMessageConnector>
-    <asyncMessageConnector edgePoints="[(10.2479166666667 : 4.25); (11.9354166666667 : 4.25)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
-      <relativeChildShapes />
-      <nodes>
-        <umlExecutionSpecificationShapeMoniker Id="7d0e68fc-d448-4332-b875-6fd71f2b744f" />
-        <umlExecutionSpecificationShapeMoniker Id="861fed7c-1df8-46b9-b024-70c98136a179" />
-      </nodes>
-    </asyncMessageConnector>
-    <asyncMessageConnector edgePoints="[(5.82083333333333 : 6.30625); (6.99583333333333 : 6.30625)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+    <asyncMessageConnector edgePoints="[(5.82083333333333 : 6.49375); (6.99583333333333 : 6.49375)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
         <umlExecutionSpecificationShapeMoniker Id="70968274-e98d-4ebb-a2d1-e804673b2f21" />
@@ -200,5 +156,27 @@
         <umlExecutionSpecificationShapeMoniker Id="e5b859fd-ec8b-4c72-b04c-321b8780976e" />
       </nodes>
     </asyncSelfMessageConnector>
+    <lifelineShape Id="b4cea1e0-08f7-4e26-aa28-037aba8c3114" absoluteBounds="8.1770830154418945, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
+      <lifelineMoniker Id="0f846951-325e-4583-bf8b-c8ecacfb73d3" LastKnownName=": Event" />
+      <relativeChildShapes>
+        <umlLifelineHeadShape Id="5e0b8ad8-631a-40dc-9ca1-3504318d5c3f" absoluteBounds="7.7520830154418947, 0.6, 1, 0.4" customColor="White" visualStyleMode="Modified">
+          <lifelineMoniker Id="0f846951-325e-4583-bf8b-c8ecacfb73d3" LastKnownName=": Event" />
+          <relativeChildShapes />
+        </umlLifelineHeadShape>
+        <lifelineHoverShape Id="afb19c44-d60d-41cc-aae6-31870d0bf1c6" absoluteBounds="8.1770830154418945, 1, 0, 7">
+          <lifelineMoniker Id="0f846951-325e-4583-bf8b-c8ecacfb73d3" LastKnownName=": Event" />
+        </lifelineHoverShape>
+        <umlExecutionSpecificationShape Id="3d6a3ee7-688a-4f1d-848e-0e2a72e7b1a6" absoluteBounds="8.1770830154418945, 5.34375, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="3478056f-0688-48c3-88b4-6d47c5b0bebb" LastKnownName="BehaviorExecutionSpecification11" />
+        </umlExecutionSpecificationShape>
+      </relativeChildShapes>
+    </lifelineShape>
+    <asyncMessageConnector edgePoints="[(5.82083333333333 : 5.34375); (8.17708301544189 : 5.34375)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="e5b859fd-ec8b-4c72-b04c-321b8780976e" />
+        <umlExecutionSpecificationShapeMoniker Id="3d6a3ee7-688a-4f1d-848e-0e2a72e7b1a6" />
+      </nodes>
+    </asyncMessageConnector>
   </nestedChildShapes>
 </sequenceDesignerDiagram>
\ No newline at end of file
diff --git a/EventMaker/Design/Design.modelproj b/EventMaker/Design/Design.modelproj
index d91dee3..ef1194c 100644
--- a/EventMaker/Design/Design.modelproj
+++ b/EventMaker/Design/Design.modelproj
@@ -102,6 +102,13 @@
       <SubType>Content</SubType>
       <DependentUpon>RemoveEventSystem.sequencediagram</DependentUpon>
     </Content>
+    <Content Include="Startup.sequencediagram">
+      <SubType>Content</SubType>
+    </Content>
+    <Content Include="Startup.sequencediagram.layout">
+      <SubType>Content</SubType>
+      <DependentUpon>Startup.sequencediagram</DependentUpon>
+    </Content>
     <Content Include="TestCases.txt">
       <SubType>Content</SubType>
     </Content>
diff --git a/EventMaker/Design/EditEvent.sequencediagram b/EventMaker/Design/EditEvent.sequencediagram
index f2a4805..9283729 100644
--- a/EventMaker/Design/EditEvent.sequencediagram
+++ b/EventMaker/Design/EditEvent.sequencediagram
@@ -57,8 +57,8 @@
             </start>
             <nestedOccurrences>
               <messageOccurrenceSpecificationMoniker Id="d480ab44-7dd0-447f-86e2-4e54fb435dc7" LastKnownName="MessageOccurrenceSpecification32" />
-              <messageOccurrenceSpecificationMoniker Id="ab209892-3004-4020-99cf-c6df27942e6d" LastKnownName="MessageOccurrenceSpecification37" />
-              <messageOccurrenceSpecificationMoniker Id="f878b9db-bbaa-421c-a4f0-0de3cd8ff367" LastKnownName="MessageOccurrenceSpecification40" />
+              <messageOccurrenceSpecificationMoniker Id="af5faa89-f49f-4ecc-9ab0-ceba506513c9" LastKnownName="MessageOccurrenceSpecification43" />
+              <messageOccurrenceSpecificationMoniker Id="6d97c5d7-791c-4777-b6d5-04727ede1fba" LastKnownName="MessageOccurrenceSpecification46" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification Id="40d351ca-131b-4a23-97b6-353d29db8757" name="ExecutionOccurrenceSpecification27">
@@ -84,22 +84,6 @@
               <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
             </covered>
           </messageOccurrenceSpecification>
-          <behaviorExecutionSpecification Id="e3b71b43-73cf-4d2c-b987-315fa94252ad" name="BehaviorExecutionSpecification16">
-            <elementDefinition Id="43f4d105-4a5f-4813-8f74-c576ffaa2aab" />
-            <coveredLifelines>
-              <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker Id="b10575f6-0d7e-4fb8-9dac-5dc7c09cb9dd" LastKnownName="ExecutionOccurrenceSpecification32" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker Id="75932911-3048-4dbc-8db1-f681b27e2a98" LastKnownName="ExecutionOccurrenceSpecification31" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker Id="0e77a3e9-42cd-46ff-8180-60d99301c6f7" LastKnownName="MessageOccurrenceSpecification38" />
-              <messageOccurrenceSpecificationMoniker Id="f72aa3ec-e6ce-4ef6-a9c0-96433f52c432" LastKnownName="MessageOccurrenceSpecification39" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
           <executionOccurrenceSpecification Id="6d25d6a7-f7b4-44c0-a7cc-12ca500e4e4f" name="ExecutionOccurrenceSpecification24">
             <elementDefinition Id="c5fe1885-73be-47c5-92f8-b904eeabecb5" />
             <event>
@@ -111,50 +95,66 @@
               <lifelineMoniker Id="b24f8ebb-1941-4004-9466-508f8e6fe2d5" LastKnownName=": RelayCommand" />
             </covered>
           </executionOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="75932911-3048-4dbc-8db1-f681b27e2a98" name="ExecutionOccurrenceSpecification31">
-            <elementDefinition Id="ace2f6cd-d019-490c-af83-91e620893533" />
+          <behaviorExecutionSpecification Id="436648cb-0326-41b8-a793-24553a653e3a" name="BehaviorExecutionSpecification18">
+            <elementDefinition Id="2c1d84ad-e6f6-432e-8b8e-230050a7aad4" />
+            <coveredLifelines>
+              <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="9315121b-a362-4ba0-92cb-83bfbe597425" LastKnownName="ExecutionOccurrenceSpecification36" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="d9d8ac6f-3b61-4c9f-b596-29f4adc8253c" LastKnownName="ExecutionOccurrenceSpecification35" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="efcbe884-2886-4484-a915-be026e468568" LastKnownName="MessageOccurrenceSpecification44" />
+              <messageOccurrenceSpecificationMoniker Id="0541875f-f8d3-4b2e-9edb-780ffb6b1e9e" LastKnownName="MessageOccurrenceSpecification45" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="d9d8ac6f-3b61-4c9f-b596-29f4adc8253c" name="ExecutionOccurrenceSpecification35">
+            <elementDefinition Id="bbd7d448-a26b-4a67-a730-c92de2a7f650" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="a4f1e37c-b292-4d33-96cf-d6a90e1657c2" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="e6e21b5b-6a1a-44e0-9eb9-31f69616c493" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
+              <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
             </covered>
           </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="ab209892-3004-4020-99cf-c6df27942e6d" name="MessageOccurrenceSpecification37">
-            <elementDefinition Id="963da5f8-48a2-447c-937e-f432da784b26" />
+          <messageOccurrenceSpecification Id="efcbe884-2886-4484-a915-be026e468568" name="MessageOccurrenceSpecification44">
+            <elementDefinition Id="95652271-b751-4e7f-8099-90a3acef9c82" />
             <covered>
-              <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
+              <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
             </covered>
           </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="0e77a3e9-42cd-46ff-8180-60d99301c6f7" name="MessageOccurrenceSpecification38">
-            <elementDefinition Id="7ea2c2d3-7280-41e2-b5a3-f2004bebcdf5" />
+          <messageOccurrenceSpecification Id="af5faa89-f49f-4ecc-9ab0-ceba506513c9" name="MessageOccurrenceSpecification43">
+            <elementDefinition Id="014df8f7-5193-47cc-a484-869d65cebe64" />
             <covered>
-              <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
+              <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
             </covered>
           </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="f72aa3ec-e6ce-4ef6-a9c0-96433f52c432" name="MessageOccurrenceSpecification39">
-            <elementDefinition Id="814f168a-c387-437a-a6dc-20862033cc6f" />
+          <messageOccurrenceSpecification Id="6d97c5d7-791c-4777-b6d5-04727ede1fba" name="MessageOccurrenceSpecification46">
+            <elementDefinition Id="06add260-ba33-4318-93ea-2860a5b0459e" />
             <covered>
-              <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
+              <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
             </covered>
           </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="f878b9db-bbaa-421c-a4f0-0de3cd8ff367" name="MessageOccurrenceSpecification40">
-            <elementDefinition Id="7beca056-2011-44b5-814a-8ca202b153ad" />
+          <messageOccurrenceSpecification Id="0541875f-f8d3-4b2e-9edb-780ffb6b1e9e" name="MessageOccurrenceSpecification45">
+            <elementDefinition Id="3e325c5d-2129-4364-9b80-ffb27ec5b162" />
             <covered>
-              <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
+              <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
             </covered>
           </messageOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="b10575f6-0d7e-4fb8-9dac-5dc7c09cb9dd" name="ExecutionOccurrenceSpecification32">
-            <elementDefinition Id="1062caed-e4dd-4de0-a06a-c56ed35fdb96" />
+          <executionOccurrenceSpecification Id="9315121b-a362-4ba0-92cb-83bfbe597425" name="ExecutionOccurrenceSpecification36">
+            <elementDefinition Id="c18077b4-a335-4294-88bc-66c1f5a1fe1a" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="31e64087-cbc5-4d17-8e25-02a2a46f2b34" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="28c6427b-4291-4646-9d07-8e7851a62542" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
+              <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
             </covered>
           </executionOccurrenceSpecification>
           <executionOccurrenceSpecification Id="9f1879db-5219-42f7-9ff3-863df07635a4" name="ExecutionOccurrenceSpecification28">
@@ -195,18 +195,18 @@
               <lifelineMoniker Id="f23a6632-8053-4208-b3b7-a011728320ed" LastKnownName=": EditEventPage" />
             </covered>
           </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="b425b3ea-90c1-425c-8992-44f7966966b4" name="MessageOccurrenceSpecification2">
-            <elementDefinition Id="b2b3e8f5-c0c5-4e42-85d3-92db8336a74a" />
-            <covered>
-              <lifelineMoniker Id="f23a6632-8053-4208-b3b7-a011728320ed" LastKnownName=": EditEventPage" />
-            </covered>
-          </messageOccurrenceSpecification>
           <messageOccurrenceSpecification Id="cfa6bc8c-f507-43ba-8984-1e4be8848c1a" name="MessageOccurrenceSpecification1">
             <elementDefinition Id="1bce4de4-2a51-4858-ae27-7bda65879548" />
             <covered>
               <lifelineMoniker Id="6252080e-8033-4446-874a-5cee5bb16d58" LastKnownName=": EventPage" />
             </covered>
           </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="b425b3ea-90c1-425c-8992-44f7966966b4" name="MessageOccurrenceSpecification2">
+            <elementDefinition Id="b2b3e8f5-c0c5-4e42-85d3-92db8336a74a" />
+            <covered>
+              <lifelineMoniker Id="f23a6632-8053-4208-b3b7-a011728320ed" LastKnownName=": EditEventPage" />
+            </covered>
+          </messageOccurrenceSpecification>
           <behaviorExecutionSpecification Id="7112cf02-49ee-41b3-9c87-3483d6456dc6" name="BehaviorExecutionSpecification2">
             <elementDefinition Id="2b35e5c3-f52b-4894-8f36-c3925ceb9fec" />
             <coveredLifelines>
@@ -234,18 +234,18 @@
               <lifelineMoniker Id="b24f8ebb-1941-4004-9466-508f8e6fe2d5" LastKnownName=": RelayCommand" />
             </covered>
           </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="dfc6f9e0-287d-49d6-858d-fc7771ece974" name="MessageOccurrenceSpecification4">
-            <elementDefinition Id="1a561387-1258-400b-a664-40d6d3091006" />
-            <covered>
-              <lifelineMoniker Id="b24f8ebb-1941-4004-9466-508f8e6fe2d5" LastKnownName=": RelayCommand" />
-            </covered>
-          </messageOccurrenceSpecification>
           <messageOccurrenceSpecification Id="cb6ea470-7854-4bd3-9a45-45b73dc6f444" name="MessageOccurrenceSpecification3">
             <elementDefinition Id="cc2823fb-9d69-4169-ac56-e1fbbcdd7981" />
             <covered>
               <lifelineMoniker Id="f23a6632-8053-4208-b3b7-a011728320ed" LastKnownName=": EditEventPage" />
             </covered>
           </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="dfc6f9e0-287d-49d6-858d-fc7771ece974" name="MessageOccurrenceSpecification4">
+            <elementDefinition Id="1a561387-1258-400b-a664-40d6d3091006" />
+            <covered>
+              <lifelineMoniker Id="b24f8ebb-1941-4004-9466-508f8e6fe2d5" LastKnownName=": RelayCommand" />
+            </covered>
+          </messageOccurrenceSpecification>
           <executionOccurrenceSpecification Id="b2a41a7d-af3e-4d49-928a-6c9aff714c6c" name="ExecutionOccurrenceSpecification2">
             <elementDefinition Id="df01b9ae-d816-4a1d-8c4d-334ab64ff5ac" />
             <event>
@@ -315,29 +315,28 @@
             </start>
             <nestedOccurrences>
               <messageOccurrenceSpecificationMoniker Id="8fdf44cd-d147-4dd5-83cc-4022af5c7a22" LastKnownName="MessageOccurrenceSpecification8" />
-              <messageOccurrenceSpecificationMoniker Id="10e5c9d1-55b4-4dde-84c0-541f224084a6" LastKnownName="MessageOccurrenceSpecification13" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification Id="70965922-3603-43eb-90e2-8ecef29f2413" name="ExecutionOccurrenceSpecification4">
-            <elementDefinition Id="697868c2-1af6-4b32-beaa-beabac50e2eb" />
+          <executionOccurrenceSpecification Id="35b276fe-5429-4821-a500-12de0d305584" name="ExecutionOccurrenceSpecification7">
+            <elementDefinition Id="efbb05a0-51a0-4c3d-abcb-d27ce4b90ca6" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="78dbc8be-16a8-4f3d-9102-8102c158c78a" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="aab32814-852a-4474-9a5d-b23639ce355b" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="b24f8ebb-1941-4004-9466-508f8e6fe2d5" LastKnownName=": RelayCommand" />
+              <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
             </covered>
           </executionOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="35b276fe-5429-4821-a500-12de0d305584" name="ExecutionOccurrenceSpecification7">
-            <elementDefinition Id="efbb05a0-51a0-4c3d-abcb-d27ce4b90ca6" />
+          <executionOccurrenceSpecification Id="70965922-3603-43eb-90e2-8ecef29f2413" name="ExecutionOccurrenceSpecification4">
+            <elementDefinition Id="697868c2-1af6-4b32-beaa-beabac50e2eb" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="aab32814-852a-4474-9a5d-b23639ce355b" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="78dbc8be-16a8-4f3d-9102-8102c158c78a" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
+              <lifelineMoniker Id="b24f8ebb-1941-4004-9466-508f8e6fe2d5" LastKnownName=": RelayCommand" />
             </covered>
           </executionOccurrenceSpecification>
           <messageOccurrenceSpecification Id="8fdf44cd-d147-4dd5-83cc-4022af5c7a22" name="MessageOccurrenceSpecification8">
@@ -352,50 +351,12 @@
               <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
             </covered>
           </messageOccurrenceSpecification>
-          <behaviorExecutionSpecification Id="49b479c1-1cc5-44f5-9a0d-efd8f0200a1b" name="BehaviorExecutionSpecification7">
-            <elementDefinition Id="a16a53d9-8dda-4f5f-8590-252236b4b45c" />
-            <coveredLifelines>
-              <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker Id="0ab396d1-ad9a-407b-9427-4cecd667152f" LastKnownName="ExecutionOccurrenceSpecification14" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker Id="39b03823-b52c-459b-8c3c-d322babddb29" LastKnownName="ExecutionOccurrenceSpecification13" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker Id="5db0a00a-f05d-4eb7-a6c2-6964534e0425" LastKnownName="MessageOccurrenceSpecification14" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification Id="39b03823-b52c-459b-8c3c-d322babddb29" name="ExecutionOccurrenceSpecification13">
-            <elementDefinition Id="c6670d4c-1f85-49e9-a3ed-b41a67598b46" />
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="6b98538c-cb4b-4049-8f4c-8f136afaee0f" LastKnownName="ExecutionEvent" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-            </covered>
-          </executionOccurrenceSpecification>
           <messageOccurrenceSpecification Id="b567ee6a-2112-4755-ae32-2a012bb63a95" name="MessageOccurrenceSpecification9">
             <elementDefinition Id="9f0402f2-ac55-454c-819c-ec989f0d84e4" />
             <covered>
               <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
             </covered>
           </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="10e5c9d1-55b4-4dde-84c0-541f224084a6" name="MessageOccurrenceSpecification13">
-            <elementDefinition Id="034108d8-204b-4fbd-862e-27345466b28b" />
-            <covered>
-              <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="5db0a00a-f05d-4eb7-a6c2-6964534e0425" name="MessageOccurrenceSpecification14">
-            <elementDefinition Id="6b6093d2-5177-4624-b7dd-f73791940203" />
-            <covered>
-              <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-            </covered>
-          </messageOccurrenceSpecification>
           <behaviorExecutionSpecification Id="e8a51061-b178-434c-9324-5a81f9e6f05a" name="BehaviorExecutionSpecification5">
             <elementDefinition Id="a998bbd3-c729-489c-814b-4cd435de73ea" />
             <coveredLifelines>
@@ -409,6 +370,7 @@
             </start>
             <nestedOccurrences>
               <messageOccurrenceSpecificationMoniker Id="daacdc7b-abe4-4342-b4d0-7682ca6c05f3" LastKnownName="MessageOccurrenceSpecification10" />
+              <messageOccurrenceSpecificationMoniker Id="0ad5cd08-d5d9-499b-a232-f3604038404d" LastKnownName="MessageOccurrenceSpecification47" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification Id="ffacdcda-fcc6-47b5-bfd8-ea7ed1455f00" name="ExecutionOccurrenceSpecification9">
@@ -439,17 +401,44 @@
               <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
             </covered>
           </executionOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="0ab396d1-ad9a-407b-9427-4cecd667152f" name="ExecutionOccurrenceSpecification14">
-            <elementDefinition Id="98e22e2e-8519-48b7-8d09-60230ecec404" />
+          <behaviorExecutionSpecification Id="8fc46cf1-e4b1-4f75-b9aa-270372a08f73" name="BehaviorExecutionSpecification19">
+            <elementDefinition Id="c4ce2bff-d364-4b8d-b408-950261c79ee0" />
+            <coveredLifelines>
+              <lifelineMoniker Id="b4edab08-24d6-4338-92e5-e71f58bda075" LastKnownName=": Event" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="d22f0f6e-3c29-4468-a734-b2bc40a18188" LastKnownName="ExecutionOccurrenceSpecification38" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="017689fa-cab6-4ea8-b456-38e1c18805d9" LastKnownName="ExecutionOccurrenceSpecification37" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="7711f5f4-23fb-4725-834a-944c06c5e7ab" LastKnownName="MessageOccurrenceSpecification48" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="017689fa-cab6-4ea8-b456-38e1c18805d9" name="ExecutionOccurrenceSpecification37">
+            <elementDefinition Id="a2747504-5abf-40c2-86bb-610ef243e75c" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="5195233c-0b0c-411f-b3c7-e9822ab85854" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="49fc2960-bb1e-42fd-b44a-6cedb53367cb" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
+              <lifelineMoniker Id="b4edab08-24d6-4338-92e5-e71f58bda075" LastKnownName=": Event" />
             </covered>
           </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="7711f5f4-23fb-4725-834a-944c06c5e7ab" name="MessageOccurrenceSpecification48">
+            <elementDefinition Id="863049b4-780c-410e-87a0-6de4a81600d2" />
+            <covered>
+              <lifelineMoniker Id="b4edab08-24d6-4338-92e5-e71f58bda075" LastKnownName=": Event" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="0ad5cd08-d5d9-499b-a232-f3604038404d" name="MessageOccurrenceSpecification47">
+            <elementDefinition Id="0925eccc-e865-4247-91a6-a1bdcf486ebf" />
+            <covered>
+              <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
           <executionOccurrenceSpecification Id="82ad563d-a56c-4781-878c-b74061b7c1d8" name="ExecutionOccurrenceSpecification10">
             <elementDefinition Id="0b567ada-b6b5-4276-a506-b89c04fe2b38" />
             <event>
@@ -474,7 +463,6 @@
             </start>
             <nestedOccurrences>
               <messageOccurrenceSpecificationMoniker Id="d16dcbdb-2fa2-4f3d-a4f5-23320456cdaa" LastKnownName="MessageOccurrenceSpecification16" />
-              <messageOccurrenceSpecificationMoniker Id="63522e5b-fcee-40c2-81c9-7f30e3658153" LastKnownName="MessageOccurrenceSpecification17" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification Id="bc0d7768-ac93-4ed1-b0ed-6e4f70b3f55a" name="ExecutionOccurrenceSpecification15">
@@ -500,48 +488,21 @@
               <lifelineMoniker Id="56e705f8-85d4-4e95-9658-186332a398c7" LastKnownName="PersistencyServices" />
             </covered>
           </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="219fc177-cefa-4573-ae3f-a4760a8d7fcc" name="MessageOccurrenceSpecification11">
-            <elementDefinition Id="221f49a6-161c-47e2-8195-886a2c8c05d1" />
-            <covered>
-              <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <behaviorExecutionSpecification Id="8834c196-51c5-4673-8127-687a717db928" name="BehaviorExecutionSpecification9">
-            <elementDefinition Id="f3c64f0e-0ebc-4f1c-9214-d2dc3f23356e" />
-            <coveredLifelines>
-              <lifelineMoniker Id="6df7e8b3-a947-43a9-9d29-96758cfbf19c" LastKnownName="_eventsFile : StorageFile" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker Id="012dae10-6969-4899-92b7-0bd0014ed023" LastKnownName="ExecutionOccurrenceSpecification18" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker Id="8a66fed3-8924-4ac2-a7d8-cf699e003267" LastKnownName="ExecutionOccurrenceSpecification17" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker Id="eacd9fbc-d8d4-4a24-bb1f-fabf87a65d8e" LastKnownName="MessageOccurrenceSpecification18" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification Id="8a66fed3-8924-4ac2-a7d8-cf699e003267" name="ExecutionOccurrenceSpecification17">
-            <elementDefinition Id="4d3f2224-8b4e-426c-97ac-36ed695e1832" />
+          <executionOccurrenceSpecification Id="d22f0f6e-3c29-4468-a734-b2bc40a18188" name="ExecutionOccurrenceSpecification38">
+            <elementDefinition Id="ef9c6dbd-9f31-48f4-ba29-3295ffc2de51" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="4d17fe75-da5d-4976-b28d-a08dd8b81881" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="8e2e6f11-d456-4e1f-878a-9d9b88783452" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="6df7e8b3-a947-43a9-9d29-96758cfbf19c" LastKnownName="_eventsFile : StorageFile" />
+              <lifelineMoniker Id="b4edab08-24d6-4338-92e5-e71f58bda075" LastKnownName=": Event" />
             </covered>
           </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="63522e5b-fcee-40c2-81c9-7f30e3658153" name="MessageOccurrenceSpecification17">
-            <elementDefinition Id="ff971bbe-f649-4bde-a7ea-599798f0dca2" />
-            <covered>
-              <lifelineMoniker Id="56e705f8-85d4-4e95-9658-186332a398c7" LastKnownName="PersistencyServices" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="eacd9fbc-d8d4-4a24-bb1f-fabf87a65d8e" name="MessageOccurrenceSpecification18">
-            <elementDefinition Id="26cc2cae-a1b5-4484-be27-c3f9860fffee" />
+          <messageOccurrenceSpecification Id="219fc177-cefa-4573-ae3f-a4760a8d7fcc" name="MessageOccurrenceSpecification11">
+            <elementDefinition Id="221f49a6-161c-47e2-8195-886a2c8c05d1" />
             <covered>
-              <lifelineMoniker Id="6df7e8b3-a947-43a9-9d29-96758cfbf19c" LastKnownName="_eventsFile : StorageFile" />
+              <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
             </covered>
           </messageOccurrenceSpecification>
           <behaviorExecutionSpecification Id="bf27b7c8-4c05-47e6-a6ae-1c13180037d4" name="BehaviorExecutionSpecification6">
@@ -626,17 +587,6 @@
               <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
             </covered>
           </messageOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="012dae10-6969-4899-92b7-0bd0014ed023" name="ExecutionOccurrenceSpecification18">
-            <elementDefinition Id="f64dab21-d4be-4a01-9b94-db1f4329fe85" />
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="899b889f-1851-483e-ba85-d0cfaabcb54f" LastKnownName="ExecutionEvent" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker Id="6df7e8b3-a947-43a9-9d29-96758cfbf19c" LastKnownName="_eventsFile : StorageFile" />
-            </covered>
-          </executionOccurrenceSpecification>
           <executionOccurrenceSpecification Id="3d1c0211-0359-44b9-96db-1212b4017f43" name="ExecutionOccurrenceSpecification12">
             <elementDefinition Id="5ce6aa55-d3e3-42a1-8ac6-f9d8e60f0c25" />
             <event>
@@ -704,9 +654,21 @@
               <executionOccurrenceSpecificationMoniker Id="b58d1720-43cc-4205-ab7f-a50816db9ae4" LastKnownName="ExecutionOccurrenceSpecification6" />
             </topLevelOccurrences>
           </lifeline>
+          <lifeline Id="b4edab08-24d6-4338-92e5-e71f58bda075" name=": Event" isActor="false" lifelineDisplayName=": Event">
+            <elementDefinition Id="707e96d7-2ba5-4e89-85d4-d9ac8241a29a" />
+            <represents>
+              <propertyMoniker Id="545efa00-eb90-4e4e-9ce1-de4a7918e00c" />
+            </represents>
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker Id="017689fa-cab6-4ea8-b456-38e1c18805d9" LastKnownName="ExecutionOccurrenceSpecification37" />
+              <executionOccurrenceSpecificationMoniker Id="d22f0f6e-3c29-4468-a734-b2bc40a18188" LastKnownName="ExecutionOccurrenceSpecification38" />
+            </topLevelOccurrences>
+          </lifeline>
           <lifeline Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" name="EventCatalogSingleton" isActor="false" lifelineDisplayName="EventCatalogSingleton">
             <elementDefinition Id="4280e57c-61ab-4602-ab26-2a160ede459c" />
             <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker Id="d9d8ac6f-3b61-4c9f-b596-29f4adc8253c" LastKnownName="ExecutionOccurrenceSpecification35" />
+              <executionOccurrenceSpecificationMoniker Id="9315121b-a362-4ba0-92cb-83bfbe597425" LastKnownName="ExecutionOccurrenceSpecification36" />
               <executionOccurrenceSpecificationMoniker Id="35b276fe-5429-4821-a500-12de0d305584" LastKnownName="ExecutionOccurrenceSpecification7" />
               <executionOccurrenceSpecificationMoniker Id="a7bcd1ac-443f-4617-9a6f-647413af050e" LastKnownName="ExecutionOccurrenceSpecification8" />
               <messageOccurrenceSpecificationMoniker Id="708a8ae3-62dd-4632-8a16-2ca6a60cd80e" LastKnownName="MessageOccurrenceSpecification15" />
@@ -714,15 +676,6 @@
               <executionOccurrenceSpecificationMoniker Id="941fc5e5-5b3f-411c-b39f-4ceda9f14fd9" LastKnownName="ExecutionOccurrenceSpecification20" />
             </topLevelOccurrences>
           </lifeline>
-          <lifeline Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" name="Events : ObservableCollection&lt;Event&gt;" isActor="false" lifelineDisplayName="Events : ObservableCollection&lt;Event&gt;">
-            <elementDefinition Id="c68d33d8-acf2-4e5c-b2d4-6c74f269ea39" />
-            <topLevelOccurrences>
-              <executionOccurrenceSpecificationMoniker Id="75932911-3048-4dbc-8db1-f681b27e2a98" LastKnownName="ExecutionOccurrenceSpecification31" />
-              <executionOccurrenceSpecificationMoniker Id="b10575f6-0d7e-4fb8-9dac-5dc7c09cb9dd" LastKnownName="ExecutionOccurrenceSpecification32" />
-              <executionOccurrenceSpecificationMoniker Id="39b03823-b52c-459b-8c3c-d322babddb29" LastKnownName="ExecutionOccurrenceSpecification13" />
-              <executionOccurrenceSpecificationMoniker Id="0ab396d1-ad9a-407b-9427-4cecd667152f" LastKnownName="ExecutionOccurrenceSpecification14" />
-            </topLevelOccurrences>
-          </lifeline>
           <lifeline Id="56e705f8-85d4-4e95-9658-186332a398c7" name="PersistencyServices" isActor="false" lifelineDisplayName="PersistencyServices">
             <elementDefinition Id="40a4cb2e-e3a5-41a3-9207-c1af07374492" />
             <topLevelOccurrences>
@@ -730,13 +683,6 @@
               <executionOccurrenceSpecificationMoniker Id="98a59ad6-596d-4491-8d56-ec7feb8fabd8" LastKnownName="ExecutionOccurrenceSpecification16" />
             </topLevelOccurrences>
           </lifeline>
-          <lifeline Id="6df7e8b3-a947-43a9-9d29-96758cfbf19c" name="_eventsFile : StorageFile" isActor="false" lifelineDisplayName="_eventsFile : StorageFile">
-            <elementDefinition Id="a99849fd-50b0-49a6-ab7c-c32da745b812" />
-            <topLevelOccurrences>
-              <executionOccurrenceSpecificationMoniker Id="8a66fed3-8924-4ac2-a7d8-cf699e003267" LastKnownName="ExecutionOccurrenceSpecification17" />
-              <executionOccurrenceSpecificationMoniker Id="012dae10-6969-4899-92b7-0bd0014ed023" LastKnownName="ExecutionOccurrenceSpecification18" />
-            </topLevelOccurrences>
-          </lifeline>
         </lifelines>
         <messages>
           <message Id="27625368-32df-45f9-9ef7-d3361ad87dd6" name="LoadEventCommand" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
@@ -757,22 +703,22 @@
               <messageOccurrenceSpecificationMoniker Id="d480ab44-7dd0-447f-86e2-4e54fb435dc7" LastKnownName="MessageOccurrenceSpecification32" />
             </receiveEvent>
           </message>
-          <message Id="07d2173a-171e-465d-bd4f-08a4efbeca02" name="LoadEvent" messageKind="Complete" messageSort="SynchCall" createSelfMessage="false">
-            <elementDefinition Id="79c1b154-73e3-49fa-bab8-0a82546a19d9" />
+          <message Id="ad6bd517-967f-423a-81ef-03d17cb9aa91" name="LoadEvent" messageKind="Complete" messageSort="SynchCall" createSelfMessage="false">
+            <elementDefinition Id="f8c55847-d63f-47e3-9121-37dc355d2cab" />
             <sendEvent>
-              <messageOccurrenceSpecificationMoniker Id="ab209892-3004-4020-99cf-c6df27942e6d" LastKnownName="MessageOccurrenceSpecification37" />
+              <messageOccurrenceSpecificationMoniker Id="af5faa89-f49f-4ecc-9ab0-ceba506513c9" LastKnownName="MessageOccurrenceSpecification43" />
             </sendEvent>
             <receiveEvent>
-              <messageOccurrenceSpecificationMoniker Id="0e77a3e9-42cd-46ff-8180-60d99301c6f7" LastKnownName="MessageOccurrenceSpecification38" />
+              <messageOccurrenceSpecificationMoniker Id="efcbe884-2886-4484-a915-be026e468568" LastKnownName="MessageOccurrenceSpecification44" />
             </receiveEvent>
           </message>
-          <message Id="3b4f1f4b-b625-4bd7-8d6d-3294eba2fbd3" name="Events[SelectedEventIndex]" messageKind="Complete" messageSort="Reply" createSelfMessage="false">
-            <elementDefinition Id="14003ff9-ada1-4291-b069-91f1fd513ab2" />
+          <message Id="5d55cb90-8ec1-4df3-b675-2ef3456d274c" name="EventTemplate=Events[SelectedEventIndex]" messageKind="Complete" messageSort="Reply" createSelfMessage="false">
+            <elementDefinition Id="6bbe2878-2071-40ec-969b-4e98fdfdb849" />
             <sendEvent>
-              <messageOccurrenceSpecificationMoniker Id="f72aa3ec-e6ce-4ef6-a9c0-96433f52c432" LastKnownName="MessageOccurrenceSpecification39" />
+              <messageOccurrenceSpecificationMoniker Id="0541875f-f8d3-4b2e-9edb-780ffb6b1e9e" LastKnownName="MessageOccurrenceSpecification45" />
             </sendEvent>
             <receiveEvent>
-              <messageOccurrenceSpecificationMoniker Id="f878b9db-bbaa-421c-a4f0-0de3cd8ff367" LastKnownName="MessageOccurrenceSpecification40" />
+              <messageOccurrenceSpecificationMoniker Id="6d97c5d7-791c-4777-b6d5-04727ede1fba" LastKnownName="MessageOccurrenceSpecification46" />
             </receiveEvent>
           </message>
           <message Id="9953dd53-71cd-4ba6-86e7-54f67612d71c" name="NavigateToPageAction" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
@@ -811,15 +757,6 @@
               <messageOccurrenceSpecificationMoniker Id="8fdf44cd-d147-4dd5-83cc-4022af5c7a22" LastKnownName="MessageOccurrenceSpecification8" />
             </receiveEvent>
           </message>
-          <message Id="f8a4ae06-54b0-44a9-ae7b-c2c5fc0ba9c5" name="Events[SelectedEventIndex]=eventToUpdate" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
-            <elementDefinition Id="abb7d357-b931-490e-ac38-4f1211aeb2d3" />
-            <sendEvent>
-              <messageOccurrenceSpecificationMoniker Id="10e5c9d1-55b4-4dde-84c0-541f224084a6" LastKnownName="MessageOccurrenceSpecification13" />
-            </sendEvent>
-            <receiveEvent>
-              <messageOccurrenceSpecificationMoniker Id="5db0a00a-f05d-4eb7-a6c2-6964534e0425" LastKnownName="MessageOccurrenceSpecification14" />
-            </receiveEvent>
-          </message>
           <message Id="784238b7-17bb-49ef-90c3-13975f729a47" name="CleanTemplate" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="true">
             <elementDefinition Id="1b6aa430-4c88-4618-8a3d-fe8f0177d619" />
             <sendEvent>
@@ -829,22 +766,22 @@
               <messageOccurrenceSpecificationMoniker Id="daacdc7b-abe4-4342-b4d0-7682ca6c05f3" LastKnownName="MessageOccurrenceSpecification10" />
             </receiveEvent>
           </message>
-          <message Id="ead30ca7-ebed-46ac-8fe0-250d882a25da" name="SaveEventsAsJsonAsync(Events)" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
-            <elementDefinition Id="beb945fa-3f9d-4980-bbed-1f88f834749a" />
+          <message Id="9cf430ae-4017-4ddd-b763-59f12825a205" name="EventTemplate=new Event" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
+            <elementDefinition Id="68160f76-a24e-4d29-9547-6935b21ffcfc" />
             <sendEvent>
-              <messageOccurrenceSpecificationMoniker Id="708a8ae3-62dd-4632-8a16-2ca6a60cd80e" LastKnownName="MessageOccurrenceSpecification15" />
+              <messageOccurrenceSpecificationMoniker Id="0ad5cd08-d5d9-499b-a232-f3604038404d" LastKnownName="MessageOccurrenceSpecification47" />
             </sendEvent>
             <receiveEvent>
-              <messageOccurrenceSpecificationMoniker Id="d16dcbdb-2fa2-4f3d-a4f5-23320456cdaa" LastKnownName="MessageOccurrenceSpecification16" />
+              <messageOccurrenceSpecificationMoniker Id="7711f5f4-23fb-4725-834a-944c06c5e7ab" LastKnownName="MessageOccurrenceSpecification48" />
             </receiveEvent>
           </message>
-          <message Id="bb2ad6a0-c1f5-4491-a8c8-76bc63271376" name="File.WriteAllText(_eventsFile)" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
-            <elementDefinition Id="6b221e9d-a68a-4835-8cc1-75956d4861b6" />
+          <message Id="ead30ca7-ebed-46ac-8fe0-250d882a25da" name="SaveEventsAsJsonAsync(Events)" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
+            <elementDefinition Id="beb945fa-3f9d-4980-bbed-1f88f834749a" />
             <sendEvent>
-              <messageOccurrenceSpecificationMoniker Id="63522e5b-fcee-40c2-81c9-7f30e3658153" LastKnownName="MessageOccurrenceSpecification17" />
+              <messageOccurrenceSpecificationMoniker Id="708a8ae3-62dd-4632-8a16-2ca6a60cd80e" LastKnownName="MessageOccurrenceSpecification15" />
             </sendEvent>
             <receiveEvent>
-              <messageOccurrenceSpecificationMoniker Id="eacd9fbc-d8d4-4a24-bb1f-fabf87a65d8e" LastKnownName="MessageOccurrenceSpecification18" />
+              <messageOccurrenceSpecificationMoniker Id="d16dcbdb-2fa2-4f3d-a4f5-23320456cdaa" LastKnownName="MessageOccurrenceSpecification16" />
             </receiveEvent>
           </message>
           <message Id="bdc56ac2-7099-43aa-869c-bc904c6297c9" name="SortEvents" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="true">
@@ -866,6 +803,14 @@
             </receiveEvent>
           </message>
         </messages>
+        <ownedAttributesInternal>
+          <property Id="545efa00-eb90-4e4e-9ce1-de4a7918e00c" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
+            <elementDefinition Id="e47c5f7d-c8c6-4448-a002-8fb794c99f83" />
+            <type_NamedElement>
+              <referencedTypeMoniker Id="79852b08-e397-48d0-b09e-95dc12ac8221" LastKnownName="Event" />
+            </type_NamedElement>
+          </property>
+        </ownedAttributesInternal>
       </interaction>
     </packageHasNamedElement>
     <packageHasNamedElement>
@@ -899,16 +844,6 @@
       </executionEvent>
     </packageHasNamedElement>
     <packageHasNamedElement>
-      <executionEvent Id="6b98538c-cb4b-4049-8f4c-8f136afaee0f" name="ExecutionEvent">
-        <elementDefinition Id="2ad85703-c973-40fc-b2f5-90cc810c51f4" />
-      </executionEvent>
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent Id="5195233c-0b0c-411f-b3c7-e9822ab85854" name="ExecutionEvent">
-        <elementDefinition Id="7aa4f3be-5a62-4785-95ab-784ad70e346a" />
-      </executionEvent>
-    </packageHasNamedElement>
-    <packageHasNamedElement>
       <executionEvent Id="36d4eef9-bb4f-4df4-b086-15d8e9b220c6" name="ExecutionEvent">
         <elementDefinition Id="fb53fb8e-a82b-4de4-8c7b-61e3d3221b4c" />
       </executionEvent>
@@ -919,16 +854,6 @@
       </executionEvent>
     </packageHasNamedElement>
     <packageHasNamedElement>
-      <executionEvent Id="4d17fe75-da5d-4976-b28d-a08dd8b81881" name="ExecutionEvent">
-        <elementDefinition Id="7660337f-9062-4a10-a642-970050cb0bc1" />
-      </executionEvent>
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent Id="899b889f-1851-483e-ba85-d0cfaabcb54f" name="ExecutionEvent">
-        <elementDefinition Id="976b1c0e-34a4-4497-a897-a1d63a9bd2a5" />
-      </executionEvent>
-    </packageHasNamedElement>
-    <packageHasNamedElement>
       <executionEvent Id="8d0fe00a-2239-4bb5-afca-febdee8f103f" name="ExecutionEvent">
         <elementDefinition Id="94bf2bb5-adc3-425d-9b48-7884b40c0e7f" />
       </executionEvent>
@@ -989,13 +914,28 @@
       </executionEvent>
     </packageHasNamedElement>
     <packageHasNamedElement>
-      <executionEvent Id="a4f1e37c-b292-4d33-96cf-d6a90e1657c2" name="ExecutionEvent">
-        <elementDefinition Id="ed04e67b-72c6-4b8e-80b9-1a1afb12e110" />
+      <executionEvent Id="e6e21b5b-6a1a-44e0-9eb9-31f69616c493" name="ExecutionEvent">
+        <elementDefinition Id="72a2d284-ede2-41e7-bd85-25c7da1fdf4d" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="28c6427b-4291-4646-9d07-8e7851a62542" name="ExecutionEvent">
+        <elementDefinition Id="22ea9710-87ba-4536-98b6-3fe37ab8209e" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <referencedType Id="79852b08-e397-48d0-b09e-95dc12ac8221" name="Event" isAbstract="false" isLeaf="false" cachedFullName="Design::Event">
+        <elementDefinition Id="760f646f-837b-4a99-aa04-8b3e628b4189" />
+      </referencedType>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="49fc2960-bb1e-42fd-b44a-6cedb53367cb" name="ExecutionEvent">
+        <elementDefinition Id="42266f5b-52bf-416b-bed9-5cb7cb2c8f09" />
       </executionEvent>
     </packageHasNamedElement>
     <packageHasNamedElement>
-      <executionEvent Id="31e64087-cbc5-4d17-8e25-02a2a46f2b34" name="ExecutionEvent">
-        <elementDefinition Id="702e62d5-9239-4caf-b89c-14e21e718cb8" />
+      <executionEvent Id="8e2e6f11-d456-4e1f-878a-9d9b88783452" name="ExecutionEvent">
+        <elementDefinition Id="525ad41e-9ee5-4bca-b3a6-bb8bdc496dab" />
       </executionEvent>
     </packageHasNamedElement>
   </packagedElements>
diff --git a/EventMaker/Design/EditEvent.sequencediagram.layout b/EventMaker/Design/EditEvent.sequencediagram.layout
index 9b995ae..3562b91 100644
--- a/EventMaker/Design/EditEvent.sequencediagram.layout
+++ b/EventMaker/Design/EditEvent.sequencediagram.layout
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<sequenceDesignerDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 16, 8.5" name="EditEvent">
+<sequenceDesignerDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 12, 8.5" name="EditEvent">
   <SequenceDesignerModelMoniker Id="72fea727-aa4b-4016-a925-cabebf6d0481" />
   <nestedChildShapes>
     <lifelineShape Id="d2a06bef-c1d1-4f2a-a0bd-4f7afc301848" absoluteBounds="4.1270833333333323, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
@@ -26,13 +26,13 @@
         <lifelineHoverShape Id="1d27d911-3ee6-4a3d-9b84-9bdb1cffa666" absoluteBounds="5.6729166666666657, 1, 0, 7">
           <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
         </lifelineHoverShape>
-        <umlExecutionSpecificationShape Id="60df7e15-98f4-46d5-970f-88cf5c2dee5a" absoluteBounds="5.6729166666666657, 4.2312499999999993, 0.15, 2.8499999999999988" customColor="184, 204, 215" visualStyleMode="Modified">
+        <umlExecutionSpecificationShape Id="60df7e15-98f4-46d5-970f-88cf5c2dee5a" absoluteBounds="5.6729166666666657, 4.2312499999999993, 0.15, 2.8999999999999986" customColor="184, 204, 215" visualStyleMode="Modified">
           <behaviorExecutionSpecificationMoniker Id="31fd72c4-131b-400c-9227-53420c2a9210" LastKnownName="BehaviorExecutionSpecification3" />
           <relativeChildShapes>
-            <umlExecutionSpecificationShape Id="e27a8fd1-5cd3-47ee-b882-d27e33720248" absoluteBounds="5.7479166666666659, 5.0812499999999989, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+            <umlExecutionSpecificationShape Id="e27a8fd1-5cd3-47ee-b882-d27e33720248" absoluteBounds="5.7479166666666659, 5.0812499999999989, 0.15, 0.59999999999999964" customColor="184, 204, 215" visualStyleMode="Modified">
               <behaviorExecutionSpecificationMoniker Id="e8a51061-b178-434c-9324-5a81f9e6f05a" LastKnownName="BehaviorExecutionSpecification5" />
             </umlExecutionSpecificationShape>
-            <umlExecutionSpecificationShape Id="fdd1ce57-9e5b-4242-94ad-da3d58dc7950" absoluteBounds="5.7479166666666659, 6.1812499999999986, 0.15, 0.59999999999999964" customColor="184, 204, 215" visualStyleMode="Modified">
+            <umlExecutionSpecificationShape Id="fdd1ce57-9e5b-4242-94ad-da3d58dc7950" absoluteBounds="5.7479166666666659, 6.2312499999999984, 0.15, 0.59999999999999964" customColor="184, 204, 215" visualStyleMode="Modified">
               <behaviorExecutionSpecificationMoniker Id="bf27b7c8-4c05-47e6-a6ae-1c13180037d4" LastKnownName="BehaviorExecutionSpecification6" />
             </umlExecutionSpecificationShape>
           </relativeChildShapes>
@@ -41,77 +41,47 @@
           <lifelineMoniker Id="85f19d3d-9173-44cc-86b3-1e17e5f638c7" LastKnownName=": EventViewModel" />
           <relativeChildShapes />
         </umlLifelineHeadShape>
-        <umlExecutionSpecificationShape Id="0a5ee4e2-a781-4ab9-986b-8599c0d2dd36" absoluteBounds="5.6729166666666657, 1.9375, 0.15, 1.1499999999999995" customColor="184, 204, 215" visualStyleMode="Modified">
+        <umlExecutionSpecificationShape Id="0a5ee4e2-a781-4ab9-986b-8599c0d2dd36" absoluteBounds="5.6729166666666657, 1.9375, 0.15, 1.2666666666666662" customColor="184, 204, 215" visualStyleMode="Modified">
           <behaviorExecutionSpecificationMoniker Id="f732f139-c900-4b31-9a70-271a48877a9a" LastKnownName="BehaviorExecutionSpecification14" />
         </umlExecutionSpecificationShape>
       </relativeChildShapes>
     </lifelineShape>
-    <lifelineShape Id="9a20d8bd-6fcb-4cad-bdb9-d0f746248bc3" absoluteBounds="8.3333333333333321, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
+    <lifelineShape Id="9a20d8bd-6fcb-4cad-bdb9-d0f746248bc3" absoluteBounds="8.8749999999999982, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
       <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
       <relativeChildShapes>
-        <lifelineHoverShape Id="0c799c37-1ecc-48e3-99fa-0ceba0871eb4" absoluteBounds="8.3333333333333321, 1, 0, 7">
+        <lifelineHoverShape Id="0c799c37-1ecc-48e3-99fa-0ceba0871eb4" absoluteBounds="8.8749999999999982, 1, 0, 7">
           <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
         </lifelineHoverShape>
-        <umlExecutionSpecificationShape Id="53aa3cdc-7afb-48c8-9e7a-84760310e5cd" absoluteBounds="8.3333333333333321, 4.5312499999999991, 0.15, 0.59999999999999964" customColor="184, 204, 215" visualStyleMode="Modified">
+        <umlExecutionSpecificationShape Id="53aa3cdc-7afb-48c8-9e7a-84760310e5cd" absoluteBounds="8.8749999999999982, 4.5312499999999991, 0.15, 0.59999999999999964" customColor="184, 204, 215" visualStyleMode="Modified">
           <behaviorExecutionSpecificationMoniker Id="f402e09a-73ee-464c-8204-e7ab284bc8ee" LastKnownName="BehaviorExecutionSpecification4" />
         </umlExecutionSpecificationShape>
-        <umlExecutionSpecificationShape Id="881a75f0-4298-413b-be70-c53130f1938d" absoluteBounds="8.3333333333333321, 6.4812499999999984, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+        <umlExecutionSpecificationShape Id="881a75f0-4298-413b-be70-c53130f1938d" absoluteBounds="8.8749999999999982, 6.5312499999999982, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
           <behaviorExecutionSpecificationMoniker Id="a6370701-bab4-48fc-8580-9eaaee243e4b" LastKnownName="BehaviorExecutionSpecification10" />
         </umlExecutionSpecificationShape>
-        <umlLifelineHeadShape Id="ee6d90f2-2aa0-418c-9582-a4e69a1469f9" absoluteBounds="7.9083333333333323, 0.6, 1, 0.4" customColor="White" visualStyleMode="Modified">
+        <umlLifelineHeadShape Id="ee6d90f2-2aa0-418c-9582-a4e69a1469f9" absoluteBounds="8.4499999999999975, 0.6, 1, 0.4" customColor="White" visualStyleMode="Modified">
           <lifelineMoniker Id="c435ffb0-2763-4073-9ff6-d5fc4127f427" LastKnownName="EventCatalogSingleton" />
           <relativeChildShapes />
         </umlLifelineHeadShape>
-      </relativeChildShapes>
-    </lifelineShape>
-    <lifelineShape Id="19be4a9a-d6cf-433e-a719-5de1b4986d46" absoluteBounds="11.15, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
-      <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-      <relativeChildShapes>
-        <lifelineHoverShape Id="29db0727-8fb9-41b8-b218-8f3b800aa5f1" absoluteBounds="11.15, 1, 0, 7">
-          <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-        </lifelineHoverShape>
-        <umlExecutionSpecificationShape Id="3b91f2da-d9ab-4d47-b352-f33b75a6bbe8" absoluteBounds="11.15, 4.8312499999999989, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
-          <behaviorExecutionSpecificationMoniker Id="49b479c1-1cc5-44f5-9a0d-efd8f0200a1b" LastKnownName="BehaviorExecutionSpecification7" />
-        </umlExecutionSpecificationShape>
-        <umlLifelineHeadShape Id="0bd7bd62-5a5b-44e2-a152-59662699111c" absoluteBounds="10.225, 0.6, 2, 0.4" customColor="White" visualStyleMode="Modified">
-          <lifelineMoniker Id="99f9c7d8-4271-476a-9519-f66b3da1ff6f" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-          <relativeChildShapes />
-        </umlLifelineHeadShape>
-        <umlExecutionSpecificationShape Id="ffff2e85-22d2-4974-9a4e-3cd2990c959e" absoluteBounds="11.15, 2.2375, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
-          <behaviorExecutionSpecificationMoniker Id="e3b71b43-73cf-4d2c-b987-315fa94252ad" LastKnownName="BehaviorExecutionSpecification16" />
+        <umlExecutionSpecificationShape Id="d913ee08-ac2f-45b8-a04a-d71106d19e4d" absoluteBounds="8.8749999999999982, 2.3541666666666665, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="436648cb-0326-41b8-a793-24553a653e3a" LastKnownName="BehaviorExecutionSpecification18" />
         </umlExecutionSpecificationShape>
       </relativeChildShapes>
     </lifelineShape>
-    <lifelineShape Id="61942671-9558-402b-9c72-07c952a9ab77" absoluteBounds="12.914583333333335, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
+    <lifelineShape Id="61942671-9558-402b-9c72-07c952a9ab77" absoluteBounds="11.029166666666669, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
       <lifelineMoniker Id="56e705f8-85d4-4e95-9658-186332a398c7" LastKnownName="PersistencyServices" />
       <relativeChildShapes>
-        <lifelineHoverShape Id="73c700d6-c48e-493e-97b0-7cee244bae85" absoluteBounds="12.914583333333335, 1, 0, 7">
+        <lifelineHoverShape Id="73c700d6-c48e-493e-97b0-7cee244bae85" absoluteBounds="11.029166666666669, 1, 0, 7">
           <lifelineMoniker Id="56e705f8-85d4-4e95-9658-186332a398c7" LastKnownName="PersistencyServices" />
         </lifelineHoverShape>
-        <umlExecutionSpecificationShape Id="108afd37-1c11-4c06-8e66-9f936f970ef5" absoluteBounds="12.914583333333335, 5.7854166666666655, 0.15, 0.59999999999999964" customColor="184, 204, 215" visualStyleMode="Modified">
+        <umlExecutionSpecificationShape Id="108afd37-1c11-4c06-8e66-9f936f970ef5" absoluteBounds="11.029166666666669, 5.7854166666666655, 0.15, 0.59999999999999964" customColor="184, 204, 215" visualStyleMode="Modified">
           <behaviorExecutionSpecificationMoniker Id="9710a138-bfe6-4219-841f-4396eb0c26d3" LastKnownName="BehaviorExecutionSpecification8" />
         </umlExecutionSpecificationShape>
-        <umlLifelineHeadShape Id="af36cb0c-70c8-4f4b-9e30-d664d8fec8be" absoluteBounds="12.333333333333334, 0.6, 1.3125, 0.4" customColor="White" visualStyleMode="Modified">
+        <umlLifelineHeadShape Id="af36cb0c-70c8-4f4b-9e30-d664d8fec8be" absoluteBounds="10.447916666666668, 0.6, 1.3125, 0.4" customColor="White" visualStyleMode="Modified">
           <lifelineMoniker Id="56e705f8-85d4-4e95-9658-186332a398c7" LastKnownName="PersistencyServices" />
           <relativeChildShapes />
         </umlLifelineHeadShape>
       </relativeChildShapes>
     </lifelineShape>
-    <lifelineShape Id="37efbd90-aa75-4868-9164-682560a2c8a5" absoluteBounds="14.762500000000005, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
-      <lifelineMoniker Id="6df7e8b3-a947-43a9-9d29-96758cfbf19c" LastKnownName="_eventsFile : StorageFile" />
-      <relativeChildShapes>
-        <lifelineHoverShape Id="090a298b-bd20-40ea-bfc2-f879f961f5f5" absoluteBounds="14.762500000000005, 1, 0, 7">
-          <lifelineMoniker Id="6df7e8b3-a947-43a9-9d29-96758cfbf19c" LastKnownName="_eventsFile : StorageFile" />
-        </lifelineHoverShape>
-        <umlExecutionSpecificationShape Id="49586dfe-7571-45fc-bec3-9b10f750e777" absoluteBounds="14.762500000000005, 6.0854166666666654, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
-          <behaviorExecutionSpecificationMoniker Id="8834c196-51c5-4673-8127-687a717db928" LastKnownName="BehaviorExecutionSpecification9" />
-        </umlExecutionSpecificationShape>
-        <umlLifelineHeadShape Id="6a300658-6100-4c13-a145-0735e1fdf33a" absoluteBounds="13.910416666666672, 0.6, 1.8541666666666661, 0.4" customColor="White" visualStyleMode="Modified">
-          <lifelineMoniker Id="6df7e8b3-a947-43a9-9d29-96758cfbf19c" LastKnownName="_eventsFile : StorageFile" />
-          <relativeChildShapes />
-        </umlLifelineHeadShape>
-      </relativeChildShapes>
-    </lifelineShape>
     <lifelineShape Id="c3f815a0-7e8f-46f4-9770-49adc3ead8bb" absoluteBounds="2.5916666666666668, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
       <lifelineMoniker Id="f23a6632-8053-4208-b3b7-a011728320ed" LastKnownName=": EditEventPage" />
       <relativeChildShapes>
@@ -139,7 +109,7 @@
         </lifelineHoverShape>
       </relativeChildShapes>
     </lifelineShape>
-    <asyncMessageConnector edgePoints="[(8.40833333333333 : 5.78541666666667); (12.9145833333333 : 5.78541666666667)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+    <asyncMessageConnector edgePoints="[(8.95 : 5.78541666666667); (11.0291666666667 : 5.78541666666667)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
         <lifelineShapeMoniker Id="9a20d8bd-6fcb-4cad-bdb9-d0f746248bc3" />
@@ -153,13 +123,6 @@
         <umlExecutionSpecificationShapeMoniker Id="10eb2e60-525b-49cd-9c3d-ec264227adfb" />
       </nodes>
     </asyncMessageConnector>
-    <asyncMessageConnector edgePoints="[(13.0645833333333 : 6.08541666666667); (14.7625 : 6.08541666666667)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
-      <relativeChildShapes />
-      <nodes>
-        <umlExecutionSpecificationShapeMoniker Id="108afd37-1c11-4c06-8e66-9f936f970ef5" />
-        <umlExecutionSpecificationShapeMoniker Id="49586dfe-7571-45fc-bec3-9b10f750e777" />
-      </nodes>
-    </asyncMessageConnector>
     <asyncMessageConnector edgePoints="[(2.74166666666667 : 3.69375); (4.12708333333333 : 3.69375)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
@@ -174,7 +137,7 @@
         <umlExecutionSpecificationShapeMoniker Id="60df7e15-98f4-46d5-970f-88cf5c2dee5a" />
       </nodes>
     </asyncMessageConnector>
-    <asyncMessageConnector edgePoints="[(5.82291666666667 : 4.53125); (8.33333333333333 : 4.53125)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+    <asyncMessageConnector edgePoints="[(5.82291666666667 : 4.53125); (8.875 : 4.53125)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
         <umlExecutionSpecificationShapeMoniker Id="60df7e15-98f4-46d5-970f-88cf5c2dee5a" />
@@ -188,21 +151,14 @@
         <umlExecutionSpecificationShapeMoniker Id="e27a8fd1-5cd3-47ee-b882-d27e33720248" />
       </nodes>
     </asyncSelfMessageConnector>
-    <asyncMessageConnector edgePoints="[(8.48333333333333 : 4.83125); (11.15 : 4.83125)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
-      <relativeChildShapes />
-      <nodes>
-        <umlExecutionSpecificationShapeMoniker Id="53aa3cdc-7afb-48c8-9e7a-84760310e5cd" />
-        <umlExecutionSpecificationShapeMoniker Id="3b91f2da-d9ab-4d47-b352-f33b75a6bbe8" />
-      </nodes>
-    </asyncMessageConnector>
-    <asyncSelfMessageConnector edgePoints="[(5.82291666666667 : 5.93125); (6.07291666666667 : 5.93125); (6.07291666666667 : 6.18125); (5.89791666666667 : 6.18125)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+    <asyncSelfMessageConnector edgePoints="[(5.82291666666667 : 5.98125); (6.07291666666667 : 5.98125); (6.07291666666667 : 6.23125); (5.89791666666667 : 6.23125)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
         <umlExecutionSpecificationShapeMoniker Id="60df7e15-98f4-46d5-970f-88cf5c2dee5a" />
         <umlExecutionSpecificationShapeMoniker Id="fdd1ce57-9e5b-4242-94ad-da3d58dc7950" />
       </nodes>
     </asyncSelfMessageConnector>
-    <asyncMessageConnector edgePoints="[(5.89791666666667 : 6.48125); (8.33333333333333 : 6.48125)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+    <asyncMessageConnector edgePoints="[(5.89791666666667 : 6.53125); (8.875 : 6.53125)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
         <umlExecutionSpecificationShapeMoniker Id="fdd1ce57-9e5b-4242-94ad-da3d58dc7950" />
@@ -223,19 +179,41 @@
         <umlExecutionSpecificationShapeMoniker Id="0a5ee4e2-a781-4ab9-986b-8599c0d2dd36" />
       </nodes>
     </asyncMessageConnector>
-    <syncMessageConnector edgePoints="[(5.82291666666667 : 2.2375); (11.15 : 2.2375)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+    <syncMessageConnector edgePoints="[(5.82291666666667 : 2.35416666666667); (8.875 : 2.35416666666667)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
         <umlExecutionSpecificationShapeMoniker Id="0a5ee4e2-a781-4ab9-986b-8599c0d2dd36" />
-        <umlExecutionSpecificationShapeMoniker Id="ffff2e85-22d2-4974-9a4e-3cd2990c959e" />
+        <umlExecutionSpecificationShapeMoniker Id="d913ee08-ac2f-45b8-a04a-d71106d19e4d" />
       </nodes>
     </syncMessageConnector>
-    <returnMessageConnector edgePoints="[(11.15 : 2.7875); (5.82291666666667 : 2.7875)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+    <returnMessageConnector edgePoints="[(8.875 : 2.90416666666667); (5.82291666666667 : 2.90416666666667)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
-        <umlExecutionSpecificationShapeMoniker Id="ffff2e85-22d2-4974-9a4e-3cd2990c959e" />
+        <umlExecutionSpecificationShapeMoniker Id="d913ee08-ac2f-45b8-a04a-d71106d19e4d" />
         <umlExecutionSpecificationShapeMoniker Id="0a5ee4e2-a781-4ab9-986b-8599c0d2dd36" />
       </nodes>
     </returnMessageConnector>
+    <lifelineShape Id="3635876d-84fe-4c23-98dc-29e9ba2011e7" absoluteBounds="7.7083331743876133, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
+      <lifelineMoniker Id="b4edab08-24d6-4338-92e5-e71f58bda075" LastKnownName=": Event" />
+      <relativeChildShapes>
+        <umlLifelineHeadShape Id="d233828c-5f99-4340-b5ba-a4a8c546f728" absoluteBounds="7.2833331743876135, 0.6, 1, 0.4" customColor="White" visualStyleMode="Modified">
+          <lifelineMoniker Id="b4edab08-24d6-4338-92e5-e71f58bda075" LastKnownName=": Event" />
+          <relativeChildShapes />
+        </umlLifelineHeadShape>
+        <lifelineHoverShape Id="c2dfdc92-3fb8-4a6b-8abc-5bcc0f1cd4ef" absoluteBounds="7.7083331743876133, 1, 0, 7">
+          <lifelineMoniker Id="b4edab08-24d6-4338-92e5-e71f58bda075" LastKnownName=": Event" />
+        </lifelineHoverShape>
+        <umlExecutionSpecificationShape Id="9141a294-8606-4cbf-a7ab-848f99e8dfab" absoluteBounds="7.7083331743876133, 5.3812499999999988, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="8fc46cf1-e4b1-4f75-b9aa-270372a08f73" LastKnownName="BehaviorExecutionSpecification19" />
+        </umlExecutionSpecificationShape>
+      </relativeChildShapes>
+    </lifelineShape>
+    <asyncMessageConnector edgePoints="[(5.89791666666667 : 5.38125); (7.70833317438761 : 5.38125)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="e27a8fd1-5cd3-47ee-b882-d27e33720248" />
+        <umlExecutionSpecificationShapeMoniker Id="9141a294-8606-4cbf-a7ab-848f99e8dfab" />
+      </nodes>
+    </asyncMessageConnector>
   </nestedChildShapes>
 </sequenceDesignerDiagram>
\ No newline at end of file
diff --git a/EventMaker/Design/ModelDefinition/Design.uml b/EventMaker/Design/ModelDefinition/Design.uml
index aca2f5d..e26efec 100644
--- a/EventMaker/Design/ModelDefinition/Design.uml
+++ b/EventMaker/Design/ModelDefinition/Design.uml
@@ -850,48 +850,44 @@
                 LastKnownName="MessageOccurrenceSpecification6"
                 LastKnownLocation="Design.uml" />
               <messageOccurrenceSpecificationMoniker
-                Id="798464e4-1339-465f-b72a-deac7c8f9430"
-                LastKnownName="MessageOccurrenceSpecification7"
-                LastKnownLocation="Design.uml" />
-              <messageOccurrenceSpecificationMoniker
                 Id="9e37779a-70f0-49c6-863a-39b6ac05401a"
                 LastKnownName="MessageOccurrenceSpecification9"
                 LastKnownLocation="Design.uml" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
-            Id="8dbcf6ae-9a45-4026-8e44-2bcba22a1fb6"
-            name="ExecutionOccurrenceSpecification5">
+            Id="af33ae6e-5225-454c-b908-d0c5a2d27874"
+            name="ExecutionOccurrenceSpecification2">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="da4f5011-80d7-455f-ba56-c7f59d58bf38"
+                  Id="54387a40-ee2e-4a44-a320-49eaa469ab25"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="940f7838-f671-45e2-937a-5f166551dcdf"
-                LastKnownName="EventCatalogSingleton"
+                Id="3c9265ca-87ba-4f7e-bb16-00dc86b935df"
+                LastKnownName=": RelayCommand"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
           <executionOccurrenceSpecification
-            Id="af33ae6e-5225-454c-b908-d0c5a2d27874"
-            name="ExecutionOccurrenceSpecification2">
+            Id="8dbcf6ae-9a45-4026-8e44-2bcba22a1fb6"
+            name="ExecutionOccurrenceSpecification5">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="54387a40-ee2e-4a44-a320-49eaa469ab25"
+                  Id="da4f5011-80d7-455f-ba56-c7f59d58bf38"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="3c9265ca-87ba-4f7e-bb16-00dc86b935df"
-                LastKnownName=": RelayCommand"
+                Id="940f7838-f671-45e2-937a-5f166551dcdf"
+                LastKnownName="EventCatalogSingleton"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
@@ -915,122 +911,52 @@
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
-          <executionOccurrenceSpecification
-            Id="f6a36440-efd3-43bb-823d-4c50ae7385d5"
-            name="ExecutionOccurrenceSpecification4">
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker
-                  Id="7bdfb3bb-c0c8-4b58-aa0e-2657b909ebf1"
-                  LastKnownName="ExecutionEvent"
-                  LastKnownLocation="Design.uml" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker
-                Id="2d72c8cd-4cb1-48ad-b8a8-b226805ac199"
-                LastKnownName=": EventViewModel"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </executionOccurrenceSpecification>
           <behaviorExecutionSpecification
-            Id="cef5b769-aac4-4e4c-bd3f-12794bba9d1c"
-            name="BehaviorExecutionSpecification4">
+            Id="abe6eef0-1a34-4d81-af34-e68a78ab58a4"
+            name="BehaviorExecutionSpecification5">
             <coveredLifelines>
               <lifelineMoniker
-                Id="db711ff3-81be-4cd4-8fe9-7ed3f1771955"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
+                Id="1dd26310-62be-440f-8559-303ba662eb46"
+                LastKnownName="PersistencyServices"
                 LastKnownLocation="Design.uml" />
             </coveredLifelines>
             <finish>
               <executionOccurrenceSpecificationMoniker
-                Id="3fb706f0-b41b-4bfb-b470-9e99bbde9e4c"
-                LastKnownName="ExecutionOccurrenceSpecification8"
+                Id="c7917553-fcef-40a1-b63f-7cb07d9632ac"
+                LastKnownName="ExecutionOccurrenceSpecification10"
                 LastKnownLocation="Design.uml" />
             </finish>
             <start>
               <executionOccurrenceSpecificationMoniker
-                Id="72f5b833-aa1f-42f7-b7a5-1823300e0abb"
-                LastKnownName="ExecutionOccurrenceSpecification7"
+                Id="b3b0dfb7-48fa-4ed1-bf0d-d5822421a09d"
+                LastKnownName="ExecutionOccurrenceSpecification9"
                 LastKnownLocation="Design.uml" />
             </start>
             <nestedOccurrences>
               <messageOccurrenceSpecificationMoniker
-                Id="8670e399-acd9-4613-a9df-40cb2b6f846c"
-                LastKnownName="MessageOccurrenceSpecification8"
+                Id="1b1263ff-645b-4e88-9ee5-fbfae17b8cbc"
+                LastKnownName="MessageOccurrenceSpecification10"
                 LastKnownLocation="Design.uml" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
-            Id="72f5b833-aa1f-42f7-b7a5-1823300e0abb"
-            name="ExecutionOccurrenceSpecification7">
+            Id="f6a36440-efd3-43bb-823d-4c50ae7385d5"
+            name="ExecutionOccurrenceSpecification4">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="bf7f8e3c-e0e9-4ea1-8fbf-fccf0732fc18"
+                  Id="7bdfb3bb-c0c8-4b58-aa0e-2657b909ebf1"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="db711ff3-81be-4cd4-8fe9-7ed3f1771955"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
+                Id="2d72c8cd-4cb1-48ad-b8a8-b226805ac199"
+                LastKnownName=": EventViewModel"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification
-            Id="798464e4-1339-465f-b72a-deac7c8f9430"
-            name="MessageOccurrenceSpecification7">
-            <covered>
-              <lifelineMoniker
-                Id="940f7838-f671-45e2-937a-5f166551dcdf"
-                LastKnownName="EventCatalogSingleton"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification
-            Id="8670e399-acd9-4613-a9df-40cb2b6f846c"
-            name="MessageOccurrenceSpecification8">
-            <covered>
-              <lifelineMoniker
-                Id="db711ff3-81be-4cd4-8fe9-7ed3f1771955"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <behaviorExecutionSpecification
-            Id="abe6eef0-1a34-4d81-af34-e68a78ab58a4"
-            name="BehaviorExecutionSpecification5">
-            <coveredLifelines>
-              <lifelineMoniker
-                Id="1dd26310-62be-440f-8559-303ba662eb46"
-                LastKnownName="PersistencyServices"
-                LastKnownLocation="Design.uml" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker
-                Id="c7917553-fcef-40a1-b63f-7cb07d9632ac"
-                LastKnownName="ExecutionOccurrenceSpecification10"
-                LastKnownLocation="Design.uml" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker
-                Id="b3b0dfb7-48fa-4ed1-bf0d-d5822421a09d"
-                LastKnownName="ExecutionOccurrenceSpecification9"
-                LastKnownLocation="Design.uml" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker
-                Id="1b1263ff-645b-4e88-9ee5-fbfae17b8cbc"
-                LastKnownName="MessageOccurrenceSpecification10"
-                LastKnownLocation="Design.uml" />
-              <messageOccurrenceSpecificationMoniker
-                Id="c91b8ccd-a800-4f7d-ae8e-12c6dcbd71ec"
-                LastKnownName="MessageOccurrenceSpecification11"
-                LastKnownLocation="Design.uml" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
             Id="b3b0dfb7-48fa-4ed1-bf0d-d5822421a09d"
             name="ExecutionOccurrenceSpecification9">
@@ -1070,108 +996,6 @@
             </covered>
           </messageOccurrenceSpecification>
           <executionOccurrenceSpecification
-            Id="3fb706f0-b41b-4bfb-b470-9e99bbde9e4c"
-            name="ExecutionOccurrenceSpecification8">
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker
-                  Id="1a44e628-b5ce-465f-87bf-3e8c0af5eb54"
-                  LastKnownName="ExecutionEvent"
-                  LastKnownLocation="Design.uml" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker
-                Id="db711ff3-81be-4cd4-8fe9-7ed3f1771955"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <behaviorExecutionSpecification
-            Id="ef8d2294-392b-4acf-96df-19cb139b9de0"
-            name="BehaviorExecutionSpecification6">
-            <coveredLifelines>
-              <lifelineMoniker
-                Id="0ca6628a-2b42-4af9-b9d1-a383c7a5aabf"
-                LastKnownName="_eventsFile : StorageFile"
-                LastKnownLocation="Design.uml" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker
-                Id="060bc9a0-4c4c-461f-96d8-b91371528f09"
-                LastKnownName="ExecutionOccurrenceSpecification12"
-                LastKnownLocation="Design.uml" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker
-                Id="c1833e0c-7cd0-4ee5-8138-1802e42f7f7d"
-                LastKnownName="ExecutionOccurrenceSpecification11"
-                LastKnownLocation="Design.uml" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker
-                Id="c95d4bf0-afa9-480d-bc93-3e3ce841b14e"
-                LastKnownName="MessageOccurrenceSpecification12"
-                LastKnownLocation="Design.uml" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification
-            Id="7e9212c4-c349-4eab-81c1-740a4e1d18c0"
-            name="ExecutionOccurrenceSpecification6">
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker
-                  Id="ea517757-2594-4b46-80af-a36f7535c247"
-                  LastKnownName="ExecutionEvent"
-                  LastKnownLocation="Design.uml" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker
-                Id="940f7838-f671-45e2-937a-5f166551dcdf"
-                LastKnownName="EventCatalogSingleton"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <executionOccurrenceSpecification
-            Id="c1833e0c-7cd0-4ee5-8138-1802e42f7f7d"
-            name="ExecutionOccurrenceSpecification11">
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker
-                  Id="da52fb32-4f3f-468d-b086-17ff140abd32"
-                  LastKnownName="ExecutionEvent"
-                  LastKnownLocation="Design.uml" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker
-                Id="0ca6628a-2b42-4af9-b9d1-a383c7a5aabf"
-                LastKnownName="_eventsFile : StorageFile"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification
-            Id="c91b8ccd-a800-4f7d-ae8e-12c6dcbd71ec"
-            name="MessageOccurrenceSpecification11">
-            <covered>
-              <lifelineMoniker
-                Id="1dd26310-62be-440f-8559-303ba662eb46"
-                LastKnownName="PersistencyServices"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification
-            Id="c95d4bf0-afa9-480d-bc93-3e3ce841b14e"
-            name="MessageOccurrenceSpecification12">
-            <covered>
-              <lifelineMoniker
-                Id="0ca6628a-2b42-4af9-b9d1-a383c7a5aabf"
-                LastKnownName="_eventsFile : StorageFile"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <executionOccurrenceSpecification
             Id="c7917553-fcef-40a1-b63f-7cb07d9632ac"
             name="ExecutionOccurrenceSpecification10">
             <event>
@@ -1190,20 +1014,20 @@
             </covered>
           </executionOccurrenceSpecification>
           <executionOccurrenceSpecification
-            Id="060bc9a0-4c4c-461f-96d8-b91371528f09"
-            name="ExecutionOccurrenceSpecification12">
+            Id="7e9212c4-c349-4eab-81c1-740a4e1d18c0"
+            name="ExecutionOccurrenceSpecification6">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="c466dc58-635d-4c2b-8b60-9dbe992bdfbf"
+                  Id="ea517757-2594-4b46-80af-a36f7535c247"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="0ca6628a-2b42-4af9-b9d1-a383c7a5aabf"
-                LastKnownName="_eventsFile : StorageFile"
+                Id="940f7838-f671-45e2-937a-5f166551dcdf"
+                LastKnownName="EventCatalogSingleton"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
@@ -1270,22 +1094,6 @@
             </topLevelOccurrences>
           </lifeline>
           <lifeline
-            Id="db711ff3-81be-4cd4-8fe9-7ed3f1771955"
-            name="Events : ObservableCollection&lt;Event&gt;"
-            isActor="false"
-            lifelineDisplayName="Events : ObservableCollection&lt;Event&gt;">
-            <topLevelOccurrences>
-              <executionOccurrenceSpecificationMoniker
-                Id="72f5b833-aa1f-42f7-b7a5-1823300e0abb"
-                LastKnownName="ExecutionOccurrenceSpecification7"
-                LastKnownLocation="Design.uml" />
-              <executionOccurrenceSpecificationMoniker
-                Id="3fb706f0-b41b-4bfb-b470-9e99bbde9e4c"
-                LastKnownName="ExecutionOccurrenceSpecification8"
-                LastKnownLocation="Design.uml" />
-            </topLevelOccurrences>
-          </lifeline>
-          <lifeline
             Id="1dd26310-62be-440f-8559-303ba662eb46"
             name="PersistencyServices"
             isActor="false"
@@ -1301,22 +1109,6 @@
                 LastKnownLocation="Design.uml" />
             </topLevelOccurrences>
           </lifeline>
-          <lifeline
-            Id="0ca6628a-2b42-4af9-b9d1-a383c7a5aabf"
-            name="_eventsFile : StorageFile"
-            isActor="false"
-            lifelineDisplayName="_eventsFile : StorageFile">
-            <topLevelOccurrences>
-              <executionOccurrenceSpecificationMoniker
-                Id="c1833e0c-7cd0-4ee5-8138-1802e42f7f7d"
-                LastKnownName="ExecutionOccurrenceSpecification11"
-                LastKnownLocation="Design.uml" />
-              <executionOccurrenceSpecificationMoniker
-                Id="060bc9a0-4c4c-461f-96d8-b91371528f09"
-                LastKnownName="ExecutionOccurrenceSpecification12"
-                LastKnownLocation="Design.uml" />
-            </topLevelOccurrences>
-          </lifeline>
         </lifelines>
         <messages>
           <message
@@ -1377,25 +1169,6 @@
             </receiveEvent>
           </message>
           <message
-            Id="4e0b7ffb-8d61-4304-b72e-defe8eea0f18"
-            name="RemoveAt(index)"
-            messageKind="Complete"
-            messageSort="AsynchCall"
-            createSelfMessage="false">
-            <sendEvent>
-              <messageOccurrenceSpecificationMoniker
-                Id="798464e4-1339-465f-b72a-deac7c8f9430"
-                LastKnownName="MessageOccurrenceSpecification7"
-                LastKnownLocation="Design.uml" />
-            </sendEvent>
-            <receiveEvent>
-              <messageOccurrenceSpecificationMoniker
-                Id="8670e399-acd9-4613-a9df-40cb2b6f846c"
-                LastKnownName="MessageOccurrenceSpecification8"
-                LastKnownLocation="Design.uml" />
-            </receiveEvent>
-          </message>
-          <message
             Id="4ab6bb53-aaf9-456b-a18f-a03d57973831"
             name="SaveEventsAsJson(Events)"
             messageKind="Complete"
@@ -1414,25 +1187,6 @@
                 LastKnownLocation="Design.uml" />
             </receiveEvent>
           </message>
-          <message
-            Id="82c7efa2-a3b0-4d55-b2c6-28e6d869f3f2"
-            name="File.WriteAllText(_eventsFile)"
-            messageKind="Complete"
-            messageSort="AsynchCall"
-            createSelfMessage="false">
-            <sendEvent>
-              <messageOccurrenceSpecificationMoniker
-                Id="c91b8ccd-a800-4f7d-ae8e-12c6dcbd71ec"
-                LastKnownName="MessageOccurrenceSpecification11"
-                LastKnownLocation="Design.uml" />
-            </sendEvent>
-            <receiveEvent>
-              <messageOccurrenceSpecificationMoniker
-                Id="c95d4bf0-afa9-480d-bc93-3e3ce841b14e"
-                LastKnownName="MessageOccurrenceSpecification12"
-                LastKnownLocation="Design.uml" />
-            </receiveEvent>
-          </message>
         </messages>
       </interaction>
     </packageHasNamedElement>
@@ -1468,16 +1222,6 @@
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="bf7f8e3c-e0e9-4ea1-8fbf-fccf0732fc18"
-        name="ExecutionEvent" />
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent
-        Id="1a44e628-b5ce-465f-87bf-3e8c0af5eb54"
-        name="ExecutionEvent" />
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent
         Id="5f7f39a9-20e2-4bd2-9cc1-e4e78c4ca0fd"
         name="ExecutionEvent" />
     </packageHasNamedElement>
@@ -1487,16 +1231,6 @@
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
-      <executionEvent
-        Id="da52fb32-4f3f-468d-b086-17ff140abd32"
-        name="ExecutionEvent" />
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent
-        Id="c466dc58-635d-4c2b-8b60-9dbe992bdfbf"
-        name="ExecutionEvent" />
-    </packageHasNamedElement>
-    <packageHasNamedElement>
       <interaction
         Id="30d427cf-f0d6-4c7b-ad93-845fd3c38def"
         name="AddEvent"
@@ -1703,38 +1437,38 @@
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
-            Id="739cb067-6313-4e79-ac54-dad923a71f24"
-            name="ExecutionOccurrenceSpecification2">
+            Id="59ec5e03-806d-411c-a6f9-de6ed50e45e2"
+            name="ExecutionOccurrenceSpecification5">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="c40da742-cfca-40ba-ae10-211ae6564a81"
+                  Id="830df811-ef4c-430c-bb7d-0c15fb083d21"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="e84c4057-34d1-4d6d-9f54-69b59a55a3fb"
-                LastKnownName=": CreateEventPage"
+                Id="145c3d10-e855-4fe3-bb39-3dce647089cb"
+                LastKnownName=": EventViewModel"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
           <executionOccurrenceSpecification
-            Id="59ec5e03-806d-411c-a6f9-de6ed50e45e2"
-            name="ExecutionOccurrenceSpecification5">
+            Id="739cb067-6313-4e79-ac54-dad923a71f24"
+            name="ExecutionOccurrenceSpecification2">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="830df811-ef4c-430c-bb7d-0c15fb083d21"
+                  Id="c40da742-cfca-40ba-ae10-211ae6564a81"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="145c3d10-e855-4fe3-bb39-3dce647089cb"
-                LastKnownName=": EventViewModel"
+                Id="e84c4057-34d1-4d6d-9f54-69b59a55a3fb"
+                LastKnownName=": CreateEventPage"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
@@ -1784,10 +1518,6 @@
                 Id="5ff6aa9d-30b5-430d-b63a-dbc8bcc7fe89"
                 LastKnownName="MessageOccurrenceSpecification8"
                 LastKnownLocation="Design.uml" />
-              <messageOccurrenceSpecificationMoniker
-                Id="00c95165-0e2e-42b5-b0c4-92bf6dfdb877"
-                LastKnownName="MessageOccurrenceSpecification13"
-                LastKnownLocation="Design.uml" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
@@ -1846,90 +1576,6 @@
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
-          <behaviorExecutionSpecification
-            Id="bc7c8b8a-fe63-4dde-aee9-13a1784100ce"
-            name="BehaviorExecutionSpecification7">
-            <coveredLifelines>
-              <lifelineMoniker
-                Id="b1db110f-6b40-4b88-8b82-9e78817b4bda"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
-                LastKnownLocation="Design.uml" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker
-                Id="edb5f27a-2cc9-400a-bf3e-eb5f271f1f62"
-                LastKnownName="ExecutionOccurrenceSpecification14"
-                LastKnownLocation="Design.uml" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker
-                Id="c7a9431e-cb8b-4c18-8749-9b8e8f268e95"
-                LastKnownName="ExecutionOccurrenceSpecification13"
-                LastKnownLocation="Design.uml" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker
-                Id="dd7801ab-f88d-44e8-9e27-1bd5fc2fd24b"
-                LastKnownName="MessageOccurrenceSpecification14"
-                LastKnownLocation="Design.uml" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification
-            Id="c7a9431e-cb8b-4c18-8749-9b8e8f268e95"
-            name="ExecutionOccurrenceSpecification13">
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker
-                  Id="2fc8bb7c-330c-4cb4-9a1f-13d4ce4bff2e"
-                  LastKnownName="ExecutionEvent"
-                  LastKnownLocation="Design.uml" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker
-                Id="b1db110f-6b40-4b88-8b82-9e78817b4bda"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification
-            Id="dd7801ab-f88d-44e8-9e27-1bd5fc2fd24b"
-            name="MessageOccurrenceSpecification14">
-            <covered>
-              <lifelineMoniker
-                Id="b1db110f-6b40-4b88-8b82-9e78817b4bda"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification
-            Id="00c95165-0e2e-42b5-b0c4-92bf6dfdb877"
-            name="MessageOccurrenceSpecification13">
-            <covered>
-              <lifelineMoniker
-                Id="c252f11c-9156-48b0-adaf-7f6b0082a6a9"
-                LastKnownName="EventCatalogSingleton"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <executionOccurrenceSpecification
-            Id="edb5f27a-2cc9-400a-bf3e-eb5f271f1f62"
-            name="ExecutionOccurrenceSpecification14">
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker
-                  Id="53e07674-c131-49bd-88ed-6d8f5bb45843"
-                  LastKnownName="ExecutionEvent"
-                  LastKnownLocation="Design.uml" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker
-                Id="b1db110f-6b40-4b88-8b82-9e78817b4bda"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </executionOccurrenceSpecification>
           <executionOccurrenceSpecification
             Id="2afb1614-e404-4763-8478-7b0324574fcb"
             name="ExecutionOccurrenceSpecification8">
@@ -1974,10 +1620,6 @@
                 Id="773cc808-ab31-40c7-a954-22f27add010d"
                 LastKnownName="MessageOccurrenceSpecification16"
                 LastKnownLocation="Design.uml" />
-              <messageOccurrenceSpecificationMoniker
-                Id="2e1df5b3-da79-4f18-8283-74ec4a3646e8"
-                LastKnownName="MessageOccurrenceSpecification17"
-                LastKnownLocation="Design.uml" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
@@ -1999,16 +1641,6 @@
             </covered>
           </executionOccurrenceSpecification>
           <messageOccurrenceSpecification
-            Id="06bd0e00-cfa5-4d51-9b2c-5023ba17e4d3"
-            name="MessageOccurrenceSpecification15">
-            <covered>
-              <lifelineMoniker
-                Id="c252f11c-9156-48b0-adaf-7f6b0082a6a9"
-                LastKnownName="EventCatalogSingleton"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification
             Id="773cc808-ab31-40c7-a954-22f27add010d"
             name="MessageOccurrenceSpecification16">
             <covered>
@@ -2018,69 +1650,13 @@
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
-          <behaviorExecutionSpecification
-            Id="7edc9865-b4bf-4a20-a1e7-e61d99474163"
-            name="BehaviorExecutionSpecification9">
-            <coveredLifelines>
-              <lifelineMoniker
-                Id="0dce1dc5-abca-41cb-bd04-e10ceafacab3"
-                LastKnownName="_eventsFile : StorageFile"
-                LastKnownLocation="Design.uml" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker
-                Id="c5f98e2f-d457-4e09-82f9-1b8837e60a2c"
-                LastKnownName="ExecutionOccurrenceSpecification18"
-                LastKnownLocation="Design.uml" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker
-                Id="f8d10164-4310-4e72-8a85-63444ff0dd0e"
-                LastKnownName="ExecutionOccurrenceSpecification17"
-                LastKnownLocation="Design.uml" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker
-                Id="4e10ccd3-a062-4f6a-b838-b6db3b821536"
-                LastKnownName="MessageOccurrenceSpecification18"
-                LastKnownLocation="Design.uml" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification
-            Id="f8d10164-4310-4e72-8a85-63444ff0dd0e"
-            name="ExecutionOccurrenceSpecification17">
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker
-                  Id="4e400a43-58cc-4fc7-a42d-a796a6783255"
-                  LastKnownName="ExecutionEvent"
-                  LastKnownLocation="Design.uml" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker
-                Id="0dce1dc5-abca-41cb-bd04-e10ceafacab3"
-                LastKnownName="_eventsFile : StorageFile"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </executionOccurrenceSpecification>
           <messageOccurrenceSpecification
-            Id="4e10ccd3-a062-4f6a-b838-b6db3b821536"
-            name="MessageOccurrenceSpecification18">
-            <covered>
-              <lifelineMoniker
-                Id="0dce1dc5-abca-41cb-bd04-e10ceafacab3"
-                LastKnownName="_eventsFile : StorageFile"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification
-            Id="2e1df5b3-da79-4f18-8283-74ec4a3646e8"
-            name="MessageOccurrenceSpecification17">
+            Id="06bd0e00-cfa5-4d51-9b2c-5023ba17e4d3"
+            name="MessageOccurrenceSpecification15">
             <covered>
               <lifelineMoniker
-                Id="c60b5e91-3b90-46f2-a28a-9619edfb3e69"
-                LastKnownName="PersistencyServices"
+                Id="c252f11c-9156-48b0-adaf-7f6b0082a6a9"
+                LastKnownName="EventCatalogSingleton"
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
@@ -2112,24 +1688,6 @@
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
-          <executionOccurrenceSpecification
-            Id="c5f98e2f-d457-4e09-82f9-1b8837e60a2c"
-            name="ExecutionOccurrenceSpecification18">
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker
-                  Id="c9a3a49b-a33e-48e6-875a-e1472b7d32f1"
-                  LastKnownName="ExecutionEvent"
-                  LastKnownLocation="Design.uml" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker
-                Id="0dce1dc5-abca-41cb-bd04-e10ceafacab3"
-                LastKnownName="_eventsFile : StorageFile"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </executionOccurrenceSpecification>
           <behaviorExecutionSpecification
             Id="16ed5561-f2f4-4301-90f2-fdec886ba35c"
             name="BehaviorExecutionSpecification5">
@@ -2156,6 +1714,10 @@
                 Id="37598c21-67be-411c-b984-d285a7d24675"
                 LastKnownName="MessageOccurrenceSpecification10"
                 LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="5ff3b465-94ac-4f34-8315-c388042f6af5"
+                LastKnownName="MessageOccurrenceSpecification21"
+                LastKnownLocation="Design.uml" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
@@ -2186,6 +1748,72 @@
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="717c3b85-5d18-40c5-9b7f-ba9c94101aaa"
+            name="BehaviorExecutionSpecification11">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="b7dc1317-a87b-4092-b32c-94312944a9fc"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="a35b7ff0-95ef-4ac0-8cd2-7ffa59880bcb"
+                LastKnownName="ExecutionOccurrenceSpecification22"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="a3869255-e686-4c4c-97de-72f6397b6fff"
+                LastKnownName="ExecutionOccurrenceSpecification21"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="02833c3d-68c1-402e-984d-d99836fd7717"
+                LastKnownName="MessageOccurrenceSpecification22"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="a3869255-e686-4c4c-97de-72f6397b6fff"
+            name="ExecutionOccurrenceSpecification21">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="6a813149-4012-450e-84c8-ad0564b55319"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="b7dc1317-a87b-4092-b32c-94312944a9fc"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="02833c3d-68c1-402e-984d-d99836fd7717"
+            name="MessageOccurrenceSpecification22">
+            <covered>
+              <lifelineMoniker
+                Id="b7dc1317-a87b-4092-b32c-94312944a9fc"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="5ff3b465-94ac-4f34-8315-c388042f6af5"
+            name="MessageOccurrenceSpecification21">
+            <covered>
+              <lifelineMoniker
+                Id="145c3d10-e855-4fe3-bb39-3dce647089cb"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
           <executionOccurrenceSpecification
             Id="ea6aa558-f9bf-4193-a891-49d7cdc39c9b"
             name="ExecutionOccurrenceSpecification10">
@@ -2204,6 +1832,24 @@
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="a35b7ff0-95ef-4ac0-8cd2-7ffa59880bcb"
+            name="ExecutionOccurrenceSpecification22">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="ca9c94dd-e209-4268-ba09-ddbea9a329d7"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="b7dc1317-a87b-4092-b32c-94312944a9fc"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
           <messageOccurrenceSpecification
             Id="9ce3bd0b-5beb-4199-a773-a8cb105497f2"
             name="MessageOccurrenceSpecification11">
@@ -2485,18 +2131,23 @@
             </topLevelOccurrences>
           </lifeline>
           <lifeline
-            Id="b1db110f-6b40-4b88-8b82-9e78817b4bda"
-            name="Events : ObservableCollection&lt;Event&gt;"
+            Id="b7dc1317-a87b-4092-b32c-94312944a9fc"
+            name=": Event"
             isActor="false"
-            lifelineDisplayName="Events : ObservableCollection&lt;Event&gt;">
+            lifelineDisplayName=": Event">
+            <represents>
+              <propertyMoniker
+                Id="3e00e8b4-c13d-4385-a472-5fa385c76af2"
+                LastKnownLocation="Design.uml" />
+            </represents>
             <topLevelOccurrences>
               <executionOccurrenceSpecificationMoniker
-                Id="c7a9431e-cb8b-4c18-8749-9b8e8f268e95"
-                LastKnownName="ExecutionOccurrenceSpecification13"
+                Id="a3869255-e686-4c4c-97de-72f6397b6fff"
+                LastKnownName="ExecutionOccurrenceSpecification21"
                 LastKnownLocation="Design.uml" />
               <executionOccurrenceSpecificationMoniker
-                Id="edb5f27a-2cc9-400a-bf3e-eb5f271f1f62"
-                LastKnownName="ExecutionOccurrenceSpecification14"
+                Id="a35b7ff0-95ef-4ac0-8cd2-7ffa59880bcb"
+                LastKnownName="ExecutionOccurrenceSpecification22"
                 LastKnownLocation="Design.uml" />
             </topLevelOccurrences>
           </lifeline>
@@ -2516,22 +2167,6 @@
                 LastKnownLocation="Design.uml" />
             </topLevelOccurrences>
           </lifeline>
-          <lifeline
-            Id="0dce1dc5-abca-41cb-bd04-e10ceafacab3"
-            name="_eventsFile : StorageFile"
-            isActor="false"
-            lifelineDisplayName="_eventsFile : StorageFile">
-            <topLevelOccurrences>
-              <executionOccurrenceSpecificationMoniker
-                Id="f8d10164-4310-4e72-8a85-63444ff0dd0e"
-                LastKnownName="ExecutionOccurrenceSpecification17"
-                LastKnownLocation="Design.uml" />
-              <executionOccurrenceSpecificationMoniker
-                Id="c5f98e2f-d457-4e09-82f9-1b8837e60a2c"
-                LastKnownName="ExecutionOccurrenceSpecification18"
-                LastKnownLocation="Design.uml" />
-            </topLevelOccurrences>
-          </lifeline>
         </lifelines>
         <messages>
           <message
@@ -2611,25 +2246,6 @@
             </receiveEvent>
           </message>
           <message
-            Id="a8ea4b51-d026-4971-bf68-88cfd4c87ddf"
-            name="Add(newEvent)"
-            messageKind="Complete"
-            messageSort="AsynchCall"
-            createSelfMessage="false">
-            <sendEvent>
-              <messageOccurrenceSpecificationMoniker
-                Id="00c95165-0e2e-42b5-b0c4-92bf6dfdb877"
-                LastKnownName="MessageOccurrenceSpecification13"
-                LastKnownLocation="Design.uml" />
-            </sendEvent>
-            <receiveEvent>
-              <messageOccurrenceSpecificationMoniker
-                Id="dd7801ab-f88d-44e8-9e27-1bd5fc2fd24b"
-                LastKnownName="MessageOccurrenceSpecification14"
-                LastKnownLocation="Design.uml" />
-            </receiveEvent>
-          </message>
-          <message
             Id="77b036ff-5211-43b2-8560-68b027d92964"
             name="SaveEventsAsJsonAsync(Events)"
             messageKind="Complete"
@@ -2649,40 +2265,40 @@
             </receiveEvent>
           </message>
           <message
-            Id="17e00c66-9eb1-438f-9c30-a124de09306b"
-            name="File.WriteAllText(_eventsFile)"
+            Id="72f566c0-834d-49f6-9be5-a5bd941e1719"
+            name="CleanTemplate"
             messageKind="Complete"
             messageSort="AsynchCall"
-            createSelfMessage="false">
+            createSelfMessage="true">
             <sendEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="2e1df5b3-da79-4f18-8283-74ec4a3646e8"
-                LastKnownName="MessageOccurrenceSpecification17"
+                Id="8508fef9-f9f8-4209-9d45-eba2bcce3bc1"
+                LastKnownName="MessageOccurrenceSpecification9"
                 LastKnownLocation="Design.uml" />
             </sendEvent>
             <receiveEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="4e10ccd3-a062-4f6a-b838-b6db3b821536"
-                LastKnownName="MessageOccurrenceSpecification18"
+                Id="37598c21-67be-411c-b984-d285a7d24675"
+                LastKnownName="MessageOccurrenceSpecification10"
                 LastKnownLocation="Design.uml" />
             </receiveEvent>
           </message>
           <message
-            Id="72f566c0-834d-49f6-9be5-a5bd941e1719"
-            name="CleanTemplate"
+            Id="6acef0c4-9da5-457a-8dbd-e76378989f8f"
+            name="EventTemplate=new Event"
             messageKind="Complete"
             messageSort="AsynchCall"
-            createSelfMessage="true">
+            createSelfMessage="false">
             <sendEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="8508fef9-f9f8-4209-9d45-eba2bcce3bc1"
-                LastKnownName="MessageOccurrenceSpecification9"
+                Id="5ff3b465-94ac-4f34-8315-c388042f6af5"
+                LastKnownName="MessageOccurrenceSpecification21"
                 LastKnownLocation="Design.uml" />
             </sendEvent>
             <receiveEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="37598c21-67be-411c-b984-d285a7d24675"
-                LastKnownName="MessageOccurrenceSpecification10"
+                Id="02833c3d-68c1-402e-984d-d99836fd7717"
+                LastKnownName="MessageOccurrenceSpecification22"
                 LastKnownLocation="Design.uml" />
             </receiveEvent>
           </message>
@@ -2725,6 +2341,24 @@
             </receiveEvent>
           </message>
         </messages>
+        <ownedAttributesInternal>
+          <property
+            Id="3e00e8b4-c13d-4385-a472-5fa385c76af2"
+            isLeaf="false"
+            isStatic="false"
+            isReadOnly="false"
+            isDerived="false"
+            isDerivedUnion="false"
+            aggregation="None"
+            isComposite="false">
+            <type_NamedElement>
+              <classMoniker
+                Id="760f646f-837b-4a99-aa04-8b3e628b4189"
+                LastKnownName="Event"
+                LastKnownLocation="Design.uml" />
+            </type_NamedElement>
+          </property>
+        </ownedAttributesInternal>
       </interaction>
     </packageHasNamedElement>
     <packageHasNamedElement>
@@ -2779,16 +2413,6 @@
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="2fc8bb7c-330c-4cb4-9a1f-13d4ce4bff2e"
-        name="ExecutionEvent" />
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent
-        Id="53e07674-c131-49bd-88ed-6d8f5bb45843"
-        name="ExecutionEvent" />
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent
         Id="fe345da2-2c5a-46ff-8c9c-12b9015021f1"
         name="ExecutionEvent" />
     </packageHasNamedElement>
@@ -2799,16 +2423,6 @@
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="4e400a43-58cc-4fc7-a42d-a796a6783255"
-        name="ExecutionEvent" />
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent
-        Id="c9a3a49b-a33e-48e6-875a-e1472b7d32f1"
-        name="ExecutionEvent" />
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent
         Id="6fe5b95d-1caf-402b-bfce-70faa4432895"
         name="ExecutionEvent" />
     </packageHasNamedElement>
@@ -4478,12 +4092,12 @@
                 LastKnownName="MessageOccurrenceSpecification32"
                 LastKnownLocation="Design.uml" />
               <messageOccurrenceSpecificationMoniker
-                Id="963da5f8-48a2-447c-937e-f432da784b26"
-                LastKnownName="MessageOccurrenceSpecification37"
+                Id="014df8f7-5193-47cc-a484-869d65cebe64"
+                LastKnownName="MessageOccurrenceSpecification43"
                 LastKnownLocation="Design.uml" />
               <messageOccurrenceSpecificationMoniker
-                Id="7beca056-2011-44b5-814a-8ca202b153ad"
-                LastKnownName="MessageOccurrenceSpecification40"
+                Id="06add260-ba33-4318-93ea-2860a5b0459e"
+                LastKnownName="MessageOccurrenceSpecification46"
                 LastKnownLocation="Design.uml" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
@@ -4525,129 +4139,129 @@
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="c5fe1885-73be-47c5-92f8-b904eeabecb5"
+            name="ExecutionOccurrenceSpecification24">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="44083a26-ddfa-4198-b976-0c9b506f2024"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="0ab55879-5894-48ac-9ef7-75e7f54a4cf6"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
           <behaviorExecutionSpecification
-            Id="43f4d105-4a5f-4813-8f74-c576ffaa2aab"
-            name="BehaviorExecutionSpecification16">
+            Id="2c1d84ad-e6f6-432e-8b8e-230050a7aad4"
+            name="BehaviorExecutionSpecification18">
             <coveredLifelines>
               <lifelineMoniker
-                Id="c68d33d8-acf2-4e5c-b2d4-6c74f269ea39"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
+                Id="4280e57c-61ab-4602-ab26-2a160ede459c"
+                LastKnownName="EventCatalogSingleton"
                 LastKnownLocation="Design.uml" />
             </coveredLifelines>
             <finish>
               <executionOccurrenceSpecificationMoniker
-                Id="1062caed-e4dd-4de0-a06a-c56ed35fdb96"
-                LastKnownName="ExecutionOccurrenceSpecification32"
+                Id="c18077b4-a335-4294-88bc-66c1f5a1fe1a"
+                LastKnownName="ExecutionOccurrenceSpecification36"
                 LastKnownLocation="Design.uml" />
             </finish>
             <start>
               <executionOccurrenceSpecificationMoniker
-                Id="ace2f6cd-d019-490c-af83-91e620893533"
-                LastKnownName="ExecutionOccurrenceSpecification31"
+                Id="bbd7d448-a26b-4a67-a730-c92de2a7f650"
+                LastKnownName="ExecutionOccurrenceSpecification35"
                 LastKnownLocation="Design.uml" />
             </start>
             <nestedOccurrences>
               <messageOccurrenceSpecificationMoniker
-                Id="7ea2c2d3-7280-41e2-b5a3-f2004bebcdf5"
-                LastKnownName="MessageOccurrenceSpecification38"
+                Id="95652271-b751-4e7f-8099-90a3acef9c82"
+                LastKnownName="MessageOccurrenceSpecification44"
                 LastKnownLocation="Design.uml" />
               <messageOccurrenceSpecificationMoniker
-                Id="814f168a-c387-437a-a6dc-20862033cc6f"
-                LastKnownName="MessageOccurrenceSpecification39"
+                Id="3e325c5d-2129-4364-9b80-ffb27ec5b162"
+                LastKnownName="MessageOccurrenceSpecification45"
                 LastKnownLocation="Design.uml" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
-            Id="c5fe1885-73be-47c5-92f8-b904eeabecb5"
-            name="ExecutionOccurrenceSpecification24">
+            Id="bbd7d448-a26b-4a67-a730-c92de2a7f650"
+            name="ExecutionOccurrenceSpecification35">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="44083a26-ddfa-4198-b976-0c9b506f2024"
+                  Id="72a2d284-ede2-41e7-bd85-25c7da1fdf4d"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="0ab55879-5894-48ac-9ef7-75e7f54a4cf6"
-                LastKnownName=": RelayCommand"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <executionOccurrenceSpecification
-            Id="ace2f6cd-d019-490c-af83-91e620893533"
-            name="ExecutionOccurrenceSpecification31">
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker
-                  Id="ed04e67b-72c6-4b8e-80b9-1a1afb12e110"
-                  LastKnownName="ExecutionEvent"
-                  LastKnownLocation="Design.uml" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker
-                Id="c68d33d8-acf2-4e5c-b2d4-6c74f269ea39"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
+                Id="4280e57c-61ab-4602-ab26-2a160ede459c"
+                LastKnownName="EventCatalogSingleton"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
           <messageOccurrenceSpecification
-            Id="963da5f8-48a2-447c-937e-f432da784b26"
-            name="MessageOccurrenceSpecification37">
+            Id="95652271-b751-4e7f-8099-90a3acef9c82"
+            name="MessageOccurrenceSpecification44">
             <covered>
               <lifelineMoniker
-                Id="89db410d-eb8e-4d1d-94d6-fabb7db2f775"
-                LastKnownName=": EventViewModel"
+                Id="4280e57c-61ab-4602-ab26-2a160ede459c"
+                LastKnownName="EventCatalogSingleton"
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
           <messageOccurrenceSpecification
-            Id="7ea2c2d3-7280-41e2-b5a3-f2004bebcdf5"
-            name="MessageOccurrenceSpecification38">
+            Id="014df8f7-5193-47cc-a484-869d65cebe64"
+            name="MessageOccurrenceSpecification43">
             <covered>
               <lifelineMoniker
-                Id="c68d33d8-acf2-4e5c-b2d4-6c74f269ea39"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
+                Id="89db410d-eb8e-4d1d-94d6-fabb7db2f775"
+                LastKnownName=": EventViewModel"
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
           <messageOccurrenceSpecification
-            Id="814f168a-c387-437a-a6dc-20862033cc6f"
-            name="MessageOccurrenceSpecification39">
+            Id="06add260-ba33-4318-93ea-2860a5b0459e"
+            name="MessageOccurrenceSpecification46">
             <covered>
               <lifelineMoniker
-                Id="c68d33d8-acf2-4e5c-b2d4-6c74f269ea39"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
+                Id="89db410d-eb8e-4d1d-94d6-fabb7db2f775"
+                LastKnownName=": EventViewModel"
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
           <messageOccurrenceSpecification
-            Id="7beca056-2011-44b5-814a-8ca202b153ad"
-            name="MessageOccurrenceSpecification40">
+            Id="3e325c5d-2129-4364-9b80-ffb27ec5b162"
+            name="MessageOccurrenceSpecification45">
             <covered>
               <lifelineMoniker
-                Id="89db410d-eb8e-4d1d-94d6-fabb7db2f775"
-                LastKnownName=": EventViewModel"
+                Id="4280e57c-61ab-4602-ab26-2a160ede459c"
+                LastKnownName="EventCatalogSingleton"
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
           <executionOccurrenceSpecification
-            Id="1062caed-e4dd-4de0-a06a-c56ed35fdb96"
-            name="ExecutionOccurrenceSpecification32">
+            Id="c18077b4-a335-4294-88bc-66c1f5a1fe1a"
+            name="ExecutionOccurrenceSpecification36">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="702e62d5-9239-4caf-b89c-14e21e718cb8"
+                  Id="22ea9710-87ba-4536-98b6-3fe37ab8209e"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="c68d33d8-acf2-4e5c-b2d4-6c74f269ea39"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
+                Id="4280e57c-61ab-4602-ab26-2a160ede459c"
+                LastKnownName="EventCatalogSingleton"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
@@ -4720,22 +4334,22 @@
             </covered>
           </executionOccurrenceSpecification>
           <messageOccurrenceSpecification
-            Id="b2b3e8f5-c0c5-4e42-85d3-92db8336a74a"
-            name="MessageOccurrenceSpecification2">
+            Id="1bce4de4-2a51-4858-ae27-7bda65879548"
+            name="MessageOccurrenceSpecification1">
             <covered>
               <lifelineMoniker
-                Id="6dabeeda-8589-4670-a26a-ad56e1a6ba7b"
-                LastKnownName=": EditEventPage"
+                Id="34a8698c-6eea-45ff-8e85-345fd9a7b290"
+                LastKnownName=": EventPage"
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
           <messageOccurrenceSpecification
-            Id="1bce4de4-2a51-4858-ae27-7bda65879548"
-            name="MessageOccurrenceSpecification1">
+            Id="b2b3e8f5-c0c5-4e42-85d3-92db8336a74a"
+            name="MessageOccurrenceSpecification2">
             <covered>
               <lifelineMoniker
-                Id="34a8698c-6eea-45ff-8e85-345fd9a7b290"
-                LastKnownName=": EventPage"
+                Id="6dabeeda-8589-4670-a26a-ad56e1a6ba7b"
+                LastKnownName=": EditEventPage"
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
@@ -4790,22 +4404,22 @@
             </covered>
           </executionOccurrenceSpecification>
           <messageOccurrenceSpecification
-            Id="1a561387-1258-400b-a664-40d6d3091006"
-            name="MessageOccurrenceSpecification4">
+            Id="cc2823fb-9d69-4169-ac56-e1fbbcdd7981"
+            name="MessageOccurrenceSpecification3">
             <covered>
               <lifelineMoniker
-                Id="0ab55879-5894-48ac-9ef7-75e7f54a4cf6"
-                LastKnownName=": RelayCommand"
+                Id="6dabeeda-8589-4670-a26a-ad56e1a6ba7b"
+                LastKnownName=": EditEventPage"
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
           <messageOccurrenceSpecification
-            Id="cc2823fb-9d69-4169-ac56-e1fbbcdd7981"
-            name="MessageOccurrenceSpecification3">
+            Id="1a561387-1258-400b-a664-40d6d3091006"
+            name="MessageOccurrenceSpecification4">
             <covered>
               <lifelineMoniker
-                Id="6dabeeda-8589-4670-a26a-ad56e1a6ba7b"
-                LastKnownName=": EditEventPage"
+                Id="0ab55879-5894-48ac-9ef7-75e7f54a4cf6"
+                LastKnownName=": RelayCommand"
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
@@ -4947,45 +4561,41 @@
                 Id="dce37e2d-09f5-4b70-9e43-45f3ff956454"
                 LastKnownName="MessageOccurrenceSpecification8"
                 LastKnownLocation="Design.uml" />
-              <messageOccurrenceSpecificationMoniker
-                Id="034108d8-204b-4fbd-862e-27345466b28b"
-                LastKnownName="MessageOccurrenceSpecification13"
-                LastKnownLocation="Design.uml" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
-            Id="697868c2-1af6-4b32-beaa-beabac50e2eb"
-            name="ExecutionOccurrenceSpecification4">
+            Id="efbb05a0-51a0-4c3d-abcb-d27ce4b90ca6"
+            name="ExecutionOccurrenceSpecification7">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="7648b528-89da-4b1c-a027-2a7b2ba0972e"
+                  Id="5aeaef3b-5af9-4077-83af-f2e32b2dcd5b"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="0ab55879-5894-48ac-9ef7-75e7f54a4cf6"
-                LastKnownName=": RelayCommand"
+                Id="4280e57c-61ab-4602-ab26-2a160ede459c"
+                LastKnownName="EventCatalogSingleton"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
           <executionOccurrenceSpecification
-            Id="efbb05a0-51a0-4c3d-abcb-d27ce4b90ca6"
-            name="ExecutionOccurrenceSpecification7">
+            Id="697868c2-1af6-4b32-beaa-beabac50e2eb"
+            name="ExecutionOccurrenceSpecification4">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="5aeaef3b-5af9-4077-83af-f2e32b2dcd5b"
+                  Id="7648b528-89da-4b1c-a027-2a7b2ba0972e"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="4280e57c-61ab-4602-ab26-2a160ede459c"
-                LastKnownName="EventCatalogSingleton"
+                Id="0ab55879-5894-48ac-9ef7-75e7f54a4cf6"
+                LastKnownName=": RelayCommand"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
@@ -5009,52 +4619,6 @@
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
-          <behaviorExecutionSpecification
-            Id="a16a53d9-8dda-4f5f-8590-252236b4b45c"
-            name="BehaviorExecutionSpecification7">
-            <coveredLifelines>
-              <lifelineMoniker
-                Id="c68d33d8-acf2-4e5c-b2d4-6c74f269ea39"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
-                LastKnownLocation="Design.uml" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker
-                Id="98e22e2e-8519-48b7-8d09-60230ecec404"
-                LastKnownName="ExecutionOccurrenceSpecification14"
-                LastKnownLocation="Design.uml" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker
-                Id="c6670d4c-1f85-49e9-a3ed-b41a67598b46"
-                LastKnownName="ExecutionOccurrenceSpecification13"
-                LastKnownLocation="Design.uml" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker
-                Id="6b6093d2-5177-4624-b7dd-f73791940203"
-                LastKnownName="MessageOccurrenceSpecification14"
-                LastKnownLocation="Design.uml" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification
-            Id="c6670d4c-1f85-49e9-a3ed-b41a67598b46"
-            name="ExecutionOccurrenceSpecification13">
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker
-                  Id="2ad85703-c973-40fc-b2f5-90cc810c51f4"
-                  LastKnownName="ExecutionEvent"
-                  LastKnownLocation="Design.uml" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker
-                Id="c68d33d8-acf2-4e5c-b2d4-6c74f269ea39"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </executionOccurrenceSpecification>
           <messageOccurrenceSpecification
             Id="9f0402f2-ac55-454c-819c-ec989f0d84e4"
             name="MessageOccurrenceSpecification9">
@@ -5065,26 +4629,6 @@
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification
-            Id="034108d8-204b-4fbd-862e-27345466b28b"
-            name="MessageOccurrenceSpecification13">
-            <covered>
-              <lifelineMoniker
-                Id="4280e57c-61ab-4602-ab26-2a160ede459c"
-                LastKnownName="EventCatalogSingleton"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification
-            Id="6b6093d2-5177-4624-b7dd-f73791940203"
-            name="MessageOccurrenceSpecification14">
-            <covered>
-              <lifelineMoniker
-                Id="c68d33d8-acf2-4e5c-b2d4-6c74f269ea39"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
           <behaviorExecutionSpecification
             Id="a998bbd3-c729-489c-814b-4cd435de73ea"
             name="BehaviorExecutionSpecification5">
@@ -5111,6 +4655,10 @@
                 Id="390b3f9a-e4e1-4ae3-913b-ab88b64d84ca"
                 LastKnownName="MessageOccurrenceSpecification10"
                 LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="0925eccc-e865-4247-91a6-a1bdcf486ebf"
+                LastKnownName="MessageOccurrenceSpecification47"
+                LastKnownLocation="Design.uml" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
@@ -5159,24 +4707,72 @@
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="c4ce2bff-d364-4b8d-b408-950261c79ee0"
+            name="BehaviorExecutionSpecification19">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="707e96d7-2ba5-4e89-85d4-d9ac8241a29a"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="ef9c6dbd-9f31-48f4-ba29-3295ffc2de51"
+                LastKnownName="ExecutionOccurrenceSpecification38"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="a2747504-5abf-40c2-86bb-610ef243e75c"
+                LastKnownName="ExecutionOccurrenceSpecification37"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="863049b4-780c-410e-87a0-6de4a81600d2"
+                LastKnownName="MessageOccurrenceSpecification48"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
-            Id="98e22e2e-8519-48b7-8d09-60230ecec404"
-            name="ExecutionOccurrenceSpecification14">
+            Id="a2747504-5abf-40c2-86bb-610ef243e75c"
+            name="ExecutionOccurrenceSpecification37">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="7aa4f3be-5a62-4785-95ab-784ad70e346a"
+                  Id="42266f5b-52bf-416b-bed9-5cb7cb2c8f09"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="c68d33d8-acf2-4e5c-b2d4-6c74f269ea39"
-                LastKnownName="Events : ObservableCollection&lt;Event&gt;"
+                Id="707e96d7-2ba5-4e89-85d4-d9ac8241a29a"
+                LastKnownName=": Event"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="863049b4-780c-410e-87a0-6de4a81600d2"
+            name="MessageOccurrenceSpecification48">
+            <covered>
+              <lifelineMoniker
+                Id="707e96d7-2ba5-4e89-85d4-d9ac8241a29a"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="0925eccc-e865-4247-91a6-a1bdcf486ebf"
+            name="MessageOccurrenceSpecification47">
+            <covered>
+              <lifelineMoniker
+                Id="89db410d-eb8e-4d1d-94d6-fabb7db2f775"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
           <executionOccurrenceSpecification
             Id="0b567ada-b6b5-4276-a506-b89c04fe2b38"
             name="ExecutionOccurrenceSpecification10">
@@ -5221,10 +4817,6 @@
                 Id="dd5ed129-57da-4835-9079-ef3cd8c9b952"
                 LastKnownName="MessageOccurrenceSpecification16"
                 LastKnownLocation="Design.uml" />
-              <messageOccurrenceSpecificationMoniker
-                Id="ff971bbe-f649-4bde-a7ea-599798f0dca2"
-                LastKnownName="MessageOccurrenceSpecification17"
-                LastKnownLocation="Design.uml" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
@@ -5265,79 +4857,31 @@
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification
-            Id="221f49a6-161c-47e2-8195-886a2c8c05d1"
-            name="MessageOccurrenceSpecification11">
-            <covered>
-              <lifelineMoniker
-                Id="89db410d-eb8e-4d1d-94d6-fabb7db2f775"
-                LastKnownName=": EventViewModel"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <behaviorExecutionSpecification
-            Id="f3c64f0e-0ebc-4f1c-9214-d2dc3f23356e"
-            name="BehaviorExecutionSpecification9">
-            <coveredLifelines>
-              <lifelineMoniker
-                Id="a99849fd-50b0-49a6-ab7c-c32da745b812"
-                LastKnownName="_eventsFile : StorageFile"
-                LastKnownLocation="Design.uml" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker
-                Id="f64dab21-d4be-4a01-9b94-db1f4329fe85"
-                LastKnownName="ExecutionOccurrenceSpecification18"
-                LastKnownLocation="Design.uml" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker
-                Id="4d3f2224-8b4e-426c-97ac-36ed695e1832"
-                LastKnownName="ExecutionOccurrenceSpecification17"
-                LastKnownLocation="Design.uml" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker
-                Id="26cc2cae-a1b5-4484-be27-c3f9860fffee"
-                LastKnownName="MessageOccurrenceSpecification18"
-                LastKnownLocation="Design.uml" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
           <executionOccurrenceSpecification
-            Id="4d3f2224-8b4e-426c-97ac-36ed695e1832"
-            name="ExecutionOccurrenceSpecification17">
+            Id="ef9c6dbd-9f31-48f4-ba29-3295ffc2de51"
+            name="ExecutionOccurrenceSpecification38">
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
                 <executionEventMoniker
-                  Id="7660337f-9062-4a10-a642-970050cb0bc1"
+                  Id="525ad41e-9ee5-4bca-b3a6-bb8bdc496dab"
                   LastKnownName="ExecutionEvent"
                   LastKnownLocation="Design.uml" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
               <lifelineMoniker
-                Id="a99849fd-50b0-49a6-ab7c-c32da745b812"
-                LastKnownName="_eventsFile : StorageFile"
+                Id="707e96d7-2ba5-4e89-85d4-d9ac8241a29a"
+                LastKnownName=": Event"
                 LastKnownLocation="Design.uml" />
             </covered>
           </executionOccurrenceSpecification>
           <messageOccurrenceSpecification
-            Id="ff971bbe-f649-4bde-a7ea-599798f0dca2"
-            name="MessageOccurrenceSpecification17">
-            <covered>
-              <lifelineMoniker
-                Id="40a4cb2e-e3a5-41a3-9207-c1af07374492"
-                LastKnownName="PersistencyServices"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification
-            Id="26cc2cae-a1b5-4484-be27-c3f9860fffee"
-            name="MessageOccurrenceSpecification18">
+            Id="221f49a6-161c-47e2-8195-886a2c8c05d1"
+            name="MessageOccurrenceSpecification11">
             <covered>
               <lifelineMoniker
-                Id="a99849fd-50b0-49a6-ab7c-c32da745b812"
-                LastKnownName="_eventsFile : StorageFile"
+                Id="89db410d-eb8e-4d1d-94d6-fabb7db2f775"
+                LastKnownName=": EventViewModel"
                 LastKnownLocation="Design.uml" />
             </covered>
           </messageOccurrenceSpecification>
@@ -5486,24 +5030,6 @@
             </covered>
           </messageOccurrenceSpecification>
           <executionOccurrenceSpecification
-            Id="f64dab21-d4be-4a01-9b94-db1f4329fe85"
-            name="ExecutionOccurrenceSpecification18">
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker
-                  Id="976b1c0e-34a4-4497-a897-a1d63a9bd2a5"
-                  LastKnownName="ExecutionEvent"
-                  LastKnownLocation="Design.uml" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker
-                Id="a99849fd-50b0-49a6-ab7c-c32da745b812"
-                LastKnownName="_eventsFile : StorageFile"
-                LastKnownLocation="Design.uml" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <executionOccurrenceSpecification
             Id="5ce6aa55-d3e3-42a1-8ac6-f9d8e60f0c25"
             name="ExecutionOccurrenceSpecification12">
             <event>
@@ -5640,12 +5166,41 @@
             </topLevelOccurrences>
           </lifeline>
           <lifeline
+            Id="707e96d7-2ba5-4e89-85d4-d9ac8241a29a"
+            name=": Event"
+            isActor="false"
+            lifelineDisplayName=": Event">
+            <represents>
+              <propertyMoniker
+                Id="e47c5f7d-c8c6-4448-a002-8fb794c99f83"
+                LastKnownLocation="Design.uml" />
+            </represents>
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker
+                Id="a2747504-5abf-40c2-86bb-610ef243e75c"
+                LastKnownName="ExecutionOccurrenceSpecification37"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="ef9c6dbd-9f31-48f4-ba29-3295ffc2de51"
+                LastKnownName="ExecutionOccurrenceSpecification38"
+                LastKnownLocation="Design.uml" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline
             Id="4280e57c-61ab-4602-ab26-2a160ede459c"
             name="EventCatalogSingleton"
             isActor="false"
             lifelineDisplayName="EventCatalogSingleton">
             <topLevelOccurrences>
               <executionOccurrenceSpecificationMoniker
+                Id="bbd7d448-a26b-4a67-a730-c92de2a7f650"
+                LastKnownName="ExecutionOccurrenceSpecification35"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="c18077b4-a335-4294-88bc-66c1f5a1fe1a"
+                LastKnownName="ExecutionOccurrenceSpecification36"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
                 Id="efbb05a0-51a0-4c3d-abcb-d27ce4b90ca6"
                 LastKnownName="ExecutionOccurrenceSpecification7"
                 LastKnownLocation="Design.uml" />
@@ -5668,30 +5223,6 @@
             </topLevelOccurrences>
           </lifeline>
           <lifeline
-            Id="c68d33d8-acf2-4e5c-b2d4-6c74f269ea39"
-            name="Events : ObservableCollection&lt;Event&gt;"
-            isActor="false"
-            lifelineDisplayName="Events : ObservableCollection&lt;Event&gt;">
-            <topLevelOccurrences>
-              <executionOccurrenceSpecificationMoniker
-                Id="ace2f6cd-d019-490c-af83-91e620893533"
-                LastKnownName="ExecutionOccurrenceSpecification31"
-                LastKnownLocation="Design.uml" />
-              <executionOccurrenceSpecificationMoniker
-                Id="1062caed-e4dd-4de0-a06a-c56ed35fdb96"
-                LastKnownName="ExecutionOccurrenceSpecification32"
-                LastKnownLocation="Design.uml" />
-              <executionOccurrenceSpecificationMoniker
-                Id="c6670d4c-1f85-49e9-a3ed-b41a67598b46"
-                LastKnownName="ExecutionOccurrenceSpecification13"
-                LastKnownLocation="Design.uml" />
-              <executionOccurrenceSpecificationMoniker
-                Id="98e22e2e-8519-48b7-8d09-60230ecec404"
-                LastKnownName="ExecutionOccurrenceSpecification14"
-                LastKnownLocation="Design.uml" />
-            </topLevelOccurrences>
-          </lifeline>
-          <lifeline
             Id="40a4cb2e-e3a5-41a3-9207-c1af07374492"
             name="PersistencyServices"
             isActor="false"
@@ -5707,22 +5238,6 @@
                 LastKnownLocation="Design.uml" />
             </topLevelOccurrences>
           </lifeline>
-          <lifeline
-            Id="a99849fd-50b0-49a6-ab7c-c32da745b812"
-            name="_eventsFile : StorageFile"
-            isActor="false"
-            lifelineDisplayName="_eventsFile : StorageFile">
-            <topLevelOccurrences>
-              <executionOccurrenceSpecificationMoniker
-                Id="4d3f2224-8b4e-426c-97ac-36ed695e1832"
-                LastKnownName="ExecutionOccurrenceSpecification17"
-                LastKnownLocation="Design.uml" />
-              <executionOccurrenceSpecificationMoniker
-                Id="f64dab21-d4be-4a01-9b94-db1f4329fe85"
-                LastKnownName="ExecutionOccurrenceSpecification18"
-                LastKnownLocation="Design.uml" />
-            </topLevelOccurrences>
-          </lifeline>
         </lifelines>
         <messages>
           <message
@@ -5764,40 +5279,40 @@
             </receiveEvent>
           </message>
           <message
-            Id="79c1b154-73e3-49fa-bab8-0a82546a19d9"
+            Id="f8c55847-d63f-47e3-9121-37dc355d2cab"
             name="LoadEvent"
             messageKind="Complete"
             messageSort="SynchCall"
             createSelfMessage="false">
             <sendEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="963da5f8-48a2-447c-937e-f432da784b26"
-                LastKnownName="MessageOccurrenceSpecification37"
+                Id="014df8f7-5193-47cc-a484-869d65cebe64"
+                LastKnownName="MessageOccurrenceSpecification43"
                 LastKnownLocation="Design.uml" />
             </sendEvent>
             <receiveEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="7ea2c2d3-7280-41e2-b5a3-f2004bebcdf5"
-                LastKnownName="MessageOccurrenceSpecification38"
+                Id="95652271-b751-4e7f-8099-90a3acef9c82"
+                LastKnownName="MessageOccurrenceSpecification44"
                 LastKnownLocation="Design.uml" />
             </receiveEvent>
           </message>
           <message
-            Id="14003ff9-ada1-4291-b069-91f1fd513ab2"
-            name="Events[SelectedEventIndex]"
+            Id="6bbe2878-2071-40ec-969b-4e98fdfdb849"
+            name="EventTemplate=Events[SelectedEventIndex]"
             messageKind="Complete"
             messageSort="Reply"
             createSelfMessage="false">
             <sendEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="814f168a-c387-437a-a6dc-20862033cc6f"
-                LastKnownName="MessageOccurrenceSpecification39"
+                Id="3e325c5d-2129-4364-9b80-ffb27ec5b162"
+                LastKnownName="MessageOccurrenceSpecification45"
                 LastKnownLocation="Design.uml" />
             </sendEvent>
             <receiveEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="7beca056-2011-44b5-814a-8ca202b153ad"
-                LastKnownName="MessageOccurrenceSpecification40"
+                Id="06add260-ba33-4318-93ea-2860a5b0459e"
+                LastKnownName="MessageOccurrenceSpecification46"
                 LastKnownLocation="Design.uml" />
             </receiveEvent>
           </message>
@@ -5878,25 +5393,6 @@
             </receiveEvent>
           </message>
           <message
-            Id="abb7d357-b931-490e-ac38-4f1211aeb2d3"
-            name="Events[SelectedEventIndex]=eventToUpdate"
-            messageKind="Complete"
-            messageSort="AsynchCall"
-            createSelfMessage="false">
-            <sendEvent>
-              <messageOccurrenceSpecificationMoniker
-                Id="034108d8-204b-4fbd-862e-27345466b28b"
-                LastKnownName="MessageOccurrenceSpecification13"
-                LastKnownLocation="Design.uml" />
-            </sendEvent>
-            <receiveEvent>
-              <messageOccurrenceSpecificationMoniker
-                Id="6b6093d2-5177-4624-b7dd-f73791940203"
-                LastKnownName="MessageOccurrenceSpecification14"
-                LastKnownLocation="Design.uml" />
-            </receiveEvent>
-          </message>
-          <message
             Id="1b6aa430-4c88-4618-8a3d-fe8f0177d619"
             name="CleanTemplate"
             messageKind="Complete"
@@ -5916,40 +5412,40 @@
             </receiveEvent>
           </message>
           <message
-            Id="beb945fa-3f9d-4980-bbed-1f88f834749a"
-            name="SaveEventsAsJsonAsync(Events)"
+            Id="68160f76-a24e-4d29-9547-6935b21ffcfc"
+            name="EventTemplate=new Event"
             messageKind="Complete"
             messageSort="AsynchCall"
             createSelfMessage="false">
             <sendEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="f1aea06b-2df3-4fb1-ac5a-971ff5080aa0"
-                LastKnownName="MessageOccurrenceSpecification15"
+                Id="0925eccc-e865-4247-91a6-a1bdcf486ebf"
+                LastKnownName="MessageOccurrenceSpecification47"
                 LastKnownLocation="Design.uml" />
             </sendEvent>
             <receiveEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="dd5ed129-57da-4835-9079-ef3cd8c9b952"
-                LastKnownName="MessageOccurrenceSpecification16"
+                Id="863049b4-780c-410e-87a0-6de4a81600d2"
+                LastKnownName="MessageOccurrenceSpecification48"
                 LastKnownLocation="Design.uml" />
             </receiveEvent>
           </message>
           <message
-            Id="6b221e9d-a68a-4835-8cc1-75956d4861b6"
-            name="File.WriteAllText(_eventsFile)"
+            Id="beb945fa-3f9d-4980-bbed-1f88f834749a"
+            name="SaveEventsAsJsonAsync(Events)"
             messageKind="Complete"
             messageSort="AsynchCall"
             createSelfMessage="false">
             <sendEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="ff971bbe-f649-4bde-a7ea-599798f0dca2"
-                LastKnownName="MessageOccurrenceSpecification17"
+                Id="f1aea06b-2df3-4fb1-ac5a-971ff5080aa0"
+                LastKnownName="MessageOccurrenceSpecification15"
                 LastKnownLocation="Design.uml" />
             </sendEvent>
             <receiveEvent>
               <messageOccurrenceSpecificationMoniker
-                Id="26cc2cae-a1b5-4484-be27-c3f9860fffee"
-                LastKnownName="MessageOccurrenceSpecification18"
+                Id="dd5ed129-57da-4835-9079-ef3cd8c9b952"
+                LastKnownName="MessageOccurrenceSpecification16"
                 LastKnownLocation="Design.uml" />
             </receiveEvent>
           </message>
@@ -5992,6 +5488,24 @@
             </receiveEvent>
           </message>
         </messages>
+        <ownedAttributesInternal>
+          <property
+            Id="e47c5f7d-c8c6-4448-a002-8fb794c99f83"
+            isLeaf="false"
+            isStatic="false"
+            isReadOnly="false"
+            isDerived="false"
+            isDerivedUnion="false"
+            aggregation="None"
+            isComposite="false">
+            <type_NamedElement>
+              <classMoniker
+                Id="760f646f-837b-4a99-aa04-8b3e628b4189"
+                LastKnownName="Event"
+                LastKnownLocation="Design.uml" />
+            </type_NamedElement>
+          </property>
+        </ownedAttributesInternal>
       </interaction>
     </packageHasNamedElement>
     <packageHasNamedElement>
@@ -6026,102 +5540,1860 @@
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="2ad85703-c973-40fc-b2f5-90cc810c51f4"
+        Id="fb53fb8e-a82b-4de4-8c7b-61e3d3221b4c"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="7aa4f3be-5a62-4785-95ab-784ad70e346a"
+        Id="da9a64fa-51ba-4d03-8ebf-82af497f0e3b"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="fb53fb8e-a82b-4de4-8c7b-61e3d3221b4c"
+        Id="94bf2bb5-adc3-425d-9b48-7884b40c0e7f"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="da9a64fa-51ba-4d03-8ebf-82af497f0e3b"
+        Id="eb47ff81-4ffa-4cf4-ba16-235b2e550c18"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="7660337f-9062-4a10-a642-970050cb0bc1"
+        Id="dfe37a88-a952-4276-b468-afc0c7f697ba"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="976b1c0e-34a4-4497-a897-a1d63a9bd2a5"
+        Id="1ad92a30-fc15-4bcb-9d69-60edf0ab62e6"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="94bf2bb5-adc3-425d-9b48-7884b40c0e7f"
+        Id="88bfd907-570c-4e57-b23f-f0c47917bcff"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="eb47ff81-4ffa-4cf4-ba16-235b2e550c18"
+        Id="bd465002-f76a-455b-aab8-e4ba2470c663"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="dfe37a88-a952-4276-b468-afc0c7f697ba"
+        Id="c2eff013-9be1-4c66-98e2-ab7cdc2c7f4c"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="1ad92a30-fc15-4bcb-9d69-60edf0ab62e6"
+        Id="4c9578c4-d452-44ee-9129-6bbe04e66c61"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="88bfd907-570c-4e57-b23f-f0c47917bcff"
+        Id="283ce9fe-9cba-4f89-870a-cdfbeef6471d"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="bd465002-f76a-455b-aab8-e4ba2470c663"
+        Id="44083a26-ddfa-4198-b976-0c9b506f2024"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="c2eff013-9be1-4c66-98e2-ab7cdc2c7f4c"
+        Id="b6fb385c-4acb-40f1-8c7d-78577bf12620"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="4c9578c4-d452-44ee-9129-6bbe04e66c61"
+        Id="b1f2c634-d3a6-4f56-b08c-7294abdcf17e"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
+      <interaction
+        Id="fd1a9120-d8ef-442a-a399-1e27c439ac95"
+        name="Startup"
+        collapseFragmentsFlag="false"
+        isActiveClass="false"
+        isAbstract="false"
+        isLeaf="false"
+        isReentrant="false">
+        <fragments>
+          <behaviorExecutionSpecification
+            Id="576e3544-5ec6-4dd6-b8c5-fdb32d850d96"
+            name="BehaviorExecutionSpecification5">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="7f300083-2a71-4894-b6bc-bf38d5c7a353"
+                LastKnownName=": EventPage"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="cf03fe83-efef-4a25-b97d-fc5dc7657961"
+                LastKnownName="ExecutionOccurrenceSpecification10"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="9f27da6c-ff5c-415a-8eb5-05a53478e2ec"
+                LastKnownName="ExecutionOccurrenceSpecification9"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="ec4d7213-fc83-4431-8544-e631e0e4bc69"
+                LastKnownName="MessageOccurrenceSpecification12"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="8f59dc21-04a1-4e9a-af78-d206a3da7d08"
+                LastKnownName="MessageOccurrenceSpecification13"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="9f27da6c-ff5c-415a-8eb5-05a53478e2ec"
+            name="ExecutionOccurrenceSpecification9">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="5a79b033-ad41-4073-8daf-b39c34d6d5b5"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="7f300083-2a71-4894-b6bc-bf38d5c7a353"
+                LastKnownName=": EventPage"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="b043ebc1-ed44-40fc-8f94-3910436da487"
+            name="MessageOccurrenceSpecification11">
+            <covered>
+              <lifelineMoniker
+                Id="5232fe88-372b-4aac-a9f4-06803326d597"
+                LastKnownName=": App"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="ec4d7213-fc83-4431-8544-e631e0e4bc69"
+            name="MessageOccurrenceSpecification12">
+            <covered>
+              <lifelineMoniker
+                Id="7f300083-2a71-4894-b6bc-bf38d5c7a353"
+                LastKnownName=": EventPage"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="391c9065-e70a-4d9b-8419-96012b12ac14"
+            name="BehaviorExecutionSpecification6">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="bcbdf04d-f3fe-41ce-bcb7-017b738f707a"
+                LastKnownName="ExecutionOccurrenceSpecification12"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="ce643bbb-0577-48db-a4bf-f5605a328355"
+                LastKnownName="ExecutionOccurrenceSpecification11"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="e0982018-e26d-41ce-a40f-9e5349b45d04"
+                LastKnownName="MessageOccurrenceSpecification14"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="10658f6c-6c52-411e-81c5-ac1d3457ea76"
+                LastKnownName="MessageOccurrenceSpecification53"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="e013feff-7d95-4702-b9a6-075ba6dc48df"
+                LastKnownName="MessageOccurrenceSpecification15"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="a4c98e9b-17c3-47f2-886f-dbee20ff2390"
+                LastKnownName="MessageOccurrenceSpecification18"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="70c19d93-9317-4fbe-9654-be4a8ef84fb7"
+                LastKnownName="MessageOccurrenceSpecification19"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="8f588f6b-7c26-4a04-8595-cd7bd15f996b"
+                LastKnownName="MessageOccurrenceSpecification21"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="e3e16227-893e-47b2-b6cc-73d53d3d8a34"
+                LastKnownName="MessageOccurrenceSpecification25"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="f5bf7ffb-cbb7-426b-af19-14aa90a04fc1"
+                LastKnownName="MessageOccurrenceSpecification27"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="ba307281-77ac-4f5e-b0fc-baae92379f44"
+                LastKnownName="MessageOccurrenceSpecification29"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="509937de-c571-4db7-95d2-246c6f3656d6"
+                LastKnownName="ExecutionOccurrenceSpecification25"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="689357f8-ac4e-496f-8362-6971c8819790"
+                LastKnownName="ExecutionOccurrenceSpecification26"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="ce643bbb-0577-48db-a4bf-f5605a328355"
+            name="ExecutionOccurrenceSpecification11">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="7dd65baf-6f08-4e59-8a72-ad77900ff249"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="8f59dc21-04a1-4e9a-af78-d206a3da7d08"
+            name="MessageOccurrenceSpecification13">
+            <covered>
+              <lifelineMoniker
+                Id="7f300083-2a71-4894-b6bc-bf38d5c7a353"
+                LastKnownName=": EventPage"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="e0982018-e26d-41ce-a40f-9e5349b45d04"
+            name="MessageOccurrenceSpecification14">
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="03b90d1c-64f5-4394-bd3c-3a6374db6f34"
+            name="BehaviorExecutionSpecification21">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="da17d610-0a02-4391-8de7-6e381a7c86ac"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="39821fcc-c320-4397-a74a-7a896ffcecdf"
+                LastKnownName="ExecutionOccurrenceSpecification42"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="416dbb6c-d76f-41d9-a99c-c0ebb767644d"
+                LastKnownName="ExecutionOccurrenceSpecification41"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="a7c4a87d-fcd5-4166-b712-cebb69e56314"
+                LastKnownName="MessageOccurrenceSpecification54"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="cf03fe83-efef-4a25-b97d-fc5dc7657961"
+            name="ExecutionOccurrenceSpecification10">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="3e7a0d24-4ae8-4809-8326-3dab7b4e9e6e"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="7f300083-2a71-4894-b6bc-bf38d5c7a353"
+                LastKnownName=": EventPage"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="416dbb6c-d76f-41d9-a99c-c0ebb767644d"
+            name="ExecutionOccurrenceSpecification41">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="dcc10ef8-e031-4af7-8a54-612b3dc9cde8"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="da17d610-0a02-4391-8de7-6e381a7c86ac"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="a7c4a87d-fcd5-4166-b712-cebb69e56314"
+            name="MessageOccurrenceSpecification54">
+            <covered>
+              <lifelineMoniker
+                Id="da17d610-0a02-4391-8de7-6e381a7c86ac"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="10658f6c-6c52-411e-81c5-ac1d3457ea76"
+            name="MessageOccurrenceSpecification53">
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="88dbdb95-444d-4159-b196-98cbfb74027e"
+            name="BehaviorExecutionSpecification7">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="c5e2c00e-fcc5-4520-9681-53adaa494893"
+                LastKnownName="ExecutionOccurrenceSpecification14"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="7e0d953f-241b-4af8-b73a-d2d5071dc501"
+                LastKnownName="ExecutionOccurrenceSpecification13"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="cf397912-0355-40e5-91b0-c97ee2db4f6e"
+                LastKnownName="MessageOccurrenceSpecification16"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="9b10686a-ceb4-4459-87f0-621951f78a3d"
+                LastKnownName="MessageOccurrenceSpecification45"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="34a6fdce-1cb6-4f9a-be46-6aecb3bf1e03"
+                LastKnownName="MessageOccurrenceSpecification48"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="5c304523-658e-4773-801e-924a38cf542d"
+                LastKnownName="MessageOccurrenceSpecification39"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="2f068aad-bac6-4ac4-88e9-9e501264d519"
+                LastKnownName="MessageOccurrenceSpecification42"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="8c0baeb3-6ade-44b3-81f7-ca83035a0f05"
+                LastKnownName="MessageOccurrenceSpecification17"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="7e0d953f-241b-4af8-b73a-d2d5071dc501"
+            name="ExecutionOccurrenceSpecification13">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="ff22f4b9-bcbc-4985-9055-53ebf3c3fe0a"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="e013feff-7d95-4702-b9a6-075ba6dc48df"
+            name="MessageOccurrenceSpecification15">
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="cf397912-0355-40e5-91b0-c97ee2db4f6e"
+            name="MessageOccurrenceSpecification16">
+            <covered>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="39821fcc-c320-4397-a74a-7a896ffcecdf"
+            name="ExecutionOccurrenceSpecification42">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="6892449b-0f07-4224-8d5f-0cbe62fe6623"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="da17d610-0a02-4391-8de7-6e381a7c86ac"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="d4a105ec-842c-42ca-999c-4a9effb778e5"
+            name="BehaviorExecutionSpecification19">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="da17d610-0a02-4391-8de7-6e381a7c86ac"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="fda099bb-128e-46c3-8dd3-aa8014a0b58b"
+                LastKnownName="ExecutionOccurrenceSpecification38"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="9191c8d5-d0cd-4be7-a23b-8a84f082d3be"
+                LastKnownName="ExecutionOccurrenceSpecification37"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="90ee8d37-219b-465a-b657-6fd4f788fa06"
+                LastKnownName="MessageOccurrenceSpecification46"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="36b7ce07-d47e-495b-ad58-a1edc132e90e"
+                LastKnownName="MessageOccurrenceSpecification47"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="9191c8d5-d0cd-4be7-a23b-8a84f082d3be"
+            name="ExecutionOccurrenceSpecification37">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="7a2fd8e3-b5ad-4694-b2b5-d8ce0f7ffe10"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="da17d610-0a02-4391-8de7-6e381a7c86ac"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="90ee8d37-219b-465a-b657-6fd4f788fa06"
+            name="MessageOccurrenceSpecification46">
+            <covered>
+              <lifelineMoniker
+                Id="da17d610-0a02-4391-8de7-6e381a7c86ac"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="9b10686a-ceb4-4459-87f0-621951f78a3d"
+            name="MessageOccurrenceSpecification45">
+            <covered>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="36b7ce07-d47e-495b-ad58-a1edc132e90e"
+            name="MessageOccurrenceSpecification47">
+            <covered>
+              <lifelineMoniker
+                Id="da17d610-0a02-4391-8de7-6e381a7c86ac"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="34a6fdce-1cb6-4f9a-be46-6aecb3bf1e03"
+            name="MessageOccurrenceSpecification48">
+            <covered>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="fda099bb-128e-46c3-8dd3-aa8014a0b58b"
+            name="ExecutionOccurrenceSpecification38">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="5108396a-37e5-49c7-8796-0a02f7edddcd"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="da17d610-0a02-4391-8de7-6e381a7c86ac"
+                LastKnownName=": Event"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="58a9616a-c3da-42ce-ae97-9db9ef0df198"
+            name="BehaviorExecutionSpecification17">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="f544c024-6acd-464b-a604-ebe2bd80d7bf"
+                LastKnownName="PersistencyServices"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="4ac0dbbe-9357-443d-afb9-b9dfe2f4d004"
+                LastKnownName="ExecutionOccurrenceSpecification34"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="cc1b7b86-c746-458a-bd5b-29a60d95fe32"
+                LastKnownName="ExecutionOccurrenceSpecification33"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="6984fb15-c81e-41ea-9afb-594ba6ed5515"
+                LastKnownName="MessageOccurrenceSpecification40"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="f7553df7-75e8-430c-8bbd-cf104ceb75f9"
+                LastKnownName="MessageOccurrenceSpecification41"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="cc1b7b86-c746-458a-bd5b-29a60d95fe32"
+            name="ExecutionOccurrenceSpecification33">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="2f7ef229-e0c9-47af-8393-6b77a73037f0"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="f544c024-6acd-464b-a604-ebe2bd80d7bf"
+                LastKnownName="PersistencyServices"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="5c304523-658e-4773-801e-924a38cf542d"
+            name="MessageOccurrenceSpecification39">
+            <covered>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="6984fb15-c81e-41ea-9afb-594ba6ed5515"
+            name="MessageOccurrenceSpecification40">
+            <covered>
+              <lifelineMoniker
+                Id="f544c024-6acd-464b-a604-ebe2bd80d7bf"
+                LastKnownName="PersistencyServices"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="2f068aad-bac6-4ac4-88e9-9e501264d519"
+            name="MessageOccurrenceSpecification42">
+            <covered>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="f7553df7-75e8-430c-8bbd-cf104ceb75f9"
+            name="MessageOccurrenceSpecification41">
+            <covered>
+              <lifelineMoniker
+                Id="f544c024-6acd-464b-a604-ebe2bd80d7bf"
+                LastKnownName="PersistencyServices"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="4ac0dbbe-9357-443d-afb9-b9dfe2f4d004"
+            name="ExecutionOccurrenceSpecification34">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="90b985ef-6490-4c6f-9b6d-c148bc2dca44"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="f544c024-6acd-464b-a604-ebe2bd80d7bf"
+                LastKnownName="PersistencyServices"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="a4c98e9b-17c3-47f2-886f-dbee20ff2390"
+            name="MessageOccurrenceSpecification18">
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="8c0baeb3-6ade-44b3-81f7-ca83035a0f05"
+            name="MessageOccurrenceSpecification17">
+            <covered>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="c5e2c00e-fcc5-4520-9681-53adaa494893"
+            name="ExecutionOccurrenceSpecification14">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="76bda587-d65c-4746-8a10-521a678bb5ce"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="a6a50e60-f82f-4f45-a6fd-3f2d28e57338"
+            name="BehaviorExecutionSpecification8">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="fa8ff8f2-668c-463b-b34a-8c3fac8c9921"
+                LastKnownName="ExecutionOccurrenceSpecification16"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="9340d729-29fd-4eaf-b9d6-1e2cdd2ab49d"
+                LastKnownName="ExecutionOccurrenceSpecification15"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="e368d694-b385-407f-b558-455f0ce64fd2"
+                LastKnownName="MessageOccurrenceSpecification20"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="9340d729-29fd-4eaf-b9d6-1e2cdd2ab49d"
+            name="ExecutionOccurrenceSpecification15">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="4ec2f070-4e45-4ac8-8c14-33340782bba3"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="70c19d93-9317-4fbe-9654-be4a8ef84fb7"
+            name="MessageOccurrenceSpecification19">
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="e368d694-b385-407f-b558-455f0ce64fd2"
+            name="MessageOccurrenceSpecification20">
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="fa8ff8f2-668c-463b-b34a-8c3fac8c9921"
+            name="ExecutionOccurrenceSpecification16">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="3d2ea6fe-5364-4279-86f9-cd581f29e73d"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="947c5e4f-d13b-4d7d-8e6b-c0c5af012b68"
+            name="BehaviorExecutionSpecification9">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="9adcf377-970c-4493-ae2a-e1c867247f4c"
+                LastKnownName="ExecutionOccurrenceSpecification18"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="d07e038f-02f1-4bb4-b055-99a46cff9cbf"
+                LastKnownName="ExecutionOccurrenceSpecification17"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="dd0c0ca9-93c2-4cc8-9c44-8661362a7e78"
+                LastKnownName="MessageOccurrenceSpecification22"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="d07e038f-02f1-4bb4-b055-99a46cff9cbf"
+            name="ExecutionOccurrenceSpecification17">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="7bc235fe-f5ef-4d6a-9610-725d57597c92"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="8f588f6b-7c26-4a04-8595-cd7bd15f996b"
+            name="MessageOccurrenceSpecification21">
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="dd0c0ca9-93c2-4cc8-9c44-8661362a7e78"
+            name="MessageOccurrenceSpecification22">
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="9adcf377-970c-4493-ae2a-e1c867247f4c"
+            name="ExecutionOccurrenceSpecification18">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="94596f5f-f71c-4490-b04b-49034e96b40d"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="b062a6b9-f234-4ab1-b8f4-e01be3346c23"
+            name="BehaviorExecutionSpecification11">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="9755df8b-0c89-478d-8c0c-b20fff47c9a1"
+                LastKnownName="ExecutionOccurrenceSpecification22"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="3244add3-5f99-43be-bfd2-5e0fcf9a8969"
+                LastKnownName="ExecutionOccurrenceSpecification21"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="16204710-4828-4cf2-b8be-8206f9f97d34"
+                LastKnownName="MessageOccurrenceSpecification26"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="3244add3-5f99-43be-bfd2-5e0fcf9a8969"
+            name="ExecutionOccurrenceSpecification21">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="cf0eb3e5-4354-4cb3-9ed7-1177dcd56080"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="e3e16227-893e-47b2-b6cc-73d53d3d8a34"
+            name="MessageOccurrenceSpecification25">
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="16204710-4828-4cf2-b8be-8206f9f97d34"
+            name="MessageOccurrenceSpecification26">
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="9755df8b-0c89-478d-8c0c-b20fff47c9a1"
+            name="ExecutionOccurrenceSpecification22">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="88742291-b39b-4b3c-b498-2c32dcff8559"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="96fb5005-9729-47d7-8d32-40230cdee19c"
+            name="BehaviorExecutionSpecification12">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="534d0ef4-7b80-49ab-b654-f4eff8c62ba9"
+                LastKnownName="ExecutionOccurrenceSpecification24"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="3bfde75b-7d35-487a-82e5-8f293429d3be"
+                LastKnownName="ExecutionOccurrenceSpecification23"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="0a08b001-e753-4802-b2b3-379b1a98e653"
+                LastKnownName="MessageOccurrenceSpecification28"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="3bfde75b-7d35-487a-82e5-8f293429d3be"
+            name="ExecutionOccurrenceSpecification23">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="21ee6095-fc3a-4ad4-8ee1-42ce2d2a3d0e"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="f5bf7ffb-cbb7-426b-af19-14aa90a04fc1"
+            name="MessageOccurrenceSpecification27">
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="0a08b001-e753-4802-b2b3-379b1a98e653"
+            name="MessageOccurrenceSpecification28">
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="ba307281-77ac-4f5e-b0fc-baae92379f44"
+            name="MessageOccurrenceSpecification29">
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="cb5b58db-2950-4156-9a00-20ecc2c31011"
+            name="BehaviorExecutionSpecification13">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="689357f8-ac4e-496f-8362-6971c8819790"
+                LastKnownName="ExecutionOccurrenceSpecification26"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="509937de-c571-4db7-95d2-246c6f3656d6"
+                LastKnownName="ExecutionOccurrenceSpecification25"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="ab6093c1-5c39-4e78-81fb-19f434ca22ff"
+                LastKnownName="MessageOccurrenceSpecification30"
+                LastKnownLocation="Design.uml" />
+              <messageOccurrenceSpecificationMoniker
+                Id="5d1b4356-4466-4e65-a2ae-9d2bc2ba6149"
+                LastKnownName="MessageOccurrenceSpecification33"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="509937de-c571-4db7-95d2-246c6f3656d6"
+            name="ExecutionOccurrenceSpecification25">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="8e814ac9-a362-4c8e-85c3-990f50b4d559"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="534d0ef4-7b80-49ab-b654-f4eff8c62ba9"
+            name="ExecutionOccurrenceSpecification24">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="c569ec74-3bdd-40fc-9a37-32a404427f9e"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+                LastKnownName=": RelayCommand"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="ab6093c1-5c39-4e78-81fb-19f434ca22ff"
+            name="MessageOccurrenceSpecification30">
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification
+            Id="5fe69533-61fe-45af-95a3-0b166bee0cb2"
+            name="BehaviorExecutionSpecification15">
+            <coveredLifelines>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker
+                Id="9fd72aa4-892b-4312-ad2b-c4ecf9bd89de"
+                LastKnownName="ExecutionOccurrenceSpecification30"
+                LastKnownLocation="Design.uml" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker
+                Id="cc528b32-a039-4ea5-949a-345ab66ab867"
+                LastKnownName="ExecutionOccurrenceSpecification29"
+                LastKnownLocation="Design.uml" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="3e30e664-8170-4208-8487-451466835bcd"
+                LastKnownName="MessageOccurrenceSpecification34"
+                LastKnownLocation="Design.uml" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification
+            Id="cc528b32-a039-4ea5-949a-345ab66ab867"
+            name="ExecutionOccurrenceSpecification29">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="63b9e5fa-bce6-4e00-95bf-fdfc5acc0fcc"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="3e30e664-8170-4208-8487-451466835bcd"
+            name="MessageOccurrenceSpecification34">
+            <covered>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification
+            Id="5d1b4356-4466-4e65-a2ae-9d2bc2ba6149"
+            name="MessageOccurrenceSpecification33">
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="689357f8-ac4e-496f-8362-6971c8819790"
+            name="ExecutionOccurrenceSpecification26">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="d28c5b44-04bf-4c23-a2d6-f5822a75150e"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="9fd72aa4-892b-4312-ad2b-c4ecf9bd89de"
+            name="ExecutionOccurrenceSpecification30">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="c4c42344-934c-45ff-8d8c-1dadff916359"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+                LastKnownName="EventCatalogSingleton"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <executionOccurrenceSpecification
+            Id="bcbdf04d-f3fe-41ce-bcb7-017b738f707a"
+            name="ExecutionOccurrenceSpecification12">
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker
+                  Id="13a78bb4-1f13-40f1-9634-416d9475f4a1"
+                  LastKnownName="ExecutionEvent"
+                  LastKnownLocation="Design.uml" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker
+                Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+                LastKnownName=": EventViewModel"
+                LastKnownLocation="Design.uml" />
+            </covered>
+          </executionOccurrenceSpecification>
+        </fragments>
+        <lifelines>
+          <lifeline
+            Id="5232fe88-372b-4aac-a9f4-06803326d597"
+            name=": App"
+            isActor="false"
+            lifelineDisplayName=": App">
+            <represents>
+              <propertyMoniker
+                Id="1a2ad4f1-e008-4234-8b75-2ca9955a47c8"
+                LastKnownLocation="Design.uml" />
+            </represents>
+            <topLevelOccurrences>
+              <messageOccurrenceSpecificationMoniker
+                Id="b043ebc1-ed44-40fc-8f94-3910436da487"
+                LastKnownName="MessageOccurrenceSpecification11"
+                LastKnownLocation="Design.uml" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline
+            Id="7f300083-2a71-4894-b6bc-bf38d5c7a353"
+            name=": EventPage"
+            isActor="false"
+            lifelineDisplayName=": EventPage">
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker
+                Id="9f27da6c-ff5c-415a-8eb5-05a53478e2ec"
+                LastKnownName="ExecutionOccurrenceSpecification9"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="cf03fe83-efef-4a25-b97d-fc5dc7657961"
+                LastKnownName="ExecutionOccurrenceSpecification10"
+                LastKnownLocation="Design.uml" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline
+            Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48"
+            name=": EventViewModel"
+            isActor="false"
+            lifelineDisplayName=": EventViewModel">
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker
+                Id="ce643bbb-0577-48db-a4bf-f5605a328355"
+                LastKnownName="ExecutionOccurrenceSpecification11"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="bcbdf04d-f3fe-41ce-bcb7-017b738f707a"
+                LastKnownName="ExecutionOccurrenceSpecification12"
+                LastKnownLocation="Design.uml" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline
+            Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5"
+            name=": RelayCommand"
+            isActor="false"
+            lifelineDisplayName=": RelayCommand">
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker
+                Id="9340d729-29fd-4eaf-b9d6-1e2cdd2ab49d"
+                LastKnownName="ExecutionOccurrenceSpecification15"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="fa8ff8f2-668c-463b-b34a-8c3fac8c9921"
+                LastKnownName="ExecutionOccurrenceSpecification16"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="d07e038f-02f1-4bb4-b055-99a46cff9cbf"
+                LastKnownName="ExecutionOccurrenceSpecification17"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="9adcf377-970c-4493-ae2a-e1c867247f4c"
+                LastKnownName="ExecutionOccurrenceSpecification18"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="3244add3-5f99-43be-bfd2-5e0fcf9a8969"
+                LastKnownName="ExecutionOccurrenceSpecification21"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="9755df8b-0c89-478d-8c0c-b20fff47c9a1"
+                LastKnownName="ExecutionOccurrenceSpecification22"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="3bfde75b-7d35-487a-82e5-8f293429d3be"
+                LastKnownName="ExecutionOccurrenceSpecification23"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="534d0ef4-7b80-49ab-b654-f4eff8c62ba9"
+                LastKnownName="ExecutionOccurrenceSpecification24"
+                LastKnownLocation="Design.uml" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline
+            Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd"
+            name="EventCatalogSingleton"
+            isActor="false"
+            lifelineDisplayName="EventCatalogSingleton">
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker
+                Id="7e0d953f-241b-4af8-b73a-d2d5071dc501"
+                LastKnownName="ExecutionOccurrenceSpecification13"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="c5e2c00e-fcc5-4520-9681-53adaa494893"
+                LastKnownName="ExecutionOccurrenceSpecification14"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="cc528b32-a039-4ea5-949a-345ab66ab867"
+                LastKnownName="ExecutionOccurrenceSpecification29"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="9fd72aa4-892b-4312-ad2b-c4ecf9bd89de"
+                LastKnownName="ExecutionOccurrenceSpecification30"
+                LastKnownLocation="Design.uml" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline
+            Id="da17d610-0a02-4391-8de7-6e381a7c86ac"
+            name=": Event"
+            isActor="false"
+            lifelineDisplayName=": Event">
+            <represents>
+              <propertyMoniker
+                Id="65b51b9f-2373-4f50-af8e-4d0c0a3a8f37"
+                LastKnownLocation="Design.uml" />
+            </represents>
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker
+                Id="416dbb6c-d76f-41d9-a99c-c0ebb767644d"
+                LastKnownName="ExecutionOccurrenceSpecification41"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="39821fcc-c320-4397-a74a-7a896ffcecdf"
+                LastKnownName="ExecutionOccurrenceSpecification42"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="9191c8d5-d0cd-4be7-a23b-8a84f082d3be"
+                LastKnownName="ExecutionOccurrenceSpecification37"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="fda099bb-128e-46c3-8dd3-aa8014a0b58b"
+                LastKnownName="ExecutionOccurrenceSpecification38"
+                LastKnownLocation="Design.uml" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline
+            Id="f544c024-6acd-464b-a604-ebe2bd80d7bf"
+            name="PersistencyServices"
+            isActor="false"
+            lifelineDisplayName="PersistencyServices">
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker
+                Id="cc1b7b86-c746-458a-bd5b-29a60d95fe32"
+                LastKnownName="ExecutionOccurrenceSpecification33"
+                LastKnownLocation="Design.uml" />
+              <executionOccurrenceSpecificationMoniker
+                Id="4ac0dbbe-9357-443d-afb9-b9dfe2f4d004"
+                LastKnownName="ExecutionOccurrenceSpecification34"
+                LastKnownLocation="Design.uml" />
+            </topLevelOccurrences>
+          </lifeline>
+        </lifelines>
+        <messages>
+          <message
+            Id="90e767cc-c1da-47db-80e2-3c85608d6aba"
+            name="Frame.Navigate"
+            messageKind="Complete"
+            messageSort="AsynchCall"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="b043ebc1-ed44-40fc-8f94-3910436da487"
+                LastKnownName="MessageOccurrenceSpecification11"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="ec4d7213-fc83-4431-8544-e631e0e4bc69"
+                LastKnownName="MessageOccurrenceSpecification12"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="5de74dbd-1cfd-443a-95b0-d4c218242d08"
+            name="DataContext"
+            messageKind="Complete"
+            messageSort="AsynchCall"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="8f59dc21-04a1-4e9a-af78-d206a3da7d08"
+                LastKnownName="MessageOccurrenceSpecification13"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="e0982018-e26d-41ce-a40f-9e5349b45d04"
+                LastKnownName="MessageOccurrenceSpecification14"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="6f2dbe07-9255-4caf-98a9-8e95c6a51a58"
+            name="EventTemplate=new Event"
+            messageKind="Complete"
+            messageSort="AsynchCall"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="10658f6c-6c52-411e-81c5-ac1d3457ea76"
+                LastKnownName="MessageOccurrenceSpecification53"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="a7c4a87d-fcd5-4166-b712-cebb69e56314"
+                LastKnownName="MessageOccurrenceSpecification54"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="75b71202-4c73-48ac-aa57-2430327d1622"
+            name="EventCatalogSingleton = EventCatalogSingleton.Instance"
+            messageKind="Complete"
+            messageSort="SynchCall"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="e013feff-7d95-4702-b9a6-075ba6dc48df"
+                LastKnownName="MessageOccurrenceSpecification15"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="cf397912-0355-40e5-91b0-c97ee2db4f6e"
+                LastKnownName="MessageOccurrenceSpecification16"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="aab73109-f2e6-4b01-95fd-60225cd1cf13"
+            name="Events=new ObservableCollection&lt;Event&gt;"
+            messageKind="Complete"
+            messageSort="SynchCall"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="9b10686a-ceb4-4459-87f0-621951f78a3d"
+                LastKnownName="MessageOccurrenceSpecification45"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="90ee8d37-219b-465a-b657-6fd4f788fa06"
+                LastKnownName="MessageOccurrenceSpecification46"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="0033e49a-852d-4224-af5d-a2f112585edf"
+            name=":Event"
+            messageKind="Complete"
+            messageSort="Reply"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="36b7ce07-d47e-495b-ad58-a1edc132e90e"
+                LastKnownName="MessageOccurrenceSpecification47"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="34a6fdce-1cb6-4f9a-be46-6aecb3bf1e03"
+                LastKnownName="MessageOccurrenceSpecification48"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="f30eed37-0e86-49da-b27b-ba3ccbe7652b"
+            name="LoadEventsAsync"
+            messageKind="Complete"
+            messageSort="SynchCall"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="5c304523-658e-4773-801e-924a38cf542d"
+                LastKnownName="MessageOccurrenceSpecification39"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="6984fb15-c81e-41ea-9afb-594ba6ed5515"
+                LastKnownName="MessageOccurrenceSpecification40"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="2676c067-7303-4709-8cc4-3af34a486a6c"
+            name="Events = LoadEventsFromJsonAsync"
+            messageKind="Complete"
+            messageSort="Reply"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="f7553df7-75e8-430c-8bbd-cf104ceb75f9"
+                LastKnownName="MessageOccurrenceSpecification41"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="2f068aad-bac6-4ac4-88e9-9e501264d519"
+                LastKnownName="MessageOccurrenceSpecification42"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="65420380-a658-46b9-96e3-f937d587b178"
+            name="Instance"
+            messageKind="Complete"
+            messageSort="Reply"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="8c0baeb3-6ade-44b3-81f7-ca83035a0f05"
+                LastKnownName="MessageOccurrenceSpecification17"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="a4c98e9b-17c3-47f2-886f-dbee20ff2390"
+                LastKnownName="MessageOccurrenceSpecification18"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="3a7f754d-71dd-4361-aece-2b0b9c40a3a3"
+            name="CreateEventCommand=new RelayCommand"
+            messageKind="Complete"
+            messageSort="AsynchCall"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="70c19d93-9317-4fbe-9654-be4a8ef84fb7"
+                LastKnownName="MessageOccurrenceSpecification19"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="e368d694-b385-407f-b558-455f0ce64fd2"
+                LastKnownName="MessageOccurrenceSpecification20"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="5310bf9c-8f14-4878-b7e6-04c0e26b29da"
+            name="RemoveEventCommand=new RelayCommand"
+            messageKind="Complete"
+            messageSort="AsynchCall"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="8f588f6b-7c26-4a04-8595-cd7bd15f996b"
+                LastKnownName="MessageOccurrenceSpecification21"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="dd0c0ca9-93c2-4cc8-9c44-8661362a7e78"
+                LastKnownName="MessageOccurrenceSpecification22"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="2a7e12c2-43eb-4275-a77d-1758ea9b7723"
+            name="LoadEventCommand=new RelayCommand"
+            messageKind="Complete"
+            messageSort="AsynchCall"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="e3e16227-893e-47b2-b6cc-73d53d3d8a34"
+                LastKnownName="MessageOccurrenceSpecification25"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="16204710-4828-4cf2-b8be-8206f9f97d34"
+                LastKnownName="MessageOccurrenceSpecification26"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="4857a12d-f849-48e2-a989-167119614260"
+            name="CleanTemplateCommand=new RelayCommand"
+            messageKind="Complete"
+            messageSort="AsynchCall"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="f5bf7ffb-cbb7-426b-af19-14aa90a04fc1"
+                LastKnownName="MessageOccurrenceSpecification27"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="0a08b001-e753-4802-b2b3-379b1a98e653"
+                LastKnownName="MessageOccurrenceSpecification28"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="95d50dbe-20a7-436c-a5b4-a7c740212632"
+            name="SortEvents"
+            messageKind="Complete"
+            messageSort="AsynchCall"
+            createSelfMessage="true">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="ba307281-77ac-4f5e-b0fc-baae92379f44"
+                LastKnownName="MessageOccurrenceSpecification29"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="ab6093c1-5c39-4e78-81fb-19f434ca22ff"
+                LastKnownName="MessageOccurrenceSpecification30"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+          <message
+            Id="51d0aaae-0900-4b49-9323-51e3a402b283"
+            name="Sort(sortValue)"
+            messageKind="Complete"
+            messageSort="AsynchCall"
+            createSelfMessage="false">
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="5d1b4356-4466-4e65-a2ae-9d2bc2ba6149"
+                LastKnownName="MessageOccurrenceSpecification33"
+                LastKnownLocation="Design.uml" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker
+                Id="3e30e664-8170-4208-8487-451466835bcd"
+                LastKnownName="MessageOccurrenceSpecification34"
+                LastKnownLocation="Design.uml" />
+            </receiveEvent>
+          </message>
+        </messages>
+        <ownedAttributesInternal>
+          <property
+            Id="1a2ad4f1-e008-4234-8b75-2ca9955a47c8"
+            isLeaf="false"
+            isStatic="false"
+            isReadOnly="false"
+            isDerived="false"
+            isDerivedUnion="false"
+            aggregation="None"
+            isComposite="false">
+            <type_NamedElement>
+              <classMoniker
+                Id="76fee8c1-e516-4ce6-8fec-7b707a51576a"
+                LastKnownName="App"
+                LastKnownLocation="Design.uml" />
+            </type_NamedElement>
+          </property>
+          <property
+            Id="65b51b9f-2373-4f50-af8e-4d0c0a3a8f37"
+            isLeaf="false"
+            isStatic="false"
+            isReadOnly="false"
+            isDerived="false"
+            isDerivedUnion="false"
+            aggregation="None"
+            isComposite="false">
+            <type_NamedElement>
+              <classMoniker
+                Id="760f646f-837b-4a99-aa04-8b3e628b4189"
+                LastKnownName="Event"
+                LastKnownLocation="Design.uml" />
+            </type_NamedElement>
+          </property>
+        </ownedAttributesInternal>
+      </interaction>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
       <executionEvent
-        Id="283ce9fe-9cba-4f89-870a-cdfbeef6471d"
+        Id="5a79b033-ad41-4073-8daf-b39c34d6d5b5"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="44083a26-ddfa-4198-b976-0c9b506f2024"
+        Id="3e7a0d24-4ae8-4809-8326-3dab7b4e9e6e"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="b6fb385c-4acb-40f1-8c7d-78577bf12620"
+        Id="7dd65baf-6f08-4e59-8a72-ad77900ff249"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="b1f2c634-d3a6-4f56-b08c-7294abdcf17e"
+        Id="13a78bb4-1f13-40f1-9634-416d9475f4a1"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="ff22f4b9-bcbc-4985-9055-53ebf3c3fe0a"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="76bda587-d65c-4746-8a10-521a678bb5ce"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="4ec2f070-4e45-4ac8-8c14-33340782bba3"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="3d2ea6fe-5364-4279-86f9-cd581f29e73d"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="7bc235fe-f5ef-4d6a-9610-725d57597c92"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="94596f5f-f71c-4490-b04b-49034e96b40d"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="cf0eb3e5-4354-4cb3-9ed7-1177dcd56080"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="88742291-b39b-4b3c-b498-2c32dcff8559"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="21ee6095-fc3a-4ad4-8ee1-42ce2d2a3d0e"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="c569ec74-3bdd-40fc-9a37-32a404427f9e"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="8e814ac9-a362-4c8e-85c3-990f50b4d559"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="d28c5b44-04bf-4c23-a2d6-f5822a75150e"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="63b9e5fa-bce6-4e00-95bf-fdfc5acc0fcc"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="c4c42344-934c-45ff-8d8c-1dadff916359"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="2f7ef229-e0c9-47af-8393-6b77a73037f0"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="90b985ef-6490-4c6f-9b6d-c148bc2dca44"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="7a2fd8e3-b5ad-4694-b2b5-d8ce0f7ffe10"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="5108396a-37e5-49c7-8796-0a02f7edddcd"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="dcc10ef8-e031-4af7-8a54-612b3dc9cde8"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="6892449b-0f07-4224-8d5f-0cbe62fe6623"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="72a2d284-ede2-41e7-bd85-25c7da1fdf4d"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="22ea9710-87ba-4536-98b6-3fe37ab8209e"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="42266f5b-52bf-416b-bed9-5cb7cb2c8f09"
+        name="ExecutionEvent" />
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent
+        Id="525ad41e-9ee5-4bca-b3a6-bb8bdc496dab"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="ed04e67b-72c6-4b8e-80b9-1a1afb12e110"
+        Id="6a813149-4012-450e-84c8-ad0564b55319"
         name="ExecutionEvent" />
     </packageHasNamedElement>
     <packageHasNamedElement>
       <executionEvent
-        Id="702e62d5-9239-4caf-b89c-14e21e718cb8"
+        Id="ca9c94dd-e209-4268-ba09-ddbea9a329d7"
         name="ExecutionEvent" />
     </packageHasNamedElement>
   </packagedElements>
diff --git a/EventMaker/Design/RemoveEvent.sequencediagram b/EventMaker/Design/RemoveEvent.sequencediagram
index 711734b..7728abd 100644
--- a/EventMaker/Design/RemoveEvent.sequencediagram
+++ b/EventMaker/Design/RemoveEvent.sequencediagram
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SequenceDesignerModel xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" xmlns:dm1="http://schemas.microsoft.com/dsltools/Kernel" xmlns:dm2="http://schemas.microsoft.com/dsltools/Component" xmlns:dm3="http://schemas.microsoft.com/dsltools/Activity" xmlns:dm4="http://schemas.microsoft.com/dsltools/UseCase" xmlns:dm5="http://schemas.microsoft.com/dsltools/Interaction" xmlns:dm6="http://schemas.microsoft.com/dsltools/UmlModelLibrary" xmlns:dm7="http://schemas.microsoft.com/dsltools/UmlDiagrams" xmlns:dm8="http://schemas.microsoft.com/dsltools/ModelStore" xmlns:dm9="http://schemas.microsoft.com/dsltools/LogicalClassDesigner" xmlns:dm10="http://schemas.microsoft.com/dsltools/SimpleShapesModel" xmlns:dm11="http://schemas.microsoft.com/dsltools/UseCaseModel" dslVersion="1.0.0.0" Id="c69789d2-acce-48bc-a2c5-5eb62badc0c9" name="RemoveEvent" linkedPackageId="ab716f91-2635-49c1-b492-2b4649da5d47" xmlns="http://schemas.microsoft.com/VisualStudio/TeamArchitect/SequenceDesigner">
+<SequenceDesignerModel xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" xmlns:dm1="http://schemas.microsoft.com/dsltools/Kernel" xmlns:dm2="http://schemas.microsoft.com/dsltools/Component" xmlns:dm3="http://schemas.microsoft.com/dsltools/Activity" xmlns:dm4="http://schemas.microsoft.com/dsltools/UseCase" xmlns:dm5="http://schemas.microsoft.com/dsltools/Interaction" xmlns:dm6="http://schemas.microsoft.com/dsltools/UmlModelLibrary" xmlns:dm7="http://schemas.microsoft.com/dsltools/UmlDiagrams" xmlns:dm8="http://schemas.microsoft.com/dsltools/ModelStore" xmlns:dm9="http://schemas.microsoft.com/dsltools/LogicalClassDesigner" xmlns:dm10="http://schemas.microsoft.com/dsltools/SimpleShapesModel" xmlns:dm11="http://schemas.microsoft.com/dsltools/UseCaseModel" xmlns:dm12="http://schemas.microsoft.com/VisualStudio/TeamArchitect/ComponentDesigner" dslVersion="1.0.0.0" Id="c69789d2-acce-48bc-a2c5-5eb62badc0c9" name="RemoveEvent" linkedPackageId="ab716f91-2635-49c1-b492-2b4649da5d47" xmlns="http://schemas.microsoft.com/VisualStudio/TeamArchitect/SequenceDesigner">
   <packagedElements>
     <packageHasNamedElement>
       <interaction Id="e8c9938d-0eb4-4142-b894-ee0b989cbc3a" name="RemoveEvent" collapseFragmentsFlag="false" isActiveClass="false" isAbstract="false" isLeaf="false" isReentrant="false">
@@ -96,30 +96,29 @@
             </start>
             <nestedOccurrences>
               <messageOccurrenceSpecificationMoniker Id="084724d3-4812-42c9-ac1f-c3a14bd96001" LastKnownName="MessageOccurrenceSpecification6" />
-              <messageOccurrenceSpecificationMoniker Id="e71bb55a-6412-4a8b-bd1a-5474f3de4b4f" LastKnownName="MessageOccurrenceSpecification7" />
               <messageOccurrenceSpecificationMoniker Id="ef34ee95-b323-423e-80fb-321ba61272e2" LastKnownName="MessageOccurrenceSpecification9" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification Id="03735218-4e78-4597-a78b-68ddc97d6488" name="ExecutionOccurrenceSpecification5">
-            <elementDefinition Id="8dbcf6ae-9a45-4026-8e44-2bcba22a1fb6" />
+          <executionOccurrenceSpecification Id="98983a28-3537-45aa-a2f2-3716e1562dc1" name="ExecutionOccurrenceSpecification2">
+            <elementDefinition Id="af33ae6e-5225-454c-b908-d0c5a2d27874" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="c741d8c7-6c42-4df6-8d47-075e1980cabd" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="e33bb760-2b2a-44bd-badf-89e688f122c8" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="c78980b8-b104-4f0c-8071-0df9c7b88c2d" LastKnownName="EventCatalogSingleton" />
+              <lifelineMoniker Id="14a5ed1b-6b02-43ba-93d2-1e85f97c883c" LastKnownName=": RelayCommand" />
             </covered>
           </executionOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="98983a28-3537-45aa-a2f2-3716e1562dc1" name="ExecutionOccurrenceSpecification2">
-            <elementDefinition Id="af33ae6e-5225-454c-b908-d0c5a2d27874" />
+          <executionOccurrenceSpecification Id="03735218-4e78-4597-a78b-68ddc97d6488" name="ExecutionOccurrenceSpecification5">
+            <elementDefinition Id="8dbcf6ae-9a45-4026-8e44-2bcba22a1fb6" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="e33bb760-2b2a-44bd-badf-89e688f122c8" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="c741d8c7-6c42-4df6-8d47-075e1980cabd" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="14a5ed1b-6b02-43ba-93d2-1e85f97c883c" LastKnownName=": RelayCommand" />
+              <lifelineMoniker Id="c78980b8-b104-4f0c-8071-0df9c7b88c2d" LastKnownName="EventCatalogSingleton" />
             </covered>
           </executionOccurrenceSpecification>
           <messageOccurrenceSpecification Id="084724d3-4812-42c9-ac1f-c3a14bd96001" name="MessageOccurrenceSpecification6">
@@ -134,71 +133,32 @@
               <lifelineMoniker Id="2cf0ae1c-a9c3-458e-8cde-3e06a6e86e76" LastKnownName=": EventViewModel" />
             </covered>
           </messageOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="f6b73e38-e4da-4adb-9a0e-8f89a28e7852" name="ExecutionOccurrenceSpecification4">
-            <elementDefinition Id="f6a36440-efd3-43bb-823d-4c50ae7385d5" />
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="21861589-9b02-4ed6-83f1-6ba847280347" LastKnownName="ExecutionEvent" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker Id="2cf0ae1c-a9c3-458e-8cde-3e06a6e86e76" LastKnownName=": EventViewModel" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <behaviorExecutionSpecification Id="595f358d-c8b0-4644-a8de-fdb8a866d998" name="BehaviorExecutionSpecification4">
-            <elementDefinition Id="cef5b769-aac4-4e4c-bd3f-12794bba9d1c" />
+          <behaviorExecutionSpecification Id="379afe61-7780-4bb8-aff5-268bcc4a6561" name="BehaviorExecutionSpecification5">
+            <elementDefinition Id="abe6eef0-1a34-4d81-af34-e68a78ab58a4" />
             <coveredLifelines>
-              <lifelineMoniker Id="fb807e5b-7641-400c-b33c-8f4df90b5a45" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
+              <lifelineMoniker Id="777e64f4-6f73-440f-b7c0-f6ca822ec922" LastKnownName="PersistencyServices" />
             </coveredLifelines>
             <finish>
-              <executionOccurrenceSpecificationMoniker Id="ede82b55-a663-49cb-a6ae-db3f55b52f13" LastKnownName="ExecutionOccurrenceSpecification8" />
+              <executionOccurrenceSpecificationMoniker Id="01734bc2-aad4-46d6-98a3-b59fca086acd" LastKnownName="ExecutionOccurrenceSpecification10" />
             </finish>
             <start>
-              <executionOccurrenceSpecificationMoniker Id="80ee5cfe-10e5-4606-b831-f8687f210027" LastKnownName="ExecutionOccurrenceSpecification7" />
+              <executionOccurrenceSpecificationMoniker Id="a80edba3-28e6-4d0f-89e8-2f53e19ec9f6" LastKnownName="ExecutionOccurrenceSpecification9" />
             </start>
             <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker Id="d3f25994-3979-4d8f-a296-a6af6f05ec93" LastKnownName="MessageOccurrenceSpecification8" />
+              <messageOccurrenceSpecificationMoniker Id="49a282be-32a9-4e13-822a-5dd5eabf79ed" LastKnownName="MessageOccurrenceSpecification10" />
             </nestedOccurrences>
           </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification Id="80ee5cfe-10e5-4606-b831-f8687f210027" name="ExecutionOccurrenceSpecification7">
-            <elementDefinition Id="72f5b833-aa1f-42f7-b7a5-1823300e0abb" />
+          <executionOccurrenceSpecification Id="f6b73e38-e4da-4adb-9a0e-8f89a28e7852" name="ExecutionOccurrenceSpecification4">
+            <elementDefinition Id="f6a36440-efd3-43bb-823d-4c50ae7385d5" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="72f66a01-8d70-48cf-8e7e-977a60fa973d" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="21861589-9b02-4ed6-83f1-6ba847280347" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="fb807e5b-7641-400c-b33c-8f4df90b5a45" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
+              <lifelineMoniker Id="2cf0ae1c-a9c3-458e-8cde-3e06a6e86e76" LastKnownName=": EventViewModel" />
             </covered>
           </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="e71bb55a-6412-4a8b-bd1a-5474f3de4b4f" name="MessageOccurrenceSpecification7">
-            <elementDefinition Id="798464e4-1339-465f-b72a-deac7c8f9430" />
-            <covered>
-              <lifelineMoniker Id="c78980b8-b104-4f0c-8071-0df9c7b88c2d" LastKnownName="EventCatalogSingleton" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="d3f25994-3979-4d8f-a296-a6af6f05ec93" name="MessageOccurrenceSpecification8">
-            <elementDefinition Id="8670e399-acd9-4613-a9df-40cb2b6f846c" />
-            <covered>
-              <lifelineMoniker Id="fb807e5b-7641-400c-b33c-8f4df90b5a45" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <behaviorExecutionSpecification Id="379afe61-7780-4bb8-aff5-268bcc4a6561" name="BehaviorExecutionSpecification5">
-            <elementDefinition Id="abe6eef0-1a34-4d81-af34-e68a78ab58a4" />
-            <coveredLifelines>
-              <lifelineMoniker Id="777e64f4-6f73-440f-b7c0-f6ca822ec922" LastKnownName="PersistencyServices" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker Id="01734bc2-aad4-46d6-98a3-b59fca086acd" LastKnownName="ExecutionOccurrenceSpecification10" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker Id="a80edba3-28e6-4d0f-89e8-2f53e19ec9f6" LastKnownName="ExecutionOccurrenceSpecification9" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker Id="49a282be-32a9-4e13-822a-5dd5eabf79ed" LastKnownName="MessageOccurrenceSpecification10" />
-              <messageOccurrenceSpecificationMoniker Id="5e25799f-3450-4a6a-9d82-a9fd0b0a7213" LastKnownName="MessageOccurrenceSpecification11" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
           <executionOccurrenceSpecification Id="a80edba3-28e6-4d0f-89e8-2f53e19ec9f6" name="ExecutionOccurrenceSpecification9">
             <elementDefinition Id="b3b0dfb7-48fa-4ed1-bf0d-d5822421a09d" />
             <event>
@@ -222,66 +182,6 @@
               <lifelineMoniker Id="777e64f4-6f73-440f-b7c0-f6ca822ec922" LastKnownName="PersistencyServices" />
             </covered>
           </messageOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="ede82b55-a663-49cb-a6ae-db3f55b52f13" name="ExecutionOccurrenceSpecification8">
-            <elementDefinition Id="3fb706f0-b41b-4bfb-b470-9e99bbde9e4c" />
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="94e80ede-32c0-48b6-83ce-1fe8289809a2" LastKnownName="ExecutionEvent" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker Id="fb807e5b-7641-400c-b33c-8f4df90b5a45" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <behaviorExecutionSpecification Id="35554780-ddfd-49b7-b23b-c0dd51b4ce6d" name="BehaviorExecutionSpecification6">
-            <elementDefinition Id="ef8d2294-392b-4acf-96df-19cb139b9de0" />
-            <coveredLifelines>
-              <lifelineMoniker Id="9428a1ce-e0dd-42ef-b76c-68108d0691a4" LastKnownName="_eventsFile : StorageFile" />
-            </coveredLifelines>
-            <finish>
-              <executionOccurrenceSpecificationMoniker Id="367e81df-4041-4180-8dc3-fee7ed379ef3" LastKnownName="ExecutionOccurrenceSpecification12" />
-            </finish>
-            <start>
-              <executionOccurrenceSpecificationMoniker Id="09723d84-d53e-41f7-bfd1-857e931b3b55" LastKnownName="ExecutionOccurrenceSpecification11" />
-            </start>
-            <nestedOccurrences>
-              <messageOccurrenceSpecificationMoniker Id="405e43c5-2318-435c-abd8-795ff0773333" LastKnownName="MessageOccurrenceSpecification12" />
-            </nestedOccurrences>
-          </behaviorExecutionSpecification>
-          <executionOccurrenceSpecification Id="dd87f695-1e29-4c40-8876-836e6ca5282b" name="ExecutionOccurrenceSpecification6">
-            <elementDefinition Id="7e9212c4-c349-4eab-81c1-740a4e1d18c0" />
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="8a1be809-6bdf-4b66-8da7-ab689be267b7" LastKnownName="ExecutionEvent" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker Id="c78980b8-b104-4f0c-8071-0df9c7b88c2d" LastKnownName="EventCatalogSingleton" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="09723d84-d53e-41f7-bfd1-857e931b3b55" name="ExecutionOccurrenceSpecification11">
-            <elementDefinition Id="c1833e0c-7cd0-4ee5-8138-1802e42f7f7d" />
-            <event>
-              <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="7a7aabde-31e0-4ec3-a54a-b96a75a83e27" LastKnownName="ExecutionEvent" />
-              </executionOccurrenceSpecificationReferencesEvent>
-            </event>
-            <covered>
-              <lifelineMoniker Id="9428a1ce-e0dd-42ef-b76c-68108d0691a4" LastKnownName="_eventsFile : StorageFile" />
-            </covered>
-          </executionOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="5e25799f-3450-4a6a-9d82-a9fd0b0a7213" name="MessageOccurrenceSpecification11">
-            <elementDefinition Id="c91b8ccd-a800-4f7d-ae8e-12c6dcbd71ec" />
-            <covered>
-              <lifelineMoniker Id="777e64f4-6f73-440f-b7c0-f6ca822ec922" LastKnownName="PersistencyServices" />
-            </covered>
-          </messageOccurrenceSpecification>
-          <messageOccurrenceSpecification Id="405e43c5-2318-435c-abd8-795ff0773333" name="MessageOccurrenceSpecification12">
-            <elementDefinition Id="c95d4bf0-afa9-480d-bc93-3e3ce841b14e" />
-            <covered>
-              <lifelineMoniker Id="9428a1ce-e0dd-42ef-b76c-68108d0691a4" LastKnownName="_eventsFile : StorageFile" />
-            </covered>
-          </messageOccurrenceSpecification>
           <executionOccurrenceSpecification Id="01734bc2-aad4-46d6-98a3-b59fca086acd" name="ExecutionOccurrenceSpecification10">
             <elementDefinition Id="c7917553-fcef-40a1-b63f-7cb07d9632ac" />
             <event>
@@ -293,15 +193,15 @@
               <lifelineMoniker Id="777e64f4-6f73-440f-b7c0-f6ca822ec922" LastKnownName="PersistencyServices" />
             </covered>
           </executionOccurrenceSpecification>
-          <executionOccurrenceSpecification Id="367e81df-4041-4180-8dc3-fee7ed379ef3" name="ExecutionOccurrenceSpecification12">
-            <elementDefinition Id="060bc9a0-4c4c-461f-96d8-b91371528f09" />
+          <executionOccurrenceSpecification Id="dd87f695-1e29-4c40-8876-836e6ca5282b" name="ExecutionOccurrenceSpecification6">
+            <elementDefinition Id="7e9212c4-c349-4eab-81c1-740a4e1d18c0" />
             <event>
               <executionOccurrenceSpecificationReferencesEvent>
-                <executionEventMoniker Id="fd4a3b9e-1245-45df-91b1-88a0030c6f08" LastKnownName="ExecutionEvent" />
+                <executionEventMoniker Id="8a1be809-6bdf-4b66-8da7-ab689be267b7" LastKnownName="ExecutionEvent" />
               </executionOccurrenceSpecificationReferencesEvent>
             </event>
             <covered>
-              <lifelineMoniker Id="9428a1ce-e0dd-42ef-b76c-68108d0691a4" LastKnownName="_eventsFile : StorageFile" />
+              <lifelineMoniker Id="c78980b8-b104-4f0c-8071-0df9c7b88c2d" LastKnownName="EventCatalogSingleton" />
             </covered>
           </executionOccurrenceSpecification>
         </fragments>
@@ -333,13 +233,6 @@
               <executionOccurrenceSpecificationMoniker Id="dd87f695-1e29-4c40-8876-836e6ca5282b" LastKnownName="ExecutionOccurrenceSpecification6" />
             </topLevelOccurrences>
           </lifeline>
-          <lifeline Id="fb807e5b-7641-400c-b33c-8f4df90b5a45" name="Events : ObservableCollection&lt;Event&gt;" isActor="false" lifelineDisplayName="Events : ObservableCollection&lt;Event&gt;">
-            <elementDefinition Id="db711ff3-81be-4cd4-8fe9-7ed3f1771955" />
-            <topLevelOccurrences>
-              <executionOccurrenceSpecificationMoniker Id="80ee5cfe-10e5-4606-b831-f8687f210027" LastKnownName="ExecutionOccurrenceSpecification7" />
-              <executionOccurrenceSpecificationMoniker Id="ede82b55-a663-49cb-a6ae-db3f55b52f13" LastKnownName="ExecutionOccurrenceSpecification8" />
-            </topLevelOccurrences>
-          </lifeline>
           <lifeline Id="777e64f4-6f73-440f-b7c0-f6ca822ec922" name="PersistencyServices" isActor="false" lifelineDisplayName="PersistencyServices">
             <elementDefinition Id="1dd26310-62be-440f-8559-303ba662eb46" />
             <topLevelOccurrences>
@@ -347,13 +240,6 @@
               <executionOccurrenceSpecificationMoniker Id="01734bc2-aad4-46d6-98a3-b59fca086acd" LastKnownName="ExecutionOccurrenceSpecification10" />
             </topLevelOccurrences>
           </lifeline>
-          <lifeline Id="9428a1ce-e0dd-42ef-b76c-68108d0691a4" name="_eventsFile : StorageFile" isActor="false" lifelineDisplayName="_eventsFile : StorageFile">
-            <elementDefinition Id="0ca6628a-2b42-4af9-b9d1-a383c7a5aabf" />
-            <topLevelOccurrences>
-              <executionOccurrenceSpecificationMoniker Id="09723d84-d53e-41f7-bfd1-857e931b3b55" LastKnownName="ExecutionOccurrenceSpecification11" />
-              <executionOccurrenceSpecificationMoniker Id="367e81df-4041-4180-8dc3-fee7ed379ef3" LastKnownName="ExecutionOccurrenceSpecification12" />
-            </topLevelOccurrences>
-          </lifeline>
         </lifelines>
         <messages>
           <message Id="297fa938-adaf-4bdd-bb74-827cda138a6f" name="RemoveEventCommand" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
@@ -383,15 +269,6 @@
               <messageOccurrenceSpecificationMoniker Id="084724d3-4812-42c9-ac1f-c3a14bd96001" LastKnownName="MessageOccurrenceSpecification6" />
             </receiveEvent>
           </message>
-          <message Id="397ab402-898d-4499-9d98-b280b771e0d4" name="RemoveAt(index)" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
-            <elementDefinition Id="4e0b7ffb-8d61-4304-b72e-defe8eea0f18" />
-            <sendEvent>
-              <messageOccurrenceSpecificationMoniker Id="e71bb55a-6412-4a8b-bd1a-5474f3de4b4f" LastKnownName="MessageOccurrenceSpecification7" />
-            </sendEvent>
-            <receiveEvent>
-              <messageOccurrenceSpecificationMoniker Id="d3f25994-3979-4d8f-a296-a6af6f05ec93" LastKnownName="MessageOccurrenceSpecification8" />
-            </receiveEvent>
-          </message>
           <message Id="3d259aa8-5d84-4dfd-8897-8386e5d5396f" name="SaveEventsAsJson(Events)" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
             <elementDefinition Id="4ab6bb53-aaf9-456b-a18f-a03d57973831" />
             <sendEvent>
@@ -401,15 +278,6 @@
               <messageOccurrenceSpecificationMoniker Id="49a282be-32a9-4e13-822a-5dd5eabf79ed" LastKnownName="MessageOccurrenceSpecification10" />
             </receiveEvent>
           </message>
-          <message Id="c2ac78ec-f04e-4010-a122-231a0ff32390" name="File.WriteAllText(_eventsFile)" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
-            <elementDefinition Id="82c7efa2-a3b0-4d55-b2c6-28e6d869f3f2" />
-            <sendEvent>
-              <messageOccurrenceSpecificationMoniker Id="5e25799f-3450-4a6a-9d82-a9fd0b0a7213" LastKnownName="MessageOccurrenceSpecification11" />
-            </sendEvent>
-            <receiveEvent>
-              <messageOccurrenceSpecificationMoniker Id="405e43c5-2318-435c-abd8-795ff0773333" LastKnownName="MessageOccurrenceSpecification12" />
-            </receiveEvent>
-          </message>
         </messages>
       </interaction>
     </packageHasNamedElement>
@@ -444,16 +312,6 @@
       </executionEvent>
     </packageHasNamedElement>
     <packageHasNamedElement>
-      <executionEvent Id="72f66a01-8d70-48cf-8e7e-977a60fa973d" name="ExecutionEvent">
-        <elementDefinition Id="bf7f8e3c-e0e9-4ea1-8fbf-fccf0732fc18" />
-      </executionEvent>
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent Id="94e80ede-32c0-48b6-83ce-1fe8289809a2" name="ExecutionEvent">
-        <elementDefinition Id="1a44e628-b5ce-465f-87bf-3e8c0af5eb54" />
-      </executionEvent>
-    </packageHasNamedElement>
-    <packageHasNamedElement>
       <executionEvent Id="baf1361e-3fe6-44ed-97c8-f75818618235" name="ExecutionEvent">
         <elementDefinition Id="5f7f39a9-20e2-4bd2-9cc1-e4e78c4ca0fd" />
       </executionEvent>
@@ -463,16 +321,6 @@
         <elementDefinition Id="6bda93cb-8a28-490f-a10a-0d6a70a0f98f" />
       </executionEvent>
     </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent Id="7a7aabde-31e0-4ec3-a54a-b96a75a83e27" name="ExecutionEvent">
-        <elementDefinition Id="da52fb32-4f3f-468d-b086-17ff140abd32" />
-      </executionEvent>
-    </packageHasNamedElement>
-    <packageHasNamedElement>
-      <executionEvent Id="fd4a3b9e-1245-45df-91b1-88a0030c6f08" name="ExecutionEvent">
-        <elementDefinition Id="c466dc58-635d-4c2b-8b60-9dbe992bdfbf" />
-      </executionEvent>
-    </packageHasNamedElement>
   </packagedElements>
   <package Id="ab716f91-2635-49c1-b492-2b4649da5d47" name="Design">
     <elementDefinition Id="1bc1064b-b630-4768-9d3b-c772ca559686" />
diff --git a/EventMaker/Design/RemoveEvent.sequencediagram.layout b/EventMaker/Design/RemoveEvent.sequencediagram.layout
index 6e89bbb..35e04d9 100644
--- a/EventMaker/Design/RemoveEvent.sequencediagram.layout
+++ b/EventMaker/Design/RemoveEvent.sequencediagram.layout
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<sequenceDesignerDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 12.375, 8.5" name="RemoveEvent">
+<sequenceDesignerDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 11, 8.5" name="RemoveEvent">
   <SequenceDesignerModelMoniker Id="c69789d2-acce-48bc-a2c5-5eb62badc0c9" />
   <nestedChildShapes>
     <lifelineShape Id="909d01c2-0ebd-4fa1-b6e4-b24e5c7355d5" absoluteBounds="1.025, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
@@ -59,51 +59,21 @@
         </umlExecutionSpecificationShape>
       </relativeChildShapes>
     </lifelineShape>
-    <lifelineShape Id="5a23ab21-764e-43e2-9423-4d3fd7b558a1" absoluteBounds="7.6666668256123849, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
-      <lifelineMoniker Id="fb807e5b-7641-400c-b33c-8f4df90b5a45" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-      <relativeChildShapes>
-        <umlLifelineHeadShape Id="991a7a38-3c6e-4583-bb4a-7fd1c9e1ac95" absoluteBounds="6.7533660443623846, 0.6, 1.9766015625, 0.4" customColor="White" visualStyleMode="Modified">
-          <lifelineMoniker Id="fb807e5b-7641-400c-b33c-8f4df90b5a45" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-          <relativeChildShapes />
-        </umlLifelineHeadShape>
-        <lifelineHoverShape Id="e9bd36a2-2e83-4f59-ba3e-5ddb90bba4a0" absoluteBounds="7.6666668256123849, 1, 0, 7">
-          <lifelineMoniker Id="fb807e5b-7641-400c-b33c-8f4df90b5a45" LastKnownName="Events : ObservableCollection&lt;Event&gt;" />
-        </lifelineHoverShape>
-        <umlExecutionSpecificationShape Id="3c193572-ae52-472f-b5de-f0075212b0a1" absoluteBounds="7.6666668256123849, 2.802083333333333, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
-          <behaviorExecutionSpecificationMoniker Id="595f358d-c8b0-4644-a8de-fdb8a866d998" LastKnownName="BehaviorExecutionSpecification4" />
-        </umlExecutionSpecificationShape>
-      </relativeChildShapes>
-    </lifelineShape>
-    <lifelineShape Id="3a2b52cb-dffd-4549-85e1-ac66a0e69d41" absoluteBounds="9.43750031789144, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
+    <lifelineShape Id="3a2b52cb-dffd-4549-85e1-ac66a0e69d41" absoluteBounds="7.59375031789144, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
       <lifelineMoniker Id="777e64f4-6f73-440f-b7c0-f6ca822ec922" LastKnownName="PersistencyServices" />
       <relativeChildShapes>
-        <umlLifelineHeadShape Id="9c445f4d-7783-48c4-bf2f-11001263729c" absoluteBounds="8.8199171932538363, 0.6, 1.3851662492752075, 0.4" customColor="White" visualStyleMode="Modified">
+        <umlLifelineHeadShape Id="9c445f4d-7783-48c4-bf2f-11001263729c" absoluteBounds="6.9761671932538363, 0.6, 1.3851662492752075, 0.4" customColor="White" visualStyleMode="Modified">
           <lifelineMoniker Id="777e64f4-6f73-440f-b7c0-f6ca822ec922" LastKnownName="PersistencyServices" />
           <relativeChildShapes />
         </umlLifelineHeadShape>
-        <lifelineHoverShape Id="d8dd1c0b-a31a-4946-a377-fc816c4461c1" absoluteBounds="9.43750031789144, 1, 0, 7">
+        <lifelineHoverShape Id="d8dd1c0b-a31a-4946-a377-fc816c4461c1" absoluteBounds="7.59375031789144, 1, 0, 7">
           <lifelineMoniker Id="777e64f4-6f73-440f-b7c0-f6ca822ec922" LastKnownName="PersistencyServices" />
         </lifelineHoverShape>
-        <umlExecutionSpecificationShape Id="1bc143c9-c64e-4d73-a2e5-dd8c5fb3a065" absoluteBounds="9.43750031789144, 3.1020833333333329, 0.15, 0.59999999999999964" customColor="184, 204, 215" visualStyleMode="Modified">
+        <umlExecutionSpecificationShape Id="1bc143c9-c64e-4d73-a2e5-dd8c5fb3a065" absoluteBounds="7.59375031789144, 2.75416666666667, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
           <behaviorExecutionSpecificationMoniker Id="379afe61-7780-4bb8-aff5-268bcc4a6561" LastKnownName="BehaviorExecutionSpecification5" />
         </umlExecutionSpecificationShape>
       </relativeChildShapes>
     </lifelineShape>
-    <lifelineShape Id="7a6c5643-7cc0-4f79-876f-a5f7424e4b2c" absoluteBounds="11.239583015441898, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
-      <lifelineMoniker Id="9428a1ce-e0dd-42ef-b76c-68108d0691a4" LastKnownName="_eventsFile : StorageFile" />
-      <relativeChildShapes>
-        <umlLifelineHeadShape Id="c2b5e54c-ff43-4a27-b264-79fa710532ef" absoluteBounds="10.481429131031041, 0.6, 1.6663077688217163, 0.4" customColor="White" visualStyleMode="Modified">
-          <lifelineMoniker Id="9428a1ce-e0dd-42ef-b76c-68108d0691a4" LastKnownName="_eventsFile : StorageFile" />
-          <relativeChildShapes />
-        </umlLifelineHeadShape>
-        <lifelineHoverShape Id="8747f94f-8187-47c3-86cb-5258de9fdbd8" absoluteBounds="11.239583015441898, 1, 0, 7">
-          <lifelineMoniker Id="9428a1ce-e0dd-42ef-b76c-68108d0691a4" LastKnownName="_eventsFile : StorageFile" />
-        </lifelineHoverShape>
-        <umlExecutionSpecificationShape Id="df6623ef-07d0-41b8-b12f-9d90d5d74e1a" absoluteBounds="11.239583015441898, 3.4020833333333327, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
-          <behaviorExecutionSpecificationMoniker Id="35554780-ddfd-49b7-b23b-c0dd51b4ce6d" LastKnownName="BehaviorExecutionSpecification6" />
-        </umlExecutionSpecificationShape>
-      </relativeChildShapes>
-    </lifelineShape>
     <asyncMessageConnector edgePoints="[(1.1 : 1.85416666666667); (2.59375007947286 : 1.85416666666667)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
@@ -125,26 +95,12 @@
         <umlExecutionSpecificationShapeMoniker Id="831c2811-79fd-4711-97c4-b028b84d1abe" />
       </nodes>
     </asyncMessageConnector>
-    <asyncMessageConnector edgePoints="[(6.01458349227905 : 2.80208333333333); (7.66666682561238 : 2.80208333333333)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
-      <relativeChildShapes />
-      <nodes>
-        <umlExecutionSpecificationShapeMoniker Id="831c2811-79fd-4711-97c4-b028b84d1abe" />
-        <umlExecutionSpecificationShapeMoniker Id="3c193572-ae52-472f-b5de-f0075212b0a1" />
-      </nodes>
-    </asyncMessageConnector>
-    <asyncMessageConnector edgePoints="[(6.01458349227905 : 3.10208333333333); (9.43750031789144 : 3.10208333333333)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+    <asyncMessageConnector edgePoints="[(6.01458349227905 : 2.75416666666667); (7.59375031789144 : 2.75416666666667)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
       <relativeChildShapes />
       <nodes>
         <umlExecutionSpecificationShapeMoniker Id="831c2811-79fd-4711-97c4-b028b84d1abe" />
         <umlExecutionSpecificationShapeMoniker Id="1bc143c9-c64e-4d73-a2e5-dd8c5fb3a065" />
       </nodes>
     </asyncMessageConnector>
-    <asyncMessageConnector edgePoints="[(9.58750031789144 : 3.40208333333333); (11.2395830154419 : 3.40208333333333)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
-      <relativeChildShapes />
-      <nodes>
-        <umlExecutionSpecificationShapeMoniker Id="1bc143c9-c64e-4d73-a2e5-dd8c5fb3a065" />
-        <umlExecutionSpecificationShapeMoniker Id="df6623ef-07d0-41b8-b12f-9d90d5d74e1a" />
-      </nodes>
-    </asyncMessageConnector>
   </nestedChildShapes>
 </sequenceDesignerDiagram>
\ No newline at end of file
diff --git a/EventMaker/Design/Startup.sequencediagram b/EventMaker/Design/Startup.sequencediagram
new file mode 100644
index 0000000..07668fe
--- /dev/null
+++ b/EventMaker/Design/Startup.sequencediagram
@@ -0,0 +1,1005 @@
+<?xml version="1.0" encoding="utf-8"?>
+<SequenceDesignerModel xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" xmlns:dm1="http://schemas.microsoft.com/dsltools/Kernel" xmlns:dm2="http://schemas.microsoft.com/dsltools/Component" xmlns:dm3="http://schemas.microsoft.com/dsltools/Activity" xmlns:dm4="http://schemas.microsoft.com/dsltools/UseCase" xmlns:dm5="http://schemas.microsoft.com/dsltools/Interaction" xmlns:dm6="http://schemas.microsoft.com/dsltools/UmlModelLibrary" xmlns:dm7="http://schemas.microsoft.com/dsltools/UmlDiagrams" xmlns:dm8="http://schemas.microsoft.com/dsltools/ModelStore" xmlns:dm9="http://schemas.microsoft.com/dsltools/LogicalClassDesigner" xmlns:dm10="http://schemas.microsoft.com/dsltools/SimpleShapesModel" xmlns:dm11="http://schemas.microsoft.com/dsltools/UseCaseModel" xmlns:dm12="http://schemas.microsoft.com/VisualStudio/TeamArchitect/ComponentDesigner" dslVersion="1.0.0.0" Id="8e493430-7189-4949-bf9f-ae56dd1ee314" name="Startup" linkedPackageId="cf500deb-a551-454f-833b-b9d9fbc59143" xmlns="http://schemas.microsoft.com/VisualStudio/TeamArchitect/SequenceDesigner">
+  <packagedElements>
+    <packageHasNamedElement>
+      <interaction Id="8f332d1f-11c4-498c-8c84-ce17d0f2f4fe" name="Startup" collapseFragmentsFlag="false" isActiveClass="false" isAbstract="false" isLeaf="false" isReentrant="false">
+        <elementDefinition Id="fd1a9120-d8ef-442a-a399-1e27c439ac95" />
+        <fragments>
+          <behaviorExecutionSpecification Id="46023c3f-e335-463c-98a1-f232c1bda3ab" name="BehaviorExecutionSpecification5">
+            <elementDefinition Id="576e3544-5ec6-4dd6-b8c5-fdb32d850d96" />
+            <coveredLifelines>
+              <lifelineMoniker Id="11c27c75-1ceb-4002-99b1-9aa3f5a721c9" LastKnownName=": EventPage" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="b55e933e-8e83-4fa5-a480-0a2bfe64911f" LastKnownName="ExecutionOccurrenceSpecification10" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="1fb11d36-13f2-4067-bea3-105a145025c7" LastKnownName="ExecutionOccurrenceSpecification9" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="a297cd58-4c4b-420f-8f5d-26261c975a36" LastKnownName="MessageOccurrenceSpecification12" />
+              <messageOccurrenceSpecificationMoniker Id="553f1ccc-f749-444f-972d-2f6553394154" LastKnownName="MessageOccurrenceSpecification13" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="1fb11d36-13f2-4067-bea3-105a145025c7" name="ExecutionOccurrenceSpecification9">
+            <elementDefinition Id="9f27da6c-ff5c-415a-8eb5-05a53478e2ec" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="56157ffb-4018-4636-be99-cbc482456a35" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="11c27c75-1ceb-4002-99b1-9aa3f5a721c9" LastKnownName=": EventPage" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="b3fe8db4-10f7-427a-8abf-895a471724b4" name="MessageOccurrenceSpecification11">
+            <elementDefinition Id="b043ebc1-ed44-40fc-8f94-3910436da487" />
+            <covered>
+              <lifelineMoniker Id="c1f31099-e9e5-429b-8092-bac573574aaf" LastKnownName=": App" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="a297cd58-4c4b-420f-8f5d-26261c975a36" name="MessageOccurrenceSpecification12">
+            <elementDefinition Id="ec4d7213-fc83-4431-8544-e631e0e4bc69" />
+            <covered>
+              <lifelineMoniker Id="11c27c75-1ceb-4002-99b1-9aa3f5a721c9" LastKnownName=": EventPage" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="1d933933-908e-4499-9caa-f514a1398209" name="BehaviorExecutionSpecification6">
+            <elementDefinition Id="391c9065-e70a-4d9b-8419-96012b12ac14" />
+            <coveredLifelines>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="06f6080c-86ad-4715-a244-c3916cb3de65" LastKnownName="ExecutionOccurrenceSpecification12" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="6a0df759-c49f-42b9-b695-1a8e6fcc7fda" LastKnownName="ExecutionOccurrenceSpecification11" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="c537bde7-dd92-40af-a74d-a8fe3c42c13e" LastKnownName="MessageOccurrenceSpecification14" />
+              <messageOccurrenceSpecificationMoniker Id="8ad91ec3-b10f-4780-b36a-05362fe39be1" LastKnownName="MessageOccurrenceSpecification53" />
+              <messageOccurrenceSpecificationMoniker Id="0f863eea-99ff-48aa-a2b2-4fc151ebe4d0" LastKnownName="MessageOccurrenceSpecification15" />
+              <messageOccurrenceSpecificationMoniker Id="a7e6592b-5416-4dd3-b321-2ac71a4b4d9a" LastKnownName="MessageOccurrenceSpecification18" />
+              <messageOccurrenceSpecificationMoniker Id="7c6025d1-d734-454e-ade6-4dc139a1a29f" LastKnownName="MessageOccurrenceSpecification19" />
+              <messageOccurrenceSpecificationMoniker Id="2e0b3a17-8bec-4270-94c6-99306e513829" LastKnownName="MessageOccurrenceSpecification21" />
+              <messageOccurrenceSpecificationMoniker Id="42a774e8-8c9f-4598-94aa-f45fa8ac5470" LastKnownName="MessageOccurrenceSpecification25" />
+              <messageOccurrenceSpecificationMoniker Id="ec21da50-ee08-4a58-8018-4b6a71eac2d4" LastKnownName="MessageOccurrenceSpecification27" />
+              <messageOccurrenceSpecificationMoniker Id="f9abdba5-e96b-4cfa-bd84-29556f24f363" LastKnownName="MessageOccurrenceSpecification29" />
+              <executionOccurrenceSpecificationMoniker Id="ea0ad6d4-ba22-469b-a471-ea33e70a3759" LastKnownName="ExecutionOccurrenceSpecification25" />
+              <executionOccurrenceSpecificationMoniker Id="816b0834-92a7-49de-a94a-ca1176b5da7b" LastKnownName="ExecutionOccurrenceSpecification26" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="6a0df759-c49f-42b9-b695-1a8e6fcc7fda" name="ExecutionOccurrenceSpecification11">
+            <elementDefinition Id="ce643bbb-0577-48db-a4bf-f5605a328355" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="df1d383f-17fa-4db0-8e61-4b7caed0f72f" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="553f1ccc-f749-444f-972d-2f6553394154" name="MessageOccurrenceSpecification13">
+            <elementDefinition Id="8f59dc21-04a1-4e9a-af78-d206a3da7d08" />
+            <covered>
+              <lifelineMoniker Id="11c27c75-1ceb-4002-99b1-9aa3f5a721c9" LastKnownName=": EventPage" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="c537bde7-dd92-40af-a74d-a8fe3c42c13e" name="MessageOccurrenceSpecification14">
+            <elementDefinition Id="e0982018-e26d-41ce-a40f-9e5349b45d04" />
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="62579704-a69f-4e28-98f7-2541e0b2068d" name="BehaviorExecutionSpecification21">
+            <elementDefinition Id="03b90d1c-64f5-4394-bd3c-3a6374db6f34" />
+            <coveredLifelines>
+              <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="7158b04b-99ca-4e4b-b4a3-72e42626b659" LastKnownName="ExecutionOccurrenceSpecification42" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="a6e39657-bc5c-4668-9dff-b3b1b53fff05" LastKnownName="ExecutionOccurrenceSpecification41" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="f6f47016-53d1-4fe3-afed-9b7edb55bd8a" LastKnownName="MessageOccurrenceSpecification54" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="b55e933e-8e83-4fa5-a480-0a2bfe64911f" name="ExecutionOccurrenceSpecification10">
+            <elementDefinition Id="cf03fe83-efef-4a25-b97d-fc5dc7657961" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="ec34896d-45e6-4c30-8e74-e7c495ae42b8" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="11c27c75-1ceb-4002-99b1-9aa3f5a721c9" LastKnownName=": EventPage" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="a6e39657-bc5c-4668-9dff-b3b1b53fff05" name="ExecutionOccurrenceSpecification41">
+            <elementDefinition Id="416dbb6c-d76f-41d9-a99c-c0ebb767644d" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="5afdbc8c-c5c4-405d-bd4c-a8ad06cfe121" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="f6f47016-53d1-4fe3-afed-9b7edb55bd8a" name="MessageOccurrenceSpecification54">
+            <elementDefinition Id="a7c4a87d-fcd5-4166-b712-cebb69e56314" />
+            <covered>
+              <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="8ad91ec3-b10f-4780-b36a-05362fe39be1" name="MessageOccurrenceSpecification53">
+            <elementDefinition Id="10658f6c-6c52-411e-81c5-ac1d3457ea76" />
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="e29c5cc1-58c4-41c5-9253-05f4f0054b63" name="BehaviorExecutionSpecification7">
+            <elementDefinition Id="88dbdb95-444d-4159-b196-98cbfb74027e" />
+            <coveredLifelines>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="e7921919-a9c7-4d69-be1f-67811910066c" LastKnownName="ExecutionOccurrenceSpecification14" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="533b699d-aefd-4358-acfd-5ac00fded3f1" LastKnownName="ExecutionOccurrenceSpecification13" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="b2df23b1-0e31-485b-8532-819298091880" LastKnownName="MessageOccurrenceSpecification16" />
+              <messageOccurrenceSpecificationMoniker Id="96d3f80e-89ad-4516-990b-d0e3f7399c3a" LastKnownName="MessageOccurrenceSpecification45" />
+              <messageOccurrenceSpecificationMoniker Id="6cd27433-e481-4e5c-a981-cbd29e1b6041" LastKnownName="MessageOccurrenceSpecification48" />
+              <messageOccurrenceSpecificationMoniker Id="5e5d8d64-a01a-4972-8d81-65052847b4a9" LastKnownName="MessageOccurrenceSpecification39" />
+              <messageOccurrenceSpecificationMoniker Id="189f1b7f-5fe9-4370-957b-9268bb2e54e0" LastKnownName="MessageOccurrenceSpecification42" />
+              <messageOccurrenceSpecificationMoniker Id="a604e923-9744-4f8a-bd35-e520cdb55ab3" LastKnownName="MessageOccurrenceSpecification17" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="533b699d-aefd-4358-acfd-5ac00fded3f1" name="ExecutionOccurrenceSpecification13">
+            <elementDefinition Id="7e0d953f-241b-4af8-b73a-d2d5071dc501" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="f3ae8953-409e-4d0c-98b1-7872c05bd566" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="0f863eea-99ff-48aa-a2b2-4fc151ebe4d0" name="MessageOccurrenceSpecification15">
+            <elementDefinition Id="e013feff-7d95-4702-b9a6-075ba6dc48df" />
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="b2df23b1-0e31-485b-8532-819298091880" name="MessageOccurrenceSpecification16">
+            <elementDefinition Id="cf397912-0355-40e5-91b0-c97ee2db4f6e" />
+            <covered>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="7158b04b-99ca-4e4b-b4a3-72e42626b659" name="ExecutionOccurrenceSpecification42">
+            <elementDefinition Id="39821fcc-c320-4397-a74a-7a896ffcecdf" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="0497383f-d483-4d88-b737-fb5af3ff35a7" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="5fdd1383-73de-44a0-a813-437c81b50d17" name="BehaviorExecutionSpecification19">
+            <elementDefinition Id="d4a105ec-842c-42ca-999c-4a9effb778e5" />
+            <coveredLifelines>
+              <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="81090c00-9593-4efd-889c-e81c1f8c0e6d" LastKnownName="ExecutionOccurrenceSpecification38" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="c027fbfd-36a0-49e7-a71f-7fd6261545ff" LastKnownName="ExecutionOccurrenceSpecification37" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="9dd1858e-ec49-48e2-ba73-23ef21b49f88" LastKnownName="MessageOccurrenceSpecification46" />
+              <messageOccurrenceSpecificationMoniker Id="2769634d-4dfc-4866-bf50-709920f84bd7" LastKnownName="MessageOccurrenceSpecification47" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="c027fbfd-36a0-49e7-a71f-7fd6261545ff" name="ExecutionOccurrenceSpecification37">
+            <elementDefinition Id="9191c8d5-d0cd-4be7-a23b-8a84f082d3be" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="6a90ca8e-f2b4-48c3-9d6c-995f17664902" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="9dd1858e-ec49-48e2-ba73-23ef21b49f88" name="MessageOccurrenceSpecification46">
+            <elementDefinition Id="90ee8d37-219b-465a-b657-6fd4f788fa06" />
+            <covered>
+              <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="96d3f80e-89ad-4516-990b-d0e3f7399c3a" name="MessageOccurrenceSpecification45">
+            <elementDefinition Id="9b10686a-ceb4-4459-87f0-621951f78a3d" />
+            <covered>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="2769634d-4dfc-4866-bf50-709920f84bd7" name="MessageOccurrenceSpecification47">
+            <elementDefinition Id="36b7ce07-d47e-495b-ad58-a1edc132e90e" />
+            <covered>
+              <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="6cd27433-e481-4e5c-a981-cbd29e1b6041" name="MessageOccurrenceSpecification48">
+            <elementDefinition Id="34a6fdce-1cb6-4f9a-be46-6aecb3bf1e03" />
+            <covered>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="81090c00-9593-4efd-889c-e81c1f8c0e6d" name="ExecutionOccurrenceSpecification38">
+            <elementDefinition Id="fda099bb-128e-46c3-8dd3-aa8014a0b58b" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="419121ea-c739-413e-84e6-4211a32f80af" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="3cddabc8-f44a-40c3-8966-1e947100d00c" name="BehaviorExecutionSpecification17">
+            <elementDefinition Id="58a9616a-c3da-42ce-ae97-9db9ef0df198" />
+            <coveredLifelines>
+              <lifelineMoniker Id="c21d9bbd-79be-4b96-baf6-a736ca8a2ed3" LastKnownName="PersistencyServices" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="84fd154f-d076-46b0-98e0-c6bf1cc86d0f" LastKnownName="ExecutionOccurrenceSpecification34" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="6622c8ae-11f4-45ca-83dd-a341297a4082" LastKnownName="ExecutionOccurrenceSpecification33" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="7c89ff69-04a5-45e1-8678-e1a9fb502891" LastKnownName="MessageOccurrenceSpecification40" />
+              <messageOccurrenceSpecificationMoniker Id="95206370-0210-42bb-bb64-e00595bd78d4" LastKnownName="MessageOccurrenceSpecification41" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="6622c8ae-11f4-45ca-83dd-a341297a4082" name="ExecutionOccurrenceSpecification33">
+            <elementDefinition Id="cc1b7b86-c746-458a-bd5b-29a60d95fe32" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="ece9d210-0760-4a1d-bfb5-3237fed2bacc" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="c21d9bbd-79be-4b96-baf6-a736ca8a2ed3" LastKnownName="PersistencyServices" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="5e5d8d64-a01a-4972-8d81-65052847b4a9" name="MessageOccurrenceSpecification39">
+            <elementDefinition Id="5c304523-658e-4773-801e-924a38cf542d" />
+            <covered>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="7c89ff69-04a5-45e1-8678-e1a9fb502891" name="MessageOccurrenceSpecification40">
+            <elementDefinition Id="6984fb15-c81e-41ea-9afb-594ba6ed5515" />
+            <covered>
+              <lifelineMoniker Id="c21d9bbd-79be-4b96-baf6-a736ca8a2ed3" LastKnownName="PersistencyServices" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="189f1b7f-5fe9-4370-957b-9268bb2e54e0" name="MessageOccurrenceSpecification42">
+            <elementDefinition Id="2f068aad-bac6-4ac4-88e9-9e501264d519" />
+            <covered>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="95206370-0210-42bb-bb64-e00595bd78d4" name="MessageOccurrenceSpecification41">
+            <elementDefinition Id="f7553df7-75e8-430c-8bbd-cf104ceb75f9" />
+            <covered>
+              <lifelineMoniker Id="c21d9bbd-79be-4b96-baf6-a736ca8a2ed3" LastKnownName="PersistencyServices" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="84fd154f-d076-46b0-98e0-c6bf1cc86d0f" name="ExecutionOccurrenceSpecification34">
+            <elementDefinition Id="4ac0dbbe-9357-443d-afb9-b9dfe2f4d004" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="570fb3ec-737b-4a61-bb85-670839d84fc9" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="c21d9bbd-79be-4b96-baf6-a736ca8a2ed3" LastKnownName="PersistencyServices" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="a7e6592b-5416-4dd3-b321-2ac71a4b4d9a" name="MessageOccurrenceSpecification18">
+            <elementDefinition Id="a4c98e9b-17c3-47f2-886f-dbee20ff2390" />
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="a604e923-9744-4f8a-bd35-e520cdb55ab3" name="MessageOccurrenceSpecification17">
+            <elementDefinition Id="8c0baeb3-6ade-44b3-81f7-ca83035a0f05" />
+            <covered>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="e7921919-a9c7-4d69-be1f-67811910066c" name="ExecutionOccurrenceSpecification14">
+            <elementDefinition Id="c5e2c00e-fcc5-4520-9681-53adaa494893" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="8a1510b7-2158-4c66-ac01-15d8911753c9" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="861099e9-f8a5-472b-83ea-6d1815c643f3" name="BehaviorExecutionSpecification8">
+            <elementDefinition Id="a6a50e60-f82f-4f45-a6fd-3f2d28e57338" />
+            <coveredLifelines>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="ea886110-e2bb-40c4-bfe8-f452006214da" LastKnownName="ExecutionOccurrenceSpecification16" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="582b93b5-514c-4755-b3e7-aa970e99de27" LastKnownName="ExecutionOccurrenceSpecification15" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="e4ba528a-8e58-4b37-b9e0-79d7c1eefe25" LastKnownName="MessageOccurrenceSpecification20" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="582b93b5-514c-4755-b3e7-aa970e99de27" name="ExecutionOccurrenceSpecification15">
+            <elementDefinition Id="9340d729-29fd-4eaf-b9d6-1e2cdd2ab49d" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="efe81bd0-521c-4efc-b056-b91a373f222f" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="7c6025d1-d734-454e-ade6-4dc139a1a29f" name="MessageOccurrenceSpecification19">
+            <elementDefinition Id="70c19d93-9317-4fbe-9654-be4a8ef84fb7" />
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="e4ba528a-8e58-4b37-b9e0-79d7c1eefe25" name="MessageOccurrenceSpecification20">
+            <elementDefinition Id="e368d694-b385-407f-b558-455f0ce64fd2" />
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="ea886110-e2bb-40c4-bfe8-f452006214da" name="ExecutionOccurrenceSpecification16">
+            <elementDefinition Id="fa8ff8f2-668c-463b-b34a-8c3fac8c9921" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="678314e6-1584-49fb-bfa0-8b74609632c0" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="709c8b71-af85-43ec-939d-021c58f61cc2" name="BehaviorExecutionSpecification9">
+            <elementDefinition Id="947c5e4f-d13b-4d7d-8e6b-c0c5af012b68" />
+            <coveredLifelines>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="1011fccf-97a1-434a-8ba8-5283fc872d81" LastKnownName="ExecutionOccurrenceSpecification18" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="011d70a5-85cc-47ca-9986-b6c5d9fa1acb" LastKnownName="ExecutionOccurrenceSpecification17" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="d1b074d8-77bc-43e0-a083-54b2e711c287" LastKnownName="MessageOccurrenceSpecification22" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="011d70a5-85cc-47ca-9986-b6c5d9fa1acb" name="ExecutionOccurrenceSpecification17">
+            <elementDefinition Id="d07e038f-02f1-4bb4-b055-99a46cff9cbf" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="655afa71-1015-41cc-99c3-bcd097dcc8bb" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="2e0b3a17-8bec-4270-94c6-99306e513829" name="MessageOccurrenceSpecification21">
+            <elementDefinition Id="8f588f6b-7c26-4a04-8595-cd7bd15f996b" />
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="d1b074d8-77bc-43e0-a083-54b2e711c287" name="MessageOccurrenceSpecification22">
+            <elementDefinition Id="dd0c0ca9-93c2-4cc8-9c44-8661362a7e78" />
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="1011fccf-97a1-434a-8ba8-5283fc872d81" name="ExecutionOccurrenceSpecification18">
+            <elementDefinition Id="9adcf377-970c-4493-ae2a-e1c867247f4c" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="fb3d802e-6141-4f56-b80b-2a1fb3f2eeae" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="68acd92a-4742-4352-8ff8-2953df5cc2c1" name="BehaviorExecutionSpecification11">
+            <elementDefinition Id="b062a6b9-f234-4ab1-b8f4-e01be3346c23" />
+            <coveredLifelines>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="cdf1e305-e7d5-4451-9a9f-75f43b0f8922" LastKnownName="ExecutionOccurrenceSpecification22" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="1ed928ee-dab1-4e96-9379-83ceef69adcb" LastKnownName="ExecutionOccurrenceSpecification21" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="098a5c15-ae84-491e-b054-88ad7b2bfe92" LastKnownName="MessageOccurrenceSpecification26" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="1ed928ee-dab1-4e96-9379-83ceef69adcb" name="ExecutionOccurrenceSpecification21">
+            <elementDefinition Id="3244add3-5f99-43be-bfd2-5e0fcf9a8969" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="6d15ed10-c25e-4c99-b134-ce28e580aced" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="42a774e8-8c9f-4598-94aa-f45fa8ac5470" name="MessageOccurrenceSpecification25">
+            <elementDefinition Id="e3e16227-893e-47b2-b6cc-73d53d3d8a34" />
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="098a5c15-ae84-491e-b054-88ad7b2bfe92" name="MessageOccurrenceSpecification26">
+            <elementDefinition Id="16204710-4828-4cf2-b8be-8206f9f97d34" />
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="cdf1e305-e7d5-4451-9a9f-75f43b0f8922" name="ExecutionOccurrenceSpecification22">
+            <elementDefinition Id="9755df8b-0c89-478d-8c0c-b20fff47c9a1" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="6bb7b480-1303-46cd-8eda-3e429dbdc0be" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="19fa6817-3f80-4c76-8f0e-8b465b5e17e3" name="BehaviorExecutionSpecification12">
+            <elementDefinition Id="96fb5005-9729-47d7-8d32-40230cdee19c" />
+            <coveredLifelines>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="e9ea4b3e-4c82-4a49-83de-a5f15490947f" LastKnownName="ExecutionOccurrenceSpecification24" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="3308d230-9988-4aee-b228-396cf2677307" LastKnownName="ExecutionOccurrenceSpecification23" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="1412408c-2bac-41f9-a8fa-24b25b6a3c34" LastKnownName="MessageOccurrenceSpecification28" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="3308d230-9988-4aee-b228-396cf2677307" name="ExecutionOccurrenceSpecification23">
+            <elementDefinition Id="3bfde75b-7d35-487a-82e5-8f293429d3be" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="0fb36480-e6c3-4fd3-9bf7-3c9a41864253" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="ec21da50-ee08-4a58-8018-4b6a71eac2d4" name="MessageOccurrenceSpecification27">
+            <elementDefinition Id="f5bf7ffb-cbb7-426b-af19-14aa90a04fc1" />
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="1412408c-2bac-41f9-a8fa-24b25b6a3c34" name="MessageOccurrenceSpecification28">
+            <elementDefinition Id="0a08b001-e753-4802-b2b3-379b1a98e653" />
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="f9abdba5-e96b-4cfa-bd84-29556f24f363" name="MessageOccurrenceSpecification29">
+            <elementDefinition Id="ba307281-77ac-4f5e-b0fc-baae92379f44" />
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="19e743e2-673d-484e-89ef-44baeb86ed23" name="BehaviorExecutionSpecification13">
+            <elementDefinition Id="cb5b58db-2950-4156-9a00-20ecc2c31011" />
+            <coveredLifelines>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="816b0834-92a7-49de-a94a-ca1176b5da7b" LastKnownName="ExecutionOccurrenceSpecification26" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="ea0ad6d4-ba22-469b-a471-ea33e70a3759" LastKnownName="ExecutionOccurrenceSpecification25" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="1e068a1a-731f-4dbf-88ba-d6c754c22a62" LastKnownName="MessageOccurrenceSpecification30" />
+              <messageOccurrenceSpecificationMoniker Id="6069e6f0-9d6e-47ff-93b5-b062e1333944" LastKnownName="MessageOccurrenceSpecification33" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="ea0ad6d4-ba22-469b-a471-ea33e70a3759" name="ExecutionOccurrenceSpecification25">
+            <elementDefinition Id="509937de-c571-4db7-95d2-246c6f3656d6" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="23340e1a-2149-41fb-9977-81bd0f75882a" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="e9ea4b3e-4c82-4a49-83de-a5f15490947f" name="ExecutionOccurrenceSpecification24">
+            <elementDefinition Id="534d0ef4-7b80-49ab-b654-f4eff8c62ba9" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="557f18a6-264d-44c7-9b24-1a8cd11b5f00" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="1e068a1a-731f-4dbf-88ba-d6c754c22a62" name="MessageOccurrenceSpecification30">
+            <elementDefinition Id="ab6093c1-5c39-4e78-81fb-19f434ca22ff" />
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <behaviorExecutionSpecification Id="89572f24-ee1d-4a8c-8137-176fd05708dc" name="BehaviorExecutionSpecification15">
+            <elementDefinition Id="5fe69533-61fe-45af-95a3-0b166bee0cb2" />
+            <coveredLifelines>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </coveredLifelines>
+            <finish>
+              <executionOccurrenceSpecificationMoniker Id="59fb93cf-24b5-4a20-9f1e-ce5183c7ae7a" LastKnownName="ExecutionOccurrenceSpecification30" />
+            </finish>
+            <start>
+              <executionOccurrenceSpecificationMoniker Id="efe62181-6a96-4733-91ca-0a423fcff1c2" LastKnownName="ExecutionOccurrenceSpecification29" />
+            </start>
+            <nestedOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="dc8ed62c-24b4-4adb-a09e-1af219bc1fe6" LastKnownName="MessageOccurrenceSpecification34" />
+            </nestedOccurrences>
+          </behaviorExecutionSpecification>
+          <executionOccurrenceSpecification Id="efe62181-6a96-4733-91ca-0a423fcff1c2" name="ExecutionOccurrenceSpecification29">
+            <elementDefinition Id="cc528b32-a039-4ea5-949a-345ab66ab867" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="73af496b-c635-4d70-81a1-dab34e8516b2" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="dc8ed62c-24b4-4adb-a09e-1af219bc1fe6" name="MessageOccurrenceSpecification34">
+            <elementDefinition Id="3e30e664-8170-4208-8487-451466835bcd" />
+            <covered>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <messageOccurrenceSpecification Id="6069e6f0-9d6e-47ff-93b5-b062e1333944" name="MessageOccurrenceSpecification33">
+            <elementDefinition Id="5d1b4356-4466-4e65-a2ae-9d2bc2ba6149" />
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </messageOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="816b0834-92a7-49de-a94a-ca1176b5da7b" name="ExecutionOccurrenceSpecification26">
+            <elementDefinition Id="689357f8-ac4e-496f-8362-6971c8819790" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="4ef1ab5a-49a1-453f-bcdb-0df30b54871d" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="59fb93cf-24b5-4a20-9f1e-ce5183c7ae7a" name="ExecutionOccurrenceSpecification30">
+            <elementDefinition Id="9fd72aa4-892b-4312-ad2b-c4ecf9bd89de" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="41deadc1-8de7-490c-baa2-4844dbd587c8" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+            </covered>
+          </executionOccurrenceSpecification>
+          <executionOccurrenceSpecification Id="06f6080c-86ad-4715-a244-c3916cb3de65" name="ExecutionOccurrenceSpecification12">
+            <elementDefinition Id="bcbdf04d-f3fe-41ce-bcb7-017b738f707a" />
+            <event>
+              <executionOccurrenceSpecificationReferencesEvent>
+                <executionEventMoniker Id="4a25b6fd-c8d0-4cb4-ad44-609f27a62336" LastKnownName="ExecutionEvent" />
+              </executionOccurrenceSpecificationReferencesEvent>
+            </event>
+            <covered>
+              <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+            </covered>
+          </executionOccurrenceSpecification>
+        </fragments>
+        <lifelines>
+          <lifeline Id="c1f31099-e9e5-429b-8092-bac573574aaf" name=": App" isActor="false" lifelineDisplayName=": App">
+            <elementDefinition Id="5232fe88-372b-4aac-a9f4-06803326d597" />
+            <represents>
+              <propertyMoniker Id="9f4aca99-6140-4a1b-a765-7c35a4cbc9e2" />
+            </represents>
+            <topLevelOccurrences>
+              <messageOccurrenceSpecificationMoniker Id="b3fe8db4-10f7-427a-8abf-895a471724b4" LastKnownName="MessageOccurrenceSpecification11" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline Id="11c27c75-1ceb-4002-99b1-9aa3f5a721c9" name=": EventPage" isActor="false" lifelineDisplayName=": EventPage">
+            <elementDefinition Id="7f300083-2a71-4894-b6bc-bf38d5c7a353" />
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker Id="1fb11d36-13f2-4067-bea3-105a145025c7" LastKnownName="ExecutionOccurrenceSpecification9" />
+              <executionOccurrenceSpecificationMoniker Id="b55e933e-8e83-4fa5-a480-0a2bfe64911f" LastKnownName="ExecutionOccurrenceSpecification10" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" name=": EventViewModel" isActor="false" lifelineDisplayName=": EventViewModel">
+            <elementDefinition Id="5064993b-fe0c-45a0-80c1-e3ad67ad0d48" />
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker Id="6a0df759-c49f-42b9-b695-1a8e6fcc7fda" LastKnownName="ExecutionOccurrenceSpecification11" />
+              <executionOccurrenceSpecificationMoniker Id="06f6080c-86ad-4715-a244-c3916cb3de65" LastKnownName="ExecutionOccurrenceSpecification12" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" name=": RelayCommand" isActor="false" lifelineDisplayName=": RelayCommand">
+            <elementDefinition Id="47a380ef-e346-4b7b-ae00-f74e0c6c66e5" />
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker Id="582b93b5-514c-4755-b3e7-aa970e99de27" LastKnownName="ExecutionOccurrenceSpecification15" />
+              <executionOccurrenceSpecificationMoniker Id="ea886110-e2bb-40c4-bfe8-f452006214da" LastKnownName="ExecutionOccurrenceSpecification16" />
+              <executionOccurrenceSpecificationMoniker Id="011d70a5-85cc-47ca-9986-b6c5d9fa1acb" LastKnownName="ExecutionOccurrenceSpecification17" />
+              <executionOccurrenceSpecificationMoniker Id="1011fccf-97a1-434a-8ba8-5283fc872d81" LastKnownName="ExecutionOccurrenceSpecification18" />
+              <executionOccurrenceSpecificationMoniker Id="1ed928ee-dab1-4e96-9379-83ceef69adcb" LastKnownName="ExecutionOccurrenceSpecification21" />
+              <executionOccurrenceSpecificationMoniker Id="cdf1e305-e7d5-4451-9a9f-75f43b0f8922" LastKnownName="ExecutionOccurrenceSpecification22" />
+              <executionOccurrenceSpecificationMoniker Id="3308d230-9988-4aee-b228-396cf2677307" LastKnownName="ExecutionOccurrenceSpecification23" />
+              <executionOccurrenceSpecificationMoniker Id="e9ea4b3e-4c82-4a49-83de-a5f15490947f" LastKnownName="ExecutionOccurrenceSpecification24" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" name="EventCatalogSingleton" isActor="false" lifelineDisplayName="EventCatalogSingleton">
+            <elementDefinition Id="75afad69-9e2e-44b0-8ed9-5e77b2faa6cd" />
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker Id="533b699d-aefd-4358-acfd-5ac00fded3f1" LastKnownName="ExecutionOccurrenceSpecification13" />
+              <executionOccurrenceSpecificationMoniker Id="e7921919-a9c7-4d69-be1f-67811910066c" LastKnownName="ExecutionOccurrenceSpecification14" />
+              <executionOccurrenceSpecificationMoniker Id="efe62181-6a96-4733-91ca-0a423fcff1c2" LastKnownName="ExecutionOccurrenceSpecification29" />
+              <executionOccurrenceSpecificationMoniker Id="59fb93cf-24b5-4a20-9f1e-ce5183c7ae7a" LastKnownName="ExecutionOccurrenceSpecification30" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" name=": Event" isActor="false" lifelineDisplayName=": Event">
+            <elementDefinition Id="da17d610-0a02-4391-8de7-6e381a7c86ac" />
+            <represents>
+              <propertyMoniker Id="245bebc4-e231-4912-ba9d-e834bc0dc980" />
+            </represents>
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker Id="a6e39657-bc5c-4668-9dff-b3b1b53fff05" LastKnownName="ExecutionOccurrenceSpecification41" />
+              <executionOccurrenceSpecificationMoniker Id="7158b04b-99ca-4e4b-b4a3-72e42626b659" LastKnownName="ExecutionOccurrenceSpecification42" />
+              <executionOccurrenceSpecificationMoniker Id="c027fbfd-36a0-49e7-a71f-7fd6261545ff" LastKnownName="ExecutionOccurrenceSpecification37" />
+              <executionOccurrenceSpecificationMoniker Id="81090c00-9593-4efd-889c-e81c1f8c0e6d" LastKnownName="ExecutionOccurrenceSpecification38" />
+            </topLevelOccurrences>
+          </lifeline>
+          <lifeline Id="c21d9bbd-79be-4b96-baf6-a736ca8a2ed3" name="PersistencyServices" isActor="false" lifelineDisplayName="PersistencyServices">
+            <elementDefinition Id="f544c024-6acd-464b-a604-ebe2bd80d7bf" />
+            <topLevelOccurrences>
+              <executionOccurrenceSpecificationMoniker Id="6622c8ae-11f4-45ca-83dd-a341297a4082" LastKnownName="ExecutionOccurrenceSpecification33" />
+              <executionOccurrenceSpecificationMoniker Id="84fd154f-d076-46b0-98e0-c6bf1cc86d0f" LastKnownName="ExecutionOccurrenceSpecification34" />
+            </topLevelOccurrences>
+          </lifeline>
+        </lifelines>
+        <messages>
+          <message Id="be8a0e05-ca86-4625-96ae-a6a23665de02" name="Frame.Navigate" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
+            <elementDefinition Id="90e767cc-c1da-47db-80e2-3c85608d6aba" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="b3fe8db4-10f7-427a-8abf-895a471724b4" LastKnownName="MessageOccurrenceSpecification11" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="a297cd58-4c4b-420f-8f5d-26261c975a36" LastKnownName="MessageOccurrenceSpecification12" />
+            </receiveEvent>
+          </message>
+          <message Id="8dba20f0-2e77-431b-9f12-1b3b00551b19" name="DataContext" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
+            <elementDefinition Id="5de74dbd-1cfd-443a-95b0-d4c218242d08" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="553f1ccc-f749-444f-972d-2f6553394154" LastKnownName="MessageOccurrenceSpecification13" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="c537bde7-dd92-40af-a74d-a8fe3c42c13e" LastKnownName="MessageOccurrenceSpecification14" />
+            </receiveEvent>
+          </message>
+          <message Id="6cc29d21-455d-4ef7-8f0c-28b95505fa40" name="EventTemplate=new Event" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
+            <elementDefinition Id="6f2dbe07-9255-4caf-98a9-8e95c6a51a58" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="8ad91ec3-b10f-4780-b36a-05362fe39be1" LastKnownName="MessageOccurrenceSpecification53" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="f6f47016-53d1-4fe3-afed-9b7edb55bd8a" LastKnownName="MessageOccurrenceSpecification54" />
+            </receiveEvent>
+          </message>
+          <message Id="2f2e6c53-9820-46ac-80e0-8d0c7619b382" name="EventCatalogSingleton = EventCatalogSingleton.Instance" messageKind="Complete" messageSort="SynchCall" createSelfMessage="false">
+            <elementDefinition Id="75b71202-4c73-48ac-aa57-2430327d1622" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="0f863eea-99ff-48aa-a2b2-4fc151ebe4d0" LastKnownName="MessageOccurrenceSpecification15" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="b2df23b1-0e31-485b-8532-819298091880" LastKnownName="MessageOccurrenceSpecification16" />
+            </receiveEvent>
+          </message>
+          <message Id="ff89d31f-9650-4dc7-b696-b3c4c572be5b" name="Events=new ObservableCollection&lt;Event&gt;" messageKind="Complete" messageSort="SynchCall" createSelfMessage="false">
+            <elementDefinition Id="aab73109-f2e6-4b01-95fd-60225cd1cf13" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="96d3f80e-89ad-4516-990b-d0e3f7399c3a" LastKnownName="MessageOccurrenceSpecification45" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="9dd1858e-ec49-48e2-ba73-23ef21b49f88" LastKnownName="MessageOccurrenceSpecification46" />
+            </receiveEvent>
+          </message>
+          <message Id="f50238f2-f682-4cf0-86a1-d84bf27808f2" name=":Event" messageKind="Complete" messageSort="Reply" createSelfMessage="false">
+            <elementDefinition Id="0033e49a-852d-4224-af5d-a2f112585edf" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="2769634d-4dfc-4866-bf50-709920f84bd7" LastKnownName="MessageOccurrenceSpecification47" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="6cd27433-e481-4e5c-a981-cbd29e1b6041" LastKnownName="MessageOccurrenceSpecification48" />
+            </receiveEvent>
+          </message>
+          <message Id="69a184ee-53ac-44ac-9726-d8946550a59c" name="LoadEventsAsync" messageKind="Complete" messageSort="SynchCall" createSelfMessage="false">
+            <elementDefinition Id="f30eed37-0e86-49da-b27b-ba3ccbe7652b" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="5e5d8d64-a01a-4972-8d81-65052847b4a9" LastKnownName="MessageOccurrenceSpecification39" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="7c89ff69-04a5-45e1-8678-e1a9fb502891" LastKnownName="MessageOccurrenceSpecification40" />
+            </receiveEvent>
+          </message>
+          <message Id="ee7016f3-647c-4216-935f-1d3719f132f1" name="Events = LoadEventsFromJsonAsync" messageKind="Complete" messageSort="Reply" createSelfMessage="false">
+            <elementDefinition Id="2676c067-7303-4709-8cc4-3af34a486a6c" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="95206370-0210-42bb-bb64-e00595bd78d4" LastKnownName="MessageOccurrenceSpecification41" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="189f1b7f-5fe9-4370-957b-9268bb2e54e0" LastKnownName="MessageOccurrenceSpecification42" />
+            </receiveEvent>
+          </message>
+          <message Id="d4a34ba6-7255-41fe-bcea-29efbd4caee7" name="Instance" messageKind="Complete" messageSort="Reply" createSelfMessage="false">
+            <elementDefinition Id="65420380-a658-46b9-96e3-f937d587b178" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="a604e923-9744-4f8a-bd35-e520cdb55ab3" LastKnownName="MessageOccurrenceSpecification17" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="a7e6592b-5416-4dd3-b321-2ac71a4b4d9a" LastKnownName="MessageOccurrenceSpecification18" />
+            </receiveEvent>
+          </message>
+          <message Id="d86e4d2f-ab86-4a65-b60e-0a54aadd2d7d" name="CreateEventCommand=new RelayCommand" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
+            <elementDefinition Id="3a7f754d-71dd-4361-aece-2b0b9c40a3a3" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="7c6025d1-d734-454e-ade6-4dc139a1a29f" LastKnownName="MessageOccurrenceSpecification19" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="e4ba528a-8e58-4b37-b9e0-79d7c1eefe25" LastKnownName="MessageOccurrenceSpecification20" />
+            </receiveEvent>
+          </message>
+          <message Id="344fc381-0a1c-4002-86da-33f26c01ec7b" name="RemoveEventCommand=new RelayCommand" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
+            <elementDefinition Id="5310bf9c-8f14-4878-b7e6-04c0e26b29da" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="2e0b3a17-8bec-4270-94c6-99306e513829" LastKnownName="MessageOccurrenceSpecification21" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="d1b074d8-77bc-43e0-a083-54b2e711c287" LastKnownName="MessageOccurrenceSpecification22" />
+            </receiveEvent>
+          </message>
+          <message Id="13d9a234-b8c1-4caa-b5a6-16dbb6ce5be3" name="LoadEventCommand=new RelayCommand" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
+            <elementDefinition Id="2a7e12c2-43eb-4275-a77d-1758ea9b7723" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="42a774e8-8c9f-4598-94aa-f45fa8ac5470" LastKnownName="MessageOccurrenceSpecification25" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="098a5c15-ae84-491e-b054-88ad7b2bfe92" LastKnownName="MessageOccurrenceSpecification26" />
+            </receiveEvent>
+          </message>
+          <message Id="96158c5f-c425-4ed6-862b-ce6b6478cd16" name="CleanTemplateCommand=new RelayCommand" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
+            <elementDefinition Id="4857a12d-f849-48e2-a989-167119614260" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="ec21da50-ee08-4a58-8018-4b6a71eac2d4" LastKnownName="MessageOccurrenceSpecification27" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="1412408c-2bac-41f9-a8fa-24b25b6a3c34" LastKnownName="MessageOccurrenceSpecification28" />
+            </receiveEvent>
+          </message>
+          <message Id="9111cee7-7b44-4d16-ac5a-32a2c8cdb32c" name="SortEvents" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="true">
+            <elementDefinition Id="95d50dbe-20a7-436c-a5b4-a7c740212632" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="f9abdba5-e96b-4cfa-bd84-29556f24f363" LastKnownName="MessageOccurrenceSpecification29" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="1e068a1a-731f-4dbf-88ba-d6c754c22a62" LastKnownName="MessageOccurrenceSpecification30" />
+            </receiveEvent>
+          </message>
+          <message Id="be33f073-f344-4138-92c6-cc5877759957" name="Sort(sortValue)" messageKind="Complete" messageSort="AsynchCall" createSelfMessage="false">
+            <elementDefinition Id="51d0aaae-0900-4b49-9323-51e3a402b283" />
+            <sendEvent>
+              <messageOccurrenceSpecificationMoniker Id="6069e6f0-9d6e-47ff-93b5-b062e1333944" LastKnownName="MessageOccurrenceSpecification33" />
+            </sendEvent>
+            <receiveEvent>
+              <messageOccurrenceSpecificationMoniker Id="dc8ed62c-24b4-4adb-a09e-1af219bc1fe6" LastKnownName="MessageOccurrenceSpecification34" />
+            </receiveEvent>
+          </message>
+        </messages>
+        <ownedAttributesInternal>
+          <property Id="9f4aca99-6140-4a1b-a765-7c35a4cbc9e2" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
+            <elementDefinition Id="1a2ad4f1-e008-4234-8b75-2ca9955a47c8" />
+            <type_NamedElement>
+              <referencedTypeMoniker Id="823b3742-1499-4398-8f2a-f01c11412521" LastKnownName="App" />
+            </type_NamedElement>
+          </property>
+          <property Id="245bebc4-e231-4912-ba9d-e834bc0dc980" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
+            <elementDefinition Id="65b51b9f-2373-4f50-af8e-4d0c0a3a8f37" />
+            <type_NamedElement>
+              <referencedTypeMoniker Id="14592e39-1302-4fca-bc3d-832094c25c18" LastKnownName="Event" />
+            </type_NamedElement>
+          </property>
+        </ownedAttributesInternal>
+      </interaction>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <referencedType Id="823b3742-1499-4398-8f2a-f01c11412521" name="App" isAbstract="false" isLeaf="false" cachedFullName="Design::App">
+        <elementDefinition Id="76fee8c1-e516-4ce6-8fec-7b707a51576a" />
+      </referencedType>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="56157ffb-4018-4636-be99-cbc482456a35" name="ExecutionEvent">
+        <elementDefinition Id="5a79b033-ad41-4073-8daf-b39c34d6d5b5" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="ec34896d-45e6-4c30-8e74-e7c495ae42b8" name="ExecutionEvent">
+        <elementDefinition Id="3e7a0d24-4ae8-4809-8326-3dab7b4e9e6e" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="df1d383f-17fa-4db0-8e61-4b7caed0f72f" name="ExecutionEvent">
+        <elementDefinition Id="7dd65baf-6f08-4e59-8a72-ad77900ff249" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="4a25b6fd-c8d0-4cb4-ad44-609f27a62336" name="ExecutionEvent">
+        <elementDefinition Id="13a78bb4-1f13-40f1-9634-416d9475f4a1" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="f3ae8953-409e-4d0c-98b1-7872c05bd566" name="ExecutionEvent">
+        <elementDefinition Id="ff22f4b9-bcbc-4985-9055-53ebf3c3fe0a" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="8a1510b7-2158-4c66-ac01-15d8911753c9" name="ExecutionEvent">
+        <elementDefinition Id="76bda587-d65c-4746-8a10-521a678bb5ce" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="efe81bd0-521c-4efc-b056-b91a373f222f" name="ExecutionEvent">
+        <elementDefinition Id="4ec2f070-4e45-4ac8-8c14-33340782bba3" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="678314e6-1584-49fb-bfa0-8b74609632c0" name="ExecutionEvent">
+        <elementDefinition Id="3d2ea6fe-5364-4279-86f9-cd581f29e73d" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="655afa71-1015-41cc-99c3-bcd097dcc8bb" name="ExecutionEvent">
+        <elementDefinition Id="7bc235fe-f5ef-4d6a-9610-725d57597c92" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="fb3d802e-6141-4f56-b80b-2a1fb3f2eeae" name="ExecutionEvent">
+        <elementDefinition Id="94596f5f-f71c-4490-b04b-49034e96b40d" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="6d15ed10-c25e-4c99-b134-ce28e580aced" name="ExecutionEvent">
+        <elementDefinition Id="cf0eb3e5-4354-4cb3-9ed7-1177dcd56080" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="6bb7b480-1303-46cd-8eda-3e429dbdc0be" name="ExecutionEvent">
+        <elementDefinition Id="88742291-b39b-4b3c-b498-2c32dcff8559" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="0fb36480-e6c3-4fd3-9bf7-3c9a41864253" name="ExecutionEvent">
+        <elementDefinition Id="21ee6095-fc3a-4ad4-8ee1-42ce2d2a3d0e" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="557f18a6-264d-44c7-9b24-1a8cd11b5f00" name="ExecutionEvent">
+        <elementDefinition Id="c569ec74-3bdd-40fc-9a37-32a404427f9e" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="23340e1a-2149-41fb-9977-81bd0f75882a" name="ExecutionEvent">
+        <elementDefinition Id="8e814ac9-a362-4c8e-85c3-990f50b4d559" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="4ef1ab5a-49a1-453f-bcdb-0df30b54871d" name="ExecutionEvent">
+        <elementDefinition Id="d28c5b44-04bf-4c23-a2d6-f5822a75150e" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="73af496b-c635-4d70-81a1-dab34e8516b2" name="ExecutionEvent">
+        <elementDefinition Id="63b9e5fa-bce6-4e00-95bf-fdfc5acc0fcc" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="41deadc1-8de7-490c-baa2-4844dbd587c8" name="ExecutionEvent">
+        <elementDefinition Id="c4c42344-934c-45ff-8d8c-1dadff916359" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="ece9d210-0760-4a1d-bfb5-3237fed2bacc" name="ExecutionEvent">
+        <elementDefinition Id="2f7ef229-e0c9-47af-8393-6b77a73037f0" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="570fb3ec-737b-4a61-bb85-670839d84fc9" name="ExecutionEvent">
+        <elementDefinition Id="90b985ef-6490-4c6f-9b6d-c148bc2dca44" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <referencedType Id="14592e39-1302-4fca-bc3d-832094c25c18" name="Event" isAbstract="false" isLeaf="false" cachedFullName="Design::Event">
+        <elementDefinition Id="760f646f-837b-4a99-aa04-8b3e628b4189" />
+      </referencedType>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="6a90ca8e-f2b4-48c3-9d6c-995f17664902" name="ExecutionEvent">
+        <elementDefinition Id="7a2fd8e3-b5ad-4694-b2b5-d8ce0f7ffe10" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="419121ea-c739-413e-84e6-4211a32f80af" name="ExecutionEvent">
+        <elementDefinition Id="5108396a-37e5-49c7-8796-0a02f7edddcd" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="5afdbc8c-c5c4-405d-bd4c-a8ad06cfe121" name="ExecutionEvent">
+        <elementDefinition Id="dcc10ef8-e031-4af7-8a54-612b3dc9cde8" />
+      </executionEvent>
+    </packageHasNamedElement>
+    <packageHasNamedElement>
+      <executionEvent Id="0497383f-d483-4d88-b737-fb5af3ff35a7" name="ExecutionEvent">
+        <elementDefinition Id="6892449b-0f07-4224-8d5f-0cbe62fe6623" />
+      </executionEvent>
+    </packageHasNamedElement>
+  </packagedElements>
+  <package Id="cf500deb-a551-454f-833b-b9d9fbc59143" name="Design">
+    <elementDefinition Id="1bc1064b-b630-4768-9d3b-c772ca559686" />
+  </package>
+</SequenceDesignerModel>
\ No newline at end of file
diff --git a/EventMaker/Design/Startup.sequencediagram.layout b/EventMaker/Design/Startup.sequencediagram.layout
new file mode 100644
index 0000000..729a121
--- /dev/null
+++ b/EventMaker/Design/Startup.sequencediagram.layout
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sequenceDesignerDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 12.75, 9.625" name="Startup">
+  <SequenceDesignerModelMoniker Id="8e493430-7189-4949-bf9f-ae56dd1ee314" />
+  <nestedChildShapes>
+    <lifelineShape Id="38258250-6501-4cea-b2ee-783b608a7950" absoluteBounds="1.025, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
+      <lifelineMoniker Id="c1f31099-e9e5-429b-8092-bac573574aaf" LastKnownName=": App" />
+      <relativeChildShapes>
+        <umlLifelineHeadShape Id="07bfea9e-dac9-40d5-b58b-2e11b7972ee3" absoluteBounds="0.59999999999999987, 0.6, 1, 0.4" customColor="White" visualStyleMode="Modified">
+          <lifelineMoniker Id="c1f31099-e9e5-429b-8092-bac573574aaf" LastKnownName=": App" />
+          <relativeChildShapes />
+        </umlLifelineHeadShape>
+        <lifelineHoverShape Id="df0beab7-e040-411e-9857-d523fb4a4580" absoluteBounds="1.025, 1, 0, 7">
+          <lifelineMoniker Id="c1f31099-e9e5-429b-8092-bac573574aaf" LastKnownName=": App" />
+        </lifelineHoverShape>
+      </relativeChildShapes>
+    </lifelineShape>
+    <lifelineShape Id="6ff35453-5e28-423d-a6d9-ca832ccb6c6c" absoluteBounds="2.20937509682029, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
+      <lifelineMoniker Id="11c27c75-1ceb-4002-99b1-9aa3f5a721c9" LastKnownName=": EventPage" />
+      <relativeChildShapes>
+        <umlLifelineHeadShape Id="3e1fd6f5-02fc-4f11-a1f8-b4d52085ea90" absoluteBounds="1.78437509682029, 0.6, 1, 0.4" customColor="White" visualStyleMode="Modified">
+          <lifelineMoniker Id="11c27c75-1ceb-4002-99b1-9aa3f5a721c9" LastKnownName=": EventPage" />
+          <relativeChildShapes />
+        </umlLifelineHeadShape>
+        <lifelineHoverShape Id="4235c9e0-5407-4cb0-ab66-32d3aaf410f9" absoluteBounds="2.20937509682029, 1, 0, 7">
+          <lifelineMoniker Id="11c27c75-1ceb-4002-99b1-9aa3f5a721c9" LastKnownName=": EventPage" />
+        </lifelineHoverShape>
+        <umlExecutionSpecificationShape Id="0166d8e6-3e82-4eed-abff-8faad144a80b" absoluteBounds="2.20937509682029, 1.6411457746413869, 0.15, 0.61145832219471563" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="46023c3f-e335-463c-98a1-f232c1bda3ab" LastKnownName="BehaviorExecutionSpecification5" />
+        </umlExecutionSpecificationShape>
+      </relativeChildShapes>
+    </lifelineShape>
+    <lifelineShape Id="0224ee5e-5b7f-49b1-9ce9-091716a576bb" absoluteBounds="3.4610552960426251, 1, 0.15, 8.402604096836102" visible="true" visualStyleMode="Modified">
+      <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+      <relativeChildShapes>
+        <umlLifelineHeadShape Id="1671001f-5d35-40c6-9d2f-9b3da3b0796f" absoluteBounds="2.8978341108352579, 0.6, 1.2764423704147339, 0.4" customColor="White" visualStyleMode="Modified">
+          <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+          <relativeChildShapes />
+        </umlLifelineHeadShape>
+        <lifelineHoverShape Id="7153ccec-f491-49a5-8745-9e98debbc7b4" absoluteBounds="3.4610552960426251, 1, 0, 8.375">
+          <lifelineMoniker Id="d0cde3d3-433f-45b1-ad3a-f76edce4a716" LastKnownName=": EventViewModel" />
+        </lifelineHoverShape>
+        <umlExecutionSpecificationShape Id="f727850a-7bb8-4d88-a666-ebb4234eae59" absoluteBounds="3.4610552960426251, 1.9526040968361025, 0.15, 7.1499999999999986" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="1d933933-908e-4499-9caa-f514a1398209" LastKnownName="BehaviorExecutionSpecification6" />
+          <relativeChildShapes>
+            <umlExecutionSpecificationShape Id="c9c6facd-9f75-4d43-a7d2-bd41a64d77e0" absoluteBounds="3.5360552960426253, 8.2026040968361009, 0.15, 0.59999999999999964" customColor="184, 204, 215" visualStyleMode="Modified">
+              <behaviorExecutionSpecificationMoniker Id="19e743e2-673d-484e-89ef-44baeb86ed23" LastKnownName="BehaviorExecutionSpecification13" />
+            </umlExecutionSpecificationShape>
+          </relativeChildShapes>
+        </umlExecutionSpecificationShape>
+      </relativeChildShapes>
+    </lifelineShape>
+    <lifelineShape Id="b398bb3e-1438-4c48-a39e-1f3922347199" absoluteBounds="7.7124139684658726, 1, 0.15, 8.3526040968361013" visible="true" visualStyleMode="Modified">
+      <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+      <relativeChildShapes>
+        <umlLifelineHeadShape Id="189f9f32-cf73-428e-8437-cd7ca926354e" absoluteBounds="7.0089204639416414, 0.6, 1.5569870090484619, 0.4" customColor="White" visualStyleMode="Modified">
+          <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+          <relativeChildShapes />
+        </umlLifelineHeadShape>
+        <lifelineHoverShape Id="33391189-da5d-4ac0-a85e-02832d0f7e0f" absoluteBounds="7.7124139684658726, 1, 0, 8.375">
+          <lifelineMoniker Id="b3ff4ad7-bd27-46f2-adfc-bfb8aa74d84b" LastKnownName="EventCatalogSingleton" />
+        </lifelineHoverShape>
+        <umlExecutionSpecificationShape Id="22b6b330-d8e2-4104-aa0a-4b9b8c33b8de" absoluteBounds="7.7124139684658726, 2.5526040968361023, 0.15, 2.2499999999999991" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="e29c5cc1-58c4-41c5-9253-05f4f0054b63" LastKnownName="BehaviorExecutionSpecification7" />
+        </umlExecutionSpecificationShape>
+        <umlExecutionSpecificationShape Id="13e2983b-c6b0-4c93-8efe-39361a59f433" absoluteBounds="7.7124139684658726, 8.5026040968361, 0.15, 0.55000000000000071" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="89572f24-ee1d-4a8c-8137-176fd05708dc" LastKnownName="BehaviorExecutionSpecification15" />
+        </umlExecutionSpecificationShape>
+      </relativeChildShapes>
+    </lifelineShape>
+    <lifelineShape Id="b9f2fa0d-2e94-4e41-a77a-1038d0f062f4" absoluteBounds="11.716060189099013, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
+      <lifelineMoniker Id="c21d9bbd-79be-4b96-baf6-a736ca8a2ed3" LastKnownName="PersistencyServices" />
+      <relativeChildShapes>
+        <umlLifelineHeadShape Id="4bf2bfd9-8c58-4b4e-b638-1c43847f8d07" absoluteBounds="11.09847706446141, 0.6, 1.3851662492752075, 0.4" customColor="White" visualStyleMode="Modified">
+          <lifelineMoniker Id="c21d9bbd-79be-4b96-baf6-a736ca8a2ed3" LastKnownName="PersistencyServices" />
+          <relativeChildShapes />
+        </umlLifelineHeadShape>
+        <lifelineHoverShape Id="1e71d5dd-87db-41bc-a654-f13291858bf9" absoluteBounds="11.716060189099013, 1, 0, 7">
+          <lifelineMoniker Id="c21d9bbd-79be-4b96-baf6-a736ca8a2ed3" LastKnownName="PersistencyServices" />
+        </lifelineHoverShape>
+        <umlExecutionSpecificationShape Id="2f77a608-9989-4951-9c76-cf66215bce7b" absoluteBounds="11.716060189099013, 3.9526040968361018, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="3cddabc8-f44a-40c3-8966-1e947100d00c" LastKnownName="BehaviorExecutionSpecification17" />
+        </umlExecutionSpecificationShape>
+      </relativeChildShapes>
+    </lifelineShape>
+    <lifelineShape Id="56f3a5c3-4f91-4654-b68e-82208177996e" absoluteBounds="6.2354138647540758, 1, 0.15, 7.5026040968361016" visible="true" visualStyleMode="Modified">
+      <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+      <relativeChildShapes>
+        <umlLifelineHeadShape Id="2ae084b9-6055-4086-b05f-0ddb5ab358fb" absoluteBounds="5.6997805701717086, 0.6, 1.2212665891647339, 0.4" customColor="White" visualStyleMode="Modified">
+          <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+          <relativeChildShapes />
+        </umlLifelineHeadShape>
+        <lifelineHoverShape Id="734f6e3b-543a-4c66-acfa-50015d07d576" absoluteBounds="6.2354138647540758, 1, 0, 7.5">
+          <lifelineMoniker Id="1c66dcf8-44ba-4f48-86ea-b4a2dc94599f" LastKnownName=": RelayCommand" />
+        </lifelineHoverShape>
+        <umlExecutionSpecificationShape Id="bbe6ee31-f5e8-46f4-bf47-04f86d083ea7" absoluteBounds="6.2354138647540758, 5.1026040968361013, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="861099e9-f8a5-472b-83ea-6d1815c643f3" LastKnownName="BehaviorExecutionSpecification8" />
+        </umlExecutionSpecificationShape>
+        <umlExecutionSpecificationShape Id="2d974677-a1d6-4785-8b74-91e4212fa108" absoluteBounds="6.2354138647540758, 5.9526040968361009, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="709c8b71-af85-43ec-939d-021c58f61cc2" LastKnownName="BehaviorExecutionSpecification9" />
+        </umlExecutionSpecificationShape>
+        <umlExecutionSpecificationShape Id="2b211fb7-6aab-49cb-99ad-76045267ce66" absoluteBounds="6.2354138647540758, 6.8026040968361006, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="68acd92a-4742-4352-8ff8-2953df5cc2c1" LastKnownName="BehaviorExecutionSpecification11" />
+        </umlExecutionSpecificationShape>
+        <umlExecutionSpecificationShape Id="3c98d1f2-703f-4a0c-a542-92055d0f35ad" absoluteBounds="6.2354138647540758, 7.6526040968361, 0.15, 0.55000000000000071" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="19fa6817-3f80-4c76-8f0e-8b465b5e17e3" LastKnownName="BehaviorExecutionSpecification12" />
+        </umlExecutionSpecificationShape>
+      </relativeChildShapes>
+    </lifelineShape>
+    <asyncMessageConnector edgePoints="[(1.1 : 1.64114577464139); (2.20937509682029 : 1.64114577464139)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <lifelineShapeMoniker Id="38258250-6501-4cea-b2ee-783b608a7950" />
+        <umlExecutionSpecificationShapeMoniker Id="0166d8e6-3e82-4eed-abff-8faad144a80b" />
+      </nodes>
+    </asyncMessageConnector>
+    <asyncMessageConnector edgePoints="[(2.35937509682029 : 1.9526040968361); (3.46105529604263 : 1.9526040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="0166d8e6-3e82-4eed-abff-8faad144a80b" />
+        <umlExecutionSpecificationShapeMoniker Id="f727850a-7bb8-4d88-a666-ebb4234eae59" />
+      </nodes>
+    </asyncMessageConnector>
+    <syncMessageConnector edgePoints="[(3.61105529604263 : 2.5526040968361); (7.71241396846587 : 2.5526040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="f727850a-7bb8-4d88-a666-ebb4234eae59" />
+        <umlExecutionSpecificationShapeMoniker Id="22b6b330-d8e2-4104-aa0a-4b9b8c33b8de" />
+      </nodes>
+    </syncMessageConnector>
+    <returnMessageConnector edgePoints="[(7.71241396846587 : 4.8026040968361); (3.61105529604263 : 4.8026040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="22b6b330-d8e2-4104-aa0a-4b9b8c33b8de" />
+        <umlExecutionSpecificationShapeMoniker Id="f727850a-7bb8-4d88-a666-ebb4234eae59" />
+      </nodes>
+    </returnMessageConnector>
+    <asyncMessageConnector edgePoints="[(3.61105529604263 : 5.1026040968361); (6.23541386475408 : 5.1026040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="f727850a-7bb8-4d88-a666-ebb4234eae59" />
+        <umlExecutionSpecificationShapeMoniker Id="bbe6ee31-f5e8-46f4-bf47-04f86d083ea7" />
+      </nodes>
+    </asyncMessageConnector>
+    <asyncMessageConnector edgePoints="[(3.61105529604263 : 5.9526040968361); (6.23541386475408 : 5.9526040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="f727850a-7bb8-4d88-a666-ebb4234eae59" />
+        <umlExecutionSpecificationShapeMoniker Id="2d974677-a1d6-4785-8b74-91e4212fa108" />
+      </nodes>
+    </asyncMessageConnector>
+    <asyncMessageConnector edgePoints="[(3.61105529604263 : 6.8026040968361); (6.23541386475408 : 6.8026040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="f727850a-7bb8-4d88-a666-ebb4234eae59" />
+        <umlExecutionSpecificationShapeMoniker Id="2b211fb7-6aab-49cb-99ad-76045267ce66" />
+      </nodes>
+    </asyncMessageConnector>
+    <asyncMessageConnector edgePoints="[(3.61105529604263 : 7.6526040968361); (6.23541386475408 : 7.6526040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="f727850a-7bb8-4d88-a666-ebb4234eae59" />
+        <umlExecutionSpecificationShapeMoniker Id="3c98d1f2-703f-4a0c-a542-92055d0f35ad" />
+      </nodes>
+    </asyncMessageConnector>
+    <asyncSelfMessageConnector edgePoints="[(3.61105529604263 : 7.9526040968361); (3.86105529604263 : 7.9526040968361); (3.86105529604263 : 8.2026040968361); (3.68605529604263 : 8.2026040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="f727850a-7bb8-4d88-a666-ebb4234eae59" />
+        <umlExecutionSpecificationShapeMoniker Id="c9c6facd-9f75-4d43-a7d2-bd41a64d77e0" />
+      </nodes>
+    </asyncSelfMessageConnector>
+    <asyncMessageConnector edgePoints="[(3.68605529604263 : 8.5026040968361); (7.71241396846587 : 8.5026040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="c9c6facd-9f75-4d43-a7d2-bd41a64d77e0" />
+        <umlExecutionSpecificationShapeMoniker Id="13e2983b-c6b0-4c93-8efe-39361a59f433" />
+      </nodes>
+    </asyncMessageConnector>
+    <syncMessageConnector edgePoints="[(7.86241396846587 : 3.9526040968361); (11.716060189099 : 3.9526040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="22b6b330-d8e2-4104-aa0a-4b9b8c33b8de" />
+        <umlExecutionSpecificationShapeMoniker Id="2f77a608-9989-4951-9c76-cf66215bce7b" />
+      </nodes>
+    </syncMessageConnector>
+    <returnMessageConnector edgePoints="[(11.716060189099 : 4.5026040968361); (7.86241396846587 : 4.5026040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="2f77a608-9989-4951-9c76-cf66215bce7b" />
+        <umlExecutionSpecificationShapeMoniker Id="22b6b330-d8e2-4104-aa0a-4b9b8c33b8de" />
+      </nodes>
+    </returnMessageConnector>
+    <lifelineShape Id="071917c4-810f-4ea9-bef3-41ee02982e1f" absoluteBounds="10.388020515441895, 1, 0.15, 7" visible="true" visualStyleMode="Modified">
+      <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+      <relativeChildShapes>
+        <umlLifelineHeadShape Id="0cac3438-bee0-4017-bc4a-127ecbe57b98" absoluteBounds="9.9630205154418938, 0.6, 1, 0.4" customColor="White" visualStyleMode="Modified">
+          <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+          <relativeChildShapes />
+        </umlLifelineHeadShape>
+        <lifelineHoverShape Id="f138c2c8-1ab0-4373-b32b-ac4975212d6c" absoluteBounds="10.388020515441895, 1, 0, 7">
+          <lifelineMoniker Id="3cf37de5-a86c-45ff-a61c-de35cb876e7c" LastKnownName=": Event" />
+        </lifelineHoverShape>
+        <umlExecutionSpecificationShape Id="da397319-bd76-4c2a-b54e-f0f068b0e00c" absoluteBounds="10.388020515441895, 3.1026040968361022, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="5fdd1383-73de-44a0-a813-437c81b50d17" LastKnownName="BehaviorExecutionSpecification19" />
+        </umlExecutionSpecificationShape>
+        <umlExecutionSpecificationShape Id="80c3aee2-2a1b-49c9-b094-caa122c936c6" absoluteBounds="10.388020515441895, 2.2526040968361025, 0.15, 0.55" customColor="184, 204, 215" visualStyleMode="Modified">
+          <behaviorExecutionSpecificationMoniker Id="62579704-a69f-4e28-98f7-2541e0b2068d" LastKnownName="BehaviorExecutionSpecification21" />
+        </umlExecutionSpecificationShape>
+      </relativeChildShapes>
+    </lifelineShape>
+    <syncMessageConnector edgePoints="[(7.86241396846587 : 3.1026040968361); (10.3880205154419 : 3.1026040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="22b6b330-d8e2-4104-aa0a-4b9b8c33b8de" />
+        <umlExecutionSpecificationShapeMoniker Id="da397319-bd76-4c2a-b54e-f0f068b0e00c" />
+      </nodes>
+    </syncMessageConnector>
+    <returnMessageConnector edgePoints="[(10.3880205154419 : 3.6526040968361); (7.86241396846587 : 3.6526040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="da397319-bd76-4c2a-b54e-f0f068b0e00c" />
+        <umlExecutionSpecificationShapeMoniker Id="22b6b330-d8e2-4104-aa0a-4b9b8c33b8de" />
+      </nodes>
+    </returnMessageConnector>
+    <asyncMessageConnector edgePoints="[(3.61105529604263 : 2.2526040968361); (10.3880205154419 : 2.2526040968361)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e24617ce-6c7e-4c7d-802a-63014f02e313" customColor="Black" visible="true" visualStyleMode="Modified" messageId="00000000-0000-0000-0000-000000000000">
+      <relativeChildShapes />
+      <nodes>
+        <umlExecutionSpecificationShapeMoniker Id="f727850a-7bb8-4d88-a666-ebb4234eae59" />
+        <umlExecutionSpecificationShapeMoniker Id="80c3aee2-2a1b-49c9-b094-caa122c936c6" />
+      </nodes>
+    </asyncMessageConnector>
+  </nestedChildShapes>
+</sequenceDesignerDiagram>
\ No newline at end of file