diff --git a/build.xml b/build.xml
index 845a67b2..d5438f6a 100644
--- a/build.xml
+++ b/build.xml
@@ -770,6 +770,7 @@
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
+          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
           <module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
@@ -2806,6 +2807,7 @@
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
+          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
           <module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index ab9001d5..a176ff89 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -1959,6 +1959,12 @@
             <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2daneBPb4hj" role="3bR37C">
+          <node concept="3bR9La" id="2daneBPb4hk" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="oI9YrJ7Rx" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index b5ee7bd3..b7e597cf 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -1355,29 +1355,18 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3F6vMxq_3wR" role="jymVt" />
-    <node concept="3clFb_" id="1pPth$lN12z" role="jymVt">
-      <property role="TrG5h" value="info" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="17QB3L" id="1pPth$lN12$" role="3clF45" />
-      <node concept="3Tm1VV" id="6kREIVkR$6P" role="1B3o_S" />
-      <node concept="3clFbS" id="1pPth$lN12B" role="3clF47">
-        <node concept="3clFbF" id="1pPth$lN1GX" role="3cqZAp">
-          <node concept="Xl_RD" id="1pPth$lN1GW" role="3clFbG">
-            <property role="Xl_RC" value="highlighting results" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="Hg6EncbjjT" role="jymVt" />
     <node concept="3clFb_" id="Hg6EncbkRR" role="jymVt">
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="false" />
       <node concept="37vLTG" id="Hg6EncbkRS" role="3clF46">
-        <property role="TrG5h" value="prevStep" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="Hg6EncbkRT" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="7eK3Dxvl25k" role="11_B2D">
-            <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+          <node concept="3uibUv" id="3bpBM3Puk6I" role="11_B2D">
+            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="3bpBM3PulUa" role="11_B2D">
+              <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+            </node>
           </node>
         </node>
       </node>
@@ -1389,30 +1378,35 @@
       </node>
       <node concept="3uibUv" id="Hg6EncbkRV" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="Hg6Enc$1Of" role="11_B2D">
-          <ref role="3uigEE" node="1pPth$lC1vN" resolve="HighlightingTypesStep" />
+        <node concept="3uibUv" id="3bpBM3Puioq" role="11_B2D">
+          <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+          <node concept="3uibUv" id="3bpBM3PuFGh" role="11_B2D">
+            <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+          </node>
         </node>
       </node>
       <node concept="3Tmbuc" id="Hg6EncFQZO" role="1B3o_S" />
       <node concept="3clFbS" id="Hg6EncbkS1" role="3clF47">
+        <node concept="3clFbH" id="3bpBM3Punp0" role="3cqZAp" />
         <node concept="3clFbF" id="5lxnBcU04KQ" role="3cqZAp">
           <node concept="2OqwBi" id="5lxnBcU05yI" role="3clFbG">
             <node concept="37vLTw" id="5lxnBcU04KO" role="2Oq$k0">
-              <ref role="3cqZAo" node="Hg6EncbkRS" resolve="prevStep" />
+              <ref role="3cqZAo" node="Hg6EncbkRS" resolve="input" />
             </node>
             <node concept="liA8E" id="5lxnBcU085M" role="2OqNvi">
               <ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function)" resolve="flatMap" />
               <node concept="1bVj0M" id="5lxnBcU08CP" role="37wK5m">
                 <node concept="37vLTG" id="5lxnBcU09rm" role="1bW2Oz">
-                  <property role="TrG5h" value="prev" />
-                  <node concept="3uibUv" id="7eK3Dxvl3g6" role="1tU5fm">
-                    <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                  <property role="TrG5h" value="inEff" />
+                  <node concept="3uibUv" id="3bpBM3Pupvg" role="1tU5fm">
+                    <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                    <node concept="3uibUv" id="3bpBM3Pur86" role="11_B2D">
+                      <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                    </node>
                   </node>
                 </node>
                 <node concept="3clFbS" id="5lxnBcU08CQ" role="1bW5cS">
                   <node concept="3clFbH" id="5lxnBcU08SE" role="3cqZAp" />
-                  <node concept="3clFbH" id="7eK3Dxvl69b" role="3cqZAp" />
-                  <node concept="3clFbH" id="7eK3Dxvl6a5" role="3cqZAp" />
                   <node concept="3cpWs8" id="78H58of3fK6" role="3cqZAp">
                     <node concept="3cpWsn" id="78H58of3fK7" role="3cpWs9">
                       <property role="TrG5h" value="task" />
@@ -1451,17 +1445,16 @@
                         </node>
                         <node concept="liA8E" id="78H58of3lAi" role="2OqNvi">
                           <ref role="37wK5l" to="o35r:78H58oeTnR1" resolve="withMessages" />
-                          <node concept="2OqwBi" id="7eK3DxvjPRA" role="37wK5m">
-                            <node concept="2OqwBi" id="7eK3DxvnYrT" role="2Oq$k0">
-                              <node concept="37vLTw" id="7eK3DxvnWDA" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
-                              </node>
-                              <node concept="liA8E" id="7eK3DxvnZF0" role="2OqNvi">
-                                <ref role="37wK5l" to="tj24:7eK3DxvlKlZ" resolve="getTypesIndex" />
-                              </node>
+                          <node concept="2OqwBi" id="7eK3DxvnYrT" role="37wK5m">
+                            <node concept="37vLTw" id="7eK3DxvnWDA" role="2Oq$k0">
+                              <ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
                             </node>
-                            <node concept="liA8E" id="7eK3Dxvo0tM" role="2OqNvi">
-                              <ref role="37wK5l" to="tj24:1FOQehxe9vM" resolve="allTypes" />
+                            <node concept="liA8E" id="3bpBM3PuuHl" role="2OqNvi">
+                              <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                              <node concept="10M0yZ" id="3bpBM3Puy7n" role="37wK5m">
+                                <ref role="3cqZAo" to="tj24:2daneBPzfwl" resolve="LOCAL_TYPES" />
+                                <ref role="1PxDUh" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -1479,12 +1472,16 @@
                         </node>
                         <node concept="liA8E" id="1FOQehx4bA2" role="2OqNvi">
                           <ref role="37wK5l" to="o35r:1FOQehx0V$P" resolve="withReportItems" />
-                          <node concept="2OqwBi" id="1FOQehx4bA3" role="37wK5m">
+                          <node concept="2OqwBi" id="3bpBM3Pu$$N" role="37wK5m">
                             <node concept="37vLTw" id="1FOQehx4bA4" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
+                              <ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
                             </node>
-                            <node concept="liA8E" id="7eK3Dxvl4vE" role="2OqNvi">
-                              <ref role="37wK5l" to="tj24:1FOQehx3WGd" resolve="getReportItems" />
+                            <node concept="liA8E" id="3bpBM3Pu_sp" role="2OqNvi">
+                              <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                              <node concept="10M0yZ" id="3bpBM3PuCdZ" role="37wK5m">
+                                <ref role="3cqZAo" to="tj24:2daneBP_Jiy" resolve="REPORT_ITEMS" />
+                                <ref role="1PxDUh" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -1494,29 +1491,6 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="78H58of3s4V" role="3cqZAp">
-                    <node concept="37vLTI" id="78H58of3s4W" role="3clFbG">
-                      <node concept="2OqwBi" id="78H58of3s4X" role="37vLTx">
-                        <node concept="37vLTw" id="78H58of3s4Y" role="2Oq$k0">
-                          <ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
-                        </node>
-                        <node concept="liA8E" id="78H58of3fKt" role="2OqNvi">
-                          <ref role="37wK5l" to="o35r:78H58oeTpjT" resolve="withTracetabs" />
-                          <node concept="2OqwBi" id="78H58of3fKu" role="37wK5m">
-                            <node concept="liA8E" id="7eK3Dxvl5ss" role="2OqNvi">
-                              <ref role="37wK5l" to="tj24:6kREIVl0T6j" resolve="getTraceTabComponents" />
-                            </node>
-                            <node concept="37vLTw" id="78H58of3fKw" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="78H58of3s53" role="37vLTJ">
-                        <ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3clFbH" id="78H58of3v9B" role="3cqZAp" />
                   <node concept="3clFbF" id="5lxnBcU0aba" role="3cqZAp">
                     <node concept="2OqwBi" id="5lxnBcU0d7B" role="3clFbG">
@@ -1540,17 +1514,35 @@
                           <ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
                           <node concept="1bVj0M" id="5lxnBcU0iBX" role="37wK5m">
                             <node concept="3clFbS" id="5lxnBcU0iBY" role="1bW5cS">
-                              <node concept="3clFbF" id="5lxnBcU0nAW" role="3cqZAp">
-                                <node concept="Xjq3P" id="5lxnBcU0nAU" role="3clFbG" />
+                              <node concept="3clFbH" id="3bpBM3QaoLJ" role="3cqZAp" />
+                              <node concept="3clFbF" id="3bpBM3PuExW" role="3cqZAp">
+                                <node concept="2OqwBi" id="3bpBM3POh9K" role="3clFbG">
+                                  <node concept="37vLTw" id="3bpBM3PuExU" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
+                                  </node>
+                                  <node concept="liA8E" id="3bpBM3POiX3" role="2OqNvi">
+                                    <ref role="37wK5l" to="1yqb:2daneBOX0cV" resolve="combine" />
+                                    <node concept="2ShNRf" id="3bpBM3POjII" role="37wK5m">
+                                      <node concept="1pGfFk" id="3bpBM3POrIQ" role="2ShVmc">
+                                        <ref role="37wK5l" to="1yqb:3bpBM3PNk9l" resolve="Effect.NullEffect" />
+                                        <node concept="Xl_RD" id="3bpBM3POsK4" role="37wK5m">
+                                          <property role="Xl_RC" value="highlighting results" />
+                                        </node>
+                                        <node concept="3uibUv" id="3bpBM3POurz" role="1pMfVU">
+                                          <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
-                              <node concept="3clFbH" id="78H58of3wTG" role="3cqZAp" />
+                              <node concept="3clFbH" id="3bpBM3Qahlw" role="3cqZAp" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbH" id="5lxnBcU0rmn" role="3cqZAp" />
                 </node>
               </node>
             </node>
@@ -1661,14 +1653,17 @@
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="false" />
       <node concept="37vLTG" id="Hg6Enc6phb" role="3clF46">
-        <property role="TrG5h" value="prevStep" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="Hg6Enc6phc" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="Hg6Enc6phj" role="11_B2D">
-            <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-            <node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
-              <node concept="3uibUv" id="6vFODDAYjpq" role="3qUE_r">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+          <node concept="3uibUv" id="2daneBPWjy6" role="11_B2D">
+            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="Hg6Enc6phj" role="11_B2D">
+              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+              <node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
+                <node concept="3uibUv" id="6vFODDAYjpq" role="3qUE_r">
+                  <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                </node>
               </node>
             </node>
           </node>
@@ -1682,8 +1677,13 @@
       </node>
       <node concept="3uibUv" id="Hg6Enc6phe" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="Hg6Enc6wvA" role="11_B2D">
-          <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+        <node concept="3uibUv" id="2daneBPWfh1" role="11_B2D">
+          <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+          <node concept="3qUE_q" id="3bpBM3Pvmhp" role="11_B2D">
+            <node concept="3uibUv" id="3bpBM3Pvna5" role="3qUE_r">
+              <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3Tmbuc" id="Hg6EncFIBw" role="1B3o_S" />
@@ -1691,15 +1691,18 @@
         <node concept="3clFbH" id="2daneBOSijV" role="3cqZAp" />
         <node concept="3cpWs8" id="Hg6EncXntS" role="3cqZAp">
           <node concept="3cpWsn" id="Hg6EncXntT" role="3cpWs9">
-            <property role="TrG5h" value="withTrace" />
+            <property role="TrG5h" value="input_trace" />
             <node concept="3uibUv" id="Hg6EncXnsI" role="1tU5fm">
               <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
               <node concept="1LlUBW" id="Hg6EncXnsT" role="11_B2D">
-                <node concept="3uibUv" id="Hg6EncXnsU" role="1Lm7xW">
-                  <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-                  <node concept="3qUE_q" id="6vFODDAZbjL" role="11_B2D">
-                    <node concept="3uibUv" id="6vFODDAZbjM" role="3qUE_r">
-                      <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                <node concept="3uibUv" id="2daneBPWr7k" role="1Lm7xW">
+                  <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                  <node concept="3uibUv" id="Hg6EncXnsU" role="11_B2D">
+                    <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                    <node concept="3qUE_q" id="6vFODDAZbjL" role="11_B2D">
+                      <node concept="3uibUv" id="6vFODDAZbjM" role="3qUE_r">
+                        <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -1710,18 +1713,21 @@
             </node>
             <node concept="2OqwBi" id="Hg6EncXntV" role="33vP2m">
               <node concept="37vLTw" id="Hg6EncXntW" role="2Oq$k0">
-                <ref role="3cqZAo" node="Hg6Enc6phb" resolve="prevStep" />
+                <ref role="3cqZAo" node="Hg6Enc6phb" resolve="input" />
               </node>
               <node concept="liA8E" id="Hg6EncXntX" role="2OqNvi">
                 <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
                 <node concept="1bVj0M" id="Hg6EncXntY" role="37wK5m">
                   <node concept="37vLTG" id="Hg6EncXntZ" role="1bW2Oz">
-                    <property role="TrG5h" value="prev" />
-                    <node concept="3uibUv" id="Hg6EncXnu0" role="1tU5fm">
-                      <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-                      <node concept="3qUE_q" id="6vFODDAZcUx" role="11_B2D">
-                        <node concept="3uibUv" id="6vFODDAZcUy" role="3qUE_r">
-                          <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                    <property role="TrG5h" value="inEff" />
+                    <node concept="3uibUv" id="2daneBPWxGU" role="1tU5fm">
+                      <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                      <node concept="3uibUv" id="Hg6EncXnu0" role="11_B2D">
+                        <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                        <node concept="3qUE_q" id="6vFODDAZcUx" role="11_B2D">
+                          <node concept="3uibUv" id="6vFODDAZcUy" role="3qUE_r">
+                            <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -1734,12 +1740,21 @@
                         <node concept="3uibUv" id="6tPOoeTcyRh" role="1tU5fm">
                           <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
                         </node>
-                        <node concept="2OqwBi" id="Hg6EncXnub" role="33vP2m">
-                          <node concept="liA8E" id="6kREIVl1TxS" role="2OqNvi">
-                            <ref role="37wK5l" to="1yqb:6kREIVl0HhM" resolve="getProgram" />
+                        <node concept="2OqwBi" id="2daneBPWI2a" role="33vP2m">
+                          <node concept="2OqwBi" id="Hg6EncXnub" role="2Oq$k0">
+                            <node concept="liA8E" id="2daneBPWC8M" role="2OqNvi">
+                              <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                              <node concept="10M0yZ" id="2daneBPWGBl" role="37wK5m">
+                                <ref role="3cqZAo" to="1yqb:2daneBPSu1V" resolve="PROGRAM_PRODUCER" />
+                                <ref role="1PxDUh" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="Hg6EncXnud" role="2Oq$k0">
+                              <ref role="3cqZAo" node="Hg6EncXntZ" resolve="inEff" />
+                            </node>
                           </node>
-                          <node concept="37vLTw" id="Hg6EncXnud" role="2Oq$k0">
-                            <ref role="3cqZAo" node="Hg6EncXntZ" resolve="prev" />
+                          <node concept="liA8E" id="2daneBPWJwb" role="2OqNvi">
+                            <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
                           </node>
                         </node>
                       </node>
@@ -1785,7 +1800,7 @@
                     <node concept="3clFbF" id="Hg6EncXnuO" role="3cqZAp">
                       <node concept="1Ls8ON" id="Hg6EncXnuP" role="3clFbG">
                         <node concept="37vLTw" id="Hg6EncXnuQ" role="1Lso8e">
-                          <ref role="3cqZAo" node="Hg6EncXntZ" resolve="prev" />
+                          <ref role="3cqZAo" node="Hg6EncXntZ" resolve="inEff" />
                         </node>
                         <node concept="1eOMI4" id="6tPOoeTcTIQ" role="1Lso8e">
                           <node concept="10QFUN" id="6tPOoeTcTIN" role="1eOMHV">
@@ -1826,7 +1841,7 @@
               <node concept="1rXfSq" id="55Q$YFtItIY" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:78H58of4zU0" resolve="scheduleWithTrace" />
                 <node concept="37vLTw" id="55Q$YFtIv91" role="37wK5m">
-                  <ref role="3cqZAo" node="Hg6EncXntT" resolve="withTrace" />
+                  <ref role="3cqZAo" node="Hg6EncXntT" resolve="input_trace" />
                 </node>
                 <node concept="37vLTw" id="55Q$YFtIvC0" role="37wK5m">
                   <ref role="3cqZAo" node="6kREIVkNs$S" resolve="subscribeScheduler" />
@@ -1984,6 +1999,13 @@
         <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
       </node>
     </node>
+    <node concept="312cEg" id="6IQb_Rxsgb3" role="jymVt">
+      <property role="TrG5h" value="editorComponent" />
+      <node concept="3Tm6S6" id="6IQb_Rxsgb4" role="1B3o_S" />
+      <node concept="3uibUv" id="6IQb_Rxsgb5" role="1tU5fm">
+        <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+      </node>
+    </node>
     <node concept="312cEg" id="3F6vMxqv_px" role="jymVt">
       <property role="TrG5h" value="msgtrace" />
       <node concept="3Tm6S6" id="6kREIVkHFzh" role="1B3o_S" />
@@ -1998,13 +2020,6 @@
         <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
       </node>
     </node>
-    <node concept="312cEg" id="6IQb_Rxsgb3" role="jymVt">
-      <property role="TrG5h" value="editorComponent" />
-      <node concept="3Tm6S6" id="6IQb_Rxsgb4" role="1B3o_S" />
-      <node concept="3uibUv" id="6IQb_Rxsgb5" role="1tU5fm">
-        <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-      </node>
-    </node>
     <node concept="3Tm1VV" id="55Q$YFtIVEQ" role="1B3o_S" />
     <node concept="3uibUv" id="NKt6yn8c2j" role="1zkMxy">
       <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
@@ -3540,33 +3555,19 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4vBwiiV$8T_" role="jymVt" />
-    <node concept="3clFb_" id="4vBwiiV$97$" role="jymVt">
-      <property role="TrG5h" value="info" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="17QB3L" id="4vBwiiV$97_" role="3clF45" />
-      <node concept="3Tm1VV" id="NKt6yndP17" role="1B3o_S" />
-      <node concept="3clFbS" id="4vBwiiV$97C" role="3clF47">
-        <node concept="3clFbF" id="4vBwiiV$9TT" role="3cqZAp">
-          <node concept="Xl_RD" id="4vBwiiV$9TS" role="3clFbG">
-            <property role="Xl_RC" value="showing type" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="4vBwiiV$97D" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="4vBwiiV$8US" role="jymVt" />
     <node concept="3clFb_" id="4vBwiiV$ady" role="jymVt">
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="false" />
       <node concept="37vLTG" id="4vBwiiV$adz" role="3clF46">
-        <property role="TrG5h" value="prevStep" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="4vBwiiV$ad$" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="7eK3Dxvn9eV" role="11_B2D">
-            <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+          <node concept="3uibUv" id="3bpBM3PuOmk" role="11_B2D">
+            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="3bpBM3PuQLw" role="11_B2D">
+              <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+            </node>
           </node>
         </node>
       </node>
@@ -3578,20 +3579,21 @@
       </node>
       <node concept="3uibUv" id="4vBwiiV$adC" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3qUE_q" id="4vBwiiV$adD" role="11_B2D">
-          <node concept="3uibUv" id="4vBwiiV$adE" role="3qUE_r">
-            <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-            <node concept="3qTvmN" id="4vBwiiV$adF" role="11_B2D" />
+        <node concept="3uibUv" id="3bpBM3PuNjc" role="11_B2D">
+          <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+          <node concept="3uibUv" id="3bpBM3PuO4F" role="11_B2D">
+            <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
           </node>
         </node>
       </node>
       <node concept="3Tmbuc" id="4vBwiiV$adG" role="1B3o_S" />
       <node concept="3clFbS" id="4vBwiiV$adJ" role="3clF47">
+        <node concept="3clFbH" id="3bpBM3PuSfk" role="3cqZAp" />
         <node concept="3clFbF" id="4vBwiiV$b$i" role="3cqZAp">
           <node concept="2OqwBi" id="4vBwiiV$c5o" role="3clFbG">
             <node concept="2OqwBi" id="6kEuCh$3_7M" role="2Oq$k0">
               <node concept="37vLTw" id="4vBwiiV$b$g" role="2Oq$k0">
-                <ref role="3cqZAo" node="4vBwiiV$adz" resolve="prevStep" />
+                <ref role="3cqZAo" node="4vBwiiV$adz" resolve="input" />
               </node>
               <node concept="liA8E" id="6kEuCh$3Be5" role="2OqNvi">
                 <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
@@ -3622,10 +3624,14 @@
                       <node concept="2OqwBi" id="1GKZK$A9FpR" role="33vP2m">
                         <node concept="2OqwBi" id="6kEuCh$5lxs" role="2Oq$k0">
                           <node concept="37vLTw" id="6kEuCh$5lxt" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4vBwiiV$duq" resolve="prev" />
+                            <ref role="3cqZAo" node="4vBwiiV$duq" resolve="inEff" />
                           </node>
-                          <node concept="liA8E" id="1GKZK$A9uzN" role="2OqNvi">
-                            <ref role="37wK5l" to="tj24:7eK3DxvlKlZ" resolve="getTypesIndex" />
+                          <node concept="liA8E" id="3bpBM3PuYc5" role="2OqNvi">
+                            <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                            <node concept="10M0yZ" id="3bpBM3Pv2ox" role="37wK5m">
+                              <ref role="3cqZAo" to="tj24:2daneBP0TEV" resolve="TYPE_INDEX" />
+                              <ref role="1PxDUh" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                            </node>
                           </node>
                         </node>
                         <node concept="liA8E" id="1GKZK$A9KJb" role="2OqNvi">
@@ -3936,13 +3942,34 @@
                   </node>
                   <node concept="3clFbH" id="4vBwiiV_Ku6" role="3cqZAp" />
                   <node concept="3clFbF" id="4vBwiiV$eYg" role="3cqZAp">
-                    <node concept="Xjq3P" id="4vBwiiV$eYe" role="3clFbG" />
+                    <node concept="2OqwBi" id="3bpBM3POyXQ" role="3clFbG">
+                      <node concept="37vLTw" id="3bpBM3Pv3ko" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4vBwiiV$duq" resolve="inEff" />
+                      </node>
+                      <node concept="liA8E" id="3bpBM3POzUk" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX0cV" resolve="combine" />
+                        <node concept="2ShNRf" id="3bpBM3PO$JE" role="37wK5m">
+                          <node concept="1pGfFk" id="3bpBM3POBkk" role="2ShVmc">
+                            <ref role="37wK5l" to="1yqb:3bpBM3PNk9l" resolve="Effect.NullEffect" />
+                            <node concept="Xl_RD" id="3bpBM3POEvz" role="37wK5m">
+                              <property role="Xl_RC" value="showing type" />
+                            </node>
+                            <node concept="3uibUv" id="3bpBM3POGh1" role="1pMfVU">
+                              <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
                 <node concept="37vLTG" id="4vBwiiV$duq" role="1bW2Oz">
-                  <property role="TrG5h" value="prev" />
-                  <node concept="3uibUv" id="7eK3DxvnaS2" role="1tU5fm">
-                    <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                  <property role="TrG5h" value="inEff" />
+                  <node concept="3uibUv" id="3bpBM3PuT6f" role="1tU5fm">
+                    <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                    <node concept="3uibUv" id="3bpBM3PuV9m" role="11_B2D">
+                      <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                    </node>
                   </node>
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 54171853..289a4f81 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -286,9 +286,13 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+        <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
       </concept>
     </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
@@ -3518,33 +3522,19 @@
       </node>
     </node>
     <node concept="2tJIrI" id="HOeeeUboXT" role="jymVt" />
-    <node concept="3clFb_" id="HOeeeUbp85" role="jymVt">
-      <property role="TrG5h" value="info" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="17QB3L" id="HOeeeUbp86" role="3clF45" />
-      <node concept="3Tm1VV" id="NKt6yndLKO" role="1B3o_S" />
-      <node concept="3clFbS" id="HOeeeUbp89" role="3clF47">
-        <node concept="3clFbF" id="HOeeeUbpD6" role="3cqZAp">
-          <node concept="Xl_RD" id="HOeeeUbpD5" role="3clFbG">
-            <property role="Xl_RC" value="compute baseline time" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="HOeeeUbp8a" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="HOeeeUbp7t" role="jymVt" />
     <node concept="3clFb_" id="HOeeeUbp7O" role="jymVt">
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="false" />
       <node concept="37vLTG" id="HOeeeUbp7P" role="3clF46">
-        <property role="TrG5h" value="prevStep" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="HOeeeUbp7Q" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="HOeeeUbNwF" role="11_B2D">
-            <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-            <node concept="3qTvmN" id="HOeeeUbOfW" role="11_B2D" />
+          <node concept="3uibUv" id="2daneBPQlML" role="11_B2D">
+            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="2daneBPQmB_" role="11_B2D">
+              <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
+              <node concept="3qTvmN" id="2daneBPQnrV" role="11_B2D" />
+            </node>
           </node>
         </node>
       </node>
@@ -3557,9 +3547,11 @@
       <node concept="3uibUv" id="HOeeeUbp7U" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
         <node concept="3qUE_q" id="HOeeeUbp7V" role="11_B2D">
-          <node concept="3uibUv" id="HOeeeUbp7W" role="3qUE_r">
-            <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-            <node concept="3qTvmN" id="HOeeeUbp7X" role="11_B2D" />
+          <node concept="3uibUv" id="2daneBPQkN3" role="3qUE_r">
+            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="2daneBPQzhR" role="11_B2D">
+              <ref role="3uigEE" node="HOeeeUbosT" resolve="ComputeBaselineTimeStep" />
+            </node>
           </node>
         </node>
       </node>
@@ -3568,16 +3560,19 @@
         <node concept="3clFbF" id="HOeeeUbpVa" role="3cqZAp">
           <node concept="2OqwBi" id="HOeeeUbqo4" role="3clFbG">
             <node concept="37vLTw" id="HOeeeUbpV8" role="2Oq$k0">
-              <ref role="3cqZAo" node="HOeeeUbp7P" resolve="prevStep" />
+              <ref role="3cqZAo" node="HOeeeUbp7P" resolve="input" />
             </node>
             <node concept="liA8E" id="HOeeeUbqUm" role="2OqNvi">
               <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
               <node concept="1bVj0M" id="HOeeeUbrlt" role="37wK5m">
                 <node concept="37vLTG" id="HOeeeUbrCB" role="1bW2Oz">
-                  <property role="TrG5h" value="prev" />
-                  <node concept="3uibUv" id="HOeeeUbN0H" role="1tU5fm">
-                    <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-                    <node concept="3qTvmN" id="HOeeeUbN9q" role="11_B2D" />
+                  <property role="TrG5h" value="inEff" />
+                  <node concept="3uibUv" id="2daneBPQoxW" role="1tU5fm">
+                    <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                    <node concept="3uibUv" id="2daneBPQoVO" role="11_B2D">
+                      <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
+                      <node concept="3qTvmN" id="2daneBPQpK7" role="11_B2D" />
+                    </node>
                   </node>
                 </node>
                 <node concept="3clFbS" id="HOeeeUbrlu" role="1bW5cS">
@@ -3633,8 +3628,27 @@
                       <ref role="3cqZAo" node="HOeeeUbu1e" resolve="repository" />
                     </node>
                   </node>
-                  <node concept="3clFbF" id="HOeeeUbsu$" role="3cqZAp">
-                    <node concept="Xjq3P" id="HOeeeUbsuy" role="3clFbG" />
+                  <node concept="3clFbH" id="2daneBPQqH3" role="3cqZAp" />
+                  <node concept="3clFbF" id="2daneBPQrYu" role="3cqZAp">
+                    <node concept="10QFUN" id="2daneBPQtAv" role="3clFbG">
+                      <node concept="2ShNRf" id="2daneBPQtAt" role="10QFUP">
+                        <node concept="1pGfFk" id="3bpBM3PNkNK" role="2ShVmc">
+                          <ref role="37wK5l" to="1yqb:3bpBM3PNk9l" resolve="Effect.NullEffect" />
+                          <node concept="Xl_RD" id="3bpBM3PNpqJ" role="37wK5m">
+                            <property role="Xl_RC" value="compute baseline time" />
+                          </node>
+                          <node concept="3uibUv" id="3bpBM3PNkNL" role="1pMfVU">
+                            <ref role="3uigEE" node="HOeeeUbosT" resolve="ComputeBaselineTimeStep" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3uibUv" id="2daneBPQu_N" role="10QFUM">
+                        <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                        <node concept="3uibUv" id="2daneBPQvyD" role="11_B2D">
+                          <ref role="3uigEE" node="HOeeeUbosT" resolve="ComputeBaselineTimeStep" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -3672,6 +3686,362 @@
     <property role="3GE5qa" value="launch.step" />
     <property role="TrG5h" value="TypecheckingStep" />
     <node concept="2tJIrI" id="NKt6yn82M9" role="jymVt" />
+    <node concept="Wx3nA" id="2daneBP0TEV" role="jymVt">
+      <property role="TrG5h" value="TYPE_INDEX" />
+      <node concept="3Tm1VV" id="2daneBP0USd" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBP0Vcj" role="1tU5fm">
+        <ref role="3uigEE" to="1yqb:2daneBOYiP$" resolve="Effect.ClassValueKind" />
+        <node concept="3uibUv" id="2daneBPzy2u" role="11_B2D">
+          <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypesIndex" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="2daneBP0Xen" role="33vP2m">
+        <node concept="YeOm9" id="2daneBP10gZ" role="2ShVmc">
+          <node concept="1Y3b0j" id="2daneBP10h2" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <ref role="37wK5l" to="1yqb:2daneBOYlrK" resolve="Effect.ClassValueKind" />
+            <ref role="1Y3XeK" to="1yqb:2daneBOYiP$" resolve="Effect.ClassValueKind" />
+            <node concept="3Tm1VV" id="2daneBP10h3" role="1B3o_S" />
+            <node concept="3VsKOn" id="2daneBP0ZO3" role="37wK5m">
+              <ref role="3VsUkX" node="6QH_LDtcxgf" resolve="TypesIndex" />
+            </node>
+            <node concept="3clFb_" id="2daneBP10PE" role="jymVt">
+              <property role="TrG5h" value="extractValue" />
+              <node concept="37vLTG" id="2daneBP10PF" role="3clF46">
+                <property role="TrG5h" value="eff" />
+                <node concept="3uibUv" id="2daneBP10PG" role="1tU5fm">
+                  <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                </node>
+              </node>
+              <node concept="3uibUv" id="2daneBPkiZt" role="3clF45">
+                <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypesIndex" />
+              </node>
+              <node concept="3Tm1VV" id="2daneBP10PI" role="1B3o_S" />
+              <node concept="3clFbS" id="2daneBP10PP" role="3clF47">
+                <node concept="3clFbF" id="2daneBP125Y" role="3cqZAp">
+                  <node concept="2OqwBi" id="2daneBP13rC" role="3clFbG">
+                    <node concept="1eOMI4" id="2daneBP125W" role="2Oq$k0">
+                      <node concept="10QFUN" id="2daneBP125T" role="1eOMHV">
+                        <node concept="3uibUv" id="2daneBP12HW" role="10QFUM">
+                          <ref role="3uigEE" node="2daneBP0KUh" resolve="TypecheckingStep.LocalEffect" />
+                        </node>
+                        <node concept="37vLTw" id="2daneBP13eQ" role="10QFUP">
+                          <ref role="3cqZAo" node="2daneBP10PF" resolve="eff" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OwXpG" id="2daneBPUmtX" role="2OqNvi">
+                      <ref role="2Oxat5" node="2daneBPUdnF" resolve="typesIndex" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="2daneBP10PQ" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+              </node>
+            </node>
+            <node concept="3uibUv" id="2daneBPkitJ" role="2Ghqu4">
+              <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypesIndex" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBP0Sri" role="jymVt" />
+    <node concept="Wx3nA" id="2daneBPzfwl" role="jymVt">
+      <property role="TrG5h" value="LOCAL_TYPES" />
+      <node concept="3Tm1VV" id="2daneBPzfwm" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBPzfwn" role="1tU5fm">
+        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKind" />
+        <node concept="3rvAFt" id="2daneBPzzjd" role="11_B2D">
+          <node concept="2sp9CU" id="2daneBPzzje" role="3rvQeY" />
+          <node concept="3Tqbb2" id="2daneBPzzjf" role="3rvSg0" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="2daneBPzfwo" role="33vP2m">
+        <node concept="YeOm9" id="2daneBPzfwp" role="2ShVmc">
+          <node concept="1Y3b0j" id="2daneBPzfwq" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <ref role="1Y3XeK" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKind" />
+            <ref role="37wK5l" to="1yqb:2daneBPU2_R" resolve="Effect.ValueKind" />
+            <node concept="3Tm1VV" id="2daneBPzfwr" role="1B3o_S" />
+            <node concept="3clFb_" id="2daneBPzfwt" role="jymVt">
+              <property role="TrG5h" value="extractValue" />
+              <node concept="37vLTG" id="2daneBPzfwu" role="3clF46">
+                <property role="TrG5h" value="eff" />
+                <node concept="3uibUv" id="2daneBPzfwv" role="1tU5fm">
+                  <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                </node>
+              </node>
+              <node concept="3Tm1VV" id="2daneBPzfwx" role="1B3o_S" />
+              <node concept="3clFbS" id="2daneBPzfwy" role="3clF47">
+                <node concept="3clFbF" id="2daneBPzfwz" role="3cqZAp">
+                  <node concept="2OqwBi" id="2daneBPzfw$" role="3clFbG">
+                    <node concept="1eOMI4" id="2daneBPzfw_" role="2Oq$k0">
+                      <node concept="10QFUN" id="2daneBPzfwA" role="1eOMHV">
+                        <node concept="3uibUv" id="2daneBPzfwB" role="10QFUM">
+                          <ref role="3uigEE" node="2daneBP0KUh" resolve="TypecheckingStep.LocalEffect" />
+                        </node>
+                        <node concept="37vLTw" id="2daneBPzfwC" role="10QFUP">
+                          <ref role="3cqZAo" node="2daneBPzfwu" resolve="eff" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OwXpG" id="2daneBPUmiQ" role="2OqNvi">
+                      <ref role="2Oxat5" node="2daneBPUeE_" resolve="localTypes" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="2daneBPzfwE" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+              </node>
+              <node concept="3rvAFt" id="2daneBPzr_r" role="3clF45">
+                <node concept="2sp9CU" id="2daneBPzr_s" role="3rvQeY" />
+                <node concept="3Tqbb2" id="2daneBPzr_t" role="3rvSg0" />
+              </node>
+            </node>
+            <node concept="3rvAFt" id="2daneBPzpAJ" role="2Ghqu4">
+              <node concept="2sp9CU" id="2daneBPzqlo" role="3rvQeY" />
+              <node concept="3Tqbb2" id="2daneBPzr5d" role="3rvSg0" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBP_LbI" role="jymVt" />
+    <node concept="Wx3nA" id="2daneBP_Jiy" role="jymVt">
+      <property role="TrG5h" value="REPORT_ITEMS" />
+      <node concept="3Tm1VV" id="2daneBP_Jiz" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBP_Ji$" role="1tU5fm">
+        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKind" />
+        <node concept="_YKpA" id="2daneBP_OV2" role="11_B2D">
+          <node concept="3uibUv" id="2daneBP_OV3" role="_ZDj9">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
+        </node>
+      </node>
+      <node concept="2ShNRf" id="2daneBP_JiC" role="33vP2m">
+        <node concept="YeOm9" id="2daneBP_JiD" role="2ShVmc">
+          <node concept="1Y3b0j" id="2daneBP_JiE" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <ref role="1Y3XeK" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKind" />
+            <ref role="37wK5l" to="1yqb:2daneBPU2_R" resolve="Effect.ValueKind" />
+            <node concept="3Tm1VV" id="2daneBP_JiF" role="1B3o_S" />
+            <node concept="3clFb_" id="2daneBP_JiG" role="jymVt">
+              <property role="TrG5h" value="extractValue" />
+              <node concept="37vLTG" id="2daneBP_JiH" role="3clF46">
+                <property role="TrG5h" value="eff" />
+                <node concept="3uibUv" id="2daneBP_JiI" role="1tU5fm">
+                  <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                </node>
+              </node>
+              <node concept="3Tm1VV" id="2daneBP_JiJ" role="1B3o_S" />
+              <node concept="3clFbS" id="2daneBP_JiK" role="3clF47">
+                <node concept="3clFbF" id="2daneBP_JiL" role="3cqZAp">
+                  <node concept="2OqwBi" id="2daneBP_JiM" role="3clFbG">
+                    <node concept="1eOMI4" id="2daneBP_JiN" role="2Oq$k0">
+                      <node concept="10QFUN" id="2daneBP_JiO" role="1eOMHV">
+                        <node concept="3uibUv" id="2daneBP_JiP" role="10QFUM">
+                          <ref role="3uigEE" node="2daneBP0KUh" resolve="TypecheckingStep.LocalEffect" />
+                        </node>
+                        <node concept="37vLTw" id="2daneBP_JiQ" role="10QFUP">
+                          <ref role="3cqZAo" node="2daneBP_JiH" resolve="eff" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OwXpG" id="2daneBPUlY7" role="2OqNvi">
+                      <ref role="2Oxat5" node="2daneBPUfZ5" resolve="reportItems" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="2daneBP_JiS" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+              </node>
+              <node concept="_YKpA" id="2daneBP_Phf" role="3clF45">
+                <node concept="3uibUv" id="2daneBP_Phg" role="_ZDj9">
+                  <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+                </node>
+              </node>
+            </node>
+            <node concept="_YKpA" id="2daneBP_OpG" role="2Ghqu4">
+              <node concept="3uibUv" id="2daneBP_OpH" role="_ZDj9">
+                <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBPTQSz" role="jymVt" />
+    <node concept="312cEu" id="2daneBP0KUh" role="jymVt">
+      <property role="TrG5h" value="LocalEffect" />
+      <node concept="2tJIrI" id="2daneBP0QTj" role="jymVt" />
+      <node concept="3clFbW" id="2daneBPTXIa" role="jymVt">
+        <node concept="37vLTG" id="2daneBPU8Gc" role="3clF46">
+          <property role="TrG5h" value="typesIndex" />
+          <node concept="3uibUv" id="2daneBPU9Bx" role="1tU5fm">
+            <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypesIndex" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="2daneBPUa9E" role="3clF46">
+          <property role="TrG5h" value="localTypes" />
+          <node concept="3rvAFt" id="2daneBPUaMI" role="1tU5fm">
+            <node concept="2sp9CU" id="2daneBPUaMJ" role="3rvQeY" />
+            <node concept="3Tqbb2" id="2daneBPUaMK" role="3rvSg0" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="2daneBPUbGa" role="3clF46">
+          <property role="TrG5h" value="reportItems" />
+          <node concept="_YKpA" id="2daneBPUcqv" role="1tU5fm">
+            <node concept="3uibUv" id="2daneBPUcqw" role="_ZDj9">
+              <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2daneBPTXIc" role="3clF45" />
+        <node concept="3Tm6S6" id="2daneBPTZG0" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBPTXIe" role="3clF47">
+          <node concept="3clFbF" id="2daneBPUdnJ" role="3cqZAp">
+            <node concept="37vLTI" id="2daneBPUdnL" role="3clFbG">
+              <node concept="2OqwBi" id="2daneBPUki$" role="37vLTJ">
+                <node concept="Xjq3P" id="2daneBPUkuD" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2daneBPUkiB" role="2OqNvi">
+                  <ref role="2Oxat5" node="2daneBPUdnF" resolve="typesIndex" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="2daneBPUdnP" role="37vLTx">
+                <ref role="3cqZAo" node="2daneBPU8Gc" resolve="typesIndex" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2daneBPUeEF" role="3cqZAp">
+            <node concept="37vLTI" id="2daneBPUeEH" role="3clFbG">
+              <node concept="2OqwBi" id="2daneBPUkOl" role="37vLTJ">
+                <node concept="Xjq3P" id="2daneBPUl0w" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2daneBPUkOo" role="2OqNvi">
+                  <ref role="2Oxat5" node="2daneBPUeE_" resolve="localTypes" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="2daneBPUeEL" role="37vLTx">
+                <ref role="3cqZAo" node="2daneBPUa9E" resolve="localTypes" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2daneBPUfZa" role="3cqZAp">
+            <node concept="37vLTI" id="2daneBPUfZc" role="3clFbG">
+              <node concept="2OqwBi" id="2daneBPUlok" role="37vLTJ">
+                <node concept="Xjq3P" id="2daneBPUl$s" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2daneBPUlon" role="2OqNvi">
+                  <ref role="2Oxat5" node="2daneBPUfZ5" resolve="reportItems" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="2daneBPUfZg" role="37vLTx">
+                <ref role="3cqZAo" node="2daneBPUbGa" resolve="reportItems" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBPTWiR" role="jymVt" />
+      <node concept="3Tm1VV" id="2daneBPTV4k" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBP0QoL" role="1zkMxy">
+        <ref role="3uigEE" to="1yqb:2daneBOXQpd" resolve="Effect.SingularEffect" />
+        <node concept="3uibUv" id="2daneBPVIMe" role="11_B2D">
+          <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="2daneBP0Ra_" role="jymVt">
+        <property role="TrG5h" value="hasValue" />
+        <node concept="37vLTG" id="2daneBP0RaA" role="3clF46">
+          <property role="TrG5h" value="valueKind" />
+          <node concept="3uibUv" id="2daneBP0RaB" role="1tU5fm">
+            <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKind" />
+            <node concept="3qTvmN" id="2daneBP0RaC" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="10P_77" id="2daneBP0RaD" role="3clF45" />
+        <node concept="3Tm1VV" id="2daneBP0RaE" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBP0RaH" role="3clF47">
+          <node concept="3clFbF" id="2daneBPzZmL" role="3cqZAp">
+            <node concept="22lmx$" id="2daneBPNmpf" role="3clFbG">
+              <node concept="3clFbC" id="2daneBPNnMj" role="3uHU7w">
+                <node concept="37vLTw" id="2daneBPNoe9" role="3uHU7w">
+                  <ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
+                </node>
+                <node concept="37vLTw" id="2daneBPNnn5" role="3uHU7B">
+                  <ref role="3cqZAo" node="2daneBP0RaA" resolve="valueKind" />
+                </node>
+              </node>
+              <node concept="22lmx$" id="2daneBP$0N6" role="3uHU7B">
+                <node concept="3clFbC" id="2daneBPzZK1" role="3uHU7B">
+                  <node concept="37vLTw" id="2daneBPzZmK" role="3uHU7B">
+                    <ref role="3cqZAo" node="2daneBP0RaA" resolve="valueKind" />
+                  </node>
+                  <node concept="37vLTw" id="2daneBP$02M" role="3uHU7w">
+                    <ref role="3cqZAo" node="2daneBPzfwl" resolve="LOCAL_TYPES" />
+                  </node>
+                </node>
+                <node concept="3clFbC" id="2daneBP$1St" role="3uHU7w">
+                  <node concept="37vLTw" id="2daneBP$1tQ" role="3uHU7B">
+                    <ref role="3cqZAo" node="2daneBP0RaA" resolve="valueKind" />
+                  </node>
+                  <node concept="37vLTw" id="2daneBP$28m" role="3uHU7w">
+                    <ref role="3cqZAo" node="2daneBP0TEV" resolve="TYPE_INDEX" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBP0RaI" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3bpBM3PHNNe" role="jymVt" />
+      <node concept="3clFb_" id="2daneBP0zkO" role="jymVt">
+        <property role="TrG5h" value="info" />
+        <node concept="17QB3L" id="2daneBP0zkP" role="3clF45" />
+        <node concept="3Tm1VV" id="2daneBP0zkQ" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBP0zkU" role="3clF47">
+          <node concept="3clFbF" id="2daneBP0zkX" role="3cqZAp">
+            <node concept="Xl_RD" id="2daneBP0EEj" role="3clFbG">
+              <property role="Xl_RC" value="typechecking" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBP0zkV" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBP0$MZ" role="jymVt" />
+      <node concept="312cEg" id="2daneBPUdnF" role="jymVt">
+        <property role="TrG5h" value="typesIndex" />
+        <node concept="3Tm6S6" id="2daneBPUdnG" role="1B3o_S" />
+        <node concept="3uibUv" id="2daneBPUdnI" role="1tU5fm">
+          <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypesIndex" />
+        </node>
+      </node>
+      <node concept="312cEg" id="2daneBPUeE_" role="jymVt">
+        <property role="TrG5h" value="localTypes" />
+        <node concept="3Tm6S6" id="2daneBPUeEA" role="1B3o_S" />
+        <node concept="3rvAFt" id="2daneBPUeEC" role="1tU5fm">
+          <node concept="2sp9CU" id="2daneBPUeED" role="3rvQeY" />
+          <node concept="3Tqbb2" id="2daneBPUeEE" role="3rvSg0" />
+        </node>
+      </node>
+      <node concept="312cEg" id="2daneBPUfZ5" role="jymVt">
+        <property role="TrG5h" value="reportItems" />
+        <node concept="3Tm6S6" id="2daneBPUfZ6" role="1B3o_S" />
+        <node concept="_YKpA" id="2daneBPUfZ8" role="1tU5fm">
+          <node concept="3uibUv" id="2daneBPUfZ9" role="_ZDj9">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBPzfwk" role="jymVt" />
     <node concept="3clFbW" id="NKt6yn84NI" role="jymVt">
       <node concept="37vLTG" id="NKt6yn85Io" role="3clF46">
         <property role="TrG5h" value="repository" />
@@ -3737,20 +4107,23 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1FOQehwff1G" role="jymVt" />
+    <node concept="2tJIrI" id="2daneBP0HoR" role="jymVt" />
     <node concept="3clFb_" id="78H58of4zU0" role="jymVt">
       <property role="TrG5h" value="scheduleWithTrace" />
       <property role="1EzhhJ" value="false" />
       <node concept="37vLTG" id="78H58of4zU1" role="3clF46">
-        <property role="TrG5h" value="prevStepWithTrace" />
+        <property role="TrG5h" value="input_trace" />
         <node concept="3uibUv" id="78H58of4zU2" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
           <node concept="1LlUBW" id="78H58of4zU3" role="11_B2D">
-            <node concept="3uibUv" id="78H58of4zU4" role="1Lm7xW">
-              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-              <node concept="3qUE_q" id="6vFODDAYUz3" role="11_B2D">
-                <node concept="3uibUv" id="6vFODDAYUz4" role="3qUE_r">
-                  <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+            <node concept="3uibUv" id="2daneBPUt5u" role="1Lm7xW">
+              <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+              <node concept="3uibUv" id="78H58of4zU4" role="11_B2D">
+                <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                <node concept="3qUE_q" id="6vFODDAYUz3" role="11_B2D">
+                  <node concept="3uibUv" id="6vFODDAYUz4" role="3qUE_r">
+                    <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -3768,18 +4141,24 @@
       </node>
       <node concept="3uibUv" id="78H58of4zU8" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="78H58of4zU9" role="11_B2D">
-          <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+        <node concept="3uibUv" id="2daneBPUmA0" role="11_B2D">
+          <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+          <node concept="3qUE_q" id="3bpBM3PhF_V" role="11_B2D">
+            <node concept="3uibUv" id="3bpBM3PhGf9" role="3qUE_r">
+              <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3Tmbuc" id="78H58of4zUa" role="1B3o_S" />
       <node concept="3clFbS" id="78H58of4zYm" role="3clF47">
+        <node concept="3clFbH" id="2daneBPUNeL" role="3cqZAp" />
         <node concept="3clFbF" id="78H58of4JwC" role="3cqZAp">
           <node concept="2OqwBi" id="78H58of4N2x" role="3clFbG">
             <node concept="3nyPlj" id="78H58of4JwA" role="2Oq$k0">
               <ref role="37wK5l" to="1yqb:55Q$YFtHM07" resolve="scheduleWithTrace" />
               <node concept="37vLTw" id="78H58of4KA7" role="37wK5m">
-                <ref role="3cqZAo" node="78H58of4zU1" resolve="prevStepWithTrace" />
+                <ref role="3cqZAo" node="78H58of4zU1" resolve="input_trace" />
               </node>
               <node concept="37vLTw" id="78H58of4Mnl" role="37wK5m">
                 <ref role="3cqZAo" node="78H58of4zU6" resolve="subscribeScheduler" />
@@ -3790,58 +4169,63 @@
               <node concept="1bVj0M" id="78H58of4P00" role="37wK5m">
                 <node concept="3clFbS" id="78H58of4P01" role="1bW5cS">
                   <node concept="3clFbH" id="78H58of6jpm" role="3cqZAp" />
+                  <node concept="3cpWs8" id="3bpBM3Q7U5Q" role="3cqZAp">
+                    <node concept="3cpWsn" id="3bpBM3Q7U5R" role="3cpWs9">
+                      <property role="TrG5h" value="updateCachedTypesIndex" />
+                      <node concept="3uibUv" id="3bpBM3Q7TgB" role="1tU5fm">
+                        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypesIndex" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3clFbJ" id="7eK3DxvmLWs" role="3cqZAp">
                     <node concept="3clFbS" id="7eK3DxvmLWu" role="3clFbx">
                       <node concept="1QHqEK" id="1GKZK$AhAAw" role="3cqZAp">
                         <node concept="1QHqEC" id="1GKZK$AhAAy" role="1QHqEI">
                           <node concept="3clFbS" id="1GKZK$AhAA$" role="1bW5cS">
-                            <node concept="3clFbF" id="1GKZK$A8VYc" role="3cqZAp">
-                              <node concept="37vLTI" id="1GKZK$A8VYd" role="3clFbG">
-                                <node concept="2OqwBi" id="1GKZK$A8VYe" role="37vLTJ">
-                                  <node concept="Xjq3P" id="1GKZK$A8VYf" role="2Oq$k0" />
-                                  <node concept="2OwXpG" id="7eK3DxvmQAT" role="2OqNvi">
-                                    <ref role="2Oxat5" node="1GKZK$A8VXP" resolve="typesIndex" />
-                                  </node>
-                                </node>
-                                <node concept="2OqwBi" id="1GKZK$A8VYh" role="37vLTx">
-                                  <node concept="2YIFZM" id="Sw6td08fY7" role="2Oq$k0">
+                            <node concept="3clFbF" id="3bpBM3Q7Vll" role="3cqZAp">
+                              <node concept="37vLTI" id="3bpBM3Q7Vln" role="3clFbG">
+                                <node concept="2OqwBi" id="3bpBM3Q7U5S" role="37vLTx">
+                                  <node concept="2YIFZM" id="3bpBM3Q7U5T" role="2Oq$k0">
                                     <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
                                     <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypesIndexCache" />
-                                    <node concept="37vLTw" id="Sw6td08fY8" role="37wK5m">
+                                    <node concept="37vLTw" id="3bpBM3Q7U5U" role="37wK5m">
                                       <ref role="3cqZAo" to="1yqb:443LGHBSt7P" resolve="repository" />
                                     </node>
                                   </node>
-                                  <node concept="liA8E" id="1GKZK$A8VYj" role="2OqNvi">
+                                  <node concept="liA8E" id="3bpBM3Q7U5V" role="2OqNvi">
                                     <ref role="37wK5l" node="6QH_LDtbsGz" resolve="updateCachedTypesIndex" />
-                                    <node concept="37vLTw" id="7eK3DxvluVF" role="37wK5m">
+                                    <node concept="37vLTw" id="3bpBM3Q7U5W" role="37wK5m">
                                       <ref role="3cqZAo" node="7eK3Dxvlq8f" resolve="unitRef" />
                                     </node>
-                                    <node concept="1bVj0M" id="1GKZK$A8VYl" role="37wK5m">
-                                      <node concept="37vLTG" id="1GKZK$A8VYm" role="1bW2Oz">
+                                    <node concept="1bVj0M" id="3bpBM3Q7U5X" role="37wK5m">
+                                      <node concept="37vLTG" id="3bpBM3Q7U5Y" role="1bW2Oz">
                                         <property role="TrG5h" value="index" />
-                                        <node concept="3uibUv" id="1GKZK$A8VYn" role="1tU5fm">
+                                        <node concept="3uibUv" id="3bpBM3Q7U5Z" role="1tU5fm">
                                           <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypesIndex" />
                                         </node>
                                       </node>
-                                      <node concept="3clFbS" id="1GKZK$A8VYo" role="1bW5cS">
-                                        <node concept="3clFbF" id="1GKZK$A8VYq" role="3cqZAp">
-                                          <node concept="2OqwBi" id="1GKZK$A8VYr" role="3clFbG">
-                                            <node concept="37vLTw" id="1GKZK$A8VYs" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="1GKZK$A8VYm" resolve="index" />
+                                      <node concept="3clFbS" id="3bpBM3Q7U60" role="1bW5cS">
+                                        <node concept="3clFbF" id="3bpBM3Q7U61" role="3cqZAp">
+                                          <node concept="2OqwBi" id="3bpBM3Q7U62" role="3clFbG">
+                                            <node concept="37vLTw" id="3bpBM3Q7U63" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="3bpBM3Q7U5Y" resolve="index" />
                                             </node>
-                                            <node concept="liA8E" id="1GKZK$A8VYt" role="2OqNvi">
+                                            <node concept="liA8E" id="3bpBM3Q7U64" role="2OqNvi">
                                               <ref role="37wK5l" node="6$gg4kA3UdB" resolve="putAllTypes" />
-                                              <node concept="37vLTw" id="7eK3Dxvlwfj" role="37wK5m">
+                                              <node concept="37vLTw" id="3bpBM3Q7U65" role="37wK5m">
                                                 <ref role="3cqZAo" node="7lt0LtQ_Xx_" resolve="typeNodes" />
                                               </node>
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="3clFbH" id="7eK3DxvmTjY" role="3cqZAp" />
+                                        <node concept="3clFbH" id="3bpBM3Q7U66" role="3cqZAp" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
+                                <node concept="37vLTw" id="3bpBM3Q7Vlr" role="37vLTJ">
+                                  <ref role="3cqZAo" node="3bpBM3Q7U5R" resolve="updateCachedTypesIndex" />
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -3859,16 +4243,40 @@
                     </node>
                   </node>
                   <node concept="3clFbH" id="7eK3DxvldLn" role="3cqZAp" />
-                  <node concept="3clFbF" id="78H58of4RE2" role="3cqZAp">
-                    <node concept="37vLTw" id="78H58of4RE0" role="3clFbG">
-                      <ref role="3cqZAo" node="78H58of4PnT" resolve="step" />
+                  <node concept="3clFbF" id="2daneBPUSwx" role="3cqZAp">
+                    <node concept="2OqwBi" id="2daneBPUTfL" role="3clFbG">
+                      <node concept="37vLTw" id="2daneBPUSwv" role="2Oq$k0">
+                        <ref role="3cqZAo" node="78H58of4PnT" resolve="inEff" />
+                      </node>
+                      <node concept="liA8E" id="2daneBPUTM_" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX0cV" resolve="combine" />
+                        <node concept="2ShNRf" id="2daneBPUU_J" role="37wK5m">
+                          <node concept="1pGfFk" id="2daneBPUVZd" role="2ShVmc">
+                            <ref role="37wK5l" node="2daneBPTXIa" resolve="TypecheckingStep.LocalEffect" />
+                            <node concept="37vLTw" id="3bpBM3Q7XB0" role="37wK5m">
+                              <ref role="3cqZAo" node="3bpBM3Q7U5R" resolve="updateCachedTypesIndex" />
+                            </node>
+                            <node concept="37vLTw" id="2daneBPUYxT" role="37wK5m">
+                              <ref role="3cqZAo" node="7lt0LtQ_Xx_" resolve="typeNodes" />
+                            </node>
+                            <node concept="37vLTw" id="2daneBPUZTi" role="37wK5m">
+                              <ref role="3cqZAo" node="1FOQehx3Ss8" resolve="reportItems" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
                 <node concept="37vLTG" id="78H58of4PnT" role="1bW2Oz">
-                  <property role="TrG5h" value="step" />
-                  <node concept="3uibUv" id="78H58of4Q7e" role="1tU5fm">
-                    <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+                  <property role="TrG5h" value="inEff" />
+                  <node concept="3uibUv" id="2daneBPUNHQ" role="1tU5fm">
+                    <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                    <node concept="3qUE_q" id="2daneBPVBm2" role="11_B2D">
+                      <node concept="3uibUv" id="2daneBPVCDB" role="3qUE_r">
+                        <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -4026,73 +4434,6 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="NKt6yn8qnT" role="jymVt" />
-    <node concept="3clFb_" id="7lt0LtQA50L" role="jymVt">
-      <property role="TrG5h" value="getTypeNodes" />
-      <node concept="3rvAFt" id="7lt0LtQA50M" role="3clF45">
-        <node concept="3Tqbb2" id="7lt0LtQA50N" role="3rvSg0" />
-        <node concept="3uibUv" id="7lt0LtQA50O" role="3rvQeY">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7lt0LtQA50P" role="1B3o_S" />
-      <node concept="3clFbS" id="7lt0LtQA50Q" role="3clF47">
-        <node concept="3clFbF" id="7lt0LtQA50R" role="3cqZAp">
-          <node concept="37vLTw" id="7lt0LtQA50S" role="3clFbG">
-            <ref role="3cqZAo" node="7lt0LtQ_Xx_" resolve="typeNodes" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7lt0LtQA50T" role="jymVt" />
-    <node concept="3clFb_" id="1FOQehx3WGd" role="jymVt">
-      <property role="TrG5h" value="getReportItems" />
-      <node concept="3vKaQO" id="1FOQehx403O" role="3clF45">
-        <node concept="3uibUv" id="1FOQehx41Iq" role="3O5elw">
-          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1FOQehx3WGh" role="1B3o_S" />
-      <node concept="3clFbS" id="1FOQehx3WGi" role="3clF47">
-        <node concept="3clFbF" id="1FOQehx43$$" role="3cqZAp">
-          <node concept="37vLTw" id="1FOQehx43$z" role="3clFbG">
-            <ref role="3cqZAo" node="1FOQehx3Ss8" resolve="reportItems" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="78H58of7juA" role="jymVt" />
-    <node concept="3clFb_" id="6kREIVl0T6j" role="jymVt">
-      <property role="TrG5h" value="getTraceTabComponents" />
-      <node concept="_YKpA" id="6kREIVl0T6k" role="3clF45">
-        <node concept="3uibUv" id="6IQb_RxROcP" role="_ZDj9">
-          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6kREIVl0T6m" role="1B3o_S" />
-      <node concept="3clFbS" id="6kREIVl0T6n" role="3clF47">
-        <node concept="3clFbF" id="6kREIVl0T6o" role="3cqZAp">
-          <node concept="37vLTw" id="6IQb_Rx$Mfp" role="3clFbG">
-            <ref role="3cqZAo" node="6IQb_RxsBvb" resolve="traceTabComponents" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7eK3DxvlH1l" role="jymVt" />
-    <node concept="3clFb_" id="7eK3DxvlKlZ" role="jymVt">
-      <property role="TrG5h" value="getTypesIndex" />
-      <node concept="3uibUv" id="7eK3DxvlNhq" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypesIndex" />
-      </node>
-      <node concept="3Tm1VV" id="7eK3DxvlKm2" role="1B3o_S" />
-      <node concept="3clFbS" id="7eK3DxvlKm3" role="3clF47">
-        <node concept="3clFbF" id="7eK3DxvlSL6" role="3cqZAp">
-          <node concept="37vLTw" id="7eK3DxvlSL5" role="3clFbG">
-            <ref role="3cqZAo" node="1GKZK$A8VXP" resolve="typesIndex" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="7lt0LtQA512" role="jymVt" />
     <node concept="312cEg" id="7lt0LtQ_Xx_" role="jymVt">
       <property role="TrG5h" value="typeNodes" />
@@ -4100,15 +4441,11 @@
       <node concept="3Tm6S6" id="7lt0LtQ_XxA" role="1B3o_S" />
       <node concept="3rvAFt" id="7lt0LtQ_XxB" role="1tU5fm">
         <node concept="3Tqbb2" id="7lt0LtQ_XxC" role="3rvSg0" />
-        <node concept="3uibUv" id="7lt0LtQ_XxD" role="3rvQeY">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
+        <node concept="2sp9CU" id="2daneBPkw$7" role="3rvQeY" />
       </node>
       <node concept="2ShNRf" id="7lt0LtQ_XxE" role="33vP2m">
         <node concept="3rGOSV" id="7lt0LtQ_XxF" role="2ShVmc">
-          <node concept="3uibUv" id="7lt0LtQ_XxG" role="3rHrn6">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
+          <node concept="2sp9CU" id="2daneBPkxm9" role="3rHrn6" />
           <node concept="3Tqbb2" id="7lt0LtQ_XxH" role="3rHtpV" />
         </node>
       </node>
@@ -4134,29 +4471,6 @@
       <node concept="3Tm6S6" id="7eK3Dxvlq8g" role="1B3o_S" />
       <node concept="2sp9CU" id="7eK3Dxvlq8i" role="1tU5fm" />
     </node>
-    <node concept="312cEg" id="1GKZK$A8VXP" role="jymVt">
-      <property role="TrG5h" value="typesIndex" />
-      <node concept="3Tm6S6" id="1GKZK$A8VXN" role="1B3o_S" />
-      <node concept="3uibUv" id="1GKZK$A8VXO" role="1tU5fm">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypesIndex" />
-      </node>
-    </node>
-    <node concept="312cEg" id="6IQb_RxsBvb" role="jymVt">
-      <property role="TrG5h" value="traceTabComponents" />
-      <node concept="3Tmbuc" id="78H58of7l2T" role="1B3o_S" />
-      <node concept="_YKpA" id="6IQb_RxsBvd" role="1tU5fm">
-        <node concept="3uibUv" id="6IQb_RxRQS7" role="_ZDj9">
-          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="6IQb_RxsBvf" role="33vP2m">
-        <node concept="Tc6Ow" id="6IQb_RxsBvg" role="2ShVmc">
-          <node concept="3uibUv" id="6IQb_RxRP6h" role="HW$YZ">
-            <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3Tm1VV" id="NKt6yn81z_" role="1B3o_S" />
     <node concept="3uibUv" id="NKt6yn81EI" role="1zkMxy">
       <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
@@ -5370,125 +5684,95 @@
           <node concept="3clFbS" id="3KN3A4vIAwn" role="2LFqv$">
             <node concept="SfApY" id="1FOQehxoN4w" role="3cqZAp">
               <node concept="3clFbS" id="1FOQehxoN4x" role="SfCbr">
-                <node concept="3cpWs8" id="1FOQehxoN4y" role="3cqZAp">
-                  <node concept="3cpWsn" id="1FOQehxoN4z" role="3cpWs9">
-                    <property role="TrG5h" value="lastStep" />
-                    <node concept="3uibUv" id="1FOQehxoN4$" role="1tU5fm">
-                      <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-                      <node concept="3qTvmN" id="1FOQehxoN4_" role="11_B2D" />
+                <node concept="3cpWs8" id="2daneBP_A$I" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBP_A$J" role="3cpWs9">
+                    <property role="TrG5h" value="effect" />
+                    <node concept="3uibUv" id="2daneBP_AxI" role="1tU5fm">
+                      <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                      <node concept="3qTvmN" id="3bpBM3PijwJ" role="11_B2D" />
                     </node>
-                    <node concept="2OqwBi" id="1FOQehxoN4A" role="33vP2m">
-                      <node concept="2OqwBi" id="1FOQehxoN4B" role="2Oq$k0">
-                        <node concept="37vLTw" id="3KN3A4vINve" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3KN3A4vIAwo" resolve="helper" />
-                        </node>
-                        <node concept="liA8E" id="1FOQehxoN4D" role="2OqNvi">
-                          <ref role="37wK5l" to="1yqb:2mbQB8J5m$l" resolve="scheduleExecute" />
-                          <node concept="2YIFZM" id="1FOQehxoN4E" role="37wK5m">
-                            <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
-                            <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
-                          </node>
-                        </node>
+                    <node concept="2OqwBi" id="2daneBP_A$K" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBP_A$L" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3KN3A4vIAwo" resolve="helper" />
                       </node>
-                      <node concept="liA8E" id="1FOQehxoN4F" role="2OqNvi">
-                        <ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
+                      <node concept="liA8E" id="2daneBP_A$M" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbJ" id="1FOQehxoN4G" role="3cqZAp">
-                  <node concept="3clFbS" id="1FOQehxoN4H" role="3clFbx">
-                    <node concept="3cpWs8" id="1FOQehxoN4I" role="3cqZAp">
-                      <node concept="3cpWsn" id="1FOQehxoN4J" role="3cpWs9">
-                        <property role="TrG5h" value="step" />
-                        <node concept="3uibUv" id="1FOQehxoN4K" role="1tU5fm">
-                          <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                        </node>
-                        <node concept="1eOMI4" id="1FOQehxoN4L" role="33vP2m">
-                          <node concept="10QFUN" id="1FOQehxoN4M" role="1eOMHV">
-                            <node concept="3uibUv" id="1FOQehxoN4N" role="10QFUM">
-                              <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                            </node>
-                            <node concept="37vLTw" id="1FOQehxoN4O" role="10QFUP">
-                              <ref role="3cqZAo" node="1FOQehxoN4z" resolve="lastStep" />
-                            </node>
-                          </node>
-                        </node>
+                <node concept="3cpWs8" id="2daneBPA6IX" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPA6IY" role="3cpWs9">
+                    <property role="TrG5h" value="reportItems" />
+                    <node concept="_YKpA" id="2daneBPA6Ez" role="1tU5fm">
+                      <node concept="3uibUv" id="2daneBPA6EA" role="_ZDj9">
+                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
                       </node>
                     </node>
-                    <node concept="3clFbF" id="1FOQehxoN4P" role="3cqZAp">
-                      <node concept="1rXfSq" id="1FOQehxoN4Q" role="3clFbG">
-                        <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
-                        <node concept="2OqwBi" id="1FOQehxoN4R" role="37wK5m">
-                          <node concept="37vLTw" id="1FOQehxoN4S" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1FOQehxoN4J" resolve="step" />
-                          </node>
-                          <node concept="liA8E" id="1FOQehxoN4T" role="2OqNvi">
-                            <ref role="37wK5l" node="1FOQehx3WGd" resolve="getReportItems" />
-                          </node>
+                    <node concept="2OqwBi" id="2daneBPA6IZ" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBPA6J0" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2daneBP_A$J" resolve="effect" />
+                      </node>
+                      <node concept="liA8E" id="2daneBPA6J1" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                        <node concept="10M0yZ" id="2daneBPA6J2" role="37wK5m">
+                          <ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
+                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="1FOQehxoQvt" role="3cqZAp" />
-                    <node concept="3cpWs8" id="2Qe6u2c8pS7" role="3cqZAp">
-                      <node concept="3cpWsn" id="2Qe6u2c8pS8" role="3cpWs9">
-                        <property role="TrG5h" value="localType" />
-                        <node concept="3Tqbb2" id="2Qe6u2c8pRu" role="1tU5fm" />
-                        <node concept="3EllGN" id="1FOQehxoT1P" role="33vP2m">
-                          <node concept="2OqwBi" id="1FOQehxoUTh" role="3ElVtu">
-                            <node concept="2JrnkZ" id="1FOQehxoUAZ" role="2Oq$k0">
-                              <node concept="37vLTw" id="1FOQehxoTH7" role="2JrQYb">
-                                <ref role="3cqZAo" node="1FOQehxnAn0" resolve="node" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="1FOQehxoVgF" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="2Qe6u2c8pSd" role="3ElQJh">
-                            <node concept="1eOMI4" id="2Qe6u2c8pSe" role="2Oq$k0">
-                              <node concept="10QFUN" id="2Qe6u2c8pSf" role="1eOMHV">
-                                <node concept="3uibUv" id="78H58of7KjA" role="10QFUM">
-                                  <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                                </node>
-                                <node concept="37vLTw" id="1FOQehxoRYf" role="10QFUP">
-                                  <ref role="3cqZAo" node="1FOQehxoN4z" resolve="lastStep" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="2Qe6u2c8pSi" role="2OqNvi">
-                              <ref role="37wK5l" node="7lt0LtQA50L" resolve="getTypeNodes" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbJ" id="3KN3A4vJq91" role="3cqZAp">
-                      <node concept="3clFbS" id="3KN3A4vJq93" role="3clFbx">
-                        <node concept="3cpWs6" id="1FOQehxp3nN" role="3cqZAp">
-                          <node concept="37vLTw" id="1FOQehxp4Rg" role="3cqZAk">
-                            <ref role="3cqZAo" node="2Qe6u2c8pS8" resolve="localType" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3y3z36" id="3KN3A4vJ_mA" role="3clFbw">
-                        <node concept="10Nm6u" id="3KN3A4vJ_se" role="3uHU7w" />
-                        <node concept="37vLTw" id="3KN3A4vJuE2" role="3uHU7B">
-                          <ref role="3cqZAo" node="2Qe6u2c8pS8" resolve="localType" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2ZW3vV" id="1FOQehxoN4U" role="3clFbw">
-                    <node concept="3uibUv" id="1FOQehxoN4V" role="2ZW6by">
-                      <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                    </node>
-                    <node concept="37vLTw" id="1FOQehxoN4W" role="2ZW6bz">
-                      <ref role="3cqZAo" node="1FOQehxoN4z" resolve="lastStep" />
-                    </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="3KN3A4vJ7VS" role="3cqZAp" />
+                <node concept="3clFbF" id="2daneBPAxH$" role="3cqZAp">
+                  <node concept="1rXfSq" id="2daneBPAxHy" role="3clFbG">
+                    <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
+                    <node concept="37vLTw" id="2daneBPABuD" role="37wK5m">
+                      <ref role="3cqZAo" node="2daneBPA6IY" resolve="reportItems" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="2daneBPAYoH" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPAYoI" role="3cpWs9">
+                    <property role="TrG5h" value="localType" />
+                    <node concept="3Tqbb2" id="2daneBPAYmD" role="1tU5fm" />
+                    <node concept="3EllGN" id="2daneBPAYoJ" role="33vP2m">
+                      <node concept="2OqwBi" id="2daneBPAYoK" role="3ElVtu">
+                        <node concept="37vLTw" id="2daneBPBss4" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1FOQehxnAn0" resolve="node" />
+                        </node>
+                        <node concept="iZEcu" id="2daneBPAYoM" role="2OqNvi" />
+                      </node>
+                      <node concept="2OqwBi" id="2daneBPAYoN" role="3ElQJh">
+                        <node concept="37vLTw" id="2daneBPAYoO" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2daneBP_A$J" resolve="effect" />
+                        </node>
+                        <node concept="liA8E" id="2daneBPAYoP" role="2OqNvi">
+                          <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                          <node concept="10M0yZ" id="2daneBPAYoQ" role="37wK5m">
+                            <ref role="3cqZAo" node="2daneBPzfwl" resolve="LOCAL_TYPES" />
+                            <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="2daneBPBeIB" role="3cqZAp">
+                  <node concept="3clFbS" id="2daneBPBeIC" role="3clFbx">
+                    <node concept="3cpWs6" id="2daneBPBeID" role="3cqZAp">
+                      <node concept="37vLTw" id="2daneBPBeIE" role="3cqZAk">
+                        <ref role="3cqZAo" node="2daneBPAYoI" resolve="localType" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3y3z36" id="2daneBPBeIF" role="3clFbw">
+                    <node concept="10Nm6u" id="2daneBPBeIG" role="3uHU7w" />
+                    <node concept="37vLTw" id="2daneBPBeIH" role="3uHU7B">
+                      <ref role="3cqZAo" node="2daneBPAYoI" resolve="localType" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="2daneBPBoh5" role="3cqZAp" />
               </node>
               <node concept="TDmWw" id="1FOQehxoN51" role="TEbGg">
                 <node concept="3cpWsn" id="1FOQehxoN52" role="TDEfY">
@@ -5595,92 +5879,54 @@
           <node concept="3clFbS" id="3KN3A4vJU0x" role="2LFqv$">
             <node concept="SfApY" id="2BZXJed2JyW" role="3cqZAp">
               <node concept="3clFbS" id="2BZXJed2JyY" role="SfCbr">
-                <node concept="3cpWs8" id="3IIf9O_qVu8" role="3cqZAp">
-                  <node concept="3cpWsn" id="3IIf9O_qVu9" role="3cpWs9">
-                    <property role="TrG5h" value="lastStep" />
-                    <node concept="3uibUv" id="3IIf9O_qVua" role="1tU5fm">
-                      <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-                      <node concept="3qTvmN" id="3IIf9O_qVub" role="11_B2D" />
+                <node concept="3cpWs8" id="2daneBPBGIq" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPBGIr" role="3cpWs9">
+                    <property role="TrG5h" value="effect" />
+                    <node concept="3uibUv" id="2daneBPBGIs" role="1tU5fm">
+                      <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                      <node concept="3qTvmN" id="3bpBM3Pi$jz" role="11_B2D" />
                     </node>
-                    <node concept="2OqwBi" id="3IIf9O_qVuc" role="33vP2m">
-                      <node concept="2OqwBi" id="3IIf9O_qVud" role="2Oq$k0">
-                        <node concept="37vLTw" id="3KN3A4vK5qH" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3KN3A4vJU0y" resolve="helper" />
-                        </node>
-                        <node concept="liA8E" id="3IIf9O_qVuf" role="2OqNvi">
-                          <ref role="37wK5l" to="1yqb:2mbQB8J5m$l" resolve="scheduleExecute" />
-                          <node concept="2YIFZM" id="NKt6yn9ky1" role="37wK5m">
-                            <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
-                            <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
-                          </node>
-                        </node>
+                    <node concept="2OqwBi" id="2daneBPBGIt" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBPBGIu" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3KN3A4vJU0y" resolve="helper" />
                       </node>
-                      <node concept="liA8E" id="3IIf9O_qVuh" role="2OqNvi">
-                        <ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
+                      <node concept="liA8E" id="2daneBPBGIv" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="3KN3A4vKesT" role="3cqZAp" />
-                <node concept="3clFbJ" id="3IIf9O_qVuj" role="3cqZAp">
-                  <node concept="3clFbS" id="3IIf9O_qVuk" role="3clFbx">
-                    <node concept="3cpWs8" id="1FOQehx0HKq" role="3cqZAp">
-                      <node concept="3cpWsn" id="1FOQehx0HKr" role="3cpWs9">
-                        <property role="TrG5h" value="step" />
-                        <node concept="3uibUv" id="1FOQehx0HKo" role="1tU5fm">
-                          <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                        </node>
-                        <node concept="1eOMI4" id="1FOQehx0HKs" role="33vP2m">
-                          <node concept="10QFUN" id="1FOQehx0HKt" role="1eOMHV">
-                            <node concept="3uibUv" id="1FOQehx0HKu" role="10QFUM">
-                              <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                            </node>
-                            <node concept="37vLTw" id="1FOQehx0HKv" role="10QFUP">
-                              <ref role="3cqZAo" node="3IIf9O_qVu9" resolve="lastStep" />
-                            </node>
-                          </node>
-                        </node>
+                <node concept="3cpWs8" id="2daneBPBGIw" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPBGIx" role="3cpWs9">
+                    <property role="TrG5h" value="reportItems" />
+                    <node concept="_YKpA" id="2daneBPBGIy" role="1tU5fm">
+                      <node concept="3uibUv" id="2daneBPBGIz" role="_ZDj9">
+                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
                       </node>
                     </node>
-                    <node concept="3clFbF" id="1FOQehxolKg" role="3cqZAp">
-                      <node concept="1rXfSq" id="1FOQehxolKf" role="3clFbG">
-                        <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
-                        <node concept="2OqwBi" id="1FOQehxoCZl" role="37wK5m">
-                          <node concept="37vLTw" id="1FOQehxolKe" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1FOQehx0HKr" resolve="step" />
-                          </node>
-                          <node concept="liA8E" id="1FOQehxoDzz" role="2OqNvi">
-                            <ref role="37wK5l" node="1FOQehx3WGd" resolve="getReportItems" />
-                          </node>
-                        </node>
+                    <node concept="2OqwBi" id="2daneBPBGI$" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBPBGI_" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2daneBPBGIr" resolve="effect" />
                       </node>
-                    </node>
-                    <node concept="3clFbH" id="7eK3Dxvm0FR" role="3cqZAp" />
-                  </node>
-                  <node concept="2ZW3vV" id="3IIf9O_qVv5" role="3clFbw">
-                    <node concept="3uibUv" id="78H58of7_8E" role="2ZW6by">
-                      <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                    </node>
-                    <node concept="37vLTw" id="3IIf9O_qVv7" role="2ZW6bz">
-                      <ref role="3cqZAo" node="3IIf9O_qVu9" resolve="lastStep" />
-                    </node>
-                  </node>
-                  <node concept="9aQIb" id="7eK3DxvlYTq" role="9aQIa">
-                    <node concept="3clFbS" id="7eK3DxvlYTr" role="9aQI4">
-                      <node concept="YS8fn" id="7eK3Dxvm2kC" role="3cqZAp">
-                        <node concept="2ShNRf" id="7eK3Dxvm2qO" role="YScLw">
-                          <node concept="1pGfFk" id="7eK3Dxvm3ls" role="2ShVmc">
-                            <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-                            <node concept="Xl_RD" id="7eK3Dxvm3ud" role="37wK5m">
-                              <property role="Xl_RC" value="unexpected step" />
-                            </node>
-                          </node>
+                      <node concept="liA8E" id="2daneBPBGIA" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                        <node concept="10M0yZ" id="2daneBPBGIB" role="37wK5m">
+                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
+                          <ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="2BZXJed2JyX" role="3cqZAp" />
+                <node concept="3clFbF" id="2daneBPBGJg" role="3cqZAp">
+                  <node concept="1rXfSq" id="2daneBPBGJh" role="3clFbG">
+                    <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
+                    <node concept="37vLTw" id="2daneBPBGJi" role="37wK5m">
+                      <ref role="3cqZAo" node="2daneBPBGIx" resolve="reportItems" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="2daneBPBGHN" role="3cqZAp" />
               </node>
               <node concept="TDmWw" id="2BZXJed2JyZ" role="TEbGg">
                 <node concept="3cpWsn" id="2BZXJed2Jz1" role="TDEfY">
@@ -5816,72 +6062,50 @@
           <node concept="3clFbS" id="3KN3A4vLuiy" role="2LFqv$">
             <node concept="SfApY" id="2BZXJecZP8N" role="3cqZAp">
               <node concept="3clFbS" id="2BZXJecZP8P" role="SfCbr">
-                <node concept="3cpWs8" id="3IIf9OAgx7T" role="3cqZAp">
-                  <node concept="3cpWsn" id="3IIf9OAgx7U" role="3cpWs9">
-                    <property role="TrG5h" value="lastStep" />
-                    <node concept="3uibUv" id="3IIf9OAgx74" role="1tU5fm">
-                      <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-                      <node concept="3qTvmN" id="3IIf9OAgx77" role="11_B2D" />
+                <node concept="3cpWs8" id="2daneBPBKoA" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPBKoB" role="3cpWs9">
+                    <property role="TrG5h" value="effect" />
+                    <node concept="3uibUv" id="2daneBPBKoC" role="1tU5fm">
+                      <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                      <node concept="3qTvmN" id="3bpBM3PiBsA" role="11_B2D" />
                     </node>
-                    <node concept="2OqwBi" id="3IIf9OAgx7V" role="33vP2m">
-                      <node concept="2OqwBi" id="3IIf9OAgx7W" role="2Oq$k0">
-                        <node concept="37vLTw" id="3KN3A4vLDY2" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3KN3A4vLuiz" resolve="helper" />
-                        </node>
-                        <node concept="liA8E" id="3IIf9OAgx7Y" role="2OqNvi">
-                          <ref role="37wK5l" to="1yqb:2mbQB8J5m$l" resolve="scheduleExecute" />
-                          <node concept="2YIFZM" id="NKt6yn9ky3" role="37wK5m">
-                            <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
-                            <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
-                          </node>
-                        </node>
+                    <node concept="2OqwBi" id="2daneBPBKoD" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBPBKoE" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3KN3A4vLuiz" resolve="helper" />
                       </node>
-                      <node concept="liA8E" id="3IIf9OAgx80" role="2OqNvi">
-                        <ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
+                      <node concept="liA8E" id="2daneBPBKoF" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbJ" id="1FOQehxogBv" role="3cqZAp">
-                  <node concept="3clFbS" id="1FOQehxogBx" role="3clFbx">
-                    <node concept="3cpWs8" id="1FOQehxoi4t" role="3cqZAp">
-                      <node concept="3cpWsn" id="1FOQehxoi4u" role="3cpWs9">
-                        <property role="TrG5h" value="step" />
-                        <node concept="3uibUv" id="1FOQehxoi4v" role="1tU5fm">
-                          <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                        </node>
-                        <node concept="1eOMI4" id="1FOQehxoi4w" role="33vP2m">
-                          <node concept="10QFUN" id="1FOQehxoi4x" role="1eOMHV">
-                            <node concept="3uibUv" id="1FOQehxoi4y" role="10QFUM">
-                              <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                            </node>
-                            <node concept="37vLTw" id="1FOQehxoi4z" role="10QFUP">
-                              <ref role="3cqZAo" node="3IIf9OAgx7U" resolve="lastStep" />
-                            </node>
-                          </node>
-                        </node>
+                <node concept="3cpWs8" id="2daneBPBKoG" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPBKoH" role="3cpWs9">
+                    <property role="TrG5h" value="reportItems" />
+                    <node concept="_YKpA" id="2daneBPBKoI" role="1tU5fm">
+                      <node concept="3uibUv" id="2daneBPBKoJ" role="_ZDj9">
+                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
                       </node>
                     </node>
-                    <node concept="3clFbF" id="1FOQehxovvR" role="3cqZAp">
-                      <node concept="1rXfSq" id="1FOQehxovvS" role="3clFbG">
-                        <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
-                        <node concept="2OqwBi" id="1FOQehxoC0S" role="37wK5m">
-                          <node concept="37vLTw" id="1FOQehxovvT" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1FOQehxoi4u" resolve="step" />
-                          </node>
-                          <node concept="liA8E" id="1FOQehxoCzL" role="2OqNvi">
-                            <ref role="37wK5l" node="1FOQehx3WGd" resolve="getReportItems" />
-                          </node>
+                    <node concept="2OqwBi" id="2daneBPBKoK" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBPBKoL" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2daneBPBKoB" resolve="effect" />
+                      </node>
+                      <node concept="liA8E" id="2daneBPBKoM" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                        <node concept="10M0yZ" id="2daneBPBKoN" role="37wK5m">
+                          <ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
+                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="2ZW3vV" id="1FOQehxoi2C" role="3clFbw">
-                    <node concept="3uibUv" id="1FOQehxoi2D" role="2ZW6by">
-                      <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                    </node>
-                    <node concept="37vLTw" id="1FOQehxoi2E" role="2ZW6bz">
-                      <ref role="3cqZAo" node="3IIf9OAgx7U" resolve="lastStep" />
+                </node>
+                <node concept="3clFbF" id="2daneBPBKps" role="3cqZAp">
+                  <node concept="1rXfSq" id="2daneBPBKpt" role="3clFbG">
+                    <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
+                    <node concept="37vLTw" id="2daneBPBKpu" role="37wK5m">
+                      <ref role="3cqZAo" node="2daneBPBKoH" resolve="reportItems" />
                     </node>
                   </node>
                 </node>
@@ -6045,72 +6269,50 @@
           <node concept="3clFbS" id="3KN3A4vMmtj" role="2LFqv$">
             <node concept="SfApY" id="7Bx7XgEiqb3" role="3cqZAp">
               <node concept="3clFbS" id="7Bx7XgEiqb4" role="SfCbr">
-                <node concept="3cpWs8" id="7Bx7XgEiqb5" role="3cqZAp">
-                  <node concept="3cpWsn" id="7Bx7XgEiqb6" role="3cpWs9">
-                    <property role="TrG5h" value="lastStep" />
-                    <node concept="3uibUv" id="7Bx7XgEiqb7" role="1tU5fm">
-                      <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-                      <node concept="3qTvmN" id="7Bx7XgEiqb8" role="11_B2D" />
+                <node concept="3cpWs8" id="2daneBPBRVH" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPBRVI" role="3cpWs9">
+                    <property role="TrG5h" value="effect" />
+                    <node concept="3uibUv" id="2daneBPBRVJ" role="1tU5fm">
+                      <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                      <node concept="3qTvmN" id="3bpBM3PiB_R" role="11_B2D" />
                     </node>
-                    <node concept="2OqwBi" id="7Bx7XgEiqb9" role="33vP2m">
-                      <node concept="2OqwBi" id="7Bx7XgEiqba" role="2Oq$k0">
-                        <node concept="37vLTw" id="3KN3A4vMzqE" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3KN3A4vMmtk" resolve="helper" />
-                        </node>
-                        <node concept="liA8E" id="7Bx7XgEiqbc" role="2OqNvi">
-                          <ref role="37wK5l" to="1yqb:2mbQB8J5m$l" resolve="scheduleExecute" />
-                          <node concept="2YIFZM" id="7Bx7XgEiqbd" role="37wK5m">
-                            <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
-                            <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
-                          </node>
-                        </node>
+                    <node concept="2OqwBi" id="2daneBPBRVK" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBPBRVL" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3KN3A4vMmtk" resolve="helper" />
                       </node>
-                      <node concept="liA8E" id="7Bx7XgEiqbe" role="2OqNvi">
-                        <ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
+                      <node concept="liA8E" id="2daneBPBRVM" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbJ" id="7Bx7XgEiqbf" role="3cqZAp">
-                  <node concept="3clFbS" id="7Bx7XgEiqbg" role="3clFbx">
-                    <node concept="3cpWs8" id="7Bx7XgEiqbh" role="3cqZAp">
-                      <node concept="3cpWsn" id="7Bx7XgEiqbi" role="3cpWs9">
-                        <property role="TrG5h" value="step" />
-                        <node concept="3uibUv" id="7Bx7XgEiqbj" role="1tU5fm">
-                          <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                        </node>
-                        <node concept="1eOMI4" id="7Bx7XgEiqbk" role="33vP2m">
-                          <node concept="10QFUN" id="7Bx7XgEiqbl" role="1eOMHV">
-                            <node concept="3uibUv" id="7Bx7XgEiqbm" role="10QFUM">
-                              <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                            </node>
-                            <node concept="37vLTw" id="7Bx7XgEiqbn" role="10QFUP">
-                              <ref role="3cqZAo" node="7Bx7XgEiqb6" resolve="lastStep" />
-                            </node>
-                          </node>
-                        </node>
+                <node concept="3cpWs8" id="2daneBPBRVN" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPBRVO" role="3cpWs9">
+                    <property role="TrG5h" value="reportItems" />
+                    <node concept="_YKpA" id="2daneBPBRVP" role="1tU5fm">
+                      <node concept="3uibUv" id="2daneBPBRVQ" role="_ZDj9">
+                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
                       </node>
                     </node>
-                    <node concept="3clFbF" id="7Bx7XgEiqbo" role="3cqZAp">
-                      <node concept="1rXfSq" id="7Bx7XgEiqbp" role="3clFbG">
-                        <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
-                        <node concept="2OqwBi" id="7Bx7XgEiqbq" role="37wK5m">
-                          <node concept="37vLTw" id="7Bx7XgEiqbr" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7Bx7XgEiqbi" resolve="step" />
-                          </node>
-                          <node concept="liA8E" id="7Bx7XgEiqbs" role="2OqNvi">
-                            <ref role="37wK5l" node="1FOQehx3WGd" resolve="getReportItems" />
-                          </node>
+                    <node concept="2OqwBi" id="2daneBPBRVR" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBPBRVS" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2daneBPBRVI" resolve="effect" />
+                      </node>
+                      <node concept="liA8E" id="2daneBPBRVT" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                        <node concept="10M0yZ" id="2daneBPBRVU" role="37wK5m">
+                          <ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
+                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="2ZW3vV" id="7Bx7XgEiqbt" role="3clFbw">
-                    <node concept="3uibUv" id="7Bx7XgEiqbu" role="2ZW6by">
-                      <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                    </node>
-                    <node concept="37vLTw" id="7Bx7XgEiqbv" role="2ZW6bz">
-                      <ref role="3cqZAo" node="7Bx7XgEiqb6" resolve="lastStep" />
+                </node>
+                <node concept="3clFbF" id="2daneBPBRWz" role="3cqZAp">
+                  <node concept="1rXfSq" id="2daneBPBRW$" role="3clFbG">
+                    <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
+                    <node concept="37vLTw" id="2daneBPBRW_" role="37wK5m">
+                      <ref role="3cqZAo" node="2daneBPBRVO" resolve="reportItems" />
                     </node>
                   </node>
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
index ca933599..81963635 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
@@ -14,6 +14,7 @@
     <dependency reexport="true">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
     <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
+    <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index de416828..58688c38 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -1065,11 +1065,6 @@
                                   <node concept="3uibUv" id="3mz2_dYCums" role="1Lm7xW">
                                     <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
                                   </node>
-                                  <node concept="_YKpA" id="5cnt3vhcXDL" role="1Lm7xW">
-                                    <node concept="3uibUv" id="6IQb_RxRs4d" role="_ZDj9">
-                                      <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-                                    </node>
-                                  </node>
                                 </node>
                                 <node concept="2OqwBi" id="3mz2_dYCumU" role="33vP2m">
                                   <node concept="37vLTw" id="3mz2_dYCumV" role="2Oq$k0">
@@ -1121,42 +1116,6 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="1DcWWT" id="5cnt3vhd4Cp" role="3cqZAp">
-                                  <node concept="3clFbS" id="5cnt3vhd4Cs" role="2LFqv$">
-                                    <node concept="3clFbF" id="3mz2_dYCVlO" role="3cqZAp">
-                                      <node concept="2OqwBi" id="3mz2_dYCXfc" role="3clFbG">
-                                        <node concept="2YIFZM" id="6Yb9hAqy3Rt" role="2Oq$k0">
-                                          <ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
-                                          <ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
-                                          <node concept="37vLTw" id="3mz2_dYCXdJ" role="37wK5m">
-                                            <ref role="3cqZAo" node="3mz2_dYDlU7" resolve="mpsProject" />
-                                          </node>
-                                        </node>
-                                        <node concept="liA8E" id="3mz2_dYCXij" role="2OqNvi">
-                                          <ref role="37wK5l" node="6IQb_Rxo4au" resolve="closeTab" />
-                                          <node concept="37vLTw" id="5cnt3vhd69F" role="37wK5m">
-                                            <ref role="3cqZAo" node="5cnt3vhd4Ct" resolve="tt" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3cpWsn" id="5cnt3vhd4Ct" role="1Duv9x">
-                                    <property role="TrG5h" value="tt" />
-                                    <node concept="3uibUv" id="6IQb_RxRx6U" role="1tU5fm">
-                                      <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-                                    </node>
-                                  </node>
-                                  <node concept="1LFfDK" id="5cnt3vhd4Cy" role="1DdaDG">
-                                    <node concept="3cmrfG" id="5cnt3vhd4Cz" role="1LF_Uc">
-                                      <property role="3cmrfH" value="1" />
-                                    </node>
-                                    <node concept="37vLTw" id="5cnt3vhd4C$" role="1LFl5Q">
-                                      <ref role="3cqZAo" node="3mz2_dYCumT" resolve="ec_tab" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3clFbH" id="3WU9yfAbRBC" role="3cqZAp" />
                               </node>
                               <node concept="3y3z36" id="3mz2_dYCvg1" role="3clFbw">
                                 <node concept="10Nm6u" id="3mz2_dYCvHF" role="3uHU7w" />
@@ -1181,14 +1140,6 @@
                                               <ref role="2Oxat5" node="78H58oeT$7J" resolve="editorComponent" />
                                             </node>
                                           </node>
-                                          <node concept="2OqwBi" id="78H58oeU6XC" role="1Lso8e">
-                                            <node concept="37vLTw" id="78H58oeU5dA" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="78H58oeTHIN" resolve="task" />
-                                            </node>
-                                            <node concept="2OwXpG" id="78H58oeU8WC" role="2OqNvi">
-                                              <ref role="2Oxat5" node="78H58oeTuSP" resolve="ttabs" />
-                                            </node>
-                                          </node>
                                         </node>
                                       </node>
                                     </node>
@@ -1607,11 +1558,6 @@
               <node concept="3uibUv" id="3mz2_dYCo8k" role="1Lm7xW">
                 <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
               </node>
-              <node concept="_YKpA" id="5cnt3vhd6A8" role="1Lm7xW">
-                <node concept="3uibUv" id="6IQb_RxRh2Y" role="_ZDj9">
-                  <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-                </node>
-              </node>
             </node>
             <node concept="2OqwBi" id="3mz2_dYCo8R" role="33vP2m">
               <node concept="37vLTw" id="3mz2_dYCo8S" role="2Oq$k0">
@@ -1680,42 +1626,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="3mz2_dYD0RV" role="3cqZAp" />
-            <node concept="1DcWWT" id="5cnt3vhdhiJ" role="3cqZAp">
-              <node concept="3clFbS" id="5cnt3vhdhiK" role="2LFqv$">
-                <node concept="3clFbF" id="5cnt3vhdhiL" role="3cqZAp">
-                  <node concept="2EnYce" id="5cnt3vhdhiM" role="3clFbG">
-                    <node concept="2YIFZM" id="6Yb9hAqy3Rv" role="2Oq$k0">
-                      <ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
-                      <ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
-                      <node concept="37vLTw" id="5cnt3vhdhiO" role="37wK5m">
-                        <ref role="3cqZAo" node="3mz2_dYDlU7" resolve="mpsProject" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="5cnt3vhdhiP" role="2OqNvi">
-                      <ref role="37wK5l" node="6IQb_Rxo4au" resolve="closeTab" />
-                      <node concept="37vLTw" id="5cnt3vhdhiQ" role="37wK5m">
-                        <ref role="3cqZAo" node="5cnt3vhdhiR" resolve="tt" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWsn" id="5cnt3vhdhiR" role="1Duv9x">
-                <property role="TrG5h" value="tt" />
-                <node concept="3uibUv" id="6IQb_RxRgx0" role="1tU5fm">
-                  <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-                </node>
-              </node>
-              <node concept="1LFfDK" id="5cnt3vhdhiT" role="1DdaDG">
-                <node concept="3cmrfG" id="5cnt3vhdhiU" role="1LF_Uc">
-                  <property role="3cmrfH" value="1" />
-                </node>
-                <node concept="37vLTw" id="5cnt3vhdhiV" role="1LFl5Q">
-                  <ref role="3cqZAo" node="3mz2_dYCo8Q" resolve="ec_tab" />
-                </node>
-              </node>
-            </node>
           </node>
           <node concept="3y3z36" id="3mz2_dYCnuy" role="3clFbw">
             <node concept="10Nm6u" id="3mz2_dYCnTE" role="3uHU7w" />
@@ -1782,42 +1692,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="5cnt3vhdjiJ" role="3cqZAp" />
-            <node concept="1DcWWT" id="5cnt3vhdilR" role="3cqZAp">
-              <node concept="3clFbS" id="5cnt3vhdilS" role="2LFqv$">
-                <node concept="3clFbF" id="5cnt3vhdilT" role="3cqZAp">
-                  <node concept="2EnYce" id="5cnt3vhdilU" role="3clFbG">
-                    <node concept="2YIFZM" id="6Yb9hAqy3Rs" role="2Oq$k0">
-                      <ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
-                      <ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
-                      <node concept="37vLTw" id="5cnt3vhdilW" role="37wK5m">
-                        <ref role="3cqZAo" node="3mz2_dYDlU7" resolve="mpsProject" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="5cnt3vhdilX" role="2OqNvi">
-                      <ref role="37wK5l" node="6IQb_Rxo4au" resolve="closeTab" />
-                      <node concept="37vLTw" id="5cnt3vhdilY" role="37wK5m">
-                        <ref role="3cqZAo" node="5cnt3vhdilZ" resolve="tt" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWsn" id="5cnt3vhdilZ" role="1Duv9x">
-                <property role="TrG5h" value="tt" />
-                <node concept="3uibUv" id="6IQb_RxReLS" role="1tU5fm">
-                  <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-                </node>
-              </node>
-              <node concept="1LFfDK" id="5cnt3vhdim1" role="1DdaDG">
-                <node concept="3cmrfG" id="5cnt3vhdim2" role="1LF_Uc">
-                  <property role="3cmrfH" value="1" />
-                </node>
-                <node concept="37vLTw" id="5cnt3vhdim3" role="1LFl5Q">
-                  <ref role="3cqZAo" node="3WU9yfAbWeO" resolve="ec_tab" />
-                </node>
-              </node>
-            </node>
           </node>
           <node concept="3cpWsn" id="3WU9yfAbWeO" role="1Duv9x">
             <property role="TrG5h" value="ec_tab" />
@@ -1825,11 +1699,6 @@
               <node concept="3uibUv" id="3mz2_dYChoq" role="1Lm7xW">
                 <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
               </node>
-              <node concept="_YKpA" id="5cnt3vhdgzW" role="1Lm7xW">
-                <node concept="3uibUv" id="6IQb_RxRfoe" role="_ZDj9">
-                  <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-                </node>
-              </node>
             </node>
           </node>
           <node concept="37vLTw" id="3WU9yfAbWeT" role="1DdaDG">
@@ -1855,11 +1724,6 @@
           <node concept="3uibUv" id="3mz2_dYCdYZ" role="1Lm7xW">
             <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
           </node>
-          <node concept="_YKpA" id="5cnt3vhcYi1" role="1Lm7xW">
-            <node concept="3uibUv" id="6IQb_RxR60y" role="_ZDj9">
-              <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-            </node>
-          </node>
         </node>
       </node>
       <node concept="2ShNRf" id="3WU9yfAbIGC" role="33vP2m">
@@ -1868,11 +1732,6 @@
             <node concept="3uibUv" id="3mz2_dYCgu7" role="1Lm7xW">
               <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
             </node>
-            <node concept="_YKpA" id="5cnt3vhd0nv" role="1Lm7xW">
-              <node concept="3uibUv" id="6IQb_RxRafU" role="_ZDj9">
-                <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-              </node>
-            </node>
           </node>
         </node>
       </node>
@@ -2013,40 +1872,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1FOQehx0V$O" role="jymVt" />
-    <node concept="3clFb_" id="78H58oeTpjT" role="jymVt">
-      <property role="TrG5h" value="withTracetabs" />
-      <node concept="37vLTG" id="78H58oeTpjU" role="3clF46">
-        <property role="TrG5h" value="ttabs" />
-        <node concept="_YKpA" id="78H58oeTpI5" role="1tU5fm">
-          <node concept="3uibUv" id="78H58oeTq9z" role="_ZDj9">
-            <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="78H58oeTpjY" role="3clF45">
-        <ref role="3uigEE" node="78H58oeT9Hs" resolve="HighlightingTask" />
-      </node>
-      <node concept="3Tm1VV" id="78H58oeTpjZ" role="1B3o_S" />
-      <node concept="3clFbS" id="78H58oeTpk0" role="3clF47">
-        <node concept="3clFbF" id="78H58oeTuSU" role="3cqZAp">
-          <node concept="37vLTI" id="78H58oeTuSW" role="3clFbG">
-            <node concept="2OqwBi" id="78H58oeTvCb" role="37vLTJ">
-              <node concept="Xjq3P" id="78H58oeTw0N" role="2Oq$k0" />
-              <node concept="2OwXpG" id="78H58oeTvCe" role="2OqNvi">
-                <ref role="2Oxat5" node="78H58oeTuSP" resolve="ttabs" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="78H58oeTuT0" role="37vLTx">
-              <ref role="3cqZAo" node="78H58oeTpjU" resolve="ttabs" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="78H58oeTx4o" role="3cqZAp">
-          <node concept="Xjq3P" id="78H58oeTx4m" role="3clFbG" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="78H58oeTnDT" role="jymVt" />
     <node concept="3Tm1VV" id="78H58oeT9Ht" role="1B3o_S" />
     <node concept="312cEg" id="78H58oeTrxx" role="jymVt">
@@ -2057,15 +1882,6 @@
         <node concept="3Tqbb2" id="78H58of1BCf" role="3rvSg0" />
       </node>
     </node>
-    <node concept="312cEg" id="78H58oeTuSP" role="jymVt">
-      <property role="TrG5h" value="ttabs" />
-      <node concept="3Tmbuc" id="78H58oeTxG0" role="1B3o_S" />
-      <node concept="_YKpA" id="78H58oeTuSS" role="1tU5fm">
-        <node concept="3uibUv" id="78H58oeTuST" role="_ZDj9">
-          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-        </node>
-      </node>
-    </node>
     <node concept="312cEg" id="78H58oeTzSd" role="jymVt">
       <property role="TrG5h" value="root" />
       <node concept="3Tmbuc" id="78H58oeTAnm" role="1B3o_S" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 13161c54..c91b0285 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -47,6 +47,7 @@
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
         <child id="1219921048460" name="componentType" index="8Xvag" />
       </concept>
@@ -98,6 +99,7 @@
         <child id="1164903359218" name="catchBody" index="TDEfX" />
         <child id="1164903359217" name="throwable" index="TDEfY" />
       </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
       <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
       <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
@@ -184,6 +186,7 @@
         <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
+        <child id="1206060520071" name="elsifClauses" index="3eNLev" />
       </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
@@ -206,6 +209,10 @@
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
+        <child id="1206060619838" name="condition" index="3eO9$A" />
+        <child id="1206060644605" name="statementList" index="3eOfB_" />
+      </concept>
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
@@ -264,6 +271,9 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
@@ -295,6 +305,7 @@
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
       </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
@@ -385,6 +396,256 @@
     <property role="2bfB8j" value="false" />
     <property role="TrG5h" value="ApplyTemplatesStep" />
     <property role="3GE5qa" value="launch.step" />
+    <node concept="2tJIrI" id="2daneBPRADK" role="jymVt" />
+    <node concept="Wx3nA" id="2daneBPREA7" role="jymVt">
+      <property role="TrG5h" value="QUERY_TEMPLATE" />
+      <node concept="3Tm1VV" id="2daneBPSrGB" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBPRItx" role="1tU5fm">
+        <ref role="3uigEE" node="2daneBOYiP$" resolve="Effect.ClassValueKind" />
+        <node concept="3uibUv" id="2daneBPRJdT" role="11_B2D">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="2daneBPRLm7" role="33vP2m">
+        <node concept="YeOm9" id="2daneBPRNf7" role="2ShVmc">
+          <node concept="1Y3b0j" id="2daneBPRNfa" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <ref role="37wK5l" node="2daneBOYlrK" resolve="Effect.ClassValueKind" />
+            <ref role="1Y3XeK" node="2daneBOYiP$" resolve="Effect.ClassValueKind" />
+            <node concept="3Tm1VV" id="2daneBPRNfb" role="1B3o_S" />
+            <node concept="3VsKOn" id="2daneBPRMsN" role="37wK5m">
+              <ref role="3VsUkX" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+            </node>
+            <node concept="3uibUv" id="2daneBPRMR9" role="2Ghqu4">
+              <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+            </node>
+            <node concept="3clFb_" id="2daneBPRNC1" role="jymVt">
+              <property role="TrG5h" value="extractValue" />
+              <node concept="37vLTG" id="2daneBPRNC2" role="3clF46">
+                <property role="TrG5h" value="eff" />
+                <node concept="3uibUv" id="2daneBPRNC3" role="1tU5fm">
+                  <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                  <node concept="3qTvmN" id="2daneBPRTe6" role="11_B2D" />
+                </node>
+              </node>
+              <node concept="3uibUv" id="2daneBPRNCc" role="3clF45">
+                <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+              </node>
+              <node concept="3Tm1VV" id="2daneBPRNC5" role="1B3o_S" />
+              <node concept="3clFbS" id="2daneBPRNCd" role="3clF47">
+                <node concept="3clFbF" id="2daneBPShLd" role="3cqZAp">
+                  <node concept="2OqwBi" id="2daneBPSiP6" role="3clFbG">
+                    <node concept="1eOMI4" id="2daneBPShLb" role="2Oq$k0">
+                      <node concept="10QFUN" id="2daneBPShL8" role="1eOMHV">
+                        <node concept="3uibUv" id="2daneBPShV4" role="10QFUM">
+                          <ref role="3uigEE" node="2daneBPRXxI" resolve="ApplyTemplatesStep.LocalEffect" />
+                        </node>
+                        <node concept="37vLTw" id="2daneBPSivR" role="10QFUP">
+                          <ref role="3cqZAo" node="2daneBPRNC2" resolve="eff" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OwXpG" id="2daneBPSkP9" role="2OqNvi">
+                      <ref role="2Oxat5" node="2daneBPSjm5" resolve="queryTemplate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="2daneBPRNCe" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBPSyJ0" role="jymVt" />
+    <node concept="Wx3nA" id="2daneBPSu1V" role="jymVt">
+      <property role="TrG5h" value="PROGRAM_PRODUCER" />
+      <node concept="3Tm1VV" id="2daneBPSu1W" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBPSu1X" role="1tU5fm">
+        <ref role="3uigEE" node="2daneBOYiP$" resolve="Effect.ClassValueKind" />
+        <node concept="3uibUv" id="2daneBPSAk3" role="11_B2D">
+          <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="2daneBPSu1Z" role="33vP2m">
+        <node concept="YeOm9" id="2daneBPSu20" role="2ShVmc">
+          <node concept="1Y3b0j" id="2daneBPSu21" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <ref role="37wK5l" node="2daneBOYlrK" resolve="Effect.ClassValueKind" />
+            <ref role="1Y3XeK" node="2daneBOYiP$" resolve="Effect.ClassValueKind" />
+            <node concept="3Tm1VV" id="2daneBPSu22" role="1B3o_S" />
+            <node concept="3VsKOn" id="2daneBPSu23" role="37wK5m">
+              <ref role="3VsUkX" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
+            </node>
+            <node concept="3uibUv" id="2daneBPSBEK" role="2Ghqu4">
+              <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
+            </node>
+            <node concept="3clFb_" id="2daneBPSu25" role="jymVt">
+              <property role="TrG5h" value="extractValue" />
+              <node concept="37vLTG" id="2daneBPSu26" role="3clF46">
+                <property role="TrG5h" value="eff" />
+                <node concept="3uibUv" id="2daneBPSu27" role="1tU5fm">
+                  <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                  <node concept="3qTvmN" id="2daneBPSu28" role="11_B2D" />
+                </node>
+              </node>
+              <node concept="3uibUv" id="2daneBPSCuT" role="3clF45">
+                <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
+              </node>
+              <node concept="3Tm1VV" id="2daneBPSu2a" role="1B3o_S" />
+              <node concept="3clFbS" id="2daneBPSu2b" role="3clF47">
+                <node concept="3clFbF" id="2daneBPSu2c" role="3cqZAp">
+                  <node concept="2OqwBi" id="2daneBPSu2d" role="3clFbG">
+                    <node concept="1eOMI4" id="2daneBPSu2e" role="2Oq$k0">
+                      <node concept="10QFUN" id="2daneBPSu2f" role="1eOMHV">
+                        <node concept="3uibUv" id="2daneBPSu2g" role="10QFUM">
+                          <ref role="3uigEE" node="2daneBPRXxI" resolve="ApplyTemplatesStep.LocalEffect" />
+                        </node>
+                        <node concept="37vLTw" id="2daneBPSu2h" role="10QFUP">
+                          <ref role="3cqZAo" node="2daneBPSu26" resolve="eff" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OwXpG" id="2daneBPSEZl" role="2OqNvi">
+                      <ref role="2Oxat5" node="2daneBPSDu9" resolve="programProducer" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="2daneBPSu2j" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBPRTub" role="jymVt" />
+    <node concept="312cEu" id="2daneBPRXxI" role="jymVt">
+      <property role="TrG5h" value="LocalEffect" />
+      <node concept="2tJIrI" id="2daneBPS44v" role="jymVt" />
+      <node concept="3clFbW" id="2daneBPSfwh" role="jymVt">
+        <node concept="37vLTG" id="2daneBPSgA$" role="3clF46">
+          <property role="TrG5h" value="queryTemplate" />
+          <node concept="3uibUv" id="2daneBPSh20" role="1tU5fm">
+            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="2daneBPSCKr" role="3clF46">
+          <property role="TrG5h" value="programProducer" />
+          <node concept="3uibUv" id="2daneBPSDdT" role="1tU5fm">
+            <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2daneBPSfwj" role="3clF45" />
+        <node concept="3Tm6S6" id="2daneBPSfLQ" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBPSfwl" role="3clF47">
+          <node concept="3clFbF" id="2daneBPSjm9" role="3cqZAp">
+            <node concept="37vLTI" id="2daneBPSjmb" role="3clFbG">
+              <node concept="2OqwBi" id="2daneBPSkbz" role="37vLTJ">
+                <node concept="Xjq3P" id="2daneBPSknG" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2daneBPSkbA" role="2OqNvi">
+                  <ref role="2Oxat5" node="2daneBPSjm5" resolve="queryTemplate" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="2daneBPSjmf" role="37vLTx">
+                <ref role="3cqZAo" node="2daneBPSgA$" resolve="queryTemplate" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2daneBPSDud" role="3cqZAp">
+            <node concept="37vLTI" id="2daneBPSDuf" role="3clFbG">
+              <node concept="2OqwBi" id="2daneBPSElE" role="37vLTJ">
+                <node concept="Xjq3P" id="2daneBPSExN" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2daneBPSElH" role="2OqNvi">
+                  <ref role="2Oxat5" node="2daneBPSDu9" resolve="programProducer" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="2daneBPSDuj" role="37vLTx">
+                <ref role="3cqZAo" node="2daneBPSCKr" resolve="programProducer" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBPSf7Y" role="jymVt" />
+      <node concept="3Tm1VV" id="2daneBPRXxJ" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBPS5_h" role="1zkMxy">
+        <ref role="3uigEE" node="2daneBOXQpd" resolve="Effect.SingularEffect" />
+        <node concept="3uibUv" id="2daneBPS7r9" role="11_B2D">
+          <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+          <node concept="3qTvmN" id="2daneBQ6fHL" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="2daneBPS8d6" role="jymVt">
+        <property role="TrG5h" value="hasValue" />
+        <node concept="37vLTG" id="2daneBPS8d7" role="3clF46">
+          <property role="TrG5h" value="valueKind" />
+          <node concept="3uibUv" id="2daneBPS8d8" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKind" />
+            <node concept="3qTvmN" id="2daneBPS8d9" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="10P_77" id="2daneBPS8da" role="3clF45" />
+        <node concept="3Tm1VV" id="2daneBPS8db" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBPS8dh" role="3clF47">
+          <node concept="3clFbF" id="2daneBPS9ch" role="3cqZAp">
+            <node concept="22lmx$" id="3bpBM3PDw4s" role="3clFbG">
+              <node concept="3clFbC" id="3bpBM3PDxi2" role="3uHU7w">
+                <node concept="37vLTw" id="3bpBM3PDxMC" role="3uHU7w">
+                  <ref role="3cqZAo" node="2daneBPSu1V" resolve="PROGRAM_PRODUCER" />
+                </node>
+                <node concept="37vLTw" id="3bpBM3PDwPB" role="3uHU7B">
+                  <ref role="3cqZAo" node="2daneBPS8d7" resolve="valueKind" />
+                </node>
+              </node>
+              <node concept="3clFbC" id="2daneBPS9zP" role="3uHU7B">
+                <node concept="37vLTw" id="2daneBPS9ce" role="3uHU7B">
+                  <ref role="3cqZAo" node="2daneBPS8d7" resolve="valueKind" />
+                </node>
+                <node concept="37vLTw" id="2daneBPSa9n" role="3uHU7w">
+                  <ref role="3cqZAo" node="2daneBPREA7" resolve="QUERY_TEMPLATE" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBPS8di" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBPSkUH" role="jymVt" />
+      <node concept="3clFb_" id="1pPth$lMB$v" role="jymVt">
+        <property role="TrG5h" value="info" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="17QB3L" id="1pPth$lMB$w" role="3clF45" />
+        <node concept="3Tm1VV" id="6kREIVkR55O" role="1B3o_S" />
+        <node concept="3clFbS" id="1pPth$lMB$z" role="3clF47">
+          <node concept="3clFbF" id="1pPth$lMDbR" role="3cqZAp">
+            <node concept="Xl_RD" id="1pPth$lMDbQ" role="3clFbG">
+              <property role="Xl_RC" value="applying templates" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="Hg6Enc3xms" role="jymVt" />
+      <node concept="312cEg" id="2daneBPSjm5" role="jymVt">
+        <property role="TrG5h" value="queryTemplate" />
+        <node concept="3Tm6S6" id="2daneBPSjm6" role="1B3o_S" />
+        <node concept="3uibUv" id="2daneBPSjm8" role="1tU5fm">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="312cEg" id="2daneBPSDu9" role="jymVt">
+        <property role="TrG5h" value="programProducer" />
+        <node concept="3Tm6S6" id="2daneBPSDua" role="1B3o_S" />
+        <node concept="3uibUv" id="2daneBPSDuc" role="1tU5fm">
+          <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
+        </node>
+      </node>
+    </node>
     <node concept="3Tm1VV" id="3F6vMxq$KGN" role="1B3o_S" />
     <node concept="2tJIrI" id="6kREIVkR068" role="jymVt" />
     <node concept="3clFbW" id="7kTeLbPt4na" role="jymVt">
@@ -574,29 +835,18 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7WKNeR9fh8i" role="jymVt" />
-    <node concept="3clFb_" id="1pPth$lMB$v" role="jymVt">
-      <property role="TrG5h" value="info" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="17QB3L" id="1pPth$lMB$w" role="3clF45" />
-      <node concept="3Tm1VV" id="6kREIVkR55O" role="1B3o_S" />
-      <node concept="3clFbS" id="1pPth$lMB$z" role="3clF47">
-        <node concept="3clFbF" id="1pPth$lMDbR" role="3cqZAp">
-          <node concept="Xl_RD" id="1pPth$lMDbQ" role="3clFbG">
-            <property role="Xl_RC" value="applying templates" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="Hg6Enc3xms" role="jymVt" />
     <node concept="3clFb_" id="Hg6Enc3ZJW" role="jymVt">
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="false" />
       <node concept="37vLTG" id="Hg6Enc3ZJX" role="3clF46">
-        <property role="TrG5h" value="prevStep" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="Hg6Enc3ZJY" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="Hg6Enc_ppe" role="11_B2D">
-            <ref role="3uigEE" node="Hg6Enc_35l" resolve="InitStep" />
+          <node concept="3uibUv" id="2daneBPPRAM" role="11_B2D">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="2daneBPPTlY" role="11_B2D">
+              <ref role="3uigEE" node="Hg6Enc_35l" resolve="InitStep" />
+            </node>
           </node>
         </node>
       </node>
@@ -608,10 +858,13 @@
       </node>
       <node concept="3uibUv" id="Hg6Enc5CAw" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3qUE_q" id="Hg6EncuiAn" role="11_B2D">
-          <node concept="3uibUv" id="Hg6EncuiAo" role="3qUE_r">
-            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-            <node concept="3qTvmN" id="Hg6EncuiAp" role="11_B2D" />
+        <node concept="3qUE_q" id="2daneBPQalW" role="11_B2D">
+          <node concept="3uibUv" id="2daneBPQ8Wy" role="3qUE_r">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="2daneBPQ9ad" role="11_B2D">
+              <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+              <node concept="3qTvmN" id="2daneBQ6hbf" role="11_B2D" />
+            </node>
           </node>
         </node>
       </node>
@@ -620,15 +873,18 @@
         <node concept="3clFbF" id="Hg6Enc49zS" role="3cqZAp">
           <node concept="2OqwBi" id="Hg6Enc4a0C" role="3clFbG">
             <node concept="37vLTw" id="Hg6Enc49zQ" role="2Oq$k0">
-              <ref role="3cqZAo" node="Hg6Enc3ZJX" resolve="prevStep" />
+              <ref role="3cqZAo" node="Hg6Enc3ZJX" resolve="input" />
             </node>
             <node concept="liA8E" id="Hg6Enc4hNz" role="2OqNvi">
               <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
               <node concept="1bVj0M" id="Hg6Enc4Jpw" role="37wK5m">
                 <node concept="37vLTG" id="Hg6Enc4Ka2" role="1bW2Oz">
-                  <property role="TrG5h" value="prevStep" />
-                  <node concept="3uibUv" id="Hg6EncCJdD" role="1tU5fm">
-                    <ref role="3uigEE" node="Hg6Enc_35l" resolve="InitStep" />
+                  <property role="TrG5h" value="inEff" />
+                  <node concept="3uibUv" id="2daneBPPU_y" role="1tU5fm">
+                    <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                    <node concept="3uibUv" id="2daneBPPVWv" role="11_B2D">
+                      <ref role="3uigEE" node="Hg6Enc_35l" resolve="InitStep" />
+                    </node>
                   </node>
                 </node>
                 <node concept="3clFbS" id="Hg6Enc4Jpx" role="1bW5cS">
@@ -645,6 +901,25 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3cpWs8" id="3bpBM3QcQzg" role="3cqZAp">
+                    <node concept="3cpWsn" id="3bpBM3QcQzh" role="3cpWs9">
+                      <property role="TrG5h" value="queryTemplate" />
+                      <node concept="3uibUv" id="3bpBM3QcPCH" role="1tU5fm">
+                        <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                      </node>
+                      <node concept="10Nm6u" id="3bpBM3Qdd_w" role="33vP2m" />
+                    </node>
+                  </node>
+                  <node concept="3cpWs8" id="3bpBM3Qd2kZ" role="3cqZAp">
+                    <node concept="3cpWsn" id="3bpBM3Qd2l0" role="3cpWs9">
+                      <property role="TrG5h" value="programProducer" />
+                      <node concept="3uibUv" id="3bpBM3Qd1UU" role="1tU5fm">
+                        <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
+                      </node>
+                      <node concept="10Nm6u" id="3bpBM3Qdf2P" role="33vP2m" />
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="3bpBM3Qd0IJ" role="3cqZAp" />
                   <node concept="1QHqEK" id="Hg6Enc4WaV" role="3cqZAp">
                     <node concept="1QHqEC" id="Hg6Enc4WaW" role="1QHqEI">
                       <node concept="3clFbS" id="Hg6Enc4WaX" role="1bW5cS">
@@ -783,73 +1058,64 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="7WKNeR9kv7F" role="3cqZAp">
-                          <node concept="37vLTI" id="7WKNeR9kv7G" role="3clFbG">
-                            <node concept="2OqwBi" id="7WKNeR9kv7H" role="37vLTJ">
-                              <node concept="Xjq3P" id="7WKNeR9kv7I" role="2Oq$k0" />
-                              <node concept="2OwXpG" id="7WKNeR9kv7J" role="2OqNvi">
-                                <ref role="2Oxat5" node="7WKNeR9kv7q" resolve="queryTemplate" />
-                              </node>
-                            </node>
-                            <node concept="3K4zz7" id="7WKNeR9kv7K" role="37vLTx">
-                              <node concept="10Nm6u" id="7WKNeR9kv7L" role="3K4GZi" />
-                              <node concept="3y3z36" id="7WKNeR9kv7M" role="3K4Cdx">
-                                <node concept="10Nm6u" id="7WKNeR9kv7N" role="3uHU7w" />
-                                <node concept="37vLTw" id="7WKNeR9kv7O" role="3uHU7B">
+                        <node concept="3clFbF" id="3bpBM3QcX9C" role="3cqZAp">
+                          <node concept="37vLTI" id="3bpBM3QcX9E" role="3clFbG">
+                            <node concept="3K4zz7" id="3bpBM3QcQzi" role="37vLTx">
+                              <node concept="10Nm6u" id="3bpBM3QcQzj" role="3K4GZi" />
+                              <node concept="3y3z36" id="3bpBM3QcQzk" role="3K4Cdx">
+                                <node concept="10Nm6u" id="3bpBM3QcQzl" role="3uHU7w" />
+                                <node concept="37vLTw" id="3bpBM3QcQzm" role="3uHU7B">
                                   <ref role="3cqZAo" node="7WKNeR9fj4f" resolve="queryKind" />
                                 </node>
                               </node>
-                              <node concept="1eOMI4" id="7mB3viLnA$T" role="3K4E3e">
-                                <node concept="2OqwBi" id="7mB3viLnA$N" role="1eOMHV">
-                                  <node concept="2OqwBi" id="7mB3viLnA$O" role="2Oq$k0">
-                                    <node concept="37vLTw" id="7mB3viLnA$P" role="2Oq$k0">
+                              <node concept="1eOMI4" id="3bpBM3QcQzn" role="3K4E3e">
+                                <node concept="2OqwBi" id="3bpBM3QcQzo" role="1eOMHV">
+                                  <node concept="2OqwBi" id="3bpBM3QcQzp" role="2Oq$k0">
+                                    <node concept="37vLTw" id="3bpBM3QcQzq" role="2Oq$k0">
                                       <ref role="3cqZAo" node="12QmIoyMK_F" resolve="session" />
                                     </node>
-                                    <node concept="liA8E" id="7mB3viLnA$Q" role="2OqNvi">
+                                    <node concept="liA8E" id="3bpBM3QcQzr" role="2OqNvi">
                                       <ref role="37wK5l" to="hano:7WKNeR9alW4" resolve="queryTemplates" />
                                     </node>
                                   </node>
-                                  <node concept="liA8E" id="7mB3viLnA$R" role="2OqNvi">
+                                  <node concept="liA8E" id="3bpBM3QcQzs" role="2OqNvi">
                                     <ref role="37wK5l" to="hano:4t7Xo7inmSj" resolve="byKind" />
-                                    <node concept="37vLTw" id="7mB3viLnA$S" role="37wK5m">
+                                    <node concept="37vLTw" id="3bpBM3QcQzt" role="37wK5m">
                                       <ref role="3cqZAo" node="7WKNeR9fj4f" resolve="queryKind" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
+                            <node concept="37vLTw" id="3bpBM3QcX9I" role="37vLTJ">
+                              <ref role="3cqZAo" node="3bpBM3QcQzh" resolve="queryTemplate" />
+                            </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="Hg6Enc4Wbq" role="3cqZAp">
-                          <node concept="37vLTI" id="Hg6Enc4Wbr" role="3clFbG">
-                            <node concept="2OqwBi" id="Hg6Enc4Wbs" role="37vLTJ">
-                              <node concept="Xjq3P" id="Hg6Enc4Wbt" role="2Oq$k0" />
-                              <node concept="2OwXpG" id="Hg6Enc4Wbu" role="2OqNvi">
-                                <ref role="2Oxat5" node="3GlpCDSzA$E" resolve="programProducer" />
-                              </node>
-                            </node>
-                            <node concept="2ShNRf" id="Hg6Enc4Wbv" role="37vLTx">
-                              <node concept="1pGfFk" id="Hg6Enc4Wbw" role="2ShVmc">
+                        <node concept="3clFbF" id="3bpBM3Qd92Y" role="3cqZAp">
+                          <node concept="37vLTI" id="3bpBM3Qd930" role="3clFbG">
+                            <node concept="2ShNRf" id="3bpBM3Qd2l1" role="37vLTx">
+                              <node concept="1pGfFk" id="3bpBM3Qd2l2" role="2ShVmc">
                                 <ref role="37wK5l" to="hano:7WKNeR9bcL$" resolve="ProgramProducer" />
-                                <node concept="3cpWs3" id="6OXbTDxuiso" role="37wK5m">
-                                  <node concept="37vLTw" id="6OXbTDxuisp" role="3uHU7w">
+                                <node concept="3cpWs3" id="3bpBM3Qd2l3" role="37wK5m">
+                                  <node concept="37vLTw" id="3bpBM3Qd2l4" role="3uHU7w">
                                     <ref role="3cqZAo" node="Hg6Enc4Wb5" resolve="nameHint" />
                                   </node>
-                                  <node concept="Xl_RD" id="6OXbTDxuisq" role="3uHU7B">
+                                  <node concept="Xl_RD" id="3bpBM3Qd2l5" role="3uHU7B">
                                     <property role="Xl_RC" value="types_" />
                                   </node>
                                 </node>
-                                <node concept="37vLTw" id="12QmIoyN06e" role="37wK5m">
+                                <node concept="37vLTw" id="3bpBM3Qd2l6" role="37wK5m">
                                   <ref role="3cqZAo" node="12QmIoyMK_F" resolve="session" />
                                 </node>
-                                <node concept="2OqwBi" id="7WKNeR9kBNr" role="37wK5m">
-                                  <node concept="Xjq3P" id="7WKNeR9kBNs" role="2Oq$k0" />
-                                  <node concept="2OwXpG" id="7WKNeR9kBNt" role="2OqNvi">
-                                    <ref role="2Oxat5" node="7WKNeR9kv7q" resolve="queryTemplate" />
-                                  </node>
+                                <node concept="37vLTw" id="3bpBM3Qd2l7" role="37wK5m">
+                                  <ref role="3cqZAo" node="3bpBM3QcQzh" resolve="queryTemplate" />
                                 </node>
                               </node>
                             </node>
+                            <node concept="37vLTw" id="3bpBM3Qd934" role="37vLTJ">
+                              <ref role="3cqZAo" node="3bpBM3Qd2l0" resolve="programProducer" />
+                            </node>
                           </node>
                         </node>
                         <node concept="3clFbF" id="7kTeLbPtIoT" role="3cqZAp">
@@ -858,8 +1124,8 @@
                               <ref role="3cqZAo" node="Hg6Enc4WaS" resolve="result" />
                             </node>
                             <node concept="2OqwBi" id="7kTeLbPtIoW" role="37vLTx">
-                              <node concept="37vLTw" id="7kTeLbPtIoX" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3GlpCDSzA$E" resolve="programProducer" />
+                              <node concept="37vLTw" id="3bpBM3Qd8fq" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3bpBM3Qd2l0" resolve="programProducer" />
                               </node>
                               <node concept="liA8E" id="7kTeLbPtIoY" role="2OqNvi">
                                 <ref role="37wK5l" to="hano:7kTeLbPojCz" resolve="produce" />
@@ -934,10 +1200,28 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="6kREIVkwaaX" role="3cqZAp">
-                    <node concept="Xjq3P" id="6kREIVkwaaV" role="3clFbG" />
+                  <node concept="3clFbH" id="2daneBPQ00p" role="3cqZAp" />
+                  <node concept="3clFbF" id="3bpBM3PEIG7" role="3cqZAp">
+                    <node concept="2OqwBi" id="3bpBM3PEJxK" role="3clFbG">
+                      <node concept="37vLTw" id="3bpBM3PEIG5" role="2Oq$k0">
+                        <ref role="3cqZAo" node="Hg6Enc4Ka2" resolve="inEff" />
+                      </node>
+                      <node concept="liA8E" id="3bpBM3PEKPu" role="2OqNvi">
+                        <ref role="37wK5l" node="2daneBOX0cV" resolve="combine" />
+                        <node concept="2ShNRf" id="3bpBM3PELzx" role="37wK5m">
+                          <node concept="1pGfFk" id="3bpBM3PELzy" role="2ShVmc">
+                            <ref role="37wK5l" node="2daneBPSfwh" resolve="ApplyTemplatesStep.LocalEffect" />
+                            <node concept="37vLTw" id="3bpBM3Qd1xT" role="37wK5m">
+                              <ref role="3cqZAo" node="3bpBM3QcQzh" resolve="queryTemplate" />
+                            </node>
+                            <node concept="37vLTw" id="3bpBM3QdfNG" role="37wK5m">
+                              <ref role="3cqZAo" node="3bpBM3Qd2l0" resolve="programProducer" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
-                  <node concept="3clFbH" id="Hg6Enc4Y_V" role="3cqZAp" />
                 </node>
               </node>
             </node>
@@ -964,56 +1248,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7WKNeR9kCIM" role="jymVt" />
-    <node concept="3clFb_" id="7WKNeR9kDKp" role="jymVt">
-      <property role="TrG5h" value="queryTemplate" />
-      <node concept="3uibUv" id="6OXbTD$pWcW" role="3clF45">
-        <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-      </node>
-      <node concept="3Tm1VV" id="7WKNeR9kDKs" role="1B3o_S" />
-      <node concept="3clFbS" id="7WKNeR9kDKt" role="3clF47">
-        <node concept="3clFbF" id="7WKNeR9kGZW" role="3cqZAp">
-          <node concept="37vLTw" id="7WKNeR9kGZV" role="3clFbG">
-            <ref role="3cqZAo" node="7WKNeR9kv7q" resolve="queryTemplate" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="20Ay2VeQP0v" role="jymVt" />
-    <node concept="3clFb_" id="6kREIVl0HhM" role="jymVt">
-      <property role="TrG5h" value="getProgram" />
-      <node concept="3uibUv" id="6tPOoeTcatz" role="3clF45">
-        <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-      </node>
-      <node concept="3Tm1VV" id="6kREIVl0HhP" role="1B3o_S" />
-      <node concept="3clFbS" id="6kREIVl0HhQ" role="3clF47">
-        <node concept="3clFbF" id="4QPCta1h7tZ" role="3cqZAp">
-          <node concept="2OqwBi" id="4QPCta1h7Ik" role="3clFbG">
-            <node concept="37vLTw" id="4QPCta1h7tY" role="2Oq$k0">
-              <ref role="3cqZAo" node="3GlpCDSzA$E" resolve="programProducer" />
-            </node>
-            <node concept="liA8E" id="4QPCta1h7Ts" role="2OqNvi">
-              <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7eQMSyzafhH" role="jymVt" />
-    <node concept="3clFb_" id="7eQMSyzadZv" role="jymVt">
-      <property role="TrG5h" value="getProgramProducer" />
-      <node concept="3uibUv" id="7eQMSyzag26" role="3clF45">
-        <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
-      </node>
-      <node concept="3Tm1VV" id="7eQMSyzadZx" role="1B3o_S" />
-      <node concept="3clFbS" id="7eQMSyzadZy" role="3clF47">
-        <node concept="3clFbF" id="7eQMSyzadZz" role="3cqZAp">
-          <node concept="37vLTw" id="7eQMSyzadZ_" role="3clFbG">
-            <ref role="3cqZAo" node="3GlpCDSzA$E" resolve="programProducer" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4QPCta1gZH8" role="jymVt" />
     <node concept="3uibUv" id="1pPth$lACR_" role="1zkMxy">
       <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
       <node concept="3uibUv" id="Hg6Enc_hBn" role="11_B2D">
@@ -1025,27 +1259,6 @@
       <node concept="3Tm6S6" id="7kTeLbPt5$4" role="1B3o_S" />
       <node concept="2I9FWS" id="7kTeLbPt5$6" role="1tU5fm" />
     </node>
-    <node concept="312cEg" id="12QmIoyMACM" role="jymVt">
-      <property role="TrG5h" value="ruleTemplateIndex" />
-      <node concept="3Tm6S6" id="12QmIoyMACN" role="1B3o_S" />
-      <node concept="3uibUv" id="12QmIoyMBE$" role="1tU5fm">
-        <ref role="3uigEE" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
-      </node>
-    </node>
-    <node concept="312cEg" id="7WKNeR9kv7q" role="jymVt">
-      <property role="TrG5h" value="queryTemplate" />
-      <node concept="3Tm6S6" id="7WKNeR9kv7o" role="1B3o_S" />
-      <node concept="3uibUv" id="6OXbTD$kGXo" role="1tU5fm">
-        <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-      </node>
-    </node>
-    <node concept="312cEg" id="3GlpCDSzA$E" role="jymVt">
-      <property role="TrG5h" value="programProducer" />
-      <node concept="3Tm6S6" id="6kREIVkHEOZ" role="1B3o_S" />
-      <node concept="3uibUv" id="3GlpCDSzA$D" role="1tU5fm">
-        <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
-      </node>
-    </node>
     <node concept="312cEg" id="6kREIVkLEGt" role="jymVt">
       <property role="TrG5h" value="repository" />
       <node concept="3Tm6S6" id="6kREIVkLEGu" role="1B3o_S" />
@@ -1079,6 +1292,13 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="12QmIoyMACM" role="jymVt">
+      <property role="TrG5h" value="ruleTemplateIndex" />
+      <node concept="3Tm6S6" id="12QmIoyMACN" role="1B3o_S" />
+      <node concept="3uibUv" id="12QmIoyMBE$" role="1tU5fm">
+        <ref role="3uigEE" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
+      </node>
+    </node>
     <node concept="16euLQ" id="3KN3A4vA$Xq" role="16eVyc">
       <property role="TrG5h" value="T" />
       <node concept="3uibUv" id="3KN3A4vABPQ" role="3ztrMU">
@@ -1096,11 +1316,14 @@
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="true" />
       <node concept="37vLTG" id="Hg6Enc3Jbw" role="3clF46">
-        <property role="TrG5h" value="prevStep" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="Hg6Enc3Olc" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="16syzq" id="Hg6Enc3OSk" role="11_B2D">
-            <ref role="16sUi3" node="1pPth$lD_uI" resolve="Prev" />
+          <node concept="3uibUv" id="2daneBPPk8N" role="11_B2D">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="16syzq" id="2daneBPPkKm" role="11_B2D">
+              <ref role="16sUi3" node="1pPth$lD_uI" resolve="Pred" />
+            </node>
           </node>
         </node>
       </node>
@@ -1114,7 +1337,7 @@
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
         <node concept="3qUE_q" id="Hg6Enc6olk" role="11_B2D">
           <node concept="3uibUv" id="Hg6Enc6oUe" role="3qUE_r">
-            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
             <node concept="3qTvmN" id="Hg6Encs16z" role="11_B2D" />
           </node>
         </node>
@@ -1122,26 +1345,21 @@
       <node concept="3Tmbuc" id="Hg6EncFur4" role="1B3o_S" />
       <node concept="3clFbS" id="Hg6Enc2x8Q" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="NKt6yndoOO" role="jymVt" />
-    <node concept="3clFb_" id="1pPth$lL0jk" role="jymVt">
-      <property role="TrG5h" value="info" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="17QB3L" id="1pPth$lL2Ts" role="3clF45" />
-      <node concept="3Tm1VV" id="NKt6yndCu8" role="1B3o_S" />
-      <node concept="3clFbS" id="1pPth$lL0jo" role="3clF47" />
-    </node>
     <node concept="2tJIrI" id="Hg6Enc2rPV" role="jymVt" />
     <node concept="3clFb_" id="Hg6EnccFiY" role="jymVt">
       <property role="DiZV1" value="true" />
       <property role="TrG5h" value="doSchedule" />
       <node concept="37vLTG" id="Hg6EncdbMF" role="3clF46">
-        <property role="TrG5h" value="scheduledPrevStep" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="Hg6EncdmgF" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3qUE_q" id="Hg6EncoSjK" role="11_B2D">
-            <node concept="3uibUv" id="Hg6EncoTxa" role="3qUE_r">
-              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-              <node concept="3qTvmN" id="Hg6EncqGOx" role="11_B2D" />
+          <node concept="3uibUv" id="3bpBM3PUz_g" role="11_B2D">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3qUE_q" id="3bpBM3PW2tI" role="11_B2D">
+              <node concept="3uibUv" id="3bpBM3PW3_8" role="3qUE_r">
+                <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                <node concept="3qTvmN" id="3bpBM3PW7Jy" role="11_B2D" />
+              </node>
             </node>
           </node>
         </node>
@@ -1154,9 +1372,14 @@
       </node>
       <node concept="3uibUv" id="Hg6EnchhtM" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="4BHjwwGpzeY" role="11_B2D">
-          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-          <node concept="3qTvmN" id="4BHjwwGpzeZ" role="11_B2D" />
+        <node concept="3uibUv" id="2daneBQ7aNN" role="11_B2D">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="3qUE_q" id="2daneBQ7b3c" role="11_B2D">
+            <node concept="3uibUv" id="2daneBQ7baN" role="3qUE_r">
+              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+              <node concept="3qTvmN" id="2daneBQ7bAs" role="11_B2D" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="NKt6yndC6Y" role="1B3o_S" />
@@ -1181,7 +1404,7 @@
           </node>
         </node>
         <node concept="3SKdUt" id="4BHjwwGqxBf" role="3cqZAp">
-          <node concept="1PaTwC" id="589APehYy$2" role="3ndbpf">
+          <node concept="1PaTwC" id="3bpBM3Q5Hsp" role="3ndbpf">
             <node concept="3oM_SD" id="589APehYy$3" role="1PaTwD">
               <property role="3oM_SC" value="so," />
             </node>
@@ -1200,19 +1423,49 @@
             <node concept="3oM_SD" id="589APehYy$8" role="1PaTwD">
               <property role="3oM_SC" value="type" />
             </node>
-            <node concept="3oM_SD" id="589APehYy$9" role="1PaTwD">
+            <node concept="3oM_SD" id="3bpBM3Q5Hxj" role="1PaTwD">
               <property role="3oM_SC" value="cast!" />
             </node>
           </node>
         </node>
+        <node concept="3SKdUt" id="3bpBM3Q5HKZ" role="3cqZAp">
+          <node concept="1PaTwC" id="3bpBM3Q5HL0" role="3ndbpf">
+            <node concept="3oM_SD" id="3bpBM3Q5HL2" role="1PaTwD">
+              <property role="3oM_SC" value="TODO:" />
+            </node>
+            <node concept="3oM_SD" id="3bpBM3Q5HQp" role="1PaTwD">
+              <property role="3oM_SC" value="dirty" />
+            </node>
+            <node concept="3oM_SD" id="3bpBM3Q5HQG" role="1PaTwD">
+              <property role="3oM_SC" value="hacks" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="6kREIVkLsiJ" role="3cqZAp">
           <node concept="10QFUN" id="4BHjwwGpzZw" role="3clFbG">
             <node concept="1rXfSq" id="4BHjwwGpzZs" role="10QFUP">
               <ref role="37wK5l" node="Hg6Enc2x8M" resolve="schedule" />
-              <node concept="1rXfSq" id="4BHjwwGpzZt" role="37wK5m">
-                <ref role="37wK5l" node="6kREIVkgN0_" resolve="markTime" />
-                <node concept="37vLTw" id="4BHjwwGpzZu" role="37wK5m">
-                  <ref role="3cqZAo" node="Hg6EncdbMF" resolve="scheduledPrevStep" />
+              <node concept="1eOMI4" id="3bpBM3PVoID" role="37wK5m">
+                <node concept="10QFUN" id="3bpBM3PVoIE" role="1eOMHV">
+                  <node concept="3uibUv" id="3bpBM3PVoI_" role="10QFUM">
+                    <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
+                    <node concept="3uibUv" id="3bpBM3PVoIA" role="11_B2D">
+                      <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                      <node concept="16syzq" id="3bpBM3PVoIB" role="11_B2D">
+                        <ref role="16sUi3" node="1pPth$lD_uI" resolve="Pred" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1eOMI4" id="3bpBM3PWm_Z" role="10QFUP">
+                    <node concept="10QFUN" id="3bpBM3PWmA0" role="1eOMHV">
+                      <node concept="37vLTw" id="3bpBM3PWm_Y" role="10QFUP">
+                        <ref role="3cqZAo" node="Hg6EncdbMF" resolve="input" />
+                      </node>
+                      <node concept="3uibUv" id="3bpBM3PWmKM" role="10QFUM">
+                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
               <node concept="37vLTw" id="4BHjwwGpzZv" role="37wK5m">
@@ -1221,9 +1474,14 @@
             </node>
             <node concept="3uibUv" id="4BHjwwGp$4F" role="10QFUM">
               <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-              <node concept="3uibUv" id="4BHjwwGp$4G" role="11_B2D">
-                <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-                <node concept="3qTvmN" id="4BHjwwGp$4H" role="11_B2D" />
+              <node concept="3uibUv" id="2daneBQ7i6h" role="11_B2D">
+                <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                <node concept="3qUE_q" id="2daneBQ7i6i" role="11_B2D">
+                  <node concept="3uibUv" id="2daneBQ7i6j" role="3qUE_r">
+                    <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                    <node concept="3qTvmN" id="2daneBQ7i6k" role="11_B2D" />
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -1231,129 +1489,10 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6kREIVkgSQq" role="jymVt" />
-    <node concept="3clFb_" id="6kREIVkgN0_" role="jymVt">
-      <property role="TrG5h" value="markTime" />
-      <node concept="3Tm6S6" id="6kREIVkgN0A" role="1B3o_S" />
-      <node concept="3uibUv" id="6kREIVkgN0B" role="3clF45">
-        <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="16syzq" id="6kREIVkgN0C" role="11_B2D">
-          <ref role="16sUi3" node="1pPth$lD_uI" resolve="Prev" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="6kREIVkgMSJ" role="3clF46">
-        <property role="TrG5h" value="prevStep" />
-        <node concept="3uibUv" id="6kREIVkgMSK" role="1tU5fm">
-          <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3qUE_q" id="6kREIVkgMSL" role="11_B2D">
-            <node concept="3uibUv" id="6kREIVkgMSM" role="3qUE_r">
-              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-              <node concept="3qTvmN" id="6kREIVkgMSN" role="11_B2D" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="6kREIVkgMKK" role="3clF47">
-        <node concept="3clFbF" id="6kREIVkDnwT" role="3cqZAp">
-          <node concept="2OqwBi" id="6kREIVkgMSw" role="3clFbG">
-            <node concept="1eOMI4" id="6kREIVkgMSx" role="2Oq$k0">
-              <node concept="10QFUN" id="6kREIVkgMSy" role="1eOMHV">
-                <node concept="3uibUv" id="6kREIVkgMSz" role="10QFUM">
-                  <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-                  <node concept="16syzq" id="6kREIVkgMS$" role="11_B2D">
-                    <ref role="16sUi3" node="1pPth$lD_uI" resolve="Prev" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="6kREIVkgMSO" role="10QFUP">
-                  <ref role="3cqZAo" node="6kREIVkgMSJ" resolve="prevStep" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="6kREIVkgMSA" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
-              <node concept="1bVj0M" id="6kREIVkgMSB" role="37wK5m">
-                <node concept="37vLTG" id="6kREIVkmlHv" role="1bW2Oz">
-                  <property role="TrG5h" value="prev" />
-                  <node concept="16syzq" id="6kREIVkn7gS" role="1tU5fm">
-                    <ref role="16sUi3" node="1pPth$lD_uI" resolve="Prev" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="6kREIVkgMSC" role="1bW5cS">
-                  <node concept="3clFbF" id="6kREIVkgMSD" role="3cqZAp">
-                    <node concept="37vLTI" id="6kREIVkgMSE" role="3clFbG">
-                      <node concept="2YIFZM" id="6kREIVkgMSF" role="37vLTx">
-                        <ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
-                        <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                      </node>
-                      <node concept="2OqwBi" id="6kREIVkgMSG" role="37vLTJ">
-                        <node concept="Xjq3P" id="6kREIVkgMSH" role="2Oq$k0" />
-                        <node concept="2OwXpG" id="6kREIVkgMSI" role="2OqNvi">
-                          <ref role="2Oxat5" node="1pPth$lLkEu" resolve="startTime" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbF" id="6kREIVkmg1x" role="3cqZAp">
-                    <node concept="37vLTw" id="6kREIVkmBAA" role="3clFbG">
-                      <ref role="3cqZAo" node="6kREIVkmlHv" resolve="prev" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6kREIVkoUIA" role="jymVt" />
-    <node concept="3clFb_" id="6kREIVkFyN$" role="jymVt">
-      <property role="TrG5h" value="setStartTime" />
-      <node concept="37vLTG" id="6kREIVkFSFw" role="3clF46">
-        <property role="TrG5h" value="time" />
-        <node concept="3cpWsb" id="6kREIVkFXW$" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="6kREIVkFyNA" role="3clF45" />
-      <node concept="3Tm1VV" id="6kREIVkFyNB" role="1B3o_S" />
-      <node concept="3clFbS" id="6kREIVkFyNC" role="3clF47">
-        <node concept="3clFbF" id="6kREIVkFZ4J" role="3cqZAp">
-          <node concept="37vLTI" id="6kREIVkG0Xp" role="3clFbG">
-            <node concept="37vLTw" id="6kREIVkG1j0" role="37vLTx">
-              <ref role="3cqZAo" node="6kREIVkFSFw" resolve="time" />
-            </node>
-            <node concept="2OqwBi" id="6kREIVkFZt6" role="37vLTJ">
-              <node concept="Xjq3P" id="6kREIVkFZ4I" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6kREIVkFZOt" role="2OqNvi">
-                <ref role="2Oxat5" node="1pPth$lLkEu" resolve="startTime" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6kREIVkFsF7" role="jymVt" />
-    <node concept="3clFb_" id="6kREIVkG1Hg" role="jymVt">
-      <property role="TrG5h" value="getStartTime" />
-      <node concept="3cpWsb" id="6kREIVkG7MI" role="3clF45" />
-      <node concept="3Tm1VV" id="6kREIVkG1Hk" role="1B3o_S" />
-      <node concept="3clFbS" id="6kREIVkG1Hl" role="3clF47">
-        <node concept="3clFbF" id="6kREIVkG1Hm" role="3cqZAp">
-          <node concept="37vLTw" id="6kREIVkGqQr" role="3clFbG">
-            <ref role="3cqZAo" node="1pPth$lLkEu" resolve="startTime" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6kREIVkG1Hf" role="jymVt" />
     <node concept="3Tm1VV" id="1pPth$lAzAy" role="1B3o_S" />
-    <node concept="312cEg" id="1pPth$lLkEu" role="jymVt">
-      <property role="34CwA1" value="false" />
-      <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="startTime" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tm6S6" id="6kREIVkzH48" role="1B3o_S" />
-      <node concept="3cpWsb" id="1pPth$lLkA$" role="1tU5fm" />
-    </node>
+    <node concept="2tJIrI" id="2daneBPWVeo" role="jymVt" />
     <node concept="16euLQ" id="1pPth$lD_uI" role="16eVyc">
-      <property role="TrG5h" value="Prev" />
+      <property role="TrG5h" value="Pred" />
       <node concept="3uibUv" id="1pPth$lDDZf" role="3ztrMU">
         <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
         <node concept="3qTvmN" id="Hg6Encrihf" role="11_B2D" />
@@ -1369,12 +1508,15 @@
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="false" />
       <node concept="37vLTG" id="Hg6Enc_ddv" role="3clF46">
-        <property role="TrG5h" value="prevStep" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="Hg6Enc_ddw" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="Hg6Enc_ddC" role="11_B2D">
-            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-            <node concept="3qTvmN" id="Hg6Enc_ddD" role="11_B2D" />
+          <node concept="3uibUv" id="2daneBQ65xO" role="11_B2D">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="2daneBQ65MG" role="11_B2D">
+              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+              <node concept="3qTvmN" id="2daneBQ668o" role="11_B2D" />
+            </node>
           </node>
         </node>
       </node>
@@ -1387,9 +1529,12 @@
       <node concept="3uibUv" id="Hg6Enc_ddy" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
         <node concept="3qUE_q" id="Hg6Enc_ddz" role="11_B2D">
-          <node concept="3uibUv" id="Hg6Enc_dd$" role="3qUE_r">
-            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-            <node concept="3qTvmN" id="Hg6Enc_dd_" role="11_B2D" />
+          <node concept="3uibUv" id="2daneBQ1o_N" role="3qUE_r">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="Hg6Enc_dd$" role="11_B2D">
+              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+              <node concept="3qTvmN" id="Hg6Enc_dd_" role="11_B2D" />
+            </node>
           </node>
         </node>
       </node>
@@ -1407,23 +1552,6 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="6kREIVkZpp$" role="jymVt" />
-    <node concept="3clFb_" id="Hg6Enc_ddS" role="jymVt">
-      <property role="TrG5h" value="info" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="17QB3L" id="Hg6Enc_ddT" role="3clF45" />
-      <node concept="3Tm1VV" id="NKt6yndSGL" role="1B3o_S" />
-      <node concept="3clFbS" id="Hg6Enc_ddW" role="3clF47">
-        <node concept="3clFbF" id="Hg6Enc_edL" role="3cqZAp">
-          <node concept="Xl_RD" id="Hg6Enc_edK" role="3clFbG">
-            <property role="Xl_RC" value="init" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="Hg6Enc_ddX" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="NKt6yndSLU" role="jymVt" />
     <node concept="3Tm1VV" id="Hg6Enc_35m" role="1B3o_S" />
     <node concept="3uibUv" id="Hg6Enc_bWh" role="1zkMxy">
@@ -1461,7 +1589,7 @@
               </node>
             </node>
             <node concept="37vLTw" id="6kREIVkwjAx" role="37vLTx">
-              <ref role="3cqZAo" node="6kREIVkwjAy" resolve="failedStep" />
+              <ref role="3cqZAo" node="6kREIVkwjAy" resolve="failedEff" />
             </node>
           </node>
         </node>
@@ -1471,10 +1599,15 @@
         <node concept="17QB3L" id="6kREIVkwm1i" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="6kREIVkwjAy" role="3clF46">
-        <property role="TrG5h" value="failedStep" />
-        <node concept="3uibUv" id="6kREIVkwjAz" role="1tU5fm">
-          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-          <node concept="3qTvmN" id="6kREIVkwjA$" role="11_B2D" />
+        <property role="TrG5h" value="failedEff" />
+        <node concept="3uibUv" id="2daneBQ9aBb" role="1tU5fm">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="3qUE_q" id="2daneBQ9b6i" role="11_B2D">
+            <node concept="3uibUv" id="2daneBQ9bbc" role="3qUE_r">
+              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+              <node concept="3qTvmN" id="2daneBQ9c2D" role="11_B2D" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="37vLTG" id="4BHjwwGKLJO" role="3clF46">
@@ -1486,10 +1619,15 @@
     </node>
     <node concept="2tJIrI" id="6kREIVkwjAn" role="jymVt" />
     <node concept="3clFb_" id="6kREIVk5cLq" role="jymVt">
-      <property role="TrG5h" value="failedStep" />
-      <node concept="3uibUv" id="6kREIVk5d8X" role="3clF45">
-        <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-        <node concept="3qTvmN" id="6kREIVk5ejU" role="11_B2D" />
+      <property role="TrG5h" value="failedEffect" />
+      <node concept="3uibUv" id="2daneBQ9dwX" role="3clF45">
+        <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+        <node concept="3qUE_q" id="2daneBQ9fcY" role="11_B2D">
+          <node concept="3uibUv" id="2daneBQ9fBw" role="3qUE_r">
+            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+            <node concept="3qTvmN" id="2daneBQ9gM0" role="11_B2D" />
+          </node>
+        </node>
       </node>
       <node concept="3Tm1VV" id="6kREIVk5cLt" role="1B3o_S" />
       <node concept="3clFbS" id="6kREIVk5cLu" role="3clF47">
@@ -1508,9 +1646,14 @@
     <node concept="312cEg" id="6kREIVk5c3c" role="jymVt">
       <property role="TrG5h" value="failedStep" />
       <node concept="3Tm6S6" id="6kREIVk5c3d" role="1B3o_S" />
-      <node concept="3uibUv" id="6kREIVk5c3f" role="1tU5fm">
-        <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-        <node concept="3qTvmN" id="6kREIVk5eC8" role="11_B2D" />
+      <node concept="3uibUv" id="2daneBQ9hN9" role="1tU5fm">
+        <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+        <node concept="3qUE_q" id="2daneBQ9hNa" role="11_B2D">
+          <node concept="3uibUv" id="2daneBQ9hNb" role="3qUE_r">
+            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+            <node concept="3qTvmN" id="2daneBQ9hNc" role="11_B2D" />
+          </node>
+        </node>
       </node>
     </node>
   </node>
@@ -1545,33 +1688,22 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="3F6vMxq$Y7S" role="jymVt" />
-    <node concept="3clFb_" id="1pPth$lMSHK" role="jymVt">
-      <property role="TrG5h" value="info" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="17QB3L" id="1pPth$lMSHL" role="3clF45" />
-      <node concept="3Tm1VV" id="6kREIVkRoDm" role="1B3o_S" />
-      <node concept="3clFbS" id="1pPth$lMSHO" role="3clF47">
-        <node concept="3clFbF" id="1pPth$lMU69" role="3cqZAp">
-          <node concept="Xl_RD" id="1pPth$lMU68" role="3clFbG">
-            <property role="Xl_RC" value="evaluating rules" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1FOQehwo8s$" role="jymVt" />
+    <node concept="2tJIrI" id="3bpBM3PNFgi" role="jymVt" />
     <node concept="3clFb_" id="55Q$YFtJK$_" role="jymVt">
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="false" />
       <node concept="37vLTG" id="55Q$YFtJK$A" role="3clF46">
-        <property role="TrG5h" value="prevStep" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="55Q$YFtJK$B" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="55Q$YFtJK$L" role="11_B2D">
-            <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-            <node concept="3qUE_q" id="6vFODDAYgK3" role="11_B2D">
-              <node concept="3uibUv" id="6vFODDAYhu0" role="3qUE_r">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+          <node concept="3uibUv" id="2daneBPQRco" role="11_B2D">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="55Q$YFtJK$L" role="11_B2D">
+              <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+              <node concept="3qUE_q" id="6vFODDAYgK3" role="11_B2D">
+                <node concept="3uibUv" id="6vFODDAYhu0" role="3qUE_r">
+                  <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                </node>
               </node>
             </node>
           </node>
@@ -1586,9 +1718,13 @@
       <node concept="3uibUv" id="55Q$YFtJK$F" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
         <node concept="3qUE_q" id="55Q$YFtJK$G" role="11_B2D">
-          <node concept="3uibUv" id="55Q$YFtJK$H" role="3qUE_r">
-            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-            <node concept="3qTvmN" id="55Q$YFtJK$I" role="11_B2D" />
+          <node concept="3uibUv" id="2daneBPQMsw" role="3qUE_r">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3qUE_q" id="2daneBPVmgZ" role="11_B2D">
+              <node concept="3uibUv" id="2daneBPVnHk" role="3qUE_r">
+                <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -1600,18 +1736,21 @@
             <ref role="37wK5l" node="55Q$YFtHM07" resolve="scheduleWithTrace" />
             <node concept="2OqwBi" id="55Q$YFtJUbO" role="37wK5m">
               <node concept="37vLTw" id="55Q$YFtJUbP" role="2Oq$k0">
-                <ref role="3cqZAo" node="55Q$YFtJK$A" resolve="prevStep" />
+                <ref role="3cqZAo" node="55Q$YFtJK$A" resolve="input" />
               </node>
               <node concept="liA8E" id="55Q$YFtJUbQ" role="2OqNvi">
                 <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
                 <node concept="1bVj0M" id="55Q$YFtJUbR" role="37wK5m">
                   <node concept="37vLTG" id="55Q$YFtJUbS" role="1bW2Oz">
-                    <property role="TrG5h" value="prev" />
-                    <node concept="3uibUv" id="55Q$YFtJUbT" role="1tU5fm">
-                      <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-                      <node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
-                        <node concept="3uibUv" id="6vFODDAYjpq" role="3qUE_r">
-                          <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                    <property role="TrG5h" value="inEff" />
+                    <node concept="3uibUv" id="2daneBPQUVb" role="1tU5fm">
+                      <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                      <node concept="3uibUv" id="55Q$YFtJUbT" role="11_B2D">
+                        <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                        <node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
+                          <node concept="3uibUv" id="6vFODDAYjpq" role="3qUE_r">
+                            <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -1621,7 +1760,7 @@
                     <node concept="3clFbF" id="55Q$YFtJUbV" role="3cqZAp">
                       <node concept="1Ls8ON" id="55Q$YFtJUbW" role="3clFbG">
                         <node concept="37vLTw" id="55Q$YFtJUbX" role="1Lso8e">
-                          <ref role="3cqZAo" node="55Q$YFtJUbS" resolve="prev" />
+                          <ref role="3cqZAo" node="55Q$YFtJUbS" resolve="inEff" />
                         </node>
                         <node concept="10M0yZ" id="4$YN6QuoGju" role="1Lso8e">
                           <ref role="3cqZAo" to="hano:24Vro6cS5rK" resolve="NULL" />
@@ -1649,15 +1788,18 @@
     <node concept="3clFb_" id="55Q$YFtHM07" role="jymVt">
       <property role="TrG5h" value="scheduleWithTrace" />
       <node concept="37vLTG" id="55Q$YFtHZC$" role="3clF46">
-        <property role="TrG5h" value="prevStepWithTrace" />
+        <property role="TrG5h" value="input_trace" />
         <node concept="3uibUv" id="55Q$YFtI1PX" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
           <node concept="1LlUBW" id="55Q$YFtI23F" role="11_B2D">
-            <node concept="3uibUv" id="55Q$YFtI23G" role="1Lm7xW">
-              <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-              <node concept="3qUE_q" id="6vFODDAYnEe" role="11_B2D">
-                <node concept="3uibUv" id="6vFODDAYpoH" role="3qUE_r">
-                  <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+            <node concept="3uibUv" id="2daneBPRdcT" role="1Lm7xW">
+              <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+              <node concept="3uibUv" id="55Q$YFtI23G" role="11_B2D">
+                <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                <node concept="3qUE_q" id="6vFODDAYnEe" role="11_B2D">
+                  <node concept="3uibUv" id="6vFODDAYpoH" role="3qUE_r">
+                    <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -1675,17 +1817,23 @@
       </node>
       <node concept="3uibUv" id="55Q$YFtHSlL" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="55Q$YFtIEjB" role="11_B2D">
-          <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
+        <node concept="3uibUv" id="2daneBPR7$U" role="11_B2D">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="3qUE_q" id="2daneBPV3w9" role="11_B2D">
+            <node concept="3uibUv" id="2daneBPV5MS" role="3qUE_r">
+              <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3Tmbuc" id="55Q$YFtHQ8P" role="1B3o_S" />
       <node concept="3clFbS" id="55Q$YFtHM0b" role="3clF47">
+        <node concept="3clFbH" id="2daneBPULbr" role="3cqZAp" />
         <node concept="3clFbF" id="Hg6Enc6x_I" role="3cqZAp">
           <node concept="2OqwBi" id="Hg6Enc6Chp" role="3clFbG">
             <node concept="2OqwBi" id="Hg6End2Sn8" role="2Oq$k0">
               <node concept="37vLTw" id="55Q$YFtIgrO" role="2Oq$k0">
-                <ref role="3cqZAo" node="55Q$YFtHZC$" resolve="prevStepWithTrace" />
+                <ref role="3cqZAo" node="55Q$YFtHZC$" resolve="input_trace" />
               </node>
               <node concept="liA8E" id="Hg6End2UXi" role="2OqNvi">
                 <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
@@ -1701,15 +1849,7 @@
                   <node concept="3clFbH" id="Hg6Enc9KMF" role="3cqZAp" />
                   <node concept="3cpWs8" id="Hg6Enc9a3F" role="3cqZAp">
                     <node concept="3cpWsn" id="Hg6Enc9a3G" role="3cpWs9">
-                      <property role="TrG5h" value="prev" />
-                      <node concept="3uibUv" id="Hg6Enc9a3E" role="1tU5fm">
-                        <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-                        <node concept="3qUE_q" id="6vFODDAYCy3" role="11_B2D">
-                          <node concept="3uibUv" id="6vFODDAYCy4" role="3qUE_r">
-                            <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
-                          </node>
-                        </node>
-                      </node>
+                      <property role="TrG5h" value="inEff" />
                       <node concept="1LFfDK" id="Hg6Enc9a3H" role="33vP2m">
                         <node concept="3cmrfG" id="Hg6Enc9a3I" role="1LF_Uc">
                           <property role="3cmrfH" value="0" />
@@ -1718,6 +1858,17 @@
                           <ref role="3cqZAo" node="Hg6Enc8tAo" resolve="prev_trace" />
                         </node>
                       </node>
+                      <node concept="3uibUv" id="2daneBPRtum" role="1tU5fm">
+                        <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                        <node concept="3uibUv" id="Hg6Enc9a3E" role="11_B2D">
+                          <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                          <node concept="3qUE_q" id="6vFODDAYCy3" role="11_B2D">
+                            <node concept="3uibUv" id="6vFODDAYCy4" role="3qUE_r">
+                              <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                   <node concept="3cpWs8" id="Hg6Enc9_Rb" role="3cqZAp">
@@ -1802,10 +1953,14 @@
                       </node>
                       <node concept="2OqwBi" id="7WKNeR9z3IA" role="33vP2m">
                         <node concept="37vLTw" id="7WKNeR9z3IB" role="2Oq$k0">
-                          <ref role="3cqZAo" node="Hg6Enc9a3G" resolve="prev" />
+                          <ref role="3cqZAo" node="Hg6Enc9a3G" resolve="inEff" />
                         </node>
-                        <node concept="liA8E" id="7WKNeR9z3IC" role="2OqNvi">
-                          <ref role="37wK5l" node="7WKNeR9kDKp" resolve="queryTemplate" />
+                        <node concept="liA8E" id="2daneBPSluv" role="2OqNvi">
+                          <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
+                          <node concept="10M0yZ" id="2daneBPSsb_" role="37wK5m">
+                            <ref role="3cqZAo" node="2daneBPREA7" resolve="QUERY_TEMPLATE" />
+                            <ref role="1PxDUh" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -1990,10 +2145,14 @@
                       </node>
                       <node concept="2OqwBi" id="6tPOoeTcqr5" role="33vP2m">
                         <node concept="37vLTw" id="6tPOoeTcp$e" role="2Oq$k0">
-                          <ref role="3cqZAo" node="Hg6Enc9a3G" resolve="prev" />
+                          <ref role="3cqZAo" node="Hg6Enc9a3G" resolve="inEff" />
                         </node>
-                        <node concept="liA8E" id="7eQMSyzanDe" role="2OqNvi">
-                          <ref role="37wK5l" node="7eQMSyzadZv" resolve="getProgramProducer" />
+                        <node concept="liA8E" id="2daneBPSFhB" role="2OqNvi">
+                          <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
+                          <node concept="10M0yZ" id="2daneBPSJ6V" role="37wK5m">
+                            <ref role="3cqZAo" node="2daneBPSu1V" resolve="PROGRAM_PRODUCER" />
+                            <ref role="1PxDUh" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -2229,7 +2388,14 @@
                                   <ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
                                 </node>
                               </node>
-                              <node concept="Xjq3P" id="6kREIVkiCK$" role="37wK5m" />
+                              <node concept="2ShNRf" id="3bpBM3P6S36" role="37wK5m">
+                                <node concept="1pGfFk" id="3bpBM3PRvn5" role="2ShVmc">
+                                  <ref role="37wK5l" node="3bpBM3PNk9l" resolve="Effect.NullEffect" />
+                                  <node concept="Xl_RD" id="3bpBM3PRsiw" role="37wK5m">
+                                    <property role="Xl_RC" value="failure evaluating rules" />
+                                  </node>
+                                </node>
+                              </node>
                               <node concept="2ShNRf" id="4BHjwwGKNNn" role="37wK5m">
                                 <node concept="1pGfFk" id="4BHjwwGKP9i" role="2ShVmc">
                                   <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
@@ -2289,19 +2455,17 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="Hg6Enc7CQZ" role="3cqZAp">
-                    <node concept="37vLTI" id="Hg6Enc7CR0" role="3clFbG">
-                      <node concept="2OqwBi" id="Hg6Enc7CR1" role="37vLTJ">
-                        <node concept="Xjq3P" id="Hg6Enc7CR2" role="2Oq$k0" />
-                        <node concept="2OwXpG" id="Hg6Enc7CR3" role="2OqNvi">
-                          <ref role="2Oxat5" node="1CcQBrQoJoP" resolve="storeView" />
-                        </node>
+                  <node concept="3cpWs8" id="3bpBM3QdvOJ" role="3cqZAp">
+                    <node concept="3cpWsn" id="3bpBM3QdvOK" role="3cpWs9">
+                      <property role="TrG5h" value="storeView" />
+                      <node concept="3uibUv" id="3bpBM3Qdt9z" role="1tU5fm">
+                        <ref role="3uigEE" to="w7la:~StoreView" resolve="StoreView" />
                       </node>
-                      <node concept="2OqwBi" id="Hg6Enc7CR4" role="37vLTx">
-                        <node concept="37vLTw" id="Hg6Enc7CR5" role="2Oq$k0">
+                      <node concept="2OqwBi" id="3bpBM3QdvOL" role="33vP2m">
+                        <node concept="37vLTw" id="3bpBM3QdvOM" role="2Oq$k0">
                           <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
                         </node>
-                        <node concept="liA8E" id="Hg6Enc7CR6" role="2OqNvi">
+                        <node concept="liA8E" id="3bpBM3QdvON" role="2OqNvi">
                           <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
                         </node>
                       </node>
@@ -2322,8 +2486,8 @@
                           </node>
                           <node concept="liA8E" id="7WKNeR9$wYC" role="2OqNvi">
                             <ref role="37wK5l" to="i348:7P_FdVQ_jLY" resolve="onCompleted" />
-                            <node concept="37vLTw" id="7WKNeR9$IH$" role="37wK5m">
-                              <ref role="3cqZAo" node="1CcQBrQoJoP" resolve="storeView" />
+                            <node concept="37vLTw" id="3bpBM3QdFoW" role="37wK5m">
+                              <ref role="3cqZAo" node="3bpBM3QdvOK" resolve="storeView" />
                             </node>
                           </node>
                         </node>
@@ -2342,19 +2506,39 @@
                     </node>
                   </node>
                   <node concept="3clFbH" id="4jShfh67I32" role="3cqZAp" />
-                  <node concept="3clFbF" id="6kREIVkw$0u" role="3cqZAp">
-                    <node concept="Xjq3P" id="6kREIVkw$0s" role="3clFbG" />
+                  <node concept="3clFbF" id="2daneBPSOje" role="3cqZAp">
+                    <node concept="2OqwBi" id="2daneBPV8S2" role="3clFbG">
+                      <node concept="37vLTw" id="2daneBPV8S3" role="2Oq$k0">
+                        <ref role="3cqZAo" node="Hg6Enc9a3G" resolve="inEff" />
+                      </node>
+                      <node concept="liA8E" id="2daneBPV8S4" role="2OqNvi">
+                        <ref role="37wK5l" node="2daneBOX0cV" resolve="combine" />
+                        <node concept="2ShNRf" id="2daneBPV8S5" role="37wK5m">
+                          <node concept="1pGfFk" id="3bpBM3PNAd_" role="2ShVmc">
+                            <ref role="37wK5l" node="3bpBM3PNk9l" resolve="Effect.NullEffect" />
+                            <node concept="Xl_RD" id="3bpBM3PNAdG" role="37wK5m">
+                              <property role="Xl_RC" value="evaluating rules" />
+                            </node>
+                            <node concept="3uibUv" id="2haXm$zXt24" role="1pMfVU">
+                              <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
-                  <node concept="3clFbH" id="Hg6EncbdAp" role="3cqZAp" />
                 </node>
                 <node concept="37vLTG" id="Hg6Enc8tAo" role="1bW2Oz">
                   <property role="TrG5h" value="prev_trace" />
                   <node concept="1LlUBW" id="Hg6Enc8tAn" role="1tU5fm">
-                    <node concept="3uibUv" id="Hg6Enc8A8x" role="1Lm7xW">
-                      <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-                      <node concept="3qUE_q" id="6vFODDAYDH5" role="11_B2D">
-                        <node concept="3uibUv" id="6vFODDAYDH6" role="3qUE_r">
-                          <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                    <node concept="3uibUv" id="2daneBPRmSU" role="1Lm7xW">
+                      <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                      <node concept="3uibUv" id="Hg6Enc8A8x" role="11_B2D">
+                        <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                        <node concept="3qUE_q" id="6vFODDAYDH5" role="11_B2D">
+                          <node concept="3uibUv" id="6vFODDAYDH6" role="3qUE_r">
+                            <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -2521,7 +2705,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="Hg6Enc6sLX" role="jymVt" />
-    <node concept="2tJIrI" id="3F6vMxqjxuu" role="jymVt" />
     <node concept="3clFb_" id="23c4kVtaQus" role="jymVt">
       <property role="TrG5h" value="createReporting" />
       <property role="1EzhhJ" value="true" />
@@ -2532,21 +2715,6 @@
       <node concept="3clFbS" id="23c4kVtaQux" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="52a_GfIGUah" role="jymVt" />
-    <node concept="3clFb_" id="6kREIVl0T6d" role="jymVt">
-      <property role="TrG5h" value="getStoreView" />
-      <node concept="3uibUv" id="6kREIVl0T6e" role="3clF45">
-        <ref role="3uigEE" to="w7la:~StoreView" resolve="StoreView" />
-      </node>
-      <node concept="3Tm1VV" id="6kREIVl0T6f" role="1B3o_S" />
-      <node concept="3clFbS" id="6kREIVl0T6g" role="3clF47">
-        <node concept="3clFbF" id="6kREIVl0T6h" role="3cqZAp">
-          <node concept="37vLTw" id="6kREIVl0T6c" role="3clFbG">
-            <ref role="3cqZAo" node="1CcQBrQoJoP" resolve="storeView" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="55Q$YFtJBDl" role="jymVt" />
     <node concept="3clFb_" id="443LGHBSOXq" role="jymVt">
       <property role="TrG5h" value="getRepository" />
       <node concept="3uibUv" id="443LGHBSOXr" role="3clF45">
@@ -2562,13 +2730,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7lt0LtQA2xG" role="jymVt" />
-    <node concept="312cEg" id="1CcQBrQoJoP" role="jymVt">
-      <property role="TrG5h" value="storeView" />
-      <node concept="3Tm6S6" id="6kREIVl17U5" role="1B3o_S" />
-      <node concept="3uibUv" id="1CcQBrQoM5e" role="1tU5fm">
-        <ref role="3uigEE" to="w7la:~StoreView" resolve="StoreView" />
-      </node>
-    </node>
     <node concept="3Tm1VV" id="3F6vMxq$V$W" role="1B3o_S" />
     <node concept="3uibUv" id="1pPth$lBP1p" role="1zkMxy">
       <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
@@ -3866,10 +4027,15 @@
                       <node concept="3Tm1VV" id="4BHjwwGhwJQ" role="1B3o_S" />
                       <node concept="3cqZAl" id="4BHjwwGhwJS" role="3clF45" />
                       <node concept="37vLTG" id="4BHjwwGhwJT" role="3clF46">
-                        <property role="TrG5h" value="step" />
-                        <node concept="3uibUv" id="4BHjwwGhwK5" role="1tU5fm">
-                          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-                          <node concept="3qTvmN" id="4BHjwwGhwK6" role="11_B2D" />
+                        <property role="TrG5h" value="inEff" />
+                        <node concept="3uibUv" id="2daneBQ720T" role="1tU5fm">
+                          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                          <node concept="3qUE_q" id="2daneBQ720U" role="11_B2D">
+                            <node concept="3uibUv" id="2daneBQ720V" role="3qUE_r">
+                              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                              <node concept="3qTvmN" id="2daneBQ720W" role="11_B2D" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                       <node concept="3clFbS" id="4BHjwwGhwK7" role="3clF47">
@@ -3916,9 +4082,14 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3uibUv" id="4BHjwwGhsFH" role="2Ghqu4">
-                      <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-                      <node concept="3qTvmN" id="4BHjwwGhtJy" role="11_B2D" />
+                    <node concept="3uibUv" id="2daneBQ6F7T" role="2Ghqu4">
+                      <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                      <node concept="3qUE_q" id="2daneBQ6S3e" role="11_B2D">
+                        <node concept="3uibUv" id="2daneBQ6ST5" role="3qUE_r">
+                          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                          <node concept="3qTvmN" id="2daneBQ6UTQ" role="11_B2D" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -3929,6 +4100,36 @@
       </node>
       <node concept="3cqZAl" id="Hg6EncONQt" role="3clF45" />
     </node>
+    <node concept="2tJIrI" id="2daneBP$fzE" role="jymVt" />
+    <node concept="3clFb_" id="2daneBP$ovk" role="jymVt">
+      <property role="TrG5h" value="executeAndWait" />
+      <node concept="3uibUv" id="2daneBP$xt5" role="3clF45">
+        <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+        <node concept="3qUE_q" id="2daneBQ3ses" role="11_B2D">
+          <node concept="3uibUv" id="2daneBQ3s$5" role="3qUE_r">
+            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+            <node concept="3qTvmN" id="2daneBQ3ubI" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2daneBP$ovn" role="1B3o_S" />
+      <node concept="3clFbS" id="2daneBP$ovo" role="3clF47">
+        <node concept="3clFbF" id="2daneBQ3r_V" role="3cqZAp">
+          <node concept="2OqwBi" id="2daneBQ3uw4" role="3clFbG">
+            <node concept="1rXfSq" id="2daneBQ3uw5" role="2Oq$k0">
+              <ref role="37wK5l" node="2mbQB8J5m$l" resolve="scheduleExecute" />
+              <node concept="2YIFZM" id="2daneBQ3uw6" role="37wK5m">
+                <ref role="37wK5l" node="3KwBCAA_erO" resolve="blocking" />
+                <ref role="1Pybhc" node="3KwBCAA_ela" resolve="MPSSchedulers" />
+              </node>
+            </node>
+            <node concept="liA8E" id="2daneBQ3uw7" role="2OqNvi">
+              <ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="Hg6EncPaQm" role="jymVt" />
     <node concept="3clFb_" id="Hg6EncMFl4" role="jymVt">
       <property role="TrG5h" value="executeAsync" />
@@ -3936,9 +4137,14 @@
         <property role="TrG5h" value="observer" />
         <node concept="3uibUv" id="4BHjwwGhlOK" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~SingleObserver" resolve="SingleObserver" />
-          <node concept="3uibUv" id="4BHjwwGpinv" role="11_B2D">
-            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-            <node concept="3qTvmN" id="4BHjwwGpinw" role="11_B2D" />
+          <node concept="3uibUv" id="2daneBQ3iNX" role="11_B2D">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3qUE_q" id="2daneBQ3iNY" role="11_B2D">
+              <node concept="3uibUv" id="2daneBQ3iNZ" role="3qUE_r">
+                <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                <node concept="3qTvmN" id="2daneBQ3iO0" role="11_B2D" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -3965,9 +4171,14 @@
       <property role="TrG5h" value="scheduleExecute" />
       <node concept="3uibUv" id="4BHjwwGhjMi" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="4BHjwwGifno" role="11_B2D">
-          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-          <node concept="3qTvmN" id="4BHjwwGifnp" role="11_B2D" />
+        <node concept="3uibUv" id="2daneBQ3h7u" role="11_B2D">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="3qUE_q" id="2daneBQ3h7v" role="11_B2D">
+            <node concept="3uibUv" id="2daneBQ3h7w" role="3qUE_r">
+              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+              <node concept="3qTvmN" id="2daneBQ3h7x" role="11_B2D" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="Hg6End$aLp" role="1B3o_S" />
@@ -3994,29 +4205,59 @@
       </node>
       <node concept="3uibUv" id="4BHjwwGh$bB" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="4BHjwwGphis" role="11_B2D">
-          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-          <node concept="3qTvmN" id="4BHjwwGphit" role="11_B2D" />
+        <node concept="3uibUv" id="2daneBQ1gCR" role="11_B2D">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="3qUE_q" id="2daneBQ3c5T" role="11_B2D">
+            <node concept="3uibUv" id="2daneBQ3cqh" role="3qUE_r">
+              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+              <node concept="3qTvmN" id="2daneBQ3dZy" role="11_B2D" />
+            </node>
+          </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="Hg6EndaMgs" role="1B3o_S" />
+      <node concept="3Tm6S6" id="3bpBM3Q8Rgb" role="1B3o_S" />
       <node concept="3clFbS" id="2mbQB8J5m$p" role="3clF47">
+        <node concept="3clFbF" id="3bpBM3Q8Ygx" role="3cqZAp">
+          <node concept="37vLTI" id="3bpBM3Q91o0" role="3clFbG">
+            <node concept="2YIFZM" id="3bpBM3Q92s2" role="37vLTx">
+              <ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
+              <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+            </node>
+            <node concept="2OqwBi" id="3bpBM3Q8ZaV" role="37vLTJ">
+              <node concept="Xjq3P" id="3bpBM3Q8Ygv" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3bpBM3Q90FM" role="2OqNvi">
+                <ref role="2Oxat5" node="3bpBM3Q8EKT" resolve="lastTimestamp" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="6kREIVkCl_J" role="3cqZAp">
           <node concept="3cpWsn" id="6kREIVkCl_K" role="3cpWs9">
             <property role="TrG5h" value="first" />
             <node concept="3uibUv" id="6kREIVkClxG" role="1tU5fm">
               <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-              <node concept="3uibUv" id="4BHjwwGpX_6" role="11_B2D">
-                <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-                <node concept="3qTvmN" id="4BHjwwGpX_7" role="11_B2D" />
+              <node concept="3uibUv" id="2daneBQ1wFo" role="11_B2D">
+                <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                <node concept="3qUE_q" id="2daneBQ2r0x" role="11_B2D">
+                  <node concept="3uibUv" id="2daneBQ2rZb" role="3qUE_r">
+                    <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                    <node concept="3qTvmN" id="2daneBQ2udZ" role="11_B2D" />
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="2YIFZM" id="6kREIVkCl_L" role="33vP2m">
               <ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
               <ref role="37wK5l" to="unkn:~Single.just(java.lang.Object)" resolve="just" />
-              <node concept="2ShNRf" id="6kREIVkCl_M" role="37wK5m">
-                <node concept="HV5vD" id="6kREIVkCl_N" role="2ShVmc">
-                  <ref role="HV5vE" node="Hg6Enc_35l" resolve="InitStep" />
+              <node concept="2ShNRf" id="2daneBQ20QO" role="37wK5m">
+                <node concept="1pGfFk" id="3bpBM3PUnta" role="2ShVmc">
+                  <ref role="37wK5l" node="3bpBM3PNk9l" resolve="Effect.NullEffect" />
+                  <node concept="Xl_RD" id="3bpBM3PUnt9" role="37wK5m">
+                    <property role="Xl_RC" value="init" />
+                  </node>
+                  <node concept="3uibUv" id="3bpBM3PUrre" role="1pMfVU">
+                    <ref role="3uigEE" node="Hg6Enc_35l" resolve="InitStep" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -4027,9 +4268,14 @@
             <property role="TrG5h" value="last" />
             <node concept="3uibUv" id="4BHjwwGi7ES" role="1tU5fm">
               <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-              <node concept="3uibUv" id="4BHjwwGpiDy" role="11_B2D">
-                <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-                <node concept="3qTvmN" id="4BHjwwGpiDz" role="11_B2D" />
+              <node concept="3uibUv" id="2daneBQ2HyO" role="11_B2D">
+                <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                <node concept="3qUE_q" id="2daneBQ2OZO" role="11_B2D">
+                  <node concept="3uibUv" id="2daneBQ2PNd" role="3qUE_r">
+                    <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                    <node concept="3qTvmN" id="2daneBQ2Ujn" role="11_B2D" />
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="2OqwBi" id="4BHjwwGi7Io" role="33vP2m">
@@ -4067,9 +4313,14 @@
                     <property role="TrG5h" value="s" />
                     <node concept="3uibUv" id="4BHjwwGi7IA" role="1tU5fm">
                       <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-                      <node concept="3uibUv" id="4BHjwwGq7wY" role="11_B2D">
-                        <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-                        <node concept="3qTvmN" id="4BHjwwGq7wZ" role="11_B2D" />
+                      <node concept="3uibUv" id="2daneBQ2C44" role="11_B2D">
+                        <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                        <node concept="3qUE_q" id="2daneBQ2Y40" role="11_B2D">
+                          <node concept="3uibUv" id="2daneBQ2YZe" role="3qUE_r">
+                            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                            <node concept="3qTvmN" id="2daneBQ312V" role="11_B2D" />
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -4095,10 +4346,15 @@
                 <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
                 <node concept="1bVj0M" id="4BHjwwGLp1f" role="37wK5m">
                   <node concept="37vLTG" id="4BHjwwGLq3q" role="1bW2Oz">
-                    <property role="TrG5h" value="step" />
-                    <node concept="3uibUv" id="4BHjwwGLqs3" role="1tU5fm">
-                      <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-                      <node concept="3qTvmN" id="4BHjwwGLqPZ" role="11_B2D" />
+                    <property role="TrG5h" value="inEff" />
+                    <node concept="3uibUv" id="2daneBQ33zx" role="1tU5fm">
+                      <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                      <node concept="3qUE_q" id="2daneBQ358o" role="11_B2D">
+                        <node concept="3uibUv" id="2daneBQ35Sl" role="3qUE_r">
+                          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                          <node concept="3qTvmN" id="2daneBQ37N6" role="11_B2D" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                   <node concept="3clFbS" id="4BHjwwGLp1g" role="1bW5cS">
@@ -4156,7 +4412,7 @@
                     </node>
                     <node concept="3clFbF" id="4BHjwwGLtiL" role="3cqZAp">
                       <node concept="37vLTw" id="4BHjwwGLtiJ" role="3clFbG">
-                        <ref role="3cqZAo" node="4BHjwwGLq3q" resolve="step" />
+                        <ref role="3cqZAo" node="4BHjwwGLq3q" resolve="inEff" />
                       </node>
                     </node>
                   </node>
@@ -4177,20 +4433,30 @@
     <node concept="3clFb_" id="6kREIVkp0T3" role="jymVt">
       <property role="TrG5h" value="success" />
       <node concept="37vLTG" id="6kREIVkpzoM" role="3clF46">
-        <property role="TrG5h" value="step" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="6kREIVkpCsf" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="4BHjwwGpHrd" role="11_B2D">
-            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-            <node concept="3qTvmN" id="4BHjwwGpIEB" role="11_B2D" />
+          <node concept="3uibUv" id="2daneBQ7_PP" role="11_B2D">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3qUE_q" id="2daneBQ7D3S" role="11_B2D">
+              <node concept="3uibUv" id="2daneBQ7ExW" role="3qUE_r">
+                <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                <node concept="3qTvmN" id="2daneBQ7Fil" role="11_B2D" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="6kREIVkt9Qk" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="4BHjwwGpBT0" role="11_B2D">
-          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-          <node concept="3qTvmN" id="4BHjwwGpBT1" role="11_B2D" />
+        <node concept="3uibUv" id="2daneBQ7H_8" role="11_B2D">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="3qUE_q" id="2daneBQ7H_9" role="11_B2D">
+            <node concept="3uibUv" id="2daneBQ7H_a" role="3qUE_r">
+              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+              <node concept="3qTvmN" id="2daneBQ7H_b" role="11_B2D" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3Tm6S6" id="6kREIVkp6J5" role="1B3o_S" />
@@ -4198,7 +4464,7 @@
         <node concept="3clFbF" id="6kREIVkDtth" role="3cqZAp">
           <node concept="2OqwBi" id="6kREIVkpVzb" role="3clFbG">
             <node concept="37vLTw" id="6kREIVkpPZM" role="2Oq$k0">
-              <ref role="3cqZAo" node="6kREIVkpzoM" resolve="step" />
+              <ref role="3cqZAo" node="6kREIVkpzoM" resolve="input" />
             </node>
             <node concept="liA8E" id="6kREIVkq2ib" role="2OqNvi">
               <ref role="37wK5l" to="unkn:~Single.doOnSuccess(io.reactivex.functions.Consumer)" resolve="doOnSuccess" />
@@ -4208,7 +4474,7 @@
                     <node concept="1rXfSq" id="6kREIVku5V2" role="3clFbG">
                       <ref role="37wK5l" node="7dgRGU4MD7E" resolve="feedback" />
                       <node concept="37vLTw" id="6kREIVkKp9Y" role="37wK5m">
-                        <ref role="3cqZAo" node="6kREIVkqewG" resolve="step" />
+                        <ref role="3cqZAo" node="6kREIVkqewG" resolve="eff" />
                       </node>
                       <node concept="3clFbT" id="6kREIVkubXN" role="37wK5m">
                         <property role="3clFbU" value="true" />
@@ -4218,10 +4484,15 @@
                   </node>
                 </node>
                 <node concept="37vLTG" id="6kREIVkqewG" role="1bW2Oz">
-                  <property role="TrG5h" value="step" />
-                  <node concept="3uibUv" id="4BHjwwGpLkQ" role="1tU5fm">
-                    <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-                    <node concept="3qTvmN" id="4BHjwwGpLkR" role="11_B2D" />
+                  <property role="TrG5h" value="eff" />
+                  <node concept="3uibUv" id="2daneBQ7Q_f" role="1tU5fm">
+                    <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                    <node concept="3qUE_q" id="2daneBQ7Sjj" role="11_B2D">
+                      <node concept="3uibUv" id="2daneBQ7SFc" role="3qUE_r">
+                        <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+                        <node concept="3qTvmN" id="3bpBM3PFo5Z" role="11_B2D" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -4234,20 +4505,20 @@
     <node concept="3clFb_" id="6kREIVkdKgX" role="jymVt">
       <property role="TrG5h" value="recover" />
       <node concept="37vLTG" id="6kREIVke7Pf" role="3clF46">
-        <property role="TrG5h" value="single" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="6kREIVkeds5" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="4BHjwwGpOpN" role="11_B2D">
-            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-            <node concept="3qTvmN" id="4BHjwwGpOpO" role="11_B2D" />
+          <node concept="3uibUv" id="2daneBQ8NXv" role="11_B2D">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3qTvmN" id="2daneBQ8Rvi" role="11_B2D" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="6kREIVkele0" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="4BHjwwGpNL$" role="11_B2D">
-          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-          <node concept="3qTvmN" id="4BHjwwGpNL_" role="11_B2D" />
+        <node concept="3uibUv" id="2daneBQ8V03" role="11_B2D">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="3qTvmN" id="2daneBQ8WGx" role="11_B2D" />
         </node>
       </node>
       <node concept="3Tm6S6" id="6kREIVkdQ4s" role="1B3o_S" />
@@ -4255,13 +4526,12 @@
         <node concept="3clFbF" id="6kREIVkeeK1" role="3cqZAp">
           <node concept="2OqwBi" id="6kREIVkefh4" role="3clFbG">
             <node concept="37vLTw" id="6kREIVkeeK0" role="2Oq$k0">
-              <ref role="3cqZAo" node="6kREIVke7Pf" resolve="single" />
+              <ref role="3cqZAo" node="6kREIVke7Pf" resolve="input" />
             </node>
             <node concept="liA8E" id="6kREIVkeglV" role="2OqNvi">
               <ref role="37wK5l" to="unkn:~Single.onErrorReturn(io.reactivex.functions.Function)" resolve="onErrorReturn" />
               <node concept="1bVj0M" id="6kREIVkftIa" role="37wK5m">
                 <node concept="3clFbS" id="6kREIVkftIc" role="1bW5cS">
-                  <node concept="3clFbH" id="2HYHa0WUUhS" role="3cqZAp" />
                   <node concept="3clFbH" id="1GKZK$A38Lc" role="3cqZAp" />
                   <node concept="2xdQw9" id="1GKZK$A3MMz" role="3cqZAp">
                     <property role="2xdLsb" value="gZ5fksE/warn" />
@@ -4426,18 +4696,18 @@
                             </node>
                             <node concept="3cpWs8" id="6kREIVkKnAM" role="3cqZAp">
                               <node concept="3cpWsn" id="6kREIVkKnAN" role="3cpWs9">
-                                <property role="TrG5h" value="step" />
+                                <property role="TrG5h" value="effect" />
                                 <node concept="2OqwBi" id="6kREIVkKnAQ" role="33vP2m">
                                   <node concept="37vLTw" id="6kREIVkKnAR" role="2Oq$k0">
                                     <ref role="3cqZAo" node="6kREIVkerkd" resolve="resume" />
                                   </node>
                                   <node concept="liA8E" id="6kREIVkKnAS" role="2OqNvi">
-                                    <ref role="37wK5l" node="6kREIVk5cLq" resolve="failedStep" />
+                                    <ref role="37wK5l" node="6kREIVk5cLq" resolve="failedEffect" />
                                   </node>
                                 </node>
-                                <node concept="3uibUv" id="6kREIVkq_DQ" role="1tU5fm">
-                                  <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-                                  <node concept="3qTvmN" id="6kREIVkq_DR" role="11_B2D" />
+                                <node concept="3uibUv" id="2daneBQ9054" role="1tU5fm">
+                                  <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                                  <node concept="3qTvmN" id="2daneBQ91ak" role="11_B2D" />
                                 </node>
                               </node>
                             </node>
@@ -4445,7 +4715,7 @@
                               <node concept="1rXfSq" id="6kREIVkjYWx" role="3clFbG">
                                 <ref role="37wK5l" node="7dgRGU4MD7E" resolve="feedback" />
                                 <node concept="37vLTw" id="6kREIVkKo$_" role="37wK5m">
-                                  <ref role="3cqZAo" node="6kREIVkKnAN" resolve="step" />
+                                  <ref role="3cqZAo" node="6kREIVkKnAN" resolve="effect" />
                                 </node>
                                 <node concept="3clFbT" id="6kREIVkjZEr" role="37wK5m">
                                   <property role="3clFbU" value="false" />
@@ -4462,7 +4732,7 @@
                             </node>
                             <node concept="3cpWs6" id="6kREIVkerkj" role="3cqZAp">
                               <node concept="37vLTw" id="6kREIVkKnAT" role="3cqZAk">
-                                <ref role="3cqZAo" node="6kREIVkKnAN" resolve="step" />
+                                <ref role="3cqZAo" node="6kREIVkKnAN" resolve="effect" />
                               </node>
                             </node>
                           </node>
@@ -4608,7 +4878,7 @@
           <node concept="1rXfSq" id="1N_0WA5K6qc" role="3clFbG">
             <ref role="37wK5l" node="1N_0WA5JUy$" resolve="updateFeedback" />
             <node concept="37vLTw" id="6kREIVkKndg" role="37wK5m">
-              <ref role="3cqZAo" node="6kREIVkK4EL" resolve="step" />
+              <ref role="3cqZAo" node="6kREIVkK4EL" resolve="eff" />
             </node>
             <node concept="37vLTw" id="1N_0WA5K78U" role="37wK5m">
               <ref role="3cqZAo" node="7dgRGU4MD8p" resolve="ok" />
@@ -4681,10 +4951,10 @@
         </node>
       </node>
       <node concept="37vLTG" id="6kREIVkK4EL" role="3clF46">
-        <property role="TrG5h" value="step" />
-        <node concept="3uibUv" id="6kREIVkK9Qz" role="1tU5fm">
-          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-          <node concept="3qTvmN" id="6kREIVkKaWw" role="11_B2D" />
+        <property role="TrG5h" value="eff" />
+        <node concept="3uibUv" id="2daneBQ8wTd" role="1tU5fm">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="3qTvmN" id="2daneBQ8yHM" role="11_B2D" />
         </node>
       </node>
       <node concept="37vLTG" id="7dgRGU4MD8p" role="3clF46">
@@ -4700,10 +4970,10 @@
     <node concept="3clFb_" id="1N_0WA5JUy$" role="jymVt">
       <property role="TrG5h" value="updateFeedback" />
       <node concept="37vLTG" id="6kREIVkKcW1" role="3clF46">
-        <property role="TrG5h" value="step" />
-        <node concept="3uibUv" id="6kREIVkKih7" role="1tU5fm">
-          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-          <node concept="3qTvmN" id="6kREIVkKj5W" role="11_B2D" />
+        <property role="TrG5h" value="eff" />
+        <node concept="3uibUv" id="2daneBQ8_xP" role="1tU5fm">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="3qTvmN" id="2daneBQ8Awq" role="11_B2D" />
         </node>
       </node>
       <node concept="37vLTG" id="1N_0WA5JWLd" role="3clF46">
@@ -4720,25 +4990,30 @@
       <node concept="3Tm6S6" id="1N_0WA5K01o" role="1B3o_S" />
       <node concept="3clFbS" id="1N_0WA5JUyC" role="3clF47">
         <node concept="3clFbJ" id="5lxnBcU2zYL" role="3cqZAp">
+          <node concept="3y3z36" id="5lxnBcU2$Ic" role="3clFbw">
+            <node concept="10Nm6u" id="5lxnBcU2$Md" role="3uHU7w" />
+            <node concept="37vLTw" id="5lxnBcU2$jJ" role="3uHU7B">
+              <ref role="3cqZAo" node="6kREIVkKcW1" resolve="eff" />
+            </node>
+          </node>
           <node concept="3clFbS" id="5lxnBcU2zYN" role="3clFbx">
             <node concept="3cpWs8" id="1N_0WA5JZX0" role="3cqZAp">
               <node concept="3cpWsn" id="1N_0WA5JZX1" role="3cpWs9">
                 <property role="TrG5h" value="elapsed" />
                 <node concept="3cpWsb" id="1N_0WA5JZX2" role="1tU5fm" />
                 <node concept="FJ1c_" id="1N_0WA5JZX3" role="33vP2m">
-                  <node concept="1eOMI4" id="1N_0WA5JZX4" role="3uHU7B">
-                    <node concept="3cpWsd" id="1N_0WA5JZX5" role="1eOMHV">
-                      <node concept="2OqwBi" id="6kREIVkKjUZ" role="3uHU7w">
-                        <node concept="37vLTw" id="6kREIVkKkhT" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6kREIVkKcW1" resolve="step" />
+                  <node concept="1eOMI4" id="3bpBM3Q8LWV" role="3uHU7B">
+                    <node concept="3cpWsd" id="3bpBM3Q8NfN" role="1eOMHV">
+                      <node concept="2OqwBi" id="3bpBM3Q9yHm" role="3uHU7B">
+                        <node concept="37vLTw" id="3bpBM3Q9yHn" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6kREIVkKcW1" resolve="eff" />
                         </node>
-                        <node concept="liA8E" id="6kREIVkKkXs" role="2OqNvi">
-                          <ref role="37wK5l" node="6kREIVkG1Hg" resolve="getStartTime" />
+                        <node concept="liA8E" id="3bpBM3Q9yHo" role="2OqNvi">
+                          <ref role="37wK5l" node="3bpBM3PG96F" resolve="timestamp" />
                         </node>
                       </node>
-                      <node concept="2YIFZM" id="1N_0WA5JZX7" role="3uHU7B">
-                        <ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
-                        <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                      <node concept="37vLTw" id="3bpBM3Q9yHp" role="3uHU7w">
+                        <ref role="3cqZAo" node="3bpBM3Q8EKT" resolve="lastTimestamp" />
                       </node>
                     </node>
                   </node>
@@ -4748,6 +5023,24 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbF" id="3bpBM3Q8P9P" role="3cqZAp">
+              <node concept="37vLTI" id="3bpBM3Q8Qyc" role="3clFbG">
+                <node concept="2OqwBi" id="3bpBM3Q8QOZ" role="37vLTx">
+                  <node concept="37vLTw" id="3bpBM3Q8QAq" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6kREIVkKcW1" resolve="eff" />
+                  </node>
+                  <node concept="liA8E" id="3bpBM3Q8R97" role="2OqNvi">
+                    <ref role="37wK5l" node="3bpBM3PG96F" resolve="timestamp" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="3bpBM3Q8PFU" role="37vLTJ">
+                  <node concept="Xjq3P" id="3bpBM3Q8P9N" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="3bpBM3Q8PUz" role="2OqNvi">
+                    <ref role="2Oxat5" node="3bpBM3Q8EKT" resolve="lastTimestamp" />
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3clFbF" id="1N_0WA5JWB6" role="3cqZAp">
               <node concept="2OqwBi" id="1N_0WA5JWB7" role="3clFbG">
                 <node concept="37vLTw" id="1N_0WA5JWB8" role="2Oq$k0">
@@ -4778,10 +5071,10 @@
                     </node>
                     <node concept="2OqwBi" id="6kREIVkKleM" role="37wK5m">
                       <node concept="37vLTw" id="6kREIVkKlLr" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6kREIVkKcW1" resolve="step" />
+                        <ref role="3cqZAo" node="6kREIVkKcW1" resolve="eff" />
                       </node>
-                      <node concept="liA8E" id="6kREIVkKleP" role="2OqNvi">
-                        <ref role="37wK5l" node="1pPth$lL0jk" resolve="info" />
+                      <node concept="liA8E" id="3bpBM3PI0XG" role="2OqNvi">
+                        <ref role="37wK5l" node="3bpBM3PHosp" resolve="info" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="1N_0WA5K275" role="37wK5m">
@@ -4792,12 +5085,6 @@
               </node>
             </node>
           </node>
-          <node concept="3y3z36" id="5lxnBcU2$Ic" role="3clFbw">
-            <node concept="10Nm6u" id="5lxnBcU2$Md" role="3uHU7w" />
-            <node concept="37vLTw" id="5lxnBcU2$jJ" role="3uHU7B">
-              <ref role="3cqZAo" node="6kREIVkKcW1" resolve="step" />
-            </node>
-          </node>
         </node>
         <node concept="3clFbJ" id="1N_0WA5KeLi" role="3cqZAp">
           <node concept="3clFbS" id="1N_0WA5KeLk" role="3clFbx">
@@ -4838,7 +5125,11 @@
       </node>
     </node>
     <node concept="2tJIrI" id="Hg6Enc2hBq" role="jymVt" />
-    <node concept="2tJIrI" id="6kREIVkQWV7" role="jymVt" />
+    <node concept="312cEg" id="3bpBM3Q8EKT" role="jymVt">
+      <property role="TrG5h" value="lastTimestamp" />
+      <node concept="3Tm6S6" id="3bpBM3Q8EKU" role="1B3o_S" />
+      <node concept="3cpWsb" id="3bpBM3Q8KWN" role="1tU5fm" />
+    </node>
     <node concept="312cEg" id="1pPth$lAEQs" role="jymVt">
       <property role="TrG5h" value="feedback" />
       <node concept="3Tm6S6" id="6kREIVkHAGZ" role="1B3o_S" />
@@ -4967,5 +5258,881 @@
     <node concept="2tJIrI" id="5KrJ7UHMRRZ" role="jymVt" />
     <node concept="3Tm1VV" id="5KrJ7UHMRRt" role="1B3o_S" />
   </node>
+  <node concept="3HP615" id="2daneBOWXQd">
+    <property role="3GE5qa" value="launch.step" />
+    <property role="TrG5h" value="Effect" />
+    <node concept="2tJIrI" id="2daneBOX09L" role="jymVt" />
+    <node concept="3clFb_" id="2daneBOX0cV" role="jymVt">
+      <property role="TrG5h" value="combine" />
+      <node concept="37vLTG" id="2daneBOX0oG" role="3clF46">
+        <property role="TrG5h" value="eff" />
+        <node concept="3uibUv" id="2daneBOX0tn" role="1tU5fm">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="16syzq" id="2daneBPOBTU" role="11_B2D">
+            <ref role="16sUi3" node="2daneBPO$45" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="2daneBOX0AU" role="3clF45">
+        <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+        <node concept="16syzq" id="2daneBPOBBk" role="11_B2D">
+          <ref role="16sUi3" node="2daneBPO$45" resolve="T" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2daneBOX0cY" role="1B3o_S" />
+      <node concept="3clFbS" id="2daneBOX0cZ" role="3clF47" />
+      <node concept="P$JXv" id="2daneBOX9n1" role="lGtFl">
+        <node concept="TZ5HA" id="2daneBOX9n2" role="TZ5H$">
+          <node concept="1dT_AC" id="2daneBOX9n3" role="1dT_Ay">
+            <property role="1dT_AB" value="Given a and b both being Effect, this produces a combination, or direct multiplication of effects: (a x b)." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="2daneBPOEjY" role="TZ5H$">
+          <node concept="1dT_AC" id="2daneBPOEjZ" role="1dT_Ay">
+            <property role="1dT_AB" value="a:Effect(S), b:Effect(T), (a combine b):Effect(T)" />
+          </node>
+        </node>
+      </node>
+      <node concept="16euLQ" id="2daneBPO$45" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="2daneBPO_T2" role="3ztrMU">
+          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+          <node concept="3qTvmN" id="2daneBPOB2Q" role="11_B2D" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBOX7Qt" role="jymVt" />
+    <node concept="3clFb_" id="2daneBOX9Mp" role="jymVt">
+      <property role="TrG5h" value="hasValue" />
+      <node concept="37vLTG" id="2daneBOXa5I" role="3clF46">
+        <property role="TrG5h" value="valueKind" />
+        <node concept="3uibUv" id="2daneBOXabT" role="1tU5fm">
+          <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKind" />
+          <node concept="3qTvmN" id="2daneBOXalS" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="10P_77" id="2daneBOX9TN" role="3clF45" />
+      <node concept="3Tm1VV" id="2daneBOX9Ms" role="1B3o_S" />
+      <node concept="3clFbS" id="2daneBOX9Mt" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="2daneBOX9IM" role="jymVt" />
+    <node concept="3clFb_" id="2daneBOX8cN" role="jymVt">
+      <property role="TrG5h" value="getValue" />
+      <node concept="37vLTG" id="2daneBOX8pD" role="3clF46">
+        <property role="TrG5h" value="valueKind" />
+        <node concept="3uibUv" id="2daneBOX8ui" role="1tU5fm">
+          <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKind" />
+          <node concept="16syzq" id="2daneBOX8Ax" role="11_B2D">
+            <ref role="16sUi3" node="2daneBOX8mW" resolve="V" />
+          </node>
+        </node>
+      </node>
+      <node concept="16syzq" id="2daneBOXp$l" role="3clF45">
+        <ref role="16sUi3" node="2daneBOX8mW" resolve="V" />
+      </node>
+      <node concept="3Tm1VV" id="2daneBOX8cQ" role="1B3o_S" />
+      <node concept="3clFbS" id="2daneBOX8cR" role="3clF47" />
+      <node concept="16euLQ" id="2daneBOX8mW" role="16eVyc">
+        <property role="TrG5h" value="V" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBOX7QB" role="jymVt" />
+    <node concept="3clFb_" id="3bpBM3PG96F" role="jymVt">
+      <property role="TrG5h" value="timestamp" />
+      <node concept="3cpWsb" id="3bpBM3PGbRd" role="3clF45" />
+      <node concept="3Tm1VV" id="3bpBM3PG96I" role="1B3o_S" />
+      <node concept="3clFbS" id="3bpBM3PG96J" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="3bpBM3PG5PW" role="jymVt" />
+    <node concept="3clFb_" id="3bpBM3PHosp" role="jymVt">
+      <property role="TrG5h" value="info" />
+      <node concept="17QB3L" id="3bpBM3PHuug" role="3clF45" />
+      <node concept="3Tm1VV" id="3bpBM3PHoss" role="1B3o_S" />
+      <node concept="3clFbS" id="3bpBM3PHost" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="3bpBM3Q6A5_" role="jymVt" />
+    <node concept="312cEu" id="2daneBOX7Tv" role="jymVt">
+      <property role="TrG5h" value="ValueKind" />
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="2daneBOX80Z" role="jymVt" />
+      <node concept="3clFbW" id="2daneBPU2_R" role="jymVt">
+        <node concept="3cqZAl" id="2daneBPU2_T" role="3clF45" />
+        <node concept="3Tmbuc" id="2daneBPU7ja" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBPU2_V" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="2daneBPU1zk" role="jymVt" />
+      <node concept="3clFb_" id="2daneBOX875" role="jymVt">
+        <property role="TrG5h" value="extractValue" />
+        <property role="1EzhhJ" value="true" />
+        <node concept="37vLTG" id="2daneBOX91h" role="3clF46">
+          <property role="TrG5h" value="eff" />
+          <node concept="3uibUv" id="2daneBOX97l" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3qTvmN" id="2daneBPRQ7C" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="16syzq" id="2daneBOX8WB" role="3clF45">
+          <ref role="16sUi3" node="2daneBOX837" resolve="T" />
+        </node>
+        <node concept="3Tm1VV" id="2daneBOX878" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBOX879" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="2daneBOX811" role="jymVt" />
+      <node concept="3Tm1VV" id="2daneBOX7Tw" role="1B3o_S" />
+      <node concept="16euLQ" id="2daneBOX837" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBOX0a_" role="jymVt" />
+    <node concept="312cEu" id="2daneBOYiP$" role="jymVt">
+      <property role="TrG5h" value="ClassValueKind" />
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="2daneBOYiP_" role="jymVt" />
+      <node concept="3clFbW" id="2daneBOYlrK" role="jymVt">
+        <node concept="37vLTG" id="2daneBOYlNE" role="3clF46">
+          <property role="TrG5h" value="klass" />
+          <node concept="3uibUv" id="2daneBOYlYK" role="1tU5fm">
+            <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+            <node concept="16syzq" id="2daneBOYml8" role="11_B2D">
+              <ref role="16sUi3" node="2daneBOYiPI" resolve="T" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2daneBOYlrM" role="3clF45" />
+        <node concept="3Tm1VV" id="2daneBOYlrN" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBOYlrO" role="3clF47">
+          <node concept="3clFbF" id="2daneBOYmsa" role="3cqZAp">
+            <node concept="37vLTI" id="2daneBOYmsc" role="3clFbG">
+              <node concept="37vLTw" id="2daneBOYmsf" role="37vLTJ">
+                <ref role="3cqZAo" node="2daneBOYms5" resolve="myKlass" />
+              </node>
+              <node concept="37vLTw" id="2daneBOYmsg" role="37vLTx">
+                <ref role="3cqZAo" node="2daneBOYlNE" resolve="klass" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBOYn0U" role="jymVt" />
+      <node concept="3clFb_" id="2daneBOYiPA" role="jymVt">
+        <property role="TrG5h" value="extractValue" />
+        <property role="1EzhhJ" value="true" />
+        <node concept="37vLTG" id="2daneBOYiPB" role="3clF46">
+          <property role="TrG5h" value="eff" />
+          <node concept="3uibUv" id="2daneBOYiPC" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3qTvmN" id="2daneBPRQXG" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="16syzq" id="2daneBOYiPD" role="3clF45">
+          <ref role="16sUi3" node="2daneBOYiPI" resolve="T" />
+        </node>
+        <node concept="3Tm1VV" id="2daneBOYiPE" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBOYiPF" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="2daneBOYiPG" role="jymVt" />
+      <node concept="312cEg" id="2daneBOYms5" role="jymVt">
+        <property role="TrG5h" value="myKlass" />
+        <node concept="3Tm6S6" id="2daneBOYms6" role="1B3o_S" />
+        <node concept="3uibUv" id="2daneBOYms8" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+          <node concept="16syzq" id="2daneBOYms9" role="11_B2D">
+            <ref role="16sUi3" node="2daneBOYiPI" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBOYp91" role="jymVt" />
+      <node concept="3Tm1VV" id="2daneBOYiPH" role="1B3o_S" />
+      <node concept="16euLQ" id="2daneBOYiPI" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="3uibUv" id="2daneBOYklh" role="1zkMxy">
+        <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKind" />
+        <node concept="16syzq" id="2daneBOYkWL" role="11_B2D">
+          <ref role="16sUi3" node="2daneBOYiPI" resolve="T" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBOYiPz" role="jymVt" />
+    <node concept="312cEu" id="2daneBOXoo$" role="jymVt">
+      <property role="TrG5h" value="NullEffect" />
+      <node concept="2tJIrI" id="2daneBOXoyO" role="jymVt" />
+      <node concept="3clFbW" id="3bpBM3PNk9l" role="jymVt">
+        <node concept="3cqZAl" id="3bpBM3PNk9n" role="3clF45" />
+        <node concept="3Tm1VV" id="3bpBM3PNk9o" role="1B3o_S" />
+        <node concept="3clFbS" id="3bpBM3PNk9p" role="3clF47">
+          <node concept="3clFbF" id="3bpBM3PNmXK" role="3cqZAp">
+            <node concept="37vLTI" id="3bpBM3PNmXM" role="3clFbG">
+              <node concept="2OqwBi" id="3bpBM3PNomC" role="37vLTJ">
+                <node concept="Xjq3P" id="3bpBM3PNoyv" role="2Oq$k0" />
+                <node concept="2OwXpG" id="3bpBM3PNomF" role="2OqNvi">
+                  <ref role="2Oxat5" node="3bpBM3PNmXG" resolve="info" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="3bpBM3PNmXQ" role="37vLTx">
+                <ref role="3cqZAo" node="3bpBM3PNlyM" resolve="info" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="3bpBM3PNlyM" role="3clF46">
+          <property role="TrG5h" value="info" />
+          <node concept="17QB3L" id="3bpBM3PNlyL" role="1tU5fm" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3bpBM3PNiZz" role="jymVt" />
+      <node concept="3Tm1VV" id="2daneBOXoo_" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBOXovy" role="EKbjA">
+        <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+        <node concept="16syzq" id="2daneBPOEa7" role="11_B2D">
+          <ref role="16sUi3" node="2daneBPOCkM" resolve="S" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="2daneBOXo$j" role="jymVt">
+        <property role="TrG5h" value="combine" />
+        <node concept="37vLTG" id="2daneBOXo$k" role="3clF46">
+          <property role="TrG5h" value="eff" />
+          <node concept="3uibUv" id="2daneBOXo$l" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="16syzq" id="2daneBPOVwd" role="11_B2D">
+              <ref role="16sUi3" node="2daneBPOTCJ" resolve="T" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="2daneBOXo$m" role="3clF45">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="16syzq" id="2daneBPOUX7" role="11_B2D">
+            <ref role="16sUi3" node="2daneBPOTCJ" resolve="T" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="2daneBOXo$n" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBOXo$s" role="3clF47">
+          <node concept="3cpWs6" id="3bpBM3Q7sex" role="3cqZAp">
+            <node concept="2ShNRf" id="3bpBM3Q7sey" role="3cqZAk">
+              <node concept="1pGfFk" id="3bpBM3Q7sez" role="2ShVmc">
+                <ref role="37wK5l" node="2daneBOXJRi" resolve="Effect.Pair" />
+                <node concept="Xjq3P" id="3bpBM3Q7se$" role="37wK5m" />
+                <node concept="37vLTw" id="3bpBM3Q7se_" role="37wK5m">
+                  <ref role="3cqZAo" node="2daneBOXo$k" resolve="eff" />
+                </node>
+                <node concept="16syzq" id="3bpBM3Q7seA" role="1pMfVU">
+                  <ref role="16sUi3" node="2daneBPOTCJ" resolve="T" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBOXo$t" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="16euLQ" id="2daneBPOTCJ" role="16eVyc">
+          <property role="TrG5h" value="T" />
+          <node concept="3uibUv" id="2daneBPOUjU" role="3ztrMU">
+            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+            <node concept="3qTvmN" id="2daneBPOUHW" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBPOTgH" role="jymVt" />
+      <node concept="3clFb_" id="2daneBOXo$w" role="jymVt">
+        <property role="TrG5h" value="hasValue" />
+        <node concept="37vLTG" id="2daneBOXo$x" role="3clF46">
+          <property role="TrG5h" value="valueKind" />
+          <node concept="3uibUv" id="2daneBOXo$y" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKind" />
+            <node concept="3qTvmN" id="2daneBOXo$z" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="10P_77" id="2daneBOXo$$" role="3clF45" />
+        <node concept="3Tm1VV" id="2daneBOXo$_" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBOXo$B" role="3clF47">
+          <node concept="3clFbF" id="2daneBOXo$E" role="3cqZAp">
+            <node concept="3clFbT" id="2daneBOXo$D" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBOXo$C" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBOXpeK" role="jymVt" />
+      <node concept="3clFb_" id="2daneBOXo$F" role="jymVt">
+        <property role="TrG5h" value="getValue" />
+        <node concept="37vLTG" id="2daneBOXo$G" role="3clF46">
+          <property role="TrG5h" value="valueKind" />
+          <node concept="3uibUv" id="2daneBOXo$H" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKind" />
+            <node concept="16syzq" id="2daneBOXo$I" role="11_B2D">
+              <ref role="16sUi3" node="2daneBOXo$M" resolve="V" />
+            </node>
+          </node>
+        </node>
+        <node concept="16syzq" id="2daneBOXpLd" role="3clF45">
+          <ref role="16sUi3" node="2daneBOXo$M" resolve="V" />
+        </node>
+        <node concept="3Tm1VV" id="2daneBOXo$K" role="1B3o_S" />
+        <node concept="16euLQ" id="2daneBOXo$M" role="16eVyc">
+          <property role="TrG5h" value="V" />
+        </node>
+        <node concept="3clFbS" id="2daneBOXo$N" role="3clF47">
+          <node concept="YS8fn" id="2daneBPNjnD" role="3cqZAp">
+            <node concept="2ShNRf" id="2daneBPNjyT" role="YScLw">
+              <node concept="1pGfFk" id="2daneBPNu5Z" role="2ShVmc">
+                <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBOXo$O" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3bpBM3PGgFt" role="jymVt" />
+      <node concept="3clFb_" id="3bpBM3PGn4M" role="jymVt">
+        <property role="TrG5h" value="timestamp" />
+        <node concept="3cpWsb" id="3bpBM3PGn4N" role="3clF45" />
+        <node concept="3Tm1VV" id="3bpBM3PGn4O" role="1B3o_S" />
+        <node concept="3clFbS" id="3bpBM3PGn4Q" role="3clF47">
+          <node concept="3clFbF" id="3bpBM3PGoiX" role="3cqZAp">
+            <node concept="37vLTw" id="3bpBM3PGoiW" role="3clFbG">
+              <ref role="3cqZAo" node="3bpBM3PGlm9" resolve="timestamp" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3bpBM3PGn4R" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3bpBM3PKAEP" role="jymVt" />
+      <node concept="3clFb_" id="3bpBM3PKBLH" role="jymVt">
+        <property role="TrG5h" value="info" />
+        <node concept="17QB3L" id="3bpBM3PKBLI" role="3clF45" />
+        <node concept="3Tm1VV" id="3bpBM3PKBLJ" role="1B3o_S" />
+        <node concept="3clFbS" id="3bpBM3PKBLL" role="3clF47">
+          <node concept="3clFbF" id="3bpBM3PKE7T" role="3cqZAp">
+            <node concept="37vLTw" id="3bpBM3PNpfg" role="3clFbG">
+              <ref role="3cqZAo" node="3bpBM3PNmXG" resolve="info" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3bpBM3PKBLM" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3bpBM3PKE8B" role="jymVt" />
+      <node concept="312cEg" id="3bpBM3PGlm9" role="jymVt">
+        <property role="TrG5h" value="timestamp" />
+        <node concept="3Tm6S6" id="3bpBM3PGlma" role="1B3o_S" />
+        <node concept="3cpWsb" id="3bpBM3PGm0i" role="1tU5fm" />
+        <node concept="2YIFZM" id="3bpBM3PGmUs" role="33vP2m">
+          <ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
+          <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="2daneBPOCkM" role="16eVyc">
+        <property role="TrG5h" value="S" />
+        <node concept="3uibUv" id="2daneBPOCQm" role="3ztrMU">
+          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+          <node concept="3qTvmN" id="2daneBPODYX" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="312cEg" id="3bpBM3PNmXG" role="jymVt">
+        <property role="TrG5h" value="info" />
+        <node concept="3Tm6S6" id="3bpBM3PNmXH" role="1B3o_S" />
+        <node concept="17QB3L" id="3bpBM3PNmXJ" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBOXsE3" role="jymVt" />
+    <node concept="312cEu" id="2daneBOXQpd" role="jymVt">
+      <property role="TrG5h" value="SingularEffect" />
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="2daneBOXSe5" role="jymVt" />
+      <node concept="3clFb_" id="2daneBOXTy4" role="jymVt">
+        <property role="TrG5h" value="combine" />
+        <node concept="37vLTG" id="2daneBOXTy5" role="3clF46">
+          <property role="TrG5h" value="eff" />
+          <node concept="3uibUv" id="2daneBOXTy6" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="16syzq" id="2daneBPP3nO" role="11_B2D">
+              <ref role="16sUi3" node="2daneBPOZPz" resolve="T" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="2daneBOXTy7" role="3clF45">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="16syzq" id="2daneBPP2yn" role="11_B2D">
+            <ref role="16sUi3" node="2daneBPOZPz" resolve="T" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="2daneBOXTy8" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBOXTyd" role="3clF47">
+          <node concept="3cpWs6" id="2daneBOXU69" role="3cqZAp">
+            <node concept="2ShNRf" id="2daneBOXUhS" role="3cqZAk">
+              <node concept="1pGfFk" id="2daneBOXViV" role="2ShVmc">
+                <ref role="37wK5l" node="2daneBOXJRi" resolve="Effect.Pair" />
+                <node concept="Xjq3P" id="2daneBOXVBe" role="37wK5m" />
+                <node concept="37vLTw" id="2daneBOXVVX" role="37wK5m">
+                  <ref role="3cqZAo" node="2daneBOXTy5" resolve="eff" />
+                </node>
+                <node concept="16syzq" id="2daneBPPjje" role="1pMfVU">
+                  <ref role="16sUi3" node="2daneBPOZPz" resolve="T" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBOXTye" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="16euLQ" id="2daneBPOZPz" role="16eVyc">
+          <property role="TrG5h" value="T" />
+          <node concept="3uibUv" id="2daneBPP0wl" role="3ztrMU">
+            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+            <node concept="3qTvmN" id="2daneBPP1D2" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBOXSe7" role="jymVt" />
+      <node concept="3Tm1VV" id="2daneBOXQpe" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBOXTbs" role="EKbjA">
+        <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+        <node concept="16syzq" id="2daneBPOZwP" role="11_B2D">
+          <ref role="16sUi3" node="2daneBPOX0Y" resolve="S" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="2daneBOYyt0" role="jymVt">
+        <property role="TrG5h" value="getValue" />
+        <node concept="37vLTG" id="2daneBOYyt1" role="3clF46">
+          <property role="TrG5h" value="valueKind" />
+          <node concept="3uibUv" id="2daneBOYyt2" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKind" />
+            <node concept="16syzq" id="2daneBOYyt3" role="11_B2D">
+              <ref role="16sUi3" node="2daneBOYyt7" resolve="V" />
+            </node>
+          </node>
+        </node>
+        <node concept="16syzq" id="2daneBOYyt4" role="3clF45">
+          <ref role="16sUi3" node="2daneBOYyt7" resolve="V" />
+        </node>
+        <node concept="3Tm1VV" id="2daneBOYyt5" role="1B3o_S" />
+        <node concept="16euLQ" id="2daneBOYyt7" role="16eVyc">
+          <property role="TrG5h" value="V" />
+        </node>
+        <node concept="3clFbS" id="2daneBOYyt8" role="3clF47">
+          <node concept="3clFbJ" id="2daneBPNpw8" role="3cqZAp">
+            <node concept="3clFbS" id="2daneBPNpwa" role="3clFbx">
+              <node concept="YS8fn" id="2daneBPNqLO" role="3cqZAp">
+                <node concept="2ShNRf" id="2daneBPNqX8" role="YScLw">
+                  <node concept="1pGfFk" id="2daneBPNsDQ" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3fqX7Q" id="2daneBPNpGY" role="3clFbw">
+              <node concept="1rXfSq" id="2daneBPNq3B" role="3fr31v">
+                <ref role="37wK5l" node="2daneBOX9Mp" resolve="hasValue" />
+                <node concept="37vLTw" id="2daneBPNqzw" role="37wK5m">
+                  <ref role="3cqZAo" node="2daneBOYyt1" resolve="valueKind" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2daneBOYzMM" role="3cqZAp">
+            <node concept="2OqwBi" id="2daneBOY$eH" role="3clFbG">
+              <node concept="37vLTw" id="2daneBOYzML" role="2Oq$k0">
+                <ref role="3cqZAo" node="2daneBOYyt1" resolve="valueKind" />
+              </node>
+              <node concept="liA8E" id="2daneBOY$ve" role="2OqNvi">
+                <ref role="37wK5l" node="2daneBOX875" resolve="extractValue" />
+                <node concept="Xjq3P" id="2daneBOY$MP" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBOYyt9" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBOYz4c" role="jymVt" />
+      <node concept="3clFb_" id="3bpBM3PGps9" role="jymVt">
+        <property role="TrG5h" value="timestamp" />
+        <node concept="3cpWsb" id="3bpBM3PGpsa" role="3clF45" />
+        <node concept="3Tm1VV" id="3bpBM3PGpsb" role="1B3o_S" />
+        <node concept="3clFbS" id="3bpBM3PGpsc" role="3clF47">
+          <node concept="3clFbF" id="3bpBM3PGpsd" role="3cqZAp">
+            <node concept="37vLTw" id="3bpBM3PGpse" role="3clFbG">
+              <ref role="3cqZAo" node="3bpBM3PGpsh" resolve="timestamp" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3bpBM3PGpsf" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3bpBM3PGpsg" role="jymVt" />
+      <node concept="312cEg" id="3bpBM3PGpsh" role="jymVt">
+        <property role="TrG5h" value="timestamp" />
+        <node concept="3Tm6S6" id="3bpBM3PGpsi" role="1B3o_S" />
+        <node concept="3cpWsb" id="3bpBM3PGpsj" role="1tU5fm" />
+        <node concept="2YIFZM" id="3bpBM3PGpsk" role="33vP2m">
+          <ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
+          <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3bpBM3PGp1e" role="jymVt" />
+      <node concept="16euLQ" id="2daneBPOX0Y" role="16eVyc">
+        <property role="TrG5h" value="S" />
+        <node concept="3uibUv" id="2daneBPOY3z" role="3ztrMU">
+          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+          <node concept="3qTvmN" id="2daneBPOZgU" role="11_B2D" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBOXPPQ" role="jymVt" />
+    <node concept="312cEu" id="2daneBOXsUp" role="jymVt">
+      <property role="TrG5h" value="Pair" />
+      <node concept="2tJIrI" id="2daneBOXusJ" role="jymVt" />
+      <node concept="3clFbW" id="2daneBOXJRi" role="jymVt">
+        <node concept="37vLTG" id="2daneBOXKfY" role="3clF46">
+          <property role="TrG5h" value="left" />
+          <node concept="3uibUv" id="2daneBOXKxy" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="3qTvmN" id="2daneBPP9HJ" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="2daneBOXKMg" role="3clF46">
+          <property role="TrG5h" value="right" />
+          <node concept="3uibUv" id="2daneBOXL3t" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="16syzq" id="2daneBPPbAR" role="11_B2D">
+              <ref role="16sUi3" node="2daneBPP3N7" resolve="S" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2daneBOXJRk" role="3clF45" />
+        <node concept="3Tm1VV" id="2daneBOXJRl" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBOXJRm" role="3clF47">
+          <node concept="3clFbF" id="2daneBOXL$K" role="3cqZAp">
+            <node concept="37vLTI" id="2daneBOXNuS" role="3clFbG">
+              <node concept="37vLTw" id="2daneBOXNEN" role="37vLTx">
+                <ref role="3cqZAo" node="2daneBOXKfY" resolve="left" />
+              </node>
+              <node concept="2OqwBi" id="2daneBOXLH0" role="37vLTJ">
+                <node concept="Xjq3P" id="2daneBOXL$J" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2daneBOXMS7" role="2OqNvi">
+                  <ref role="2Oxat5" node="2daneBOXLTU" resolve="left" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2daneBOXNKg" role="3cqZAp">
+            <node concept="37vLTI" id="2daneBOXNKh" role="3clFbG">
+              <node concept="37vLTw" id="2daneBOXOpL" role="37vLTx">
+                <ref role="3cqZAo" node="2daneBOXKMg" resolve="right" />
+              </node>
+              <node concept="2OqwBi" id="2daneBOXNKj" role="37vLTJ">
+                <node concept="Xjq3P" id="2daneBOXNKk" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2daneBOXNYa" role="2OqNvi">
+                  <ref role="2Oxat5" node="2daneBOXMnM" resolve="right" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBOXJza" role="jymVt" />
+      <node concept="3clFb_" id="3bpBM3PHxC6" role="jymVt">
+        <property role="TrG5h" value="info" />
+        <node concept="17QB3L" id="3bpBM3PHxC7" role="3clF45" />
+        <node concept="3Tm1VV" id="3bpBM3PHxC8" role="1B3o_S" />
+        <node concept="3clFbS" id="3bpBM3PHxCa" role="3clF47">
+          <node concept="3clFbF" id="3bpBM3PHyX5" role="3cqZAp">
+            <node concept="2OqwBi" id="3bpBM3PHzib" role="3clFbG">
+              <node concept="37vLTw" id="3bpBM3PHyX4" role="2Oq$k0">
+                <ref role="3cqZAo" node="2daneBOXMnM" resolve="right" />
+              </node>
+              <node concept="liA8E" id="3bpBM3PHzBb" role="2OqNvi">
+                <ref role="37wK5l" node="3bpBM3PHosp" resolve="info" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3bpBM3PHxCb" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3bpBM3Q6Mkm" role="jymVt" />
+      <node concept="3clFb_" id="2daneBOXHov" role="jymVt">
+        <property role="TrG5h" value="combine" />
+        <node concept="37vLTG" id="2daneBOXHow" role="3clF46">
+          <property role="TrG5h" value="eff" />
+          <node concept="3uibUv" id="2daneBOXHox" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+            <node concept="16syzq" id="2daneBPPgMV" role="11_B2D">
+              <ref role="16sUi3" node="2daneBPPcFs" resolve="T" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="2daneBOXHoy" role="3clF45">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="16syzq" id="2daneBPPfz8" role="11_B2D">
+            <ref role="16sUi3" node="2daneBPPcFs" resolve="T" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="2daneBOXHoz" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBOXHoC" role="3clF47">
+          <node concept="3cpWs6" id="2daneBOXIdd" role="3cqZAp">
+            <node concept="2ShNRf" id="2daneBOXIoL" role="3cqZAk">
+              <node concept="1pGfFk" id="2daneBOXK0n" role="2ShVmc">
+                <ref role="37wK5l" node="2daneBOXJRi" resolve="Effect.Pair" />
+                <node concept="Xjq3P" id="2daneBOXOBU" role="37wK5m" />
+                <node concept="37vLTw" id="2daneBOXP2h" role="37wK5m">
+                  <ref role="3cqZAo" node="2daneBOXHow" resolve="eff" />
+                </node>
+                <node concept="16syzq" id="2daneBPPigK" role="1pMfVU">
+                  <ref role="16sUi3" node="2daneBPPcFs" resolve="T" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBOXHoD" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="16euLQ" id="2daneBPPcFs" role="16eVyc">
+          <property role="TrG5h" value="T" />
+          <node concept="3uibUv" id="2daneBPPd_N" role="3ztrMU">
+            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+            <node concept="3qTvmN" id="2daneBPPdRw" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBOXH8Y" role="jymVt" />
+      <node concept="3clFb_" id="2daneBOXvbL" role="jymVt">
+        <property role="TrG5h" value="hasValue" />
+        <node concept="37vLTG" id="2daneBOXvbM" role="3clF46">
+          <property role="TrG5h" value="valueKind" />
+          <node concept="3uibUv" id="2daneBOXvbN" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKind" />
+            <node concept="3qTvmN" id="2daneBOXvbO" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="10P_77" id="2daneBOXvbP" role="3clF45" />
+        <node concept="3Tm1VV" id="2daneBOXvbQ" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBOXvbS" role="3clF47">
+          <node concept="3clFbF" id="2daneBOXwt1" role="3cqZAp">
+            <node concept="22lmx$" id="2daneBOXxJI" role="3clFbG">
+              <node concept="2OqwBi" id="2daneBOXynn" role="3uHU7w">
+                <node concept="37vLTw" id="2daneBOXy2l" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2daneBOXLTU" resolve="left" />
+                </node>
+                <node concept="liA8E" id="2daneBOXy$o" role="2OqNvi">
+                  <ref role="37wK5l" node="2daneBOX9Mp" resolve="hasValue" />
+                  <node concept="37vLTw" id="2daneBOXz7y" role="37wK5m">
+                    <ref role="3cqZAo" node="2daneBOXvbM" resolve="valueKind" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="2daneBOXwII" role="3uHU7B">
+                <node concept="37vLTw" id="2daneBOXwt0" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2daneBOXMnM" resolve="right" />
+                </node>
+                <node concept="liA8E" id="2daneBOXwSg" role="2OqNvi">
+                  <ref role="37wK5l" node="2daneBOX9Mp" resolve="hasValue" />
+                  <node concept="37vLTw" id="2daneBOXxpS" role="37wK5m">
+                    <ref role="3cqZAo" node="2daneBOXvbM" resolve="valueKind" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBOXvbT" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBOXvFv" role="jymVt" />
+      <node concept="3clFb_" id="2daneBOXvbW" role="jymVt">
+        <property role="TrG5h" value="getValue" />
+        <node concept="37vLTG" id="2daneBOXvbX" role="3clF46">
+          <property role="TrG5h" value="valueKind" />
+          <node concept="3uibUv" id="2daneBOXvbY" role="1tU5fm">
+            <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKind" />
+            <node concept="16syzq" id="2daneBOXvbZ" role="11_B2D">
+              <ref role="16sUi3" node="2daneBOXvc3" resolve="V" />
+            </node>
+          </node>
+        </node>
+        <node concept="16syzq" id="2daneBOXvc0" role="3clF45">
+          <ref role="16sUi3" node="2daneBOXvc3" resolve="V" />
+        </node>
+        <node concept="3Tm1VV" id="2daneBOXvc1" role="1B3o_S" />
+        <node concept="16euLQ" id="2daneBOXvc3" role="16eVyc">
+          <property role="TrG5h" value="V" />
+        </node>
+        <node concept="3clFbS" id="2daneBOXvc4" role="3clF47">
+          <node concept="3clFbJ" id="2daneBOXznt" role="3cqZAp">
+            <node concept="2OqwBi" id="2daneBOXzKN" role="3clFbw">
+              <node concept="37vLTw" id="2daneBOXzz6" role="2Oq$k0">
+                <ref role="3cqZAo" node="2daneBOXMnM" resolve="right" />
+              </node>
+              <node concept="liA8E" id="2daneBOXzPk" role="2OqNvi">
+                <ref role="37wK5l" node="2daneBOX9Mp" resolve="hasValue" />
+                <node concept="37vLTw" id="2daneBOX$jJ" role="37wK5m">
+                  <ref role="3cqZAo" node="2daneBOXvbX" resolve="valueKind" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="2daneBOXznv" role="3clFbx">
+              <node concept="3cpWs6" id="2daneBOX$yF" role="3cqZAp">
+                <node concept="2OqwBi" id="2daneBOX_oS" role="3cqZAk">
+                  <node concept="37vLTw" id="2daneBOX$ZM" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2daneBOXMnM" resolve="right" />
+                  </node>
+                  <node concept="liA8E" id="2daneBOX_Ar" role="2OqNvi">
+                    <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
+                    <node concept="37vLTw" id="2daneBOXA7U" role="37wK5m">
+                      <ref role="3cqZAo" node="2daneBOXvbX" resolve="valueKind" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3eNFk2" id="2daneBOXAuO" role="3eNLev">
+              <node concept="2OqwBi" id="2daneBOXBaM" role="3eO9$A">
+                <node concept="37vLTw" id="2daneBOXAP5" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2daneBOXLTU" resolve="left" />
+                </node>
+                <node concept="liA8E" id="2daneBOXBjM" role="2OqNvi">
+                  <ref role="37wK5l" node="2daneBOX9Mp" resolve="hasValue" />
+                  <node concept="37vLTw" id="2daneBOXBL3" role="37wK5m">
+                    <ref role="3cqZAo" node="2daneBOXvbX" resolve="valueKind" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="2daneBOXAuQ" role="3eOfB_">
+                <node concept="3cpWs6" id="2daneBOXC09" role="3cqZAp">
+                  <node concept="2OqwBi" id="2daneBOXCC9" role="3cqZAk">
+                    <node concept="37vLTw" id="2daneBOXCjh" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2daneBOXLTU" resolve="left" />
+                    </node>
+                    <node concept="liA8E" id="2daneBOXD0I" role="2OqNvi">
+                      <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
+                      <node concept="37vLTw" id="2daneBOXDwc" role="37wK5m">
+                        <ref role="3cqZAo" node="2daneBOXvbX" resolve="valueKind" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="9aQIb" id="2daneBOXE1h" role="9aQIa">
+              <node concept="3clFbS" id="2daneBOXE1i" role="9aQI4">
+                <node concept="YS8fn" id="2daneBOXEmn" role="3cqZAp">
+                  <node concept="2ShNRf" id="2daneBOXExF" role="YScLw">
+                    <node concept="1pGfFk" id="2daneBOXFqF" role="2ShVmc">
+                      <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+                      <node concept="3cpWs3" id="2daneBOXGp3" role="37wK5m">
+                        <node concept="37vLTw" id="2daneBOXGKf" role="3uHU7w">
+                          <ref role="3cqZAo" node="2daneBOXvbX" resolve="valueKind" />
+                        </node>
+                        <node concept="Xl_RD" id="2daneBOXFTr" role="3uHU7B">
+                          <property role="Xl_RC" value="no such value: " />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBOXvc5" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBOXtAL" role="jymVt" />
+      <node concept="3clFb_" id="3bpBM3PGrNE" role="jymVt">
+        <property role="TrG5h" value="timestamp" />
+        <node concept="3cpWsb" id="3bpBM3PGrNF" role="3clF45" />
+        <node concept="3Tm1VV" id="3bpBM3PGrNG" role="1B3o_S" />
+        <node concept="3clFbS" id="3bpBM3PGrNH" role="3clF47">
+          <node concept="3clFbF" id="3bpBM3PGrNI" role="3cqZAp">
+            <node concept="37vLTw" id="3bpBM3PGrNJ" role="3clFbG">
+              <ref role="3cqZAo" node="3bpBM3PGrNM" resolve="timestamp" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3bpBM3PGrNK" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBOXtAJ" role="jymVt" />
+      <node concept="312cEg" id="2daneBOXLTU" role="jymVt">
+        <property role="TrG5h" value="left" />
+        <node concept="3uibUv" id="2daneBOXu4J" role="1tU5fm">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="3qTvmN" id="2daneBPP7Ie" role="11_B2D" />
+        </node>
+        <node concept="3Tm6S6" id="2daneBOXtUZ" role="1B3o_S" />
+      </node>
+      <node concept="312cEg" id="2daneBOXMnM" role="jymVt">
+        <property role="TrG5h" value="right" />
+        <node concept="3uibUv" id="2daneBOXugl" role="1tU5fm">
+          <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+          <node concept="16syzq" id="2daneBPPcbo" role="11_B2D">
+            <ref role="16sUi3" node="2daneBPP3N7" resolve="S" />
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="2daneBOXugk" role="1B3o_S" />
+      </node>
+      <node concept="312cEg" id="3bpBM3PGrNM" role="jymVt">
+        <property role="TrG5h" value="timestamp" />
+        <node concept="3Tm6S6" id="3bpBM3PGrNN" role="1B3o_S" />
+        <node concept="3cpWsb" id="3bpBM3PGrNO" role="1tU5fm" />
+        <node concept="2YIFZM" id="3bpBM3PGrNP" role="33vP2m">
+          <ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
+          <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2daneBOXsUq" role="1B3o_S" />
+      <node concept="3uibUv" id="3bpBM3Q6HvN" role="EKbjA">
+        <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+        <node concept="16syzq" id="3bpBM3Q6JGh" role="11_B2D">
+          <ref role="16sUi3" node="2daneBPP3N7" resolve="S" />
+        </node>
+      </node>
+      <node concept="3UR2Jj" id="2daneBOXPjl" role="lGtFl">
+        <node concept="TZ5HA" id="2daneBOXPjm" role="TZ5H$">
+          <node concept="1dT_AC" id="2daneBOXPjn" role="1dT_Ay">
+            <property role="1dT_AB" value="Right-associative combinator." />
+          </node>
+        </node>
+      </node>
+      <node concept="16euLQ" id="2daneBPP3N7" role="16eVyc">
+        <property role="TrG5h" value="S" />
+        <node concept="3uibUv" id="2daneBPP5oM" role="3ztrMU">
+          <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+          <node concept="3qTvmN" id="2daneBPP5Up" role="11_B2D" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2daneBOXohT" role="jymVt" />
+    <node concept="3Tm1VV" id="2daneBOWXQe" role="1B3o_S" />
+    <node concept="3UR2Jj" id="2daneBOXatc" role="lGtFl">
+      <node concept="TZ5HA" id="2daneBOXatd" role="TZ5H$">
+        <node concept="1dT_AC" id="2daneBOXate" role="1dT_Ay">
+          <property role="1dT_AB" value="Effects are characterized by values they carry." />
+        </node>
+      </node>
+    </node>
+    <node concept="16euLQ" id="2daneBPOwNq" role="16eVyc">
+      <property role="TrG5h" value="S" />
+      <node concept="3uibUv" id="2daneBPOyiX" role="3ztrMU">
+        <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+        <node concept="3qTvmN" id="2daneBPOyYX" role="11_B2D" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index f76502f6..a7540d77 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -202,12 +202,13 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
+        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
+      </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
       <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
         <child id="1171903916107" name="bound" index="3qUE_r" />
       </concept>
@@ -1198,29 +1199,18 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3F6vMxq_3wR" role="jymVt" />
-    <node concept="3clFb_" id="1pPth$lN12z" role="jymVt">
-      <property role="TrG5h" value="info" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="17QB3L" id="1pPth$lN12$" role="3clF45" />
-      <node concept="3Tm1VV" id="6kREIVkR$6P" role="1B3o_S" />
-      <node concept="3clFbS" id="1pPth$lN12B" role="3clF47">
-        <node concept="3clFbF" id="1pPth$lN1GX" role="3cqZAp">
-          <node concept="Xl_RD" id="1pPth$lN1GW" role="3clFbG">
-            <property role="Xl_RC" value="highlighting results" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="Hg6EncbjjT" role="jymVt" />
     <node concept="3clFb_" id="Hg6EncbkRR" role="jymVt">
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="false" />
       <node concept="37vLTG" id="Hg6EncbkRS" role="3clF46">
-        <property role="TrG5h" value="prevStep" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="Hg6EncbkRT" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="6Yb9hAqJLJ$" role="11_B2D">
-            <ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
+          <node concept="3uibUv" id="3bpBM3PfN8R" role="11_B2D">
+            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="3bpBM3PfP5x" role="11_B2D">
+              <ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
+            </node>
           </node>
         </node>
       </node>
@@ -1232,8 +1222,11 @@
       </node>
       <node concept="3uibUv" id="Hg6EncbkRV" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="Hg6Enc$1Of" role="11_B2D">
-          <ref role="3uigEE" node="1pPth$lC1vN" resolve="HighlightingControlflowStep" />
+        <node concept="3uibUv" id="3bpBM3PfLJc" role="11_B2D">
+          <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+          <node concept="3uibUv" id="3bpBM3PpAsq" role="11_B2D">
+            <ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
+          </node>
         </node>
       </node>
       <node concept="3Tmbuc" id="Hg6EncFQZO" role="1B3o_S" />
@@ -1241,15 +1234,18 @@
         <node concept="3clFbF" id="5lxnBcU04KQ" role="3cqZAp">
           <node concept="2OqwBi" id="5lxnBcU05yI" role="3clFbG">
             <node concept="37vLTw" id="5lxnBcU04KO" role="2Oq$k0">
-              <ref role="3cqZAo" node="Hg6EncbkRS" resolve="prevStep" />
+              <ref role="3cqZAo" node="Hg6EncbkRS" resolve="input" />
             </node>
             <node concept="liA8E" id="5lxnBcU085M" role="2OqNvi">
               <ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function)" resolve="flatMap" />
               <node concept="1bVj0M" id="5lxnBcU08CP" role="37wK5m">
                 <node concept="37vLTG" id="5lxnBcU09rm" role="1bW2Oz">
-                  <property role="TrG5h" value="prev" />
-                  <node concept="3uibUv" id="6Yb9hAqJMt8" role="1tU5fm">
-                    <ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
+                  <property role="TrG5h" value="inEff" />
+                  <node concept="3uibUv" id="3bpBM3PfRqD" role="1tU5fm">
+                    <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                    <node concept="3uibUv" id="3bpBM3PfTa0" role="11_B2D">
+                      <ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
+                    </node>
                   </node>
                 </node>
                 <node concept="3clFbS" id="5lxnBcU08CQ" role="1bW5cS">
@@ -1294,10 +1290,14 @@
                           <ref role="37wK5l" to="o35r:1FOQehx0V$P" resolve="withReportItems" />
                           <node concept="2OqwBi" id="1FOQehx4mRn" role="37wK5m">
                             <node concept="37vLTw" id="1FOQehx4mRo" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
+                              <ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
                             </node>
-                            <node concept="liA8E" id="1FOQehx4mRp" role="2OqNvi">
-                              <ref role="37wK5l" to="fjx4:1FOQehx4yMT" resolve="getReportItems" />
+                            <node concept="liA8E" id="3bpBM3PpzKI" role="2OqNvi">
+                              <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                              <node concept="10M0yZ" id="3bpBM3Pp_n3" role="37wK5m">
+                                <ref role="3cqZAo" to="fjx4:2daneBP_Jiy" resolve="REPORT_ITEMS" />
+                                <ref role="1PxDUh" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -1307,29 +1307,6 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="78H58of3s4V" role="3cqZAp">
-                    <node concept="37vLTI" id="78H58of3s4W" role="3clFbG">
-                      <node concept="2OqwBi" id="78H58of3s4X" role="37vLTx">
-                        <node concept="37vLTw" id="78H58of3s4Y" role="2Oq$k0">
-                          <ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
-                        </node>
-                        <node concept="liA8E" id="78H58of3fKt" role="2OqNvi">
-                          <ref role="37wK5l" to="o35r:78H58oeTpjT" resolve="withTracetabs" />
-                          <node concept="2OqwBi" id="78H58of3fKu" role="37wK5m">
-                            <node concept="liA8E" id="78H58of3fKv" role="2OqNvi">
-                              <ref role="37wK5l" to="fjx4:6kREIVl0T6j" resolve="getTraceTabComponents" />
-                            </node>
-                            <node concept="37vLTw" id="78H58of3fKw" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="78H58of3s53" role="37vLTJ">
-                        <ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3clFbH" id="78H58of3v9B" role="3cqZAp" />
                   <node concept="3clFbF" id="5lxnBcU0aba" role="3cqZAp">
                     <node concept="2OqwBi" id="5lxnBcU0d7B" role="3clFbG">
@@ -1353,10 +1330,28 @@
                           <ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable)" resolve="fromCallable" />
                           <node concept="1bVj0M" id="5lxnBcU0iBX" role="37wK5m">
                             <node concept="3clFbS" id="5lxnBcU0iBY" role="1bW5cS">
-                              <node concept="3clFbF" id="5lxnBcU0nAW" role="3cqZAp">
-                                <node concept="Xjq3P" id="5lxnBcU0nAU" role="3clFbG" />
+                              <node concept="3clFbF" id="3bpBM3PpBWT" role="3cqZAp">
+                                <node concept="2OqwBi" id="3bpBM3PNVOk" role="3clFbG">
+                                  <node concept="37vLTw" id="3bpBM3PpBWR" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
+                                  </node>
+                                  <node concept="liA8E" id="3bpBM3PNXAL" role="2OqNvi">
+                                    <ref role="37wK5l" to="1yqb:2daneBOX0cV" resolve="combine" />
+                                    <node concept="2ShNRf" id="3bpBM3PNZZ2" role="37wK5m">
+                                      <node concept="1pGfFk" id="3bpBM3PO9qo" role="2ShVmc">
+                                        <ref role="37wK5l" to="1yqb:3bpBM3PNk9l" resolve="Effect.NullEffect" />
+                                        <node concept="Xl_RD" id="3bpBM3POaND" role="37wK5m">
+                                          <property role="Xl_RC" value="highlighting results" />
+                                        </node>
+                                        <node concept="3uibUv" id="3bpBM3POczG" role="1pMfVU">
+                                          <ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
-                              <node concept="3clFbH" id="78H58of3wTG" role="3cqZAp" />
+                              <node concept="3clFbH" id="3bpBM3QaYqB" role="3cqZAp" />
                             </node>
                           </node>
                         </node>
@@ -1462,14 +1457,17 @@
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="false" />
       <node concept="37vLTG" id="6Yb9hAqUr3u" role="3clF46">
-        <property role="TrG5h" value="prevStep" />
+        <property role="TrG5h" value="input" />
         <node concept="3uibUv" id="6Yb9hAqUr3v" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="6Yb9hAqUr3w" role="11_B2D">
-            <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-            <node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
-              <node concept="3uibUv" id="6vFODDAYjpq" role="3qUE_r">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+          <node concept="3uibUv" id="3bpBM3PfCSi" role="11_B2D">
+            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+            <node concept="3uibUv" id="6Yb9hAqUr3w" role="11_B2D">
+              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+              <node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
+                <node concept="3uibUv" id="6vFODDAYjpq" role="3qUE_r">
+                  <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                </node>
               </node>
             </node>
           </node>
@@ -1484,9 +1482,13 @@
       <node concept="3uibUv" id="6Yb9hAqUr3z" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
         <node concept="3qUE_q" id="6Yb9hAqUr3$" role="11_B2D">
-          <node concept="3uibUv" id="6Yb9hAqUr3_" role="3qUE_r">
-            <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-            <node concept="3qTvmN" id="6Yb9hAqUr3A" role="11_B2D" />
+          <node concept="3uibUv" id="2daneBPX0FP" role="3qUE_r">
+            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+            <node concept="3qUE_q" id="2daneBPY9kz" role="11_B2D">
+              <node concept="3uibUv" id="2daneBPYada" role="3qUE_r">
+                <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -1495,17 +1497,21 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
       <node concept="3clFbS" id="6Yb9hAqUr3X" role="3clF47">
+        <node concept="3clFbH" id="2daneBPXrAq" role="3cqZAp" />
         <node concept="3cpWs8" id="6Yb9hAqUIG2" role="3cqZAp">
           <node concept="3cpWsn" id="6Yb9hAqUIG3" role="3cpWs9">
-            <property role="TrG5h" value="withTrace" />
+            <property role="TrG5h" value="input_trace" />
             <node concept="3uibUv" id="6Yb9hAqUIFz" role="1tU5fm">
               <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
               <node concept="1LlUBW" id="6Yb9hAqUIFG" role="11_B2D">
-                <node concept="3uibUv" id="6Yb9hAqUIFH" role="1Lm7xW">
-                  <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-                  <node concept="3qUE_q" id="6vFODDB6Uux" role="11_B2D">
-                    <node concept="3uibUv" id="6vFODDB6WcU" role="3qUE_r">
-                      <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                <node concept="3uibUv" id="2daneBPXvOA" role="1Lm7xW">
+                  <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                  <node concept="3uibUv" id="6Yb9hAqUIFH" role="11_B2D">
+                    <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                    <node concept="3qUE_q" id="6vFODDB6Uux" role="11_B2D">
+                      <node concept="3uibUv" id="6vFODDB6WcU" role="3qUE_r">
+                        <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -1516,7 +1522,7 @@
             </node>
             <node concept="2OqwBi" id="6Yb9hAqUIG4" role="33vP2m">
               <node concept="37vLTw" id="6Yb9hAqUIG6" role="2Oq$k0">
-                <ref role="3cqZAo" node="6Yb9hAqUr3u" resolve="prevStep" />
+                <ref role="3cqZAo" node="6Yb9hAqUr3u" resolve="input" />
               </node>
               <node concept="liA8E" id="6Yb9hAqUIG9" role="2OqNvi">
                 <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
@@ -1529,12 +1535,21 @@
                         <node concept="3uibUv" id="6Yb9hAqUIGf" role="1tU5fm">
                           <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
                         </node>
-                        <node concept="2OqwBi" id="6Yb9hAqUIGg" role="33vP2m">
-                          <node concept="liA8E" id="6Yb9hAqUIGh" role="2OqNvi">
-                            <ref role="37wK5l" to="1yqb:6kREIVl0HhM" resolve="getProgram" />
+                        <node concept="2OqwBi" id="2daneBPXQMn" role="33vP2m">
+                          <node concept="2OqwBi" id="6Yb9hAqUIGg" role="2Oq$k0">
+                            <node concept="liA8E" id="2daneBPXMc8" role="2OqNvi">
+                              <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                              <node concept="10M0yZ" id="2daneBPXPgW" role="37wK5m">
+                                <ref role="3cqZAo" to="1yqb:2daneBPSu1V" resolve="PROGRAM_PRODUCER" />
+                                <ref role="1PxDUh" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="6Yb9hAqUIGi" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6Yb9hAqUIHf" resolve="inEff" />
+                            </node>
                           </node>
-                          <node concept="37vLTw" id="6Yb9hAqUIGi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6Yb9hAqUIHf" resolve="prev" />
+                          <node concept="liA8E" id="2daneBPXV6g" role="2OqNvi">
+                            <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
                           </node>
                         </node>
                       </node>
@@ -1580,7 +1595,7 @@
                     <node concept="3clFbF" id="6Yb9hAqUIH1" role="3cqZAp">
                       <node concept="1Ls8ON" id="6Yb9hAqUIH2" role="3clFbG">
                         <node concept="37vLTw" id="6Yb9hAqUIH3" role="1Lso8e">
-                          <ref role="3cqZAo" node="6Yb9hAqUIHf" resolve="prev" />
+                          <ref role="3cqZAo" node="6Yb9hAqUIHf" resolve="inEff" />
                         </node>
                         <node concept="1eOMI4" id="6Yb9hAqUIH4" role="1Lso8e">
                           <node concept="10QFUN" id="6Yb9hAqUIH5" role="1eOMHV">
@@ -1610,12 +1625,15 @@
                     <node concept="3clFbH" id="6Yb9hAqUIHe" role="3cqZAp" />
                   </node>
                   <node concept="37vLTG" id="6Yb9hAqUIHf" role="1bW2Oz">
-                    <property role="TrG5h" value="prev" />
-                    <node concept="3uibUv" id="6Yb9hAqUIHg" role="1tU5fm">
-                      <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-                      <node concept="3qUE_q" id="6vFODDAZpMe" role="11_B2D">
-                        <node concept="3uibUv" id="6vFODDAZpMf" role="3qUE_r">
-                          <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                    <property role="TrG5h" value="inEff" />
+                    <node concept="3uibUv" id="2daneBPXE3Y" role="1tU5fm">
+                      <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                      <node concept="3uibUv" id="6Yb9hAqUIHg" role="11_B2D">
+                        <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                        <node concept="3qUE_q" id="6vFODDAZpMe" role="11_B2D">
+                          <node concept="3uibUv" id="6vFODDAZpMf" role="3qUE_r">
+                            <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -1632,7 +1650,7 @@
               <node concept="1rXfSq" id="55Q$YFtItIY" role="2Oq$k0">
                 <ref role="37wK5l" to="fjx4:6Yb9hAqJSaM" resolve="scheduleWithTrace" />
                 <node concept="37vLTw" id="6Yb9hAqUOf4" role="37wK5m">
-                  <ref role="3cqZAo" node="6Yb9hAqUIG3" resolve="withTrace" />
+                  <ref role="3cqZAo" node="6Yb9hAqUIG3" resolve="input_trace" />
                 </node>
                 <node concept="37vLTw" id="55Q$YFtIvC0" role="37wK5m">
                   <ref role="3cqZAo" node="6Yb9hAqUr3x" resolve="subscribeScheduler" />
@@ -1771,7 +1789,7 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbH" id="6IQb_Rxsy3F" role="3cqZAp" />
+                  <node concept="3clFbH" id="2daneBPYcqF" role="3cqZAp" />
                 </node>
               </node>
             </node>
@@ -1787,6 +1805,13 @@
         <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
       </node>
     </node>
+    <node concept="312cEg" id="6IQb_Rxsgb3" role="jymVt">
+      <property role="TrG5h" value="editorComponent" />
+      <node concept="3Tm6S6" id="6IQb_Rxsgb4" role="1B3o_S" />
+      <node concept="3uibUv" id="6IQb_Rxsgb5" role="1tU5fm">
+        <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+      </node>
+    </node>
     <node concept="312cEg" id="3F6vMxqv_px" role="jymVt">
       <property role="TrG5h" value="msgtrace" />
       <node concept="3Tm6S6" id="6kREIVkHFzh" role="1B3o_S" />
@@ -1801,13 +1826,6 @@
         <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
       </node>
     </node>
-    <node concept="312cEg" id="6IQb_Rxsgb3" role="jymVt">
-      <property role="TrG5h" value="editorComponent" />
-      <node concept="3Tm6S6" id="6IQb_Rxsgb4" role="1B3o_S" />
-      <node concept="3uibUv" id="6IQb_Rxsgb5" role="1tU5fm">
-        <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="6Yb9hAqUq_7" role="jymVt" />
     <node concept="3Tm1VV" id="6Yb9hAqUoyf" role="1B3o_S" />
     <node concept="3uibUv" id="6Yb9hAqUo$y" role="1zkMxy">
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index 331103c3..938b8399 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -70,6 +70,10 @@
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
@@ -97,6 +101,7 @@
       <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
         <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
       </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -117,6 +122,9 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -127,6 +135,7 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
       <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
         <child id="1171903916107" name="bound" index="3qUE_r" />
       </concept>
@@ -150,6 +159,7 @@
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+        <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
@@ -187,10 +197,6 @@
       </concept>
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
-      <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
-      <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
-        <child id="5686963296372573084" name="elementType" index="3O5elw" />
-      </concept>
     </language>
   </registry>
   <node concept="312cEu" id="4t7Xo7inNgi">
@@ -343,6 +349,165 @@
   <node concept="312cEu" id="78H58oeu6dG">
     <property role="TrG5h" value="ControlflowStep" />
     <node concept="2tJIrI" id="78H58oeu6M4" role="jymVt" />
+    <node concept="Wx3nA" id="2daneBP_Jiy" role="jymVt">
+      <property role="TrG5h" value="REPORT_ITEMS" />
+      <node concept="3Tm1VV" id="2daneBP_Jiz" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBP_Ji$" role="1tU5fm">
+        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKind" />
+        <node concept="_YKpA" id="2daneBP_OV2" role="11_B2D">
+          <node concept="3uibUv" id="2daneBP_OV3" role="_ZDj9">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
+        </node>
+      </node>
+      <node concept="2ShNRf" id="2daneBP_JiC" role="33vP2m">
+        <node concept="YeOm9" id="2daneBP_JiD" role="2ShVmc">
+          <node concept="1Y3b0j" id="2daneBP_JiE" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <ref role="37wK5l" to="1yqb:2daneBPU2_R" resolve="Effect.ValueKind" />
+            <ref role="1Y3XeK" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKind" />
+            <node concept="3Tm1VV" id="2daneBP_JiF" role="1B3o_S" />
+            <node concept="3clFb_" id="2daneBP_JiG" role="jymVt">
+              <property role="TrG5h" value="extractValue" />
+              <node concept="37vLTG" id="2daneBP_JiH" role="3clF46">
+                <property role="TrG5h" value="eff" />
+                <node concept="3uibUv" id="2daneBP_JiI" role="1tU5fm">
+                  <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                </node>
+              </node>
+              <node concept="3Tm1VV" id="2daneBP_JiJ" role="1B3o_S" />
+              <node concept="3clFbS" id="2daneBP_JiK" role="3clF47">
+                <node concept="3clFbF" id="2daneBP_JiL" role="3cqZAp">
+                  <node concept="2OqwBi" id="2daneBP_JiM" role="3clFbG">
+                    <node concept="1eOMI4" id="2daneBP_JiN" role="2Oq$k0">
+                      <node concept="10QFUN" id="2daneBP_JiO" role="1eOMHV">
+                        <node concept="3uibUv" id="3bpBM3PgvVQ" role="10QFUM">
+                          <ref role="3uigEE" node="2daneBP0KUh" resolve="ControlflowStep.LocalEffect" />
+                        </node>
+                        <node concept="37vLTw" id="2daneBP_JiQ" role="10QFUP">
+                          <ref role="3cqZAo" node="2daneBP_JiH" resolve="eff" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OwXpG" id="3bpBM3PgwDC" role="2OqNvi">
+                      <ref role="2Oxat5" node="2daneBPUfZ5" resolve="reportItems" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="2daneBP_JiS" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+              </node>
+              <node concept="_YKpA" id="2daneBP_Phf" role="3clF45">
+                <node concept="3uibUv" id="2daneBP_Phg" role="_ZDj9">
+                  <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+                </node>
+              </node>
+            </node>
+            <node concept="_YKpA" id="2daneBP_OpG" role="2Ghqu4">
+              <node concept="3uibUv" id="2daneBP_OpH" role="_ZDj9">
+                <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3bpBM3Pg4tg" role="jymVt" />
+    <node concept="312cEu" id="2daneBP0KUh" role="jymVt">
+      <property role="TrG5h" value="LocalEffect" />
+      <node concept="2tJIrI" id="2daneBP0QTj" role="jymVt" />
+      <node concept="3clFbW" id="2daneBPTXIa" role="jymVt">
+        <node concept="37vLTG" id="2daneBPUbGa" role="3clF46">
+          <property role="TrG5h" value="reportItems" />
+          <node concept="_YKpA" id="2daneBPUcqv" role="1tU5fm">
+            <node concept="3uibUv" id="2daneBPUcqw" role="_ZDj9">
+              <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2daneBPTXIc" role="3clF45" />
+        <node concept="3Tm6S6" id="2daneBPTZG0" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBPTXIe" role="3clF47">
+          <node concept="3clFbF" id="2daneBPUfZa" role="3cqZAp">
+            <node concept="37vLTI" id="2daneBPUfZc" role="3clFbG">
+              <node concept="2OqwBi" id="2daneBPUlok" role="37vLTJ">
+                <node concept="Xjq3P" id="2daneBPUl$s" role="2Oq$k0" />
+                <node concept="2OwXpG" id="3bpBM3Pgab4" role="2OqNvi">
+                  <ref role="2Oxat5" node="2daneBPUfZ5" resolve="reportItems" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="2daneBPUfZg" role="37vLTx">
+                <ref role="3cqZAo" node="2daneBPUbGa" resolve="reportItems" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBPTWiR" role="jymVt" />
+      <node concept="3Tm1VV" id="2daneBPTV4k" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBP0QoL" role="1zkMxy">
+        <ref role="3uigEE" to="1yqb:2daneBOXQpd" resolve="Effect.SingularEffect" />
+        <node concept="3uibUv" id="3bpBM3PgxRb" role="11_B2D">
+          <ref role="3uigEE" node="78H58oeu6dG" resolve="ControlflowStep" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="2daneBP0Ra_" role="jymVt">
+        <property role="TrG5h" value="hasValue" />
+        <node concept="37vLTG" id="2daneBP0RaA" role="3clF46">
+          <property role="TrG5h" value="valueKind" />
+          <node concept="3uibUv" id="2daneBP0RaB" role="1tU5fm">
+            <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKind" />
+            <node concept="3qTvmN" id="2daneBP0RaC" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="10P_77" id="2daneBP0RaD" role="3clF45" />
+        <node concept="3Tm1VV" id="2daneBP0RaE" role="1B3o_S" />
+        <node concept="3clFbS" id="2daneBP0RaH" role="3clF47">
+          <node concept="3clFbF" id="2daneBPzZmL" role="3cqZAp">
+            <node concept="3clFbC" id="2daneBPNnMj" role="3clFbG">
+              <node concept="37vLTw" id="2daneBPNoe9" role="3uHU7w">
+                <ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
+              </node>
+              <node concept="37vLTw" id="2daneBPNnn5" role="3uHU7B">
+                <ref role="3cqZAo" node="2daneBP0RaA" resolve="valueKind" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="2daneBP0RaI" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2daneBP0S6b" role="jymVt" />
+      <node concept="3clFb_" id="3bpBM3PHGeJ" role="jymVt">
+        <property role="TrG5h" value="info" />
+        <node concept="17QB3L" id="3bpBM3PHGeK" role="3clF45" />
+        <node concept="3Tm1VV" id="3bpBM3PHGeL" role="1B3o_S" />
+        <node concept="3clFbS" id="3bpBM3PHGeQ" role="3clF47">
+          <node concept="3clFbF" id="3bpBM3PHHjf" role="3cqZAp">
+            <node concept="Xl_RD" id="3bpBM3PHHje" role="3clFbG">
+              <property role="Xl_RC" value="evaluating controlflow" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3bpBM3PHGeR" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3bpBM3PNKMv" role="jymVt" />
+      <node concept="312cEg" id="2daneBPUfZ5" role="jymVt">
+        <property role="TrG5h" value="reportItems" />
+        <node concept="3Tm6S6" id="2daneBPUfZ6" role="1B3o_S" />
+        <node concept="_YKpA" id="2daneBPUfZ8" role="1tU5fm">
+          <node concept="3uibUv" id="2daneBPUfZ9" role="_ZDj9">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3bpBM3Pg4v$" role="jymVt" />
+    <node concept="2tJIrI" id="3bpBM3Pg1sT" role="jymVt" />
     <node concept="3clFbW" id="78H58oeu6OE" role="jymVt">
       <node concept="37vLTG" id="78H58oeu6VL" role="3clF46">
         <property role="TrG5h" value="repository" />
@@ -366,15 +531,18 @@
       <property role="TrG5h" value="scheduleWithTrace" />
       <property role="1EzhhJ" value="false" />
       <node concept="37vLTG" id="6Yb9hAqJSaN" role="3clF46">
-        <property role="TrG5h" value="prevStepWithTrace" />
+        <property role="TrG5h" value="input_trace" />
         <node concept="3uibUv" id="6Yb9hAqJSaO" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
           <node concept="1LlUBW" id="6Yb9hAqJSaP" role="11_B2D">
-            <node concept="3uibUv" id="6Yb9hAqJSaQ" role="1Lm7xW">
-              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-              <node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
-                <node concept="3uibUv" id="6vFODDAZfM0" role="3qUE_r">
-                  <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+            <node concept="3uibUv" id="2daneBPX56x" role="1Lm7xW">
+              <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+              <node concept="3uibUv" id="6Yb9hAqJSaQ" role="11_B2D">
+                <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                <node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
+                  <node concept="3uibUv" id="6vFODDAZfM0" role="3qUE_r">
+                    <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -392,52 +560,70 @@
       </node>
       <node concept="3uibUv" id="6Yb9hAqJSaU" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="6Yb9hAqJSaV" role="11_B2D">
-          <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+        <node concept="3uibUv" id="2daneBPXiSD" role="11_B2D">
+          <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+          <node concept="3qUE_q" id="3bpBM3Pb9xV" role="11_B2D">
+            <node concept="3uibUv" id="3bpBM3Pb9SC" role="3qUE_r">
+              <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3Tmbuc" id="6Yb9hAqJSaW" role="1B3o_S" />
       <node concept="3clFbS" id="6Yb9hAqJSf8" role="3clF47">
+        <node concept="3clFbH" id="2daneBPX9B2" role="3cqZAp" />
         <node concept="3clFbF" id="6Yb9hAqJSfd" role="3cqZAp">
-          <node concept="2OqwBi" id="6Yb9hAqJTeO" role="3clFbG">
+          <node concept="2OqwBi" id="3bpBM3Pga$_" role="3clFbG">
             <node concept="3nyPlj" id="6Yb9hAqJSfc" role="2Oq$k0">
               <ref role="37wK5l" to="1yqb:55Q$YFtHM07" resolve="scheduleWithTrace" />
               <node concept="37vLTw" id="6Yb9hAqJSfa" role="37wK5m">
-                <ref role="3cqZAo" node="6Yb9hAqJSaN" resolve="prevStepWithTrace" />
+                <ref role="3cqZAo" node="6Yb9hAqJSaN" resolve="input_trace" />
               </node>
               <node concept="37vLTw" id="6Yb9hAqJSfb" role="37wK5m">
                 <ref role="3cqZAo" node="6Yb9hAqJSaS" resolve="subscribeScheduler" />
               </node>
             </node>
-            <node concept="liA8E" id="6Yb9hAqJTJO" role="2OqNvi">
+            <node concept="liA8E" id="3bpBM3PgbYD" role="2OqNvi">
               <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
-              <node concept="1bVj0M" id="6Yb9hAqJUtw" role="37wK5m">
-                <node concept="37vLTG" id="6Yb9hAqJUBz" role="1bW2Oz">
-                  <property role="TrG5h" value="step" />
-                  <node concept="3uibUv" id="6Yb9hAqJUJy" role="1tU5fm">
-                    <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="6Yb9hAqJUtx" role="1bW5cS">
-                  <node concept="3clFbH" id="6Yb9hAqJV$G" role="3cqZAp" />
-                  <node concept="3SKdUt" id="6Yb9hAqKbak" role="3cqZAp">
-                    <node concept="1PaTwC" id="589APehYy_y" role="3ndbpf">
-                      <node concept="3oM_SD" id="589APehYy_z" role="1PaTwD">
-                        <property role="3oM_SC" value="NOP" />
+              <node concept="1bVj0M" id="3bpBM3PgcUx" role="37wK5m">
+                <node concept="37vLTG" id="3bpBM3PgdJB" role="1bW2Oz">
+                  <property role="TrG5h" value="superEff" />
+                  <node concept="3uibUv" id="3bpBM3PgejS" role="1tU5fm">
+                    <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                    <node concept="3qUE_q" id="3bpBM3PgFax" role="11_B2D">
+                      <node concept="3uibUv" id="3bpBM3PgGj_" role="3qUE_r">
+                        <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbH" id="6Yb9hAqJV$L" role="3cqZAp" />
-                  <node concept="3clFbF" id="6Yb9hAqJVMD" role="3cqZAp">
-                    <node concept="37vLTw" id="6Yb9hAqJVMB" role="3clFbG">
-                      <ref role="3cqZAo" node="6Yb9hAqJUBz" resolve="step" />
+                </node>
+                <node concept="3clFbS" id="3bpBM3PgcUy" role="1bW5cS">
+                  <node concept="3clFbH" id="3bpBM3PghJA" role="3cqZAp" />
+                  <node concept="3clFbF" id="3bpBM3PgizQ" role="3cqZAp">
+                    <node concept="2OqwBi" id="3bpBM3Pgj8F" role="3clFbG">
+                      <node concept="37vLTw" id="3bpBM3PgizO" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3bpBM3PgdJB" resolve="superEff" />
+                      </node>
+                      <node concept="liA8E" id="3bpBM3Pgj_S" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX0cV" resolve="combine" />
+                        <node concept="2ShNRf" id="3bpBM3Pgkr_" role="37wK5m">
+                          <node concept="1pGfFk" id="3bpBM3Pglr7" role="2ShVmc">
+                            <ref role="37wK5l" node="2daneBPTXIa" resolve="ControlflowStep.LocalEffect" />
+                            <node concept="37vLTw" id="3bpBM3PgtRB" role="37wK5m">
+                              <ref role="3cqZAo" node="1FOQehx4tIV" resolve="reportItems" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
+                  <node concept="3clFbH" id="3bpBM3Pgi5m" role="3cqZAp" />
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="3bpBM3Pb9r4" role="3cqZAp" />
       </node>
       <node concept="2AHcQZ" id="6Yb9hAqJSf9" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
@@ -587,56 +773,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="78H58oeubmD" role="jymVt" />
-    <node concept="3clFb_" id="1FOQehx4yMT" role="jymVt">
-      <property role="TrG5h" value="getReportItems" />
-      <node concept="3Tm1VV" id="1FOQehx4yMX" role="1B3o_S" />
-      <node concept="3clFbS" id="1FOQehx4yMY" role="3clF47">
-        <node concept="3clFbF" id="1FOQehx4BDl" role="3cqZAp">
-          <node concept="37vLTw" id="1FOQehx4BDk" role="3clFbG">
-            <ref role="3cqZAo" node="1FOQehx4tIV" resolve="reportItems" />
-          </node>
-        </node>
-      </node>
-      <node concept="3vKaQO" id="1FOQehx4$tY" role="3clF45">
-        <node concept="3uibUv" id="1FOQehx4_l3" role="3O5elw">
-          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1FOQehx4yMS" role="jymVt" />
-    <node concept="3clFb_" id="6kREIVl0T6j" role="jymVt">
-      <property role="TrG5h" value="getTraceTabComponents" />
-      <node concept="_YKpA" id="6kREIVl0T6k" role="3clF45">
-        <node concept="3uibUv" id="6IQb_RxROcP" role="_ZDj9">
-          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6kREIVl0T6m" role="1B3o_S" />
-      <node concept="3clFbS" id="6kREIVl0T6n" role="3clF47">
-        <node concept="3clFbF" id="6kREIVl0T6o" role="3cqZAp">
-          <node concept="37vLTw" id="6IQb_Rx$Mfp" role="3clFbG">
-            <ref role="3cqZAo" node="6IQb_RxsBvb" resolve="traceTabComponents" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="78H58oeuecU" role="jymVt" />
-    <node concept="312cEg" id="6IQb_RxsBvb" role="jymVt">
-      <property role="TrG5h" value="traceTabComponents" />
-      <node concept="3Tmbuc" id="78H58of7l2T" role="1B3o_S" />
-      <node concept="_YKpA" id="6IQb_RxsBvd" role="1tU5fm">
-        <node concept="3uibUv" id="6IQb_RxRQS7" role="_ZDj9">
-          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="6IQb_RxsBvf" role="33vP2m">
-        <node concept="Tc6Ow" id="6IQb_RxsBvg" role="2ShVmc">
-          <node concept="3uibUv" id="6IQb_RxRP6h" role="HW$YZ">
-            <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="312cEg" id="1FOQehx4tIV" role="jymVt">
       <property role="TrG5h" value="reportItems" />
       <node concept="3Tm6S6" id="1FOQehx4tIW" role="1B3o_S" />