From f0184de4c51457338e41c5dfd0c74877afafa0b1 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 23 Aug 2016 17:44:49 +0200
Subject: [PATCH] Extracting the JCHR-related stuff to drop it later. Cleaning
 up the obsolete modules. Get rid of dependencies on JCHR stuff.

---
 .mps/modules.xml                              |   12 +-
 .../generator/template/main@generator.mps     | 1187 ++++
 .../jetbrains.mps.logic_jchr.mpl              |  120 +
 .../models/behavior.mps                       |   11 +
 .../models/constraints.mps                    |   11 +
 .../models/editor.mps                         |   11 +
 .../models/structure.mps                      |   11 +
 .../models/typesystem.mps                     |   11 +
 .../jetbrains.mps.logic_jchr.runtime.msd      |   30 +
 .../jetbrains/mps/logic_jchr/runtime.mps      |   50 +
 .../source/runtime/ConstraintSystemUtil.java  |    0
 .../classes_jchr/.keep                        |    0
 ...lang.typesystem2.samplechecker.handler.msd |    0
 .../lang/typesystem2/samplechecker/chr.mps    |    0
 .../samplechecker.handler.iml                 |    0
 ....lang.typesystem2.samplechecker.runner.msd |   13 +-
 .../lang/typesystem2/samplechecker/runner.mps |    8 +-
 .../lang/typesystem2/samplechecker/util.mps   |    0
 .../samplechecker.runner.iml                  |    0
 .../template/ExpressionSolver.java            |    0
 ...mps.lang.typesystem2.sampleplugin.jchr.msd |   68 +
 .../typesystem2/sampleplugin/jchr/plugin.mps  | 5788 +++++++++++------
 .../jetbrains.mps.logic.jchr/Logic.jchr.iml   |    0
 .../jetbrains.mps.logic.jchr.msd              |   18 +-
 .../jetbrains/mps/logic/jchr/predicate.mps    |  450 +-
 .../jetbrains/mps/logic/jchr/program.mps      |    0
 .../generator/template/main@generator.mps     |  468 +-
 .../jetbrains.mps.logic.mpl                   |   11 -
 .../runtime/jetbrains.mps.logic.runtime.msd   |   12 +-
 .../models/jetbrains/mps/logic/builtin.mps    |    2 -
 .../jetbrains/mps/logic/builtin/predicate.mps |  598 +-
 .../jetbrains/mps/logic/builtin/solver.mps    |    6 +-
 .../mps/logic/builtin/unification.mps         |  448 --
 .../jetbrains.mps.logic.reactor.msd           |   14 +-
 .../jetbrains/mps/logic/reactor/logical.mps   |  149 +
 .../jetbrains.mps.logic.test.msd              |    6 -
 .../jetbrains/mps/logic/test/logical.mps      |  361 +-
 .../jetbrains/mps/logic/test/unification.mps  |  828 ++-
 ...brains.mps.lang.typesystem2.sampleLang.mpl |    3 -
 ...rains.mps.lang.typesystem2.sample.test.msd |    4 -
 ...typesystem2.samplechecker.handler.test.msd |    5 -
 .../samplechecker/handle/test/util.mps        |  621 +-
 ...typesystem2.samplechecker.handler.util.msd |    4 -
 .../typesystem2/samplechecker/handle/util.mps |    5 -
 ...ps.lang.typesystem2.samplechecker.test.msd |    4 -
 ...ins.mps.lang.typesystem2.samplechecker.msd |   43 -
 ...ains.mps.lang.typesystem2.sampleplugin.msd |   30 -
 .../lang/typesystem2/sampleplugin/plugin.mps  | 5369 ++++++++-------
 .../jetbrains.mps.lang.typesystem2.mpl        |    8 -
 .../languageModels/typesystem.mps             |    3 -
 ...jetbrains.mps.lang.typesystem2.runtime.msd |    3 -
 ...etbrains.mps.lang.typesystem2.template.msd |    2 -
 52 files changed, 10722 insertions(+), 6084 deletions(-)
 create mode 100644 jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
 create mode 100644 jchr/languages/jetbrains.mps.logic_jchr/jetbrains.mps.logic_jchr.mpl
 create mode 100644 jchr/languages/jetbrains.mps.logic_jchr/models/behavior.mps
 create mode 100644 jchr/languages/jetbrains.mps.logic_jchr/models/constraints.mps
 create mode 100644 jchr/languages/jetbrains.mps.logic_jchr/models/editor.mps
 create mode 100644 jchr/languages/jetbrains.mps.logic_jchr/models/structure.mps
 create mode 100644 jchr/languages/jetbrains.mps.logic_jchr/models/typesystem.mps
 create mode 100644 jchr/languages/jetbrains.mps.logic_jchr/runtime/jetbrains.mps.logic_jchr.runtime.msd
 create mode 100644 jchr/languages/jetbrains.mps.logic_jchr/runtime/models/jetbrains/mps/logic_jchr/runtime.mps
 rename {logic/languages/jetbrains.mps.logic => jchr/languages/jetbrains.mps.logic_jchr}/runtime/source/runtime/ConstraintSystemUtil.java (100%)
 rename {typechecking => jchr}/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/classes_jchr/.keep (100%)
 rename {typechecking => jchr}/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd (100%)
 rename {typechecking => jchr}/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps (100%)
 rename {typechecking => jchr}/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml (100%)
 rename {typechecking => jchr}/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd (82%)
 rename {typechecking => jchr}/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps (99%)
 rename {typechecking => jchr}/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps (100%)
 rename {typechecking => jchr}/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml (100%)
 rename {typechecking => jchr}/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/source_copy/jetbrains/mps/lang/typesystem2/samplechecker/template/ExpressionSolver.java (100%)
 create mode 100644 jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd
 rename typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/typechecking/handler/producer.mps => jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps (74%)
 rename {logic => jchr}/solutions/jetbrains.mps.logic.jchr/Logic.jchr.iml (100%)
 rename {logic => jchr}/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd (57%)
 rename {logic => jchr}/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps (92%)
 rename {logic => jchr}/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps (100%)
 delete mode 100644 typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd

diff --git a/.mps/modules.xml b/.mps/modules.xml
index 99976db7..74cec25c 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -6,10 +6,15 @@
       <modulePath path="$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd" folder="jchr" />
       <modulePath path="$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd" folder="jchr" />
       <modulePath path="$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd" folder="jchr" />
+      <modulePath path="$PROJECT_DIR$/jchr/languages/jetbrains.mps.logic_jchr/jetbrains.mps.logic_jchr.mpl" folder="jchr" />
+      <modulePath path="$PROJECT_DIR$/jchr/languages/jetbrains.mps.logic_jchr/runtime/jetbrains.mps.logic_jchr.runtime.msd" folder="jchr" />
+      <modulePath path="$PROJECT_DIR$/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd" folder="jchr" />
+      <modulePath path="$PROJECT_DIR$/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd" folder="jchr" />
+      <modulePath path="$PROJECT_DIR$/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd" folder="jchr" />
+      <modulePath path="$PROJECT_DIR$/jchr/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd" folder="jchr" />
       <modulePath path="$PROJECT_DIR$/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" folder="logic" />
       <modulePath path="$PROJECT_DIR$/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl" folder="typechecking.sample" />
@@ -18,14 +23,11 @@
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd" folder="typechecking.sample" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd" folder="typechecking.template.handler" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" folder="typechecking.template.handler" />
-      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd" folder="typechecking.template.handler.chr" />
-      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd" folder="typechecking.checker" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd" folder="typechecking.template" />
-      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd" folder="typechecking.template" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" folder="typechecking.checker" />
       <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" folder="typesystem2" />
       <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" folder="typesystem2" />
       <modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" folder="typesystem2" />
     </projectModules>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps b/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
new file mode 100644
index 00000000..795f503a
--- /dev/null
+++ b/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
@@ -0,0 +1,1187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:beeea4e2-afd1-4e2b-beb7-17f38ef04a5e(jetbrains.mps.logic_jchr.generator.template.main@generator)">
+  <persistence version="9" />
+  <languages>
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
+    <use id="cd9dfc9b-6796-491f-83c8-b3448018e7f5" name="jetbrains.mps.logic_jchr" version="-1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
+    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="vgt0" ref="r:f36c95e5-e428-4945-91ae-1005e20c7971(jetbrains.mps.jchr.structure)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
+    <import index="ouxx" ref="r:727775a3-16ae-4b9f-80a6-9ef3207ffa6a(jetbrains.mps.logic.generator.template.main@generator)" />
+    <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
+    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </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" />
+      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
+        <property id="6329021646629104958" name="text" index="3SKdUp" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
+    </language>
+    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
+      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
+        <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
+      </concept>
+      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
+        <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
+      </concept>
+      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
+        <child id="1200911492601" name="mappingLabel" index="2rTMjI" />
+        <child id="7473026166162327259" name="dropAttrubuteRule" index="CYSdJ" />
+        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
+        <child id="1167514678247" name="rootMappingRule" index="3lj3bC" />
+      </concept>
+      <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
+        <child id="1177093586806" name="templateNode" index="gfFT$" />
+      </concept>
+      <concept id="1168559512253" name="jetbrains.mps.lang.generator.structure.DismissTopMappingRule" flags="lg" index="j$LIH">
+        <child id="1169669152123" name="generatorMessage" index="1lHHLF" />
+      </concept>
+      <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4">
+        <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
+      </concept>
+      <concept id="1200911316486" name="jetbrains.mps.lang.generator.structure.MappingLabelDeclaration" flags="lg" index="2rT7sh">
+        <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
+        <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
+      </concept>
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+        <reference id="1722980698497626483" name="template" index="v9R2y" />
+        <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
+      </concept>
+      <concept id="1194565793557" name="jetbrains.mps.lang.generator.structure.IncludeMacro" flags="ln" index="xERo3">
+        <reference id="1194566366375" name="includeTemplate" index="xH3mL" />
+      </concept>
+      <concept id="7473026166162297915" name="jetbrains.mps.lang.generator.structure.DropAttributeRule" flags="lg" index="CY16f">
+        <reference id="7473026166162297918" name="applicableConcept" index="CY16a" />
+      </concept>
+      <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
+      <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
+      <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
+        <property id="1167272244852" name="applyToConceptInheritors" index="36QftV" />
+        <reference id="1200917515464" name="labelDeclaration" index="2sgKRv" />
+        <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
+        <child id="1167169362365" name="conditionFunction" index="30HLyM" />
+      </concept>
+      <concept id="1195158154974" name="jetbrains.mps.lang.generator.structure.InlineSwitch_RuleConsequence" flags="lg" index="14YyZ8">
+        <child id="1195158241124" name="defaultConsequence" index="14YRTM" />
+        <child id="1195158408710" name="case" index="14ZwWg" />
+      </concept>
+      <concept id="1195158388553" name="jetbrains.mps.lang.generator.structure.InlineSwitch_Case" flags="ng" index="14ZrTv">
+        <child id="1195158608805" name="conditionFunction" index="150hEN" />
+        <child id="1195158637244" name="caseConsequence" index="150oIE" />
+      </concept>
+      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
+        <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
+      </concept>
+      <concept id="1087833466690" name="jetbrains.mps.lang.generator.structure.NodeMacro" flags="lg" index="17VmuZ">
+        <reference id="1200912223215" name="mappingLabel" index="2rW$FS" />
+      </concept>
+      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
+        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
+      </concept>
+      <concept id="1167514355419" name="jetbrains.mps.lang.generator.structure.Root_MappingRule" flags="lg" index="3lhOvk">
+        <property id="1177959072138" name="keepSourceRoot" index="13Pg2o" />
+        <reference id="1167514355421" name="template" index="3lhOvi" />
+      </concept>
+      <concept id="1169670156577" name="jetbrains.mps.lang.generator.structure.GeneratorMessage" flags="lg" index="1lLz0L">
+        <property id="1169670173015" name="messageText" index="1lLB17" />
+        <property id="1169670356567" name="messageType" index="1lMjX7" />
+      </concept>
+      <concept id="982871510068000147" name="jetbrains.mps.lang.generator.structure.TemplateSwitchMacro" flags="lg" index="1sPUBX">
+        <child id="982871510068000158" name="sourceNodeQuery" index="1sPUBK" />
+      </concept>
+      <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
+      <concept id="1167756221419" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_templatePropertyValue" flags="nn" index="3zGtF$" />
+      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
+      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
+      <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="ln" index="1WS0z7">
+        <child id="1167952069335" name="sourceNodesQuery" index="3Jn$fo" />
+      </concept>
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
+      <concept id="1217889725928" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_SessionObjectAccess" flags="nn" index="2fSANN" />
+      <concept id="1217889960776" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_UserObjectAccessBase" flags="nn" index="2fTw9j">
+        <child id="1217890689512" name="userKey" index="2fWi3N" />
+      </concept>
+      <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
+    </language>
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
+      <concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
+    </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
+        <property id="1167245565795" name="severity" index="35gtTG" />
+        <child id="1167227463056" name="logExpression" index="34bqiv" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
+      <concept id="1803469493727536395" name="jetbrains.mps.lang.smodel.structure.OperationParm_StopConceptList" flags="ng" index="hTh3S">
+        <child id="1803469493727536396" name="concept" index="hTh3Z" />
+      </concept>
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
+      <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
+        <reference id="1154546997487" name="concept" index="3gnhBz" />
+      </concept>
+      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
+      <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
+      <concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
+        <reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
+      </concept>
+      <concept id="6407023681583031218" name="jetbrains.mps.lang.smodel.structure.AttributeAccess" flags="nn" index="3CFZ6_">
+        <child id="6407023681583036852" name="qualifier" index="3CFYIz" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="3364660638048049750" name="jetbrains.mps.lang.core.structure.PropertyAttribute" flags="ng" index="A9Btg">
+        <property id="1757699476691236117" name="propertyName" index="2qtEX9" />
+        <property id="1341860900487648621" name="propertyId" index="P4ACc" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
+        <property id="709746936026609031" name="linkId" index="3V$3ak" />
+        <property id="709746936026609029" name="linkRole" index="3V$3am" />
+      </concept>
+      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
+        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
+        <child id="1176906787974" name="rightExpression" index="576Qk" />
+      </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
+      <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
+    </language>
+  </registry>
+  <node concept="bUwia" id="6yEjedmrN_Y">
+    <property role="TrG5h" value="main" />
+  </node>
+  <node concept="312cEu" id="35Lj3TiR8No">
+    <property role="TrG5h" value="Stuff" />
+    <node concept="2tJIrI" id="35Lj3TiRjxl" role="jymVt" />
+    <node concept="2YIFZL" id="35Lj3TiRjRb" role="jymVt">
+      <property role="TrG5h" value="atom" />
+      <node concept="37vLTG" id="35Lj3TiRke1" role="3clF46">
+        <property role="TrG5h" value="param" />
+        <node concept="3uibUv" id="35Lj3TiRkkj" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          <node concept="29HgVG" id="35Lj3TiSfZe" role="lGtFl">
+            <node concept="3NFfHV" id="35Lj3TiSgqy" role="3NFExx">
+              <node concept="3clFbS" id="35Lj3TiSgqz" role="2VODD2">
+                <node concept="3cpWs8" id="2AXhyOGXrUf" role="3cqZAp">
+                  <node concept="3cpWsn" id="2AXhyOGXrUg" role="3cpWs9">
+                    <property role="TrG5h" value="type" />
+                    <node concept="3Tqbb2" id="2AXhyOGXrU8" role="1tU5fm" />
+                    <node concept="2OqwBi" id="2AXhyOGXrUh" role="33vP2m">
+                      <node concept="30H73N" id="2AXhyOGXrUi" role="2Oq$k0" />
+                      <node concept="3JvlWi" id="2AXhyOGXrUj" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1X3_iC" id="6UqNvvALqpw" role="lGtFl">
+                  <property role="3V$3am" value="statement" />
+                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                  <node concept="3SKdUt" id="2AXhyOGXzgm" role="8Wnug">
+                    <node concept="3SKdUq" id="2AXhyOGXzgo" role="3SKWNk">
+                      <property role="3SKdUp" value="FIXME hack!" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1X3_iC" id="6UqNvvALqpx" role="lGtFl">
+                  <property role="3V$3am" value="statement" />
+                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                  <node concept="3cpWs8" id="2AXhyOGXvid" role="8Wnug">
+                    <node concept="3cpWsn" id="2AXhyOGXvie" role="3cpWs9">
+                      <property role="TrG5h" value="key" />
+                      <node concept="17QB3L" id="2AXhyOGXvia" role="1tU5fm" />
+                      <node concept="3cpWs3" id="2AXhyOGXvif" role="33vP2m">
+                        <node concept="Xl_RD" id="2AXhyOGXvig" role="3uHU7w">
+                          <property role="Xl_RC" value=")" />
+                        </node>
+                        <node concept="3cpWs3" id="2AXhyOGXvih" role="3uHU7B">
+                          <node concept="Xl_RD" id="2AXhyOGXvii" role="3uHU7B">
+                            <property role="Xl_RC" value="typeOf(" />
+                          </node>
+                          <node concept="2OqwBi" id="2AXhyOGXvij" role="3uHU7w">
+                            <node concept="2JrnkZ" id="2AXhyOGXvik" role="2Oq$k0">
+                              <node concept="30H73N" id="2AXhyOGXvil" role="2JrQYb" />
+                            </node>
+                            <node concept="liA8E" id="2AXhyOGXvim" role="2OqNvi">
+                              <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1X3_iC" id="6UqNvvALqpy" role="lGtFl">
+                  <property role="3V$3am" value="statement" />
+                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                  <node concept="3clFbF" id="2AXhyOGXsaw" role="8Wnug">
+                    <node concept="37vLTI" id="2AXhyOGXwSY" role="3clFbG">
+                      <node concept="37vLTw" id="2AXhyOGXx6G" role="37vLTx">
+                        <ref role="3cqZAo" node="2AXhyOGXrUg" resolve="type" />
+                      </node>
+                      <node concept="2OqwBi" id="2AXhyOGXsh8" role="37vLTJ">
+                        <node concept="1iwH7S" id="2AXhyOGXsau" role="2Oq$k0" />
+                        <node concept="2fSANN" id="2AXhyOGXsqd" role="2OqNvi">
+                          <node concept="37vLTw" id="2AXhyOGXvin" role="2fWi3N">
+                            <ref role="3cqZAo" node="2AXhyOGXvie" resolve="key" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1X3_iC" id="6UqNvvALqpz" role="lGtFl">
+                  <property role="3V$3am" value="statement" />
+                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                  <node concept="3clFbH" id="2AXhyOGXGie" role="8Wnug" />
+                </node>
+                <node concept="1X3_iC" id="6UqNvvALqp$" role="lGtFl">
+                  <property role="3V$3am" value="statement" />
+                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                  <node concept="34ab3g" id="2AXhyOGXGFi" role="8Wnug">
+                    <property role="35gtTG" value="warn" />
+                    <node concept="3cpWs3" id="2AXhyOGXJ4L" role="34bqiv">
+                      <node concept="37vLTw" id="2AXhyOGXJlq" role="3uHU7w">
+                        <ref role="3cqZAo" node="2AXhyOGXrUg" resolve="type" />
+                      </node>
+                      <node concept="3cpWs3" id="2AXhyOGXI4J" role="3uHU7B">
+                        <node concept="3cpWs3" id="2AXhyOGXH$R" role="3uHU7B">
+                          <node concept="Xl_RD" id="2AXhyOGXGFk" role="3uHU7B">
+                            <property role="Xl_RC" value="*** set " />
+                          </node>
+                          <node concept="37vLTw" id="2AXhyOGXHLT" role="3uHU7w">
+                            <ref role="3cqZAo" node="2AXhyOGXvie" resolve="key" />
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="2AXhyOGXIkC" role="3uHU7w">
+                          <property role="Xl_RC" value=" = " />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="2AXhyOGXJ_E" role="3cqZAp" />
+                <node concept="3clFbF" id="35Lj3TiSgFt" role="3cqZAp">
+                  <node concept="37vLTw" id="2AXhyOGXrUk" role="3clFbG">
+                    <ref role="3cqZAo" node="2AXhyOGXrUg" resolve="type" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1WS0z7" id="35Lj3TiRYjY" role="lGtFl">
+          <node concept="3JmXsc" id="35Lj3TiRYk0" role="3Jn$fo">
+            <node concept="3clFbS" id="35Lj3TiRYk2" role="2VODD2">
+              <node concept="3SKdUt" id="514BAS_QPhQ" role="3cqZAp">
+                <node concept="3SKdUq" id="514BAS_QPhS" role="3SKWNk">
+                  <property role="3SKdUp" value="FIXME: using the type information to derive unrelated property" />
+                </node>
+              </node>
+              <node concept="3clFbF" id="35Lj3TiRYE3" role="3cqZAp">
+                <node concept="2OqwBi" id="514BAS_QITw" role="3clFbG">
+                  <node concept="2OqwBi" id="35Lj3TiRYJj" role="2Oq$k0">
+                    <node concept="30H73N" id="35Lj3TiRYE2" role="2Oq$k0" />
+                    <node concept="2Rf3mk" id="35Lj3TiS02r" role="2OqNvi">
+                      <node concept="1xMEDy" id="35Lj3TiS02t" role="1xVPHs">
+                        <node concept="chp4Y" id="35Lj3TiS0m3" role="ri$Ld">
+                          <ref role="cht4Q" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3zZkjj" id="514BAS_QKlY" role="2OqNvi">
+                    <node concept="1bVj0M" id="514BAS_QKm0" role="23t8la">
+                      <node concept="3clFbS" id="514BAS_QKm1" role="1bW5cS">
+                        <node concept="3clFbF" id="514BAS_QL$3" role="3cqZAp">
+                          <node concept="2OqwBi" id="514BAS_QO6m" role="3clFbG">
+                            <node concept="2OqwBi" id="514BAS_QLQ$" role="2Oq$k0">
+                              <node concept="37vLTw" id="514BAS_QL$2" role="2Oq$k0">
+                                <ref role="3cqZAo" node="514BAS_QKm2" resolve="it" />
+                              </node>
+                              <node concept="3JvlWi" id="514BAS_QMei" role="2OqNvi" />
+                            </node>
+                            <node concept="3x8VRR" id="514BAS_QOox" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="514BAS_QKm2" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="514BAS_QKm3" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="17Uvod" id="35Lj3TiSmUq" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="35Lj3TiSmUr" role="3zH0cK">
+            <node concept="3clFbS" id="35Lj3TiSmUs" role="2VODD2">
+              <node concept="3clFbF" id="35Lj3TiSnv4" role="3cqZAp">
+                <node concept="2OqwBi" id="35Lj3TiSn$v" role="3clFbG">
+                  <node concept="30H73N" id="35Lj3TiSnv3" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="35Lj3TiSoj0" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="35Lj3TiSq77" role="3clF45">
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+      </node>
+      <node concept="3Tm1VV" id="35Lj3TiRjRe" role="1B3o_S" />
+      <node concept="3clFbS" id="35Lj3TiRjRf" role="3clF47">
+        <node concept="3clFbF" id="4pNU3yqbFhP" role="3cqZAp">
+          <node concept="10Nm6u" id="4pNU3yqbFhN" role="3clFbG">
+            <node concept="xERo3" id="4pNU3yqbFnX" role="lGtFl">
+              <ref role="xH3mL" to="ouxx:35Lj3TiT1Wl" resolve="Ast_Builder" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1WS0z7" id="35Lj3TiRKla" role="lGtFl">
+        <ref role="2rW$FS" node="35Lj3TiRCeh" resolve="Ast_Method" />
+        <node concept="3JmXsc" id="35Lj3TiRKlc" role="3Jn$fo">
+          <node concept="3clFbS" id="35Lj3TiRKle" role="2VODD2">
+            <node concept="3clFbF" id="35Lj3TiRKyw" role="3cqZAp">
+              <node concept="2OqwBi" id="35Lj3TiRKIX" role="3clFbG">
+                <node concept="30H73N" id="35Lj3TiRKyv" role="2Oq$k0" />
+                <node concept="2Rf3mk" id="35Lj3TiRM7X" role="2OqNvi">
+                  <node concept="1xMEDy" id="35Lj3TiRM7Z" role="1xVPHs">
+                    <node concept="chp4Y" id="35Lj3TiRMkw" role="ri$Ld">
+                      <ref role="cht4Q" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
+                    </node>
+                  </node>
+                  <node concept="hTh3S" id="35Lj3TiRMJO" role="1xVPHs">
+                    <node concept="3gn64h" id="35Lj3TiRN1c" role="hTh3Z">
+                      <ref role="3gnhBz" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17Uvod" id="35Lj3TiROzp" role="lGtFl">
+        <property role="2qtEX9" value="name" />
+        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+        <node concept="3zFVjK" id="35Lj3TiROzq" role="3zH0cK">
+          <node concept="3clFbS" id="35Lj3TiROzr" role="2VODD2">
+            <node concept="3clFbF" id="35Lj3TiROZV" role="3cqZAp">
+              <node concept="3cpWs3" id="35Lj3TiRPXV" role="3clFbG">
+                <node concept="2OqwBi" id="35Lj3TiRTNs" role="3uHU7w">
+                  <node concept="2OqwBi" id="35Lj3TiRSV6" role="2Oq$k0">
+                    <node concept="2JrnkZ" id="35Lj3TiRSCu" role="2Oq$k0">
+                      <node concept="30H73N" id="35Lj3TiRQeB" role="2JrQYb" />
+                    </node>
+                    <node concept="liA8E" id="35Lj3TiRTum" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="35Lj3TiRViR" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                  </node>
+                </node>
+                <node concept="3cpWs3" id="35Lj3TiRPh_" role="3uHU7B">
+                  <node concept="3zGtF$" id="35Lj3TiROZU" role="3uHU7B" />
+                  <node concept="Xl_RD" id="35Lj3TiRPhE" role="3uHU7w">
+                    <property role="Xl_RC" value="_" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="35Lj3TiRm6B" role="jymVt" />
+    <node concept="3Tm1VV" id="35Lj3TiR8Np" role="1B3o_S" />
+    <node concept="n94m4" id="35Lj3TiR8Nq" role="lGtFl">
+      <ref role="n9lRv" to="vgt0:pmDhvH6q87" resolve="Handler" />
+    </node>
+    <node concept="17Uvod" id="35Lj3TiR923" role="lGtFl">
+      <property role="2qtEX9" value="name" />
+      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+      <node concept="3zFVjK" id="35Lj3TiR924" role="3zH0cK">
+        <node concept="3clFbS" id="35Lj3TiR925" role="2VODD2">
+          <node concept="3clFbF" id="35Lj3TiR9kh" role="3cqZAp">
+            <node concept="3cpWs3" id="35Lj3TiSzIF" role="3clFbG">
+              <node concept="3zGtF$" id="35Lj3TiS$4Z" role="3uHU7w" />
+              <node concept="3cpWs3" id="35Lj3TiSyG0" role="3uHU7B">
+                <node concept="2OqwBi" id="35Lj3TiRb5d" role="3uHU7B">
+                  <node concept="30H73N" id="35Lj3TiRaS4" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="35Lj3TiRbQV" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="35Lj3TiSyRq" role="3uHU7w">
+                  <property role="Xl_RC" value="_" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="bUwia" id="5JQSuNswW1q">
+    <property role="TrG5h" value="ast" />
+    <property role="3GE5qa" value="" />
+    <node concept="2rT7sh" id="35Lj3TiRogF" role="2rTMjI">
+      <property role="TrG5h" value="Handler_AstHelper" />
+      <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
+      <ref role="2rTdP9" to="vgt0:pmDhvH6q87" resolve="Handler" />
+    </node>
+    <node concept="2rT7sh" id="35Lj3TiRCeh" role="2rTMjI">
+      <property role="TrG5h" value="Ast_Method" />
+      <ref role="2rTdP9" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
+      <ref role="2rZz_L" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
+    </node>
+    <node concept="3aamgX" id="1pt0VTMwlBi" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
+      <node concept="30G5F_" id="6yEjedms0FZ" role="30HLyM">
+        <node concept="3clFbS" id="6yEjedms0G0" role="2VODD2">
+          <node concept="3clFbF" id="6yEjedms0G6" role="3cqZAp">
+            <node concept="2OqwBi" id="6yEjedms0G8" role="3clFbG">
+              <node concept="2OqwBi" id="6yEjedms0G9" role="2Oq$k0">
+                <node concept="30H73N" id="6yEjedms0Ga" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="6yEjedms0Gb" role="2OqNvi">
+                  <node concept="1xMEDy" id="6yEjedms0Gc" role="1xVPHs">
+                    <node concept="chp4Y" id="6yEjedms0Gd" role="ri$Ld">
+                      <ref role="cht4Q" to="vgt0:5dz6b540Jzm" resolve="AbstractConstraint" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3x8VRR" id="6yEjedms0Ge" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="gft3U" id="35Lj3TiR81W" role="1lVwrX">
+        <node concept="2YIFZM" id="6yEjedmrPFl" role="gfFT$">
+          <ref role="1Pybhc" node="35Lj3TiR8No" resolve="Stuff" />
+          <ref role="37wK5l" node="35Lj3TiRjRb" resolve="atom" />
+          <node concept="10Nm6u" id="35Lj3TiSD25" role="37wK5m">
+            <node concept="2b32R4" id="35Lj3TiSFbs" role="lGtFl">
+              <node concept="3JmXsc" id="35Lj3TiSFbu" role="2P8S$">
+                <node concept="3clFbS" id="35Lj3TiSFbw" role="2VODD2">
+                  <node concept="3clFbF" id="35Lj3TiSFvI" role="3cqZAp">
+                    <node concept="2OqwBi" id="35Lj3TiSF$y" role="3clFbG">
+                      <node concept="30H73N" id="35Lj3TiSFvH" role="2Oq$k0" />
+                      <node concept="2Rf3mk" id="35Lj3TiSG24" role="2OqNvi">
+                        <node concept="1xMEDy" id="35Lj3TiSG26" role="1xVPHs">
+                          <node concept="chp4Y" id="35Lj3TiSGh9" role="ri$Ld">
+                            <ref role="cht4Q" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="4OKkcneVYzR" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
+      <node concept="14YyZ8" id="4OKkcneVZCA" role="1lVwrX">
+        <node concept="14ZrTv" id="4OKkcneVZCG" role="14ZwWg">
+          <node concept="30G5F_" id="4OKkcneVZCH" role="150hEN">
+            <node concept="3clFbS" id="4OKkcneVZCI" role="2VODD2">
+              <node concept="3clFbF" id="1aeprBOt4Tp" role="3cqZAp">
+                <node concept="2OqwBi" id="1aeprBOt5B4" role="3clFbG">
+                  <node concept="2OqwBi" id="1aeprBOt4Z2" role="2Oq$k0">
+                    <node concept="30H73N" id="1aeprBOt4Tn" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="1aeprBOt5n8" role="2OqNvi">
+                      <node concept="1xMEDy" id="1aeprBOt5na" role="1xVPHs">
+                        <node concept="chp4Y" id="1aeprBOt5tR" role="ri$Ld">
+                          <ref role="cht4Q" to="5j4j:6$jH9oLmYD_" resolve="Role" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1mIQ4w" id="1aeprBOt5Z_" role="2OqNvi">
+                    <node concept="chp4Y" id="1aeprBOt69d" role="cj9EA">
+                      <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="4OKkcneWb1C" role="150oIE">
+            <node concept="2YIFZM" id="7HUwyZbd5nK" role="gfFT$">
+              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asAtom" />
+              <node concept="2ShNRf" id="7nPD14NOHH4" role="37wK5m">
+                <node concept="1pGfFk" id="7nPD14NOHH5" role="2ShVmc">
+                  <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                  <node concept="3VsKOn" id="2Dg5bSg3QiY" role="37wK5m">
+                    <ref role="3VsUkX" to="wyt6:~String" resolve="String" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="gft3U" id="4OKkcneWczK" role="14YRTM">
+          <node concept="2YIFZM" id="7HUwyZbd5Au" role="gfFT$">
+            <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asAtom" />
+            <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+            <node concept="2ShNRf" id="2Dg5bSg3RdY" role="37wK5m">
+              <node concept="1pGfFk" id="2Dg5bSg3RdZ" role="2ShVmc">
+                <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                <node concept="3VsKOn" id="2Dg5bSg3Rjh" role="37wK5m">
+                  <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="4lNgnaL7Fky" role="3acgRq">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="5j4j:5lJXKARS0" resolve="Atom" />
+      <node concept="30G5F_" id="4lNgnaL7FI9" role="30HLyM">
+        <node concept="3clFbS" id="4lNgnaL7FIa" role="2VODD2">
+          <node concept="3clFbF" id="4lNgnaL7FJf" role="3cqZAp">
+            <node concept="2OqwBi" id="4lNgnaL7FVj" role="3clFbG">
+              <node concept="2OqwBi" id="4lNgnaL7FLq" role="2Oq$k0">
+                <node concept="30H73N" id="4lNgnaL7FJe" role="2Oq$k0" />
+                <node concept="3CFZ6_" id="4lNgnaL7FPd" role="2OqNvi">
+                  <node concept="3CFYIy" id="4lNgnaL7FRg" role="3CFYIz">
+                    <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3x8VRR" id="4lNgnaL7G6i" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="gft3U" id="4lNgnaL7G96" role="1lVwrX">
+        <node concept="10Nm6u" id="4lNgnaL7G97" role="gfFT$">
+          <node concept="1sPUBX" id="4lNgnaL7G98" role="lGtFl">
+            <ref role="v9R2y" to="ouxx:677NV56thjr" resolve="Expression_logical2atom" />
+            <node concept="30H73N" id="7FFmDVALefy" role="v9R3O" />
+            <node concept="3NFfHV" id="4lNgnaL7G99" role="1sPUBK">
+              <node concept="3clFbS" id="4lNgnaL7G9a" role="2VODD2">
+                <node concept="3clFbF" id="4lNgnaL7G9b" role="3cqZAp">
+                  <node concept="2OqwBi" id="4lNgnaL7G9c" role="3clFbG">
+                    <node concept="2OqwBi" id="4lNgnaL7Gq4" role="2Oq$k0">
+                      <node concept="30H73N" id="4lNgnaL7G9d" role="2Oq$k0" />
+                      <node concept="3CFZ6_" id="4lNgnaL7Gtn" role="2OqNvi">
+                        <node concept="3CFYIy" id="4lNgnaL7Gvi" role="3CFYIz">
+                          <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3TrEf2" id="4lNgnaL7G9e" role="2OqNvi">
+                      <ref role="3Tt5mk" to="5j4j:dfChU1zo4I" resolve="expression" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="29_L5zQWy8j" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+      <node concept="gft3U" id="29_L5zQWy8k" role="1lVwrX">
+        <node concept="2YIFZM" id="29_L5zQWy8l" role="gfFT$">
+          <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
+          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+          <node concept="Xl_RD" id="29_L5zQWy8m" role="37wK5m">
+            <property role="Xl_RC" value="node" />
+            <node concept="17Uvod" id="29_L5zQWJXC" role="lGtFl">
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <property role="2qtEX9" value="value" />
+              <node concept="3zFVjK" id="29_L5zQWJXD" role="3zH0cK">
+                <node concept="3clFbS" id="29_L5zQWJXE" role="2VODD2">
+                  <node concept="3clFbF" id="29_L5zR7re$" role="3cqZAp">
+                    <node concept="3cpWs3" id="29_L5zR7tnq" role="3clFbG">
+                      <node concept="Xl_RD" id="29_L5zR7rez" role="3uHU7B">
+                        <property role="Xl_RC" value="node_" />
+                      </node>
+                      <node concept="2OqwBi" id="29_L5zR7u3T" role="3uHU7w">
+                        <node concept="2OqwBi" id="29_L5zR7u3U" role="2Oq$k0">
+                          <node concept="30H73N" id="29_L5zR7u3V" role="2Oq$k0" />
+                          <node concept="3Tsc0h" id="29_L5zR7u3W" role="2OqNvi">
+                            <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
+                          </node>
+                        </node>
+                        <node concept="34oBXx" id="29_L5zR7u3X" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="10Nm6u" id="29_L5zQWy8n" role="37wK5m">
+            <node concept="2b32R4" id="29_L5zQWy8o" role="lGtFl">
+              <node concept="3JmXsc" id="29_L5zQWy8p" role="2P8S$">
+                <node concept="3clFbS" id="29_L5zQWy8q" role="2VODD2">
+                  <node concept="3clFbF" id="29_L5zQWy8r" role="3cqZAp">
+                    <node concept="2OqwBi" id="29_L5zQWy8s" role="3clFbG">
+                      <node concept="2OqwBi" id="29_L5zQWy8t" role="2Oq$k0">
+                        <node concept="2OqwBi" id="29_L5zQWy8u" role="2Oq$k0">
+                          <node concept="3Tsc0h" id="29_L5zQWy8v" role="2OqNvi">
+                            <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
+                          </node>
+                          <node concept="30H73N" id="29_L5zQWy8w" role="2Oq$k0" />
+                        </node>
+                        <node concept="3zZkjj" id="29_L5zQWy8x" role="2OqNvi">
+                          <node concept="1bVj0M" id="29_L5zQWy8y" role="23t8la">
+                            <node concept="3clFbS" id="29_L5zQWy8z" role="1bW5cS">
+                              <node concept="3clFbF" id="29_L5zQWy8$" role="3cqZAp">
+                                <node concept="2OqwBi" id="29_L5zQWy8_" role="3clFbG">
+                                  <node concept="37vLTw" id="29_L5zQWy8A" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="29_L5zQWy8D" resolve="it" />
+                                  </node>
+                                  <node concept="1mIQ4w" id="29_L5zQWy8B" role="2OqNvi">
+                                    <node concept="chp4Y" id="29_L5zQWy8C" role="cj9EA">
+                                      <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Rh6nW" id="29_L5zQWy8D" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="29_L5zQWy8E" role="1tU5fm" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3QWeyG" id="29_L5zQWy8F" role="2OqNvi">
+                        <node concept="2OqwBi" id="29_L5zQWy8G" role="576Qk">
+                          <node concept="2OqwBi" id="29_L5zQWy8H" role="2Oq$k0">
+                            <node concept="30H73N" id="29_L5zQWy8I" role="2Oq$k0" />
+                            <node concept="3Tsc0h" id="29_L5zQWy8J" role="2OqNvi">
+                              <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
+                            </node>
+                          </node>
+                          <node concept="3zZkjj" id="29_L5zQWy8K" role="2OqNvi">
+                            <node concept="1bVj0M" id="29_L5zQWy8L" role="23t8la">
+                              <node concept="3clFbS" id="29_L5zQWy8M" role="1bW5cS">
+                                <node concept="3clFbF" id="29_L5zQWy8N" role="3cqZAp">
+                                  <node concept="2OqwBi" id="29_L5zQWy8O" role="3clFbG">
+                                    <node concept="37vLTw" id="29_L5zQWy8P" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="29_L5zQWy8S" resolve="it" />
+                                    </node>
+                                    <node concept="1mIQ4w" id="29_L5zQWy8Q" role="2OqNvi">
+                                      <node concept="chp4Y" id="29_L5zQWy8R" role="cj9EA">
+                                        <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Rh6nW" id="29_L5zQWy8S" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="29_L5zQWy8T" role="1tU5fm" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="29_L5zQWy8U" role="30HLyM">
+        <node concept="3clFbS" id="29_L5zQWy8V" role="2VODD2">
+          <node concept="3clFbF" id="29_L5zQWy8W" role="3cqZAp">
+            <node concept="2OqwBi" id="29_L5zQWy8X" role="3clFbG">
+              <node concept="2OqwBi" id="29_L5zQWy8Y" role="2Oq$k0">
+                <node concept="30H73N" id="29_L5zQWy8Z" role="2Oq$k0" />
+                <node concept="3CFZ6_" id="29_L5zQWy90" role="2OqNvi">
+                  <node concept="3CFYIy" id="29_L5zQWy91" role="3CFYIz">
+                    <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3w_OXm" id="29_L5zQWy92" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="1OShD0H_454" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+      <node concept="gft3U" id="6UqNvvALIUa" role="1lVwrX">
+        <node concept="2YIFZM" id="6UqNvvALIUb" role="gfFT$">
+          <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+          <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+          <node concept="Xl_RD" id="6UqNvvALIUc" role="37wK5m">
+            <property role="Xl_RC" value="name" />
+            <node concept="17Uvod" id="6UqNvvALIUd" role="lGtFl">
+              <property role="2qtEX9" value="value" />
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <node concept="3zFVjK" id="6UqNvvALIUe" role="3zH0cK">
+                <node concept="3clFbS" id="6UqNvvALIUf" role="2VODD2">
+                  <node concept="3clFbF" id="6UqNvvALIUg" role="3cqZAp">
+                    <node concept="2OqwBi" id="6UqNvvALIUh" role="3clFbG">
+                      <node concept="30H73N" id="6UqNvvALIUi" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="6UqNvvALIUj" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="10Nm6u" id="6UqNvvALIUk" role="37wK5m">
+            <node concept="2b32R4" id="6UqNvvALIUl" role="lGtFl">
+              <node concept="3JmXsc" id="6UqNvvALIUm" role="2P8S$">
+                <node concept="3clFbS" id="6UqNvvALIUn" role="2VODD2">
+                  <node concept="3clFbF" id="6UqNvvALIUo" role="3cqZAp">
+                    <node concept="2OqwBi" id="6UqNvvALIUp" role="3clFbG">
+                      <node concept="3Tsc0h" id="6UqNvvALIUq" role="2OqNvi">
+                        <ref role="3TtcxE" to="5j4j:6$jH9oLmYL8" resolve="contents" />
+                      </node>
+                      <node concept="30H73N" id="6UqNvvALIUr" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="3ec9Qj4MdW3" role="30HLyM">
+        <node concept="3clFbS" id="3ec9Qj4MdW4" role="2VODD2">
+          <node concept="3clFbF" id="7HUwyZb79Tq" role="3cqZAp">
+            <node concept="2OqwBi" id="7HUwyZb79Tr" role="3clFbG">
+              <node concept="2OqwBi" id="7HUwyZb79Ts" role="2Oq$k0">
+                <node concept="30H73N" id="7HUwyZb79Tt" role="2Oq$k0" />
+                <node concept="3CFZ6_" id="7HUwyZb79Tu" role="2OqNvi">
+                  <node concept="3CFYIy" id="7HUwyZb79Tv" role="3CFYIz">
+                    <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3w_OXm" id="7HUwyZb79Tw" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="1OShD0H$Ege" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+      <node concept="gft3U" id="6UqNvvALIHq" role="1lVwrX">
+        <node concept="2YIFZM" id="6UqNvvALIHr" role="gfFT$">
+          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
+          <node concept="Xl_RD" id="6UqNvvALIHs" role="37wK5m">
+            <property role="Xl_RC" value="name" />
+            <node concept="17Uvod" id="6UqNvvALIHt" role="lGtFl">
+              <property role="2qtEX9" value="value" />
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <node concept="3zFVjK" id="6UqNvvALIHu" role="3zH0cK">
+                <node concept="3clFbS" id="6UqNvvALIHv" role="2VODD2">
+                  <node concept="3clFbF" id="6UqNvvALIHw" role="3cqZAp">
+                    <node concept="2OqwBi" id="6UqNvvALIHx" role="3clFbG">
+                      <node concept="30H73N" id="6UqNvvALIHy" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="6UqNvvALIHz" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="10Nm6u" id="6UqNvvALIH$" role="37wK5m">
+            <node concept="2b32R4" id="6UqNvvALIH_" role="lGtFl">
+              <node concept="3JmXsc" id="6UqNvvALIHA" role="2P8S$">
+                <node concept="3clFbS" id="6UqNvvALIHB" role="2VODD2">
+                  <node concept="3clFbF" id="6UqNvvALIHC" role="3cqZAp">
+                    <node concept="2OqwBi" id="6UqNvvALIHD" role="3clFbG">
+                      <node concept="3Tsc0h" id="6UqNvvALIHE" role="2OqNvi">
+                        <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
+                      </node>
+                      <node concept="30H73N" id="6UqNvvALIHF" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="3ec9Qj4Me8A" role="30HLyM">
+        <node concept="3clFbS" id="3ec9Qj4Me8B" role="2VODD2">
+          <node concept="3clFbF" id="7HUwyZb79WY" role="3cqZAp">
+            <node concept="2OqwBi" id="7HUwyZb79WZ" role="3clFbG">
+              <node concept="2OqwBi" id="7HUwyZb79X0" role="2Oq$k0">
+                <node concept="30H73N" id="7HUwyZb79X1" role="2Oq$k0" />
+                <node concept="3CFZ6_" id="7HUwyZb79X2" role="2OqNvi">
+                  <node concept="3CFYIy" id="7HUwyZb79X3" role="3CFYIz">
+                    <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3w_OXm" id="7HUwyZb79X4" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="1pt0VTMwUQ$" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
+      <node concept="14YyZ8" id="6UqNvvALHEz" role="1lVwrX">
+        <node concept="14ZrTv" id="6UqNvvALHED" role="14ZwWg">
+          <node concept="30G5F_" id="6UqNvvALHEE" role="150hEN">
+            <node concept="3clFbS" id="6UqNvvALHEF" role="2VODD2">
+              <node concept="3SKdUt" id="6MYr6Jxl_rL" role="3cqZAp">
+                <node concept="3SKdUq" id="6MYr6Jxl_rN" role="3SKWNk">
+                  <property role="3SKdUp" value="FIXME: stop using Builder.value" />
+                </node>
+              </node>
+              <node concept="3clFbF" id="6UqNvvALHGg" role="3cqZAp">
+                <node concept="2OqwBi" id="6UqNvvALHGh" role="3clFbG">
+                  <node concept="2OqwBi" id="6UqNvvALHGi" role="2Oq$k0">
+                    <node concept="30H73N" id="6UqNvvALHGj" role="2Oq$k0" />
+                    <node concept="1mfA1w" id="6UqNvvALHGk" role="2OqNvi" />
+                  </node>
+                  <node concept="1mIQ4w" id="6UqNvvALHGl" role="2OqNvi">
+                    <node concept="chp4Y" id="6UqNvvALHGm" role="cj9EA">
+                      <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="6UqNvvALHJa" role="150oIE">
+            <node concept="Xl_RD" id="6UqNvvALHJb" role="gfFT$">
+              <property role="Xl_RC" value="value" />
+              <node concept="17Uvod" id="6UqNvvALHJc" role="lGtFl">
+                <property role="2qtEX9" value="value" />
+                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                <node concept="3zFVjK" id="6UqNvvALHJd" role="3zH0cK">
+                  <node concept="3clFbS" id="6UqNvvALHJe" role="2VODD2">
+                    <node concept="3clFbF" id="6UqNvvALHJf" role="3cqZAp">
+                      <node concept="2OqwBi" id="6UqNvvALHJg" role="3clFbG">
+                        <node concept="3TrcHB" id="6UqNvvALHJh" role="2OqNvi">
+                          <ref role="3TsBF5" to="5j4j:6$jH9oLmYKA" resolve="value" />
+                        </node>
+                        <node concept="30H73N" id="6UqNvvALHJi" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="14ZrTv" id="6UqNvvALHNf" role="14ZwWg">
+          <node concept="30G5F_" id="6UqNvvALHNg" role="150hEN">
+            <node concept="3clFbS" id="6UqNvvALHNh" role="2VODD2">
+              <node concept="3clFbF" id="6UqNvvALHRZ" role="3cqZAp">
+                <node concept="3fqX7Q" id="6UqNvvALHS0" role="3clFbG">
+                  <node concept="2OqwBi" id="6UqNvvALHS1" role="3fr31v">
+                    <node concept="2OqwBi" id="6UqNvvALHS2" role="2Oq$k0">
+                      <node concept="30H73N" id="6UqNvvALHS3" role="2Oq$k0" />
+                      <node concept="1mfA1w" id="6UqNvvALHS4" role="2OqNvi" />
+                    </node>
+                    <node concept="1mIQ4w" id="6UqNvvALHS5" role="2OqNvi">
+                      <node concept="chp4Y" id="6UqNvvALHS6" role="cj9EA">
+                        <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="6UqNvvALHUZ" role="150oIE">
+            <node concept="2YIFZM" id="6UqNvvALHV0" role="gfFT$">
+              <ref role="37wK5l" to="ie8e:5JQSuNsxb_I" resolve="create" />
+              <ref role="1Pybhc" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+              <node concept="Xl_RD" id="6UqNvvALHV1" role="37wK5m">
+                <property role="Xl_RC" value="value" />
+                <node concept="17Uvod" id="6UqNvvALHV2" role="lGtFl">
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                  <property role="2qtEX9" value="value" />
+                  <node concept="3zFVjK" id="6UqNvvALHV3" role="3zH0cK">
+                    <node concept="3clFbS" id="6UqNvvALHV4" role="2VODD2">
+                      <node concept="3clFbF" id="6UqNvvALHV5" role="3cqZAp">
+                        <node concept="2OqwBi" id="6UqNvvALHV6" role="3clFbG">
+                          <node concept="3TrcHB" id="6UqNvvALHV7" role="2OqNvi">
+                            <ref role="3TsBF5" to="5j4j:6$jH9oLmYKA" resolve="value" />
+                          </node>
+                          <node concept="30H73N" id="6UqNvvALHV8" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="j$LIH" id="6UqNvvALI01" role="14YRTM">
+          <node concept="1lLz0L" id="6UqNvvALI02" role="1lHHLF">
+            <property role="1lMjX7" value="error" />
+            <property role="1lLB17" value="unsupported construct" />
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="3ec9Qj4MejB" role="30HLyM">
+        <node concept="3clFbS" id="3ec9Qj4MejC" role="2VODD2">
+          <node concept="3clFbF" id="7HUwyZb7a02" role="3cqZAp">
+            <node concept="2OqwBi" id="7HUwyZb7a03" role="3clFbG">
+              <node concept="2OqwBi" id="7HUwyZb7a04" role="2Oq$k0">
+                <node concept="30H73N" id="7HUwyZb7a05" role="2Oq$k0" />
+                <node concept="3CFZ6_" id="7HUwyZb7a06" role="2OqNvi">
+                  <node concept="3CFYIy" id="7HUwyZb7a07" role="3CFYIz">
+                    <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3w_OXm" id="7HUwyZb7a08" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="1OShD0HSv5l" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j:1OShD0HAY6y" resolve="List" />
+      <node concept="gft3U" id="6UqNvvALHva" role="1lVwrX">
+        <node concept="2YIFZM" id="6UqNvvALHvb" role="gfFT$">
+          <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+          <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
+          <node concept="10Nm6u" id="7HUwyZb7cIG" role="37wK5m">
+            <node concept="2b32R4" id="7HUwyZb7cIH" role="lGtFl">
+              <node concept="3JmXsc" id="7HUwyZb7cII" role="2P8S$">
+                <node concept="3clFbS" id="7HUwyZb7cIJ" role="2VODD2">
+                  <node concept="3clFbF" id="7HUwyZb7cIK" role="3cqZAp">
+                    <node concept="2OqwBi" id="7HUwyZb7cIL" role="3clFbG">
+                      <node concept="3Tsc0h" id="7HUwyZb7cIM" role="2OqNvi">
+                        <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
+                      </node>
+                      <node concept="30H73N" id="7HUwyZb7cIN" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="3ec9Qj4Mevn" role="30HLyM">
+        <node concept="3clFbS" id="3ec9Qj4Mevo" role="2VODD2">
+          <node concept="3clFbF" id="3ec9Qj4Mez7" role="3cqZAp">
+            <node concept="3fqX7Q" id="3ec9Qj4MeA_" role="3clFbG">
+              <node concept="2OqwBi" id="3ec9Qj4MeAB" role="3fr31v">
+                <node concept="2OqwBi" id="3ec9Qj4MeAC" role="2Oq$k0">
+                  <node concept="30H73N" id="3ec9Qj4MeAD" role="2Oq$k0" />
+                  <node concept="3CFZ6_" id="3ec9Qj4MeAE" role="2OqNvi">
+                    <node concept="3CFYIy" id="3ec9Qj4MeAF" role="3CFYIz">
+                      <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="3ec9Qj4MeAG" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="CY16f" id="4lNgnaL7HgZ" role="CYSdJ">
+      <ref role="CY16a" to="5j4j:dfChU1zo4B" resolve="Splice" />
+    </node>
+    <node concept="3lhOvk" id="35Lj3TiRdbZ" role="3lj3bC">
+      <property role="13Pg2o" value="true" />
+      <ref role="2sgKRv" node="35Lj3TiRogF" resolve="Handler_AstHelper" />
+      <ref role="30HIoZ" to="vgt0:pmDhvH6q87" resolve="Handler" />
+      <ref role="3lhOvi" node="35Lj3TiR8No" resolve="Stuff" />
+      <node concept="30G5F_" id="6yEjedmifNI" role="30HLyM">
+        <node concept="3clFbS" id="6yEjedmifNJ" role="2VODD2">
+          <node concept="3clFbF" id="6yEjedmigDJ" role="3cqZAp">
+            <node concept="3clFbT" id="6yEjedmigDI" role="3clFbG">
+              <property role="3clFbU" value="false" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2rT7sh" id="2AXhyOGWQ20" role="2rTMjI">
+      <property role="TrG5h" value="LogicVariable" />
+      <ref role="2rZz_L" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
+      <ref role="2rTdP9" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
+    </node>
+  </node>
+</model>
+
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/jetbrains.mps.logic_jchr.mpl b/jchr/languages/jetbrains.mps.logic_jchr/jetbrains.mps.logic_jchr.mpl
new file mode 100644
index 00000000..0f9ffb2b
--- /dev/null
+++ b/jchr/languages/jetbrains.mps.logic_jchr/jetbrains.mps.logic_jchr.mpl
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language namespace="jetbrains.mps.logic_jchr" uuid="cd9dfc9b-6796-491f-83c8-b3448018e7f5" languageVersion="0" moduleVersion="0">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <accessoryModels />
+  <generators>
+    <generator generatorUID="jetbrains.mps.logic_jchr#7541925065276733821" uuid="cb3e3296-69e1-4dcd-88e8-1ece22a0de60">
+      <models>
+        <modelRoot contentPath="${module}" type="default">
+          <sourceRoot location="generator/template" />
+        </modelRoot>
+      </models>
+      <external-templates />
+      <dependencies>
+        <dependency reexport="false">894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)</dependency>
+        <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
+        <dependency reexport="false">85f64970-3326-4ea7-966e-1ac904686424(jetbrains.mps.logic#6626732309150416985)</dependency>
+        <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
+        <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+        <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+        <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+      </dependencies>
+      <usedDevKits>
+        <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
+      </usedDevKits>
+      <languageVersions>
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+        <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l:894463aa-8754-49c0-bf4b-6a32af66b376:jetbrains.mps.jchr" version="0" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
+        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+        <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
+        <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
+        <language slang="l:cd9dfc9b-6796-491f-83c8-b3448018e7f5:jetbrains.mps.logic_jchr" version="-1" />
+      </languageVersions>
+      <dependencyVersions>
+        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+        <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)" version="0" />
+        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+        <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+        <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
+        <module reference="85f64970-3326-4ea7-966e-1ac904686424(jetbrains.mps.logic#6626732309150416985)" version="0" />
+        <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
+        <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+        <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
+        <module reference="cd9dfc9b-6796-491f-83c8-b3448018e7f5(jetbrains.mps.logic_jchr)" version="0" />
+        <module reference="cb3e3296-69e1-4dcd-88e8-1ece22a0de60(jetbrains.mps.logic_jchr#7541925065276733821)" version="0" />
+      </dependencyVersions>
+      <mapping-priorities />
+    </generator>
+  </generators>
+  <sourcePath />
+  <usedDevKits>
+    <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
+    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
+  </usedDevKits>
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="2" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
+    <module reference="cd9dfc9b-6796-491f-83c8-b3448018e7f5(jetbrains.mps.logic_jchr)" version="0" />
+  </dependencyVersions>
+  <extendedLanguages>
+    <extendedLanguage>35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</extendedLanguage>
+    <extendedLanguage>894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)</extendedLanguage>
+  </extendedLanguages>
+</language>
+
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/models/behavior.mps b/jchr/languages/jetbrains.mps.logic_jchr/models/behavior.mps
new file mode 100644
index 00000000..ebd9bc78
--- /dev/null
+++ b/jchr/languages/jetbrains.mps.logic_jchr/models/behavior.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:09e7c4f7-d7fe-4bdd-9c25-65afb84d4897(jetbrains.mps.logic_jchr.behavior)">
+  <persistence version="9" />
+  <languages>
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/models/constraints.mps b/jchr/languages/jetbrains.mps.logic_jchr/models/constraints.mps
new file mode 100644
index 00000000..477ba238
--- /dev/null
+++ b/jchr/languages/jetbrains.mps.logic_jchr/models/constraints.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:760b915f-9e66-435c-8a94-0a5e8e2e79ee(jetbrains.mps.logic_jchr.constraints)">
+  <persistence version="9" />
+  <languages>
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/models/editor.mps b/jchr/languages/jetbrains.mps.logic_jchr/models/editor.mps
new file mode 100644
index 00000000..980d59e8
--- /dev/null
+++ b/jchr/languages/jetbrains.mps.logic_jchr/models/editor.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:a704b6be-18e2-4e1c-8fe6-036d44f070fc(jetbrains.mps.logic_jchr.editor)">
+  <persistence version="9" />
+  <languages>
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="4" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/models/structure.mps b/jchr/languages/jetbrains.mps.logic_jchr/models/structure.mps
new file mode 100644
index 00000000..ab8b9f2e
--- /dev/null
+++ b/jchr/languages/jetbrains.mps.logic_jchr/models/structure.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:0061dbf1-b92f-48ef-be12-847fd50c7202(jetbrains.mps.logic_jchr.structure)">
+  <persistence version="9" />
+  <languages>
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="3" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/models/typesystem.mps b/jchr/languages/jetbrains.mps.logic_jchr/models/typesystem.mps
new file mode 100644
index 00000000..3e4ba6c4
--- /dev/null
+++ b/jchr/languages/jetbrains.mps.logic_jchr/models/typesystem.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:39d439a2-e57f-4d6c-be0f-988e8ac68046(jetbrains.mps.logic_jchr.typesystem)">
+  <persistence version="9" />
+  <languages>
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/runtime/jetbrains.mps.logic_jchr.runtime.msd b/jchr/languages/jetbrains.mps.logic_jchr/runtime/jetbrains.mps.logic_jchr.runtime.msd
new file mode 100644
index 00000000..f13eaecd
--- /dev/null
+++ b/jchr/languages/jetbrains.mps.logic_jchr/runtime/jetbrains.mps.logic_jchr.runtime.msd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="jetbrains.mps.logic_jchr.runtime" uuid="c3941617-f429-4b63-b06e-42126b247dcb" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+    <modelRoot contentPath="${module}" type="java_source_stubs">
+      <sourceRoot location="source" />
+    </modelRoot>
+  </models>
+  <sourcePath>
+    <source path="${module}/source" />
+  </sourcePath>
+  <dependencies>
+    <dependency reexport="false">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
+    <module reference="c3941617-f429-4b63-b06e-42126b247dcb(jetbrains.mps.logic_jchr.runtime)" version="0" />
+  </dependencyVersions>
+</solution>
+
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/runtime/models/jetbrains/mps/logic_jchr/runtime.mps b/jchr/languages/jetbrains.mps.logic_jchr/runtime/models/jetbrains/mps/logic_jchr/runtime.mps
new file mode 100644
index 00000000..e941c347
--- /dev/null
+++ b/jchr/languages/jetbrains.mps.logic_jchr/runtime/models/jetbrains/mps/logic_jchr/runtime.mps
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:fa97ab04-fee3-4afb-a286-3225b2135a58(jetbrains.mps.logic_jchr.runtime)">
+  <persistence version="9" />
+  <languages>
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+  </languages>
+  <imports />
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <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="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="312cEu" id="6yEjedmyQoa">
+    <property role="TrG5h" value="Placeholder" />
+    <node concept="3Tm1VV" id="6yEjedmyQob" role="1B3o_S" />
+    <node concept="3UR2Jj" id="6yEjedmyQpT" role="lGtFl">
+      <node concept="TZ5HA" id="6yEjedmyQpU" role="TZ5H$">
+        <node concept="1dT_AC" id="6yEjedmyQpV" role="1dT_Ay">
+          <property role="1dT_AB" value="Don't delete. " />
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/logic/languages/jetbrains.mps.logic/runtime/source/runtime/ConstraintSystemUtil.java b/jchr/languages/jetbrains.mps.logic_jchr/runtime/source/runtime/ConstraintSystemUtil.java
similarity index 100%
rename from logic/languages/jetbrains.mps.logic/runtime/source/runtime/ConstraintSystemUtil.java
rename to jchr/languages/jetbrains.mps.logic_jchr/runtime/source/runtime/ConstraintSystemUtil.java
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/classes_jchr/.keep b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/classes_jchr/.keep
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/classes_jchr/.keep
rename to jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/classes_jchr/.keep
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
rename to jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
rename to jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml
rename to jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
similarity index 82%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
rename to jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
index 8732696c..d413f213 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
@@ -16,14 +16,15 @@
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
     <dependency reexport="true">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
+    <dependency reexport="false">760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)</dependency>
   </dependencies>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
similarity index 99%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
rename to jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
index 2aeacbe5..07ecaf00 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
@@ -3,12 +3,10 @@
   <persistence version="9" />
   <languages>
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
   </languages>
   <imports>
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
@@ -23,10 +21,8 @@
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
     <import index="95zw" ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)" />
     <import index="stgg" ref="r:fcdb37a4-4602-4a05-8d91-e439430734b8(jetbrains.mps.logic.jchr.program)" />
-    <import index="7ub6" ref="r:b533b427-da69-49d8-9c93-4ea32433b66e(jetbrains.mps.lang.typesystem2.generation)" />
     <import index="poio" ref="r:023e4571-f779-4131-9ae1-88b3dd330e93(jetbrains.mps.lang.typesystem2.samplechecker.util)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -1013,8 +1009,8 @@
               </node>
               <node concept="22lmx$" id="4ef1vBgB9ih" role="3clFbw">
                 <node concept="2ZW3vV" id="4ef1vBgB9oR" role="3uHU7w">
-                  <node concept="3uibUv" id="7ISVfSMtuv" role="2ZW6by">
-                    <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+                  <node concept="3uibUv" id="6yEjedmh7Et" role="2ZW6by">
+                    <ref role="3uigEE" to="95zw:4U_yxogAknZ" resolve="AtomLogical" />
                   </node>
                   <node concept="37vLTw" id="4ef1vBgB9nh" role="2ZW6bz">
                     <ref role="3cqZAo" node="4ef1vBgAG$q" resolve="arg" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps
rename to jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml
rename to jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/source_copy/jetbrains/mps/lang/typesystem2/samplechecker/template/ExpressionSolver.java b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/source_copy/jetbrains/mps/lang/typesystem2/samplechecker/template/ExpressionSolver.java
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/source_copy/jetbrains/mps/lang/typesystem2/samplechecker/template/ExpressionSolver.java
rename to jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/source_copy/jetbrains/mps/lang/typesystem2/samplechecker/template/ExpressionSolver.java
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd
new file mode 100644
index 00000000..67488624
--- /dev/null
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="jetbrains.mps.lang.typesystem2.sampleplugin.jchr" uuid="b862404f-c80a-47af-9def-0ba8676f9fa5" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <sourcePath />
+  <dependencies>
+    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
+    <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
+    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+    <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)</dependency>
+    <dependency reexport="false">a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)</dependency>
+    <dependency reexport="false">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
+    <dependency reexport="false">760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)</dependency>
+    <dependency reexport="false">894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="2" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="1" />
+    <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)" version="0" />
+    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
+    <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
+    <module reference="b862404f-c80a-47af-9def-0ba8676f9fa5(jetbrains.mps.lang.typesystem2.sampleplugin.jchr)" version="0" />
+    <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
+    <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
+    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
+    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
+    <module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
+  </dependencyVersions>
+</solution>
+
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/typechecking/handler/producer.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
similarity index 74%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/typechecking/handler/producer.mps
rename to jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
index 7ce6dab0..7fa82299 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/typechecking/handler/producer.mps
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
@@ -1,43 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:37f5cc5e-5928-4049-bb1c-5c7a5459b1fe(jetbrains.mps.typechecking.handler.producer)">
+<model ref="r:fc4c60e5-6b7d-4692-ac51-9018cc815cc6(jetbrains.mps.lang.typesystem2.sampleplugin.jchr.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="894463aa-8754-49c0-bf4b-6a32af66b376" name="jetbrains.mps.jchr" version="0" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="2" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="2" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="1" />
+    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
   </languages>
   <imports>
-    <import index="vgt0" ref="r:f36c95e5-e428-4945-91ae-1005e20c7971(jetbrains.mps.jchr.structure)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
-    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="sc83" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.eclipse.jdt.internal.compiler.impl(MPS.Core/)" />
-    <import index="twf3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.eclipse.jdt.internal.compiler.ast(MPS.Core/)" />
-    <import index="1f2y" ref="r:c2e9552f-aeab-4773-af70-c663afdf96a5(jetbrains.mps.jchr.behavior)" />
-    <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
-    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="vgt0" ref="r:f36c95e5-e428-4945-91ae-1005e20c7971(jetbrains.mps.jchr.structure)" />
+    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
+    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
     <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.builtin.program)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
+    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
+    <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="1f2y" ref="r:c2e9552f-aeab-4773-af70-c663afdf96a5(jetbrains.mps.jchr.behavior)" />
+    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
+    <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
+    <import index="iawt" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime.debug(jetbrains.mps.jchr.runtime/)" />
+    <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
+    <import index="95zw" ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)" />
+    <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="i9so" ref="r:9e5578e0-37f0-4c9b-a301-771bcb453678(jetbrains.mps.make.script)" />
+    <import index="stgg" ref="r:fcdb37a4-4602-4a05-8d91-e439430734b8(jetbrains.mps.logic.jchr.program)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="j8aq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.module(MPS.Core/)" />
+    <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
+    <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
+    <import index="k3nr" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.ide.editor(MPS.Editor/)" />
+    <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
+    <import index="hfuk" ref="r:b25dd364-bc3f-4a66-97d1-262009610c5e(jetbrains.mps.make)" />
   </imports>
   <registry>
+    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
+      <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
+        <child id="1238852204892" name="componentType" index="1Lm7xW" />
+      </concept>
+      <concept id="1238853782547" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleLiteral" flags="nn" index="1Ls8ON">
+        <child id="1238853845806" name="component" index="1Lso8e" />
+      </concept>
+      <concept id="1238857743184" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleMemberAccessExpression" flags="nn" index="1LFfDK">
+        <child id="1238857764950" name="tuple" index="1LFl5Q" />
+        <child id="1238857834412" name="index" index="1LF_Uc" />
+      </concept>
+    </language>
+    <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
+      <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
+        <property id="1211298967294" name="outsideCommandExecution" index="72QZ$" />
+        <property id="1205250923097" name="caption" index="2uzpH1" />
+        <child id="1203083196627" name="updateBlock" index="tmbBb" />
+        <child id="1203083461638" name="executeFunction" index="tncku" />
+        <child id="1217413222820" name="parameter" index="1NuT2Z" />
+      </concept>
+      <concept id="1203083511112" name="jetbrains.mps.lang.plugin.structure.ExecuteBlock" flags="in" index="tnohg" />
+      <concept id="1205681243813" name="jetbrains.mps.lang.plugin.structure.IsApplicableBlock" flags="in" index="2ScWuX" />
+      <concept id="5538333046911348654" name="jetbrains.mps.lang.plugin.structure.RequiredCondition" flags="ng" index="1oajcY" />
+      <concept id="1217252042208" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterDeclaration" flags="ng" index="1DS2jV">
+        <reference id="1217252646389" name="key" index="1DUlNI" />
+      </concept>
+      <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+        <child id="5538333046911298738" name="condition" index="1oa70y" />
+      </concept>
+    </language>
+    <language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone">
+      <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
+    </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>
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
@@ -45,6 +100,7 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
@@ -77,13 +133,30 @@
         <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
         <reference id="1144432896254" name="enumClass" index="1Px2BO" />
       </concept>
+      <concept id="1164879751025" name="jetbrains.mps.baseLanguage.structure.TryCatchStatement" flags="nn" index="SfApY">
+        <child id="1164879758292" name="body" index="SfCbr" />
+        <child id="1164903496223" name="catchClause" index="TEbGg" />
+      </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1164903280175" name="jetbrains.mps.baseLanguage.structure.CatchClause" flags="nn" index="TDmWw">
+        <child id="1164903359218" name="catchBody" index="TDEfX" />
+        <child id="1164903359217" name="throwable" index="TDEfY" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P">
+        <reference id="1182955020723" name="classConcept" index="1HBi2w" />
+      </concept>
+      <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">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
@@ -100,6 +173,10 @@
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
+        <child id="1070534760952" name="componentType" index="10Q1$1" />
+      </concept>
       <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" />
@@ -110,6 +187,7 @@
       </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
+        <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
@@ -155,6 +233,9 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
@@ -179,10 +260,16 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
+      <concept id="1154542696413" name="jetbrains.mps.baseLanguage.structure.ArrayCreatorWithInitializer" flags="nn" index="3g6Rrh">
+        <child id="1154542793668" name="componentType" index="3g7fb8" />
+        <child id="1154542803372" name="initValue" index="3g7hyw" />
+      </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" />
+        <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
       </concept>
+      <concept id="1073063089578" name="jetbrains.mps.baseLanguage.structure.SuperMethodCall" flags="nn" index="3nyPlj" />
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
         <child id="1212687122400" name="typeParameter" index="1pMfVU" />
       </concept>
@@ -219,6 +306,7 @@
         <child id="1144231408325" name="iteration" index="1Dwrff" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
+      <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -227,12 +315,30 @@
       </concept>
       <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" />
+      </concept>
+    </language>
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
+      <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
+        <child id="1235746996653" name="function" index="2SgG2M" />
+      </concept>
+      <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
+        <child id="1199542457201" name="resultType" index="1ajl9A" />
+      </concept>
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -250,6 +356,14 @@
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
     </language>
+    <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
+      <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
+        <reference id="1218736638915" name="classifier" index="32nkFo" />
+      </concept>
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+        <reference id="1205756909548" name="member" index="2WH_rO" />
+      </concept>
+    </language>
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
       <concept id="5979988948250981289" name="jetbrains.mps.lang.actions.structure.SNodeCreatorAndInitializer" flags="nn" index="2fJWfE" />
       <concept id="767145758118872833" name="jetbrains.mps.lang.actions.structure.NF_LinkList_AddNewChildOperation" flags="nn" index="2DeJg1" />
@@ -258,8 +372,10 @@
     </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
+        <property id="1167228628751" name="hasException" index="34fQS0" />
         <property id="1167245565795" name="severity" index="35gtTG" />
         <child id="1167227463056" name="logExpression" index="34bqiv" />
+        <child id="1167227561449" name="exception" index="34bMjA" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -285,6 +401,10 @@
       <concept id="1143235216708" name="jetbrains.mps.lang.smodel.structure.Model_CreateNewNodeOperation" flags="nn" index="I8ghe">
         <reference id="1143235391024" name="concept" index="I8UWU" />
       </concept>
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
         <reference id="1171315804605" name="concept" index="2RRcyH" />
       </concept>
@@ -366,6 +486,7 @@
       </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
         <child id="1197683475734" name="valueType" index="3rvSg0" />
@@ -375,17 +496,2009 @@
         <child id="1197687035757" name="valueType" index="3rHtpV" />
       </concept>
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
+      <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
+      <concept id="9042586985346099698" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachStatement" flags="nn" index="1_o_46">
+        <child id="9042586985346099734" name="forEach" index="1_o_by" />
+      </concept>
+      <concept id="9042586985346099733" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachPair" flags="ng" index="1_o_bx">
+        <child id="9042586985346099778" name="variable" index="1_o_aQ" />
+        <child id="9042586985346099735" name="input" index="1_o_bz" />
+      </concept>
+      <concept id="9042586985346099736" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariable" flags="ng" index="1_o_bG" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
         <child id="1197932525128" name="key" index="3ElVtu" />
       </concept>
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
+      <concept id="8293956702609956630" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariableReference" flags="nn" index="3M$PaV">
+        <reference id="8293956702609966325" name="variable" index="3M$S_o" />
+      </concept>
       <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="4sVJFklM5v4">
+    <property role="TrG5h" value="AtomProducer" />
+    <node concept="2tJIrI" id="4sVJFklM5wv" role="jymVt" />
+    <node concept="2tJIrI" id="4sVJFklM9Jn" role="jymVt" />
+    <node concept="2YIFZL" id="4sVJFklTh$z" role="jymVt">
+      <property role="TrG5h" value="produceAtom" />
+      <property role="IEkAT" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="4sVJFklM9TS" role="3clF47">
+        <node concept="3clFbH" id="4sVJFklMlSA" role="3cqZAp" />
+        <node concept="3clFbF" id="4sVJFklMnGP" role="3cqZAp">
+          <node concept="2OqwBi" id="4sVJFklSnn$" role="3clFbG">
+            <node concept="2ShNRf" id="4sVJFklMnGN" role="2Oq$k0">
+              <node concept="1pGfFk" id="4sVJFklMonE" role="2ShVmc">
+                <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                <node concept="2ShNRf" id="4sVJFklMqNI" role="37wK5m">
+                  <node concept="1pGfFk" id="4sVJFklSvMk" role="2ShVmc">
+                    <ref role="37wK5l" node="4sVJFklSuPv" resolve="AtomProducer.Walker" />
+                    <node concept="37vLTw" id="4sVJFklSR6l" role="37wK5m">
+                      <ref role="3cqZAo" node="4sVJFklMatE" resolve="atomNode" />
+                    </node>
+                    <node concept="37vLTw" id="2$F5QpuuL_k" role="37wK5m">
+                      <ref role="3cqZAo" node="2$F5QputKOD" resolve="namingContext" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="4sVJFklSs1w" role="2OqNvi">
+              <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+              <node concept="37vLTw" id="4sVJFklSs3T" role="37wK5m">
+                <ref role="3cqZAo" node="5s497VqXKRl" resolve="atom" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4sVJFklN_7g" role="3cqZAp" />
+      </node>
+      <node concept="37vLTG" id="4sVJFklMatE" role="3clF46">
+        <property role="TrG5h" value="atomNode" />
+        <node concept="3Tqbb2" id="4sVJFklMdJa" role="1tU5fm">
+          <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5s497VqXKRl" role="3clF46">
+        <property role="TrG5h" value="atom" />
+        <node concept="3uibUv" id="5s497VqXKRk" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2$F5QputKOD" role="3clF46">
+        <property role="TrG5h" value="namingContext" />
+        <node concept="3uibUv" id="2$F5QputKSI" role="1tU5fm">
+          <ref role="3uigEE" to="nz6g:2$F5QputikM" resolve="NamingContext" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="4sVJFklM9TQ" role="3clF45" />
+      <node concept="3Tm1VV" id="4sVJFklM9TR" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="4sVJFklMowO" role="jymVt" />
+    <node concept="2tJIrI" id="4sVJFklMoyp" role="jymVt" />
+    <node concept="312cEu" id="4sVJFklMoJb" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="Walker" />
+      <node concept="2tJIrI" id="4sVJFklMpRo" role="jymVt" />
+      <node concept="3clFbW" id="4sVJFklSuPv" role="jymVt">
+        <node concept="37vLTG" id="4sVJFklSvYG" role="3clF46">
+          <property role="TrG5h" value="atomNode" />
+          <node concept="3Tqbb2" id="4sVJFklSw9L" role="1tU5fm">
+            <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="2$F5QputL05" role="3clF46">
+          <property role="TrG5h" value="namingContext" />
+          <node concept="3uibUv" id="2$F5QputL6t" role="1tU5fm">
+            <ref role="3uigEE" to="nz6g:2$F5QputikM" resolve="NamingContext" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="4sVJFklSuPx" role="3clF45" />
+        <node concept="3Tm6S6" id="4sVJFklSuPy" role="1B3o_S" />
+        <node concept="3clFbS" id="4sVJFklSuPz" role="3clF47">
+          <node concept="3clFbF" id="4sVJFklSze6" role="3cqZAp">
+            <node concept="2OqwBi" id="4sVJFklSzAN" role="3clFbG">
+              <node concept="37vLTw" id="4sVJFklSze5" role="2Oq$k0">
+                <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+              </node>
+              <node concept="2ArzE6" id="4sVJFklS$L2" role="2OqNvi">
+                <node concept="37vLTw" id="4sVJFklS$VS" role="25WWJ7">
+                  <ref role="3cqZAo" node="4sVJFklSvYG" resolve="atomNode" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2$F5QputLbq" role="3cqZAp">
+            <node concept="37vLTI" id="2$F5QputLbs" role="3clFbG">
+              <node concept="2OqwBi" id="2$F5QputLbw" role="37vLTJ">
+                <node concept="Xjq3P" id="2$F5QputLbz" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2$F5QputLbv" role="2OqNvi">
+                  <ref role="2Oxat5" node="2$F5QputLbm" resolve="namingContext" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="2$F5QputLb$" role="37vLTx">
+                <ref role="3cqZAo" node="2$F5QputL05" resolve="namingContext" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4sVJFklStNu" role="jymVt" />
+      <node concept="3Tm6S6" id="4sVJFklMoWf" role="1B3o_S" />
+      <node concept="3uibUv" id="4sVJFklMp_t" role="EKbjA">
+        <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+      </node>
+      <node concept="3clFb_" id="4sVJFklM5Pn" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="walkTerms" />
+        <node concept="3uibUv" id="4sVJFklM5Po" role="3clF45">
+          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        </node>
+        <node concept="3Tm1VV" id="4sVJFklM5Pp" role="1B3o_S" />
+        <node concept="37vLTG" id="4sVJFklM5Pr" role="3clF46">
+          <property role="TrG5h" value="cb" />
+          <node concept="3uibUv" id="4sVJFklM5Ps" role="1tU5fm">
+            <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="4sVJFklM5P_" role="3clF47">
+          <node concept="3SKdUt" id="104EUzG8PQq" role="3cqZAp">
+            <node concept="3SKdUq" id="104EUzG8Qp5" role="3SKWNk">
+              <property role="3SKdUp" value="TODO: extract &quot;node&quot; constant" />
+            </node>
+          </node>
+          <node concept="3clFbJ" id="4sVJFklQkXP" role="3cqZAp">
+            <node concept="3clFbS" id="4sVJFklQkXS" role="3clFbx">
+              <node concept="3cpWs8" id="4sVJFklS_pj" role="3cqZAp">
+                <node concept="3cpWsn" id="4sVJFklS_pk" role="3cpWs9">
+                  <property role="TrG5h" value="parentNode" />
+                  <node concept="3Tqbb2" id="4sVJFklS_pi" role="1tU5fm" />
+                  <node concept="2OqwBi" id="4sVJFklS_pl" role="33vP2m">
+                    <node concept="37vLTw" id="4sVJFklS_pm" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                    </node>
+                    <node concept="2oR75g" id="4sVJFklS_pn" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="4sVJFklQOaL" role="3cqZAp">
+                <node concept="3cpWsn" id="4sVJFklQOaM" role="3cpWs9">
+                  <property role="TrG5h" value="nodeNode" />
+                  <node concept="3Tqbb2" id="4sVJFklQOaH" role="1tU5fm">
+                    <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="4sVJFklSPl2" role="3cqZAp" />
+              <node concept="3clFbJ" id="4sVJFklSA2Y" role="3cqZAp">
+                <node concept="3clFbS" id="4sVJFklSA31" role="3clFbx">
+                  <node concept="3cpWs8" id="4sVJFklNxrF" role="3cqZAp">
+                    <node concept="3cpWsn" id="4sVJFklNxrG" role="3cpWs9">
+                      <property role="TrG5h" value="parentRoleNode" />
+                      <node concept="3Tqbb2" id="4sVJFklNxrA" role="1tU5fm">
+                        <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                      </node>
+                      <node concept="1PxgMI" id="4sVJFklQ_Yp" role="33vP2m">
+                        <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                        <node concept="37vLTw" id="4sVJFklS_po" role="1m5AlR">
+                          <ref role="3cqZAo" node="4sVJFklS_pk" resolve="parentNode" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="4sVJFklSECy" role="3cqZAp">
+                    <node concept="37vLTI" id="4sVJFklSEC$" role="3clFbG">
+                      <node concept="2OqwBi" id="4sVJFklQOaN" role="37vLTx">
+                        <node concept="2OqwBi" id="4sVJFklQOaO" role="2Oq$k0">
+                          <node concept="37vLTw" id="4sVJFklQOaP" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4sVJFklNxrG" resolve="parentRoleNode" />
+                          </node>
+                          <node concept="3Tsc0h" id="4sVJFklQOaQ" role="2OqNvi">
+                            <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
+                          </node>
+                        </node>
+                        <node concept="2DeJg1" id="4sVJFklQOaR" role="2OqNvi">
+                          <ref role="1A0vxQ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="4sVJFklSECC" role="37vLTJ">
+                        <ref role="3cqZAo" node="4sVJFklQOaM" resolve="nodeNode" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="4sVJFklSCbE" role="3cqZAp" />
+                </node>
+                <node concept="2OqwBi" id="4sVJFklSAnp" role="3clFbw">
+                  <node concept="37vLTw" id="4sVJFklSAlo" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sVJFklS_pk" resolve="parentNode" />
+                  </node>
+                  <node concept="1mIQ4w" id="4sVJFklSAu_" role="2OqNvi">
+                    <node concept="chp4Y" id="4sVJFklSAva" role="cj9EA">
+                      <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="9aQIb" id="4sVJFklSLY2" role="9aQIa">
+                  <node concept="3clFbS" id="4sVJFklSLY3" role="9aQI4">
+                    <node concept="3cpWs8" id="4sVJFklSBpE" role="3cqZAp">
+                      <node concept="3cpWsn" id="4sVJFklSBpF" role="3cpWs9">
+                        <property role="TrG5h" value="atom" />
+                        <node concept="3Tqbb2" id="4sVJFklSBpC" role="1tU5fm">
+                          <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
+                        </node>
+                        <node concept="1PxgMI" id="4sVJFklSBpG" role="33vP2m">
+                          <ref role="1m5ApE" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
+                          <node concept="37vLTw" id="4sVJFklSBpH" role="1m5AlR">
+                            <ref role="3cqZAo" node="4sVJFklS_pk" resolve="parentNode" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="4sVJFklSBgS" role="3cqZAp">
+                      <node concept="37vLTI" id="4sVJFklSNRI" role="3clFbG">
+                        <node concept="37vLTw" id="4sVJFklSNV0" role="37vLTJ">
+                          <ref role="3cqZAo" node="4sVJFklQOaM" resolve="nodeNode" />
+                        </node>
+                        <node concept="2OqwBi" id="4sVJFklSNmp" role="37vLTx">
+                          <node concept="2OqwBi" id="4sVJFklSMQq" role="2Oq$k0">
+                            <node concept="37vLTw" id="4sVJFklSBpI" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4sVJFklSBpF" resolve="atom" />
+                            </node>
+                            <node concept="3TrEf2" id="4sVJFklSNaf" role="2OqNvi">
+                              <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="4sVJFklSNB$" role="2OqNvi">
+                            <ref role="1A9B2P" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3eNFk2" id="6infEALvsUH" role="3eNLev">
+                  <node concept="2OqwBi" id="6infEALvsZy" role="3eO9$A">
+                    <node concept="37vLTw" id="6infEALvsXJ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4sVJFklS_pk" resolve="parentNode" />
+                    </node>
+                    <node concept="1mIQ4w" id="6infEALvtck" role="2OqNvi">
+                      <node concept="chp4Y" id="6infEALvtcD" role="cj9EA">
+                        <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="6infEALvsUJ" role="3eOfB_">
+                    <node concept="3cpWs8" id="6infEALvtnG" role="3cqZAp">
+                      <node concept="3cpWsn" id="6infEALvtnH" role="3cpWs9">
+                        <property role="TrG5h" value="listNode" />
+                        <node concept="3Tqbb2" id="6infEALvtnE" role="1tU5fm">
+                          <ref role="ehGHo" to="5j4j:1OShD0HAY6y" resolve="List" />
+                        </node>
+                        <node concept="1PxgMI" id="6infEALvtnI" role="33vP2m">
+                          <ref role="1m5ApE" to="5j4j:1OShD0HAY6y" resolve="List" />
+                          <node concept="37vLTw" id="6infEALvtnJ" role="1m5AlR">
+                            <ref role="3cqZAo" node="4sVJFklS_pk" resolve="parentNode" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="6infEALvtgH" role="3cqZAp">
+                      <node concept="37vLTI" id="6infEALvxAB" role="3clFbG">
+                        <node concept="37vLTw" id="6infEALv_6j" role="37vLTJ">
+                          <ref role="3cqZAo" node="4sVJFklQOaM" resolve="nodeNode" />
+                        </node>
+                        <node concept="2OqwBi" id="6infEALvum5" role="37vLTx">
+                          <node concept="2OqwBi" id="6infEALvtrz" role="2Oq$k0">
+                            <node concept="37vLTw" id="6infEALvtnK" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6infEALvtnH" resolve="listNode" />
+                            </node>
+                            <node concept="3Tsc0h" id="6infEALvtJy" role="2OqNvi">
+                              <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
+                            </node>
+                          </node>
+                          <node concept="2DeJg1" id="6infEALvxsz" role="2OqNvi">
+                            <ref role="1A0vxQ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="6infEALvtdU" role="3cqZAp" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="4sVJFklSCcq" role="3cqZAp">
+                <node concept="2OqwBi" id="4sVJFklSCcr" role="3clFbG">
+                  <node concept="37vLTw" id="4sVJFklSCcs" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                  </node>
+                  <node concept="2ArzE6" id="4sVJFklSCct" role="2OqNvi">
+                    <node concept="37vLTw" id="4sVJFklSEhv" role="25WWJ7">
+                      <ref role="3cqZAo" node="4sVJFklQOaM" resolve="nodeNode" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="4sVJFklQXal" role="3cqZAp" />
+            </node>
+            <node concept="2OqwBi" id="4sVJFklQmJS" role="3clFbw">
+              <node concept="Xl_RD" id="4sVJFklQl$v" role="2Oq$k0">
+                <property role="Xl_RC" value="node" />
+              </node>
+              <node concept="liA8E" id="4sVJFklQo5x" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                <node concept="2OqwBi" id="4sVJFklQoox" role="37wK5m">
+                  <node concept="37vLTw" id="4sVJFklQodY" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
+                  </node>
+                  <node concept="liA8E" id="4sVJFklQpn_" role="2OqNvi">
+                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3eNFk2" id="67ux3ajzAG1" role="3eNLev">
+              <node concept="3clFbS" id="67ux3ajzAG3" role="3eOfB_">
+                <node concept="3clFbH" id="67ux3aj$7Pt" role="3cqZAp" />
+                <node concept="3cpWs8" id="6BU$YTNEWii" role="3cqZAp">
+                  <node concept="3cpWsn" id="6BU$YTNEWij" role="3cpWs9">
+                    <property role="TrG5h" value="parentNode" />
+                    <node concept="3Tqbb2" id="6BU$YTNEWik" role="1tU5fm" />
+                    <node concept="2OqwBi" id="6BU$YTNEWil" role="33vP2m">
+                      <node concept="37vLTw" id="6BU$YTNEWim" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                      </node>
+                      <node concept="2oR75g" id="6BU$YTNEWin" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="6BU$YTNEWio" role="3cqZAp">
+                  <node concept="3cpWsn" id="6BU$YTNEWip" role="3cpWs9">
+                    <property role="TrG5h" value="listRole" />
+                    <node concept="3Tqbb2" id="6BU$YTNEWiq" role="1tU5fm">
+                      <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6BU$YTNEWir" role="3cqZAp" />
+                <node concept="3SKdUt" id="6BU$YTNGfVC" role="3cqZAp">
+                  <node concept="3SKdUq" id="6BU$YTNGg4r" role="3SKWNk">
+                    <property role="3SKdUp" value="FIXME: too many hacks" />
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="6BU$YTNEWis" role="3cqZAp">
+                  <node concept="3clFbS" id="6BU$YTNEWit" role="3clFbx">
+                    <node concept="3cpWs8" id="6BU$YTNEWiu" role="3cqZAp">
+                      <node concept="3cpWsn" id="6BU$YTNEWiv" role="3cpWs9">
+                        <property role="TrG5h" value="parentListNode" />
+                        <node concept="3Tqbb2" id="6BU$YTNEWiw" role="1tU5fm">
+                          <ref role="ehGHo" to="5j4j:1OShD0HAY6y" resolve="List" />
+                        </node>
+                        <node concept="1PxgMI" id="6BU$YTNEWix" role="33vP2m">
+                          <ref role="1m5ApE" to="5j4j:1OShD0HAY6y" resolve="List" />
+                          <node concept="37vLTw" id="6BU$YTNEWiy" role="1m5AlR">
+                            <ref role="3cqZAo" node="6BU$YTNEWij" resolve="parentNode" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="6BU$YTNEWiz" role="3cqZAp">
+                      <node concept="37vLTI" id="6BU$YTNEWi$" role="3clFbG">
+                        <node concept="2OqwBi" id="6BU$YTNEWi_" role="37vLTx">
+                          <node concept="2OqwBi" id="6BU$YTNEWiA" role="2Oq$k0">
+                            <node concept="37vLTw" id="6BU$YTNEWiB" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6BU$YTNEWiv" resolve="parentListNode" />
+                            </node>
+                            <node concept="3Tsc0h" id="6infEALvagK" role="2OqNvi">
+                              <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
+                            </node>
+                          </node>
+                          <node concept="2DeJg1" id="6BU$YTNEWiD" role="2OqNvi">
+                            <ref role="1A0vxQ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="6BU$YTNEWiE" role="37vLTJ">
+                          <ref role="3cqZAo" node="6BU$YTNEWip" resolve="listRole" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="6BU$YTNF874" role="3cqZAp">
+                      <node concept="37vLTI" id="6BU$YTNF93A" role="3clFbG">
+                        <node concept="Xl_RD" id="6BU$YTNF94O" role="37vLTx">
+                          <property role="Xl_RC" value="list" />
+                        </node>
+                        <node concept="2OqwBi" id="6BU$YTNF8c0" role="37vLTJ">
+                          <node concept="37vLTw" id="6BU$YTNF872" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6BU$YTNEWip" resolve="listRole" />
+                          </node>
+                          <node concept="3TrcHB" id="6BU$YTNF8BV" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="6infEALvaRe" role="3cqZAp" />
+                  </node>
+                  <node concept="2OqwBi" id="6BU$YTNEWiG" role="3clFbw">
+                    <node concept="37vLTw" id="6BU$YTNEWiH" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6BU$YTNEWij" resolve="parentNode" />
+                    </node>
+                    <node concept="1mIQ4w" id="6BU$YTNEWiI" role="2OqNvi">
+                      <node concept="chp4Y" id="6infEALuX1i" role="cj9EA">
+                        <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="9aQIb" id="6BU$YTNEWiK" role="9aQIa">
+                    <node concept="3clFbS" id="6BU$YTNEWiL" role="9aQI4">
+                      <node concept="3cpWs8" id="6BU$YTNEWiM" role="3cqZAp">
+                        <node concept="3cpWsn" id="6BU$YTNEWiN" role="3cpWs9">
+                          <property role="TrG5h" value="atom" />
+                          <node concept="3Tqbb2" id="6BU$YTNEWiO" role="1tU5fm">
+                            <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
+                          </node>
+                          <node concept="1PxgMI" id="6BU$YTNEWiP" role="33vP2m">
+                            <ref role="1m5ApE" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
+                            <node concept="37vLTw" id="6BU$YTNEWiQ" role="1m5AlR">
+                              <ref role="3cqZAo" node="6BU$YTNEWij" resolve="parentNode" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="6BU$YTNEWiR" role="3cqZAp">
+                        <node concept="37vLTI" id="6BU$YTNEWiS" role="3clFbG">
+                          <node concept="37vLTw" id="6BU$YTNEWiT" role="37vLTJ">
+                            <ref role="3cqZAo" node="6BU$YTNEWip" resolve="listRole" />
+                          </node>
+                          <node concept="2OqwBi" id="6BU$YTNEWiU" role="37vLTx">
+                            <node concept="2OqwBi" id="6BU$YTNEWiV" role="2Oq$k0">
+                              <node concept="37vLTw" id="6BU$YTNEWiW" role="2Oq$k0">
+                                <ref role="3cqZAo" node="6BU$YTNEWiN" resolve="atom" />
+                              </node>
+                              <node concept="3TrEf2" id="6BU$YTNEWiX" role="2OqNvi">
+                                <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
+                              </node>
+                            </node>
+                            <node concept="2DeJnY" id="6BU$YTNEWiY" role="2OqNvi">
+                              <ref role="1A9B2P" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="6BU$YTNF9IS" role="3cqZAp">
+                        <node concept="37vLTI" id="6BU$YTNF9IT" role="3clFbG">
+                          <node concept="Xl_RD" id="6BU$YTNF9IU" role="37vLTx">
+                            <property role="Xl_RC" value="list" />
+                          </node>
+                          <node concept="2OqwBi" id="6BU$YTNF9IV" role="37vLTJ">
+                            <node concept="37vLTw" id="6BU$YTNF9IW" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6BU$YTNEWip" resolve="listRole" />
+                            </node>
+                            <node concept="3TrcHB" id="6BU$YTNF9IX" role="2OqNvi">
+                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="6BU$YTNF9HC" role="3cqZAp" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="6BU$YTNEWiZ" role="3cqZAp">
+                  <node concept="2OqwBi" id="6BU$YTNEWj0" role="3clFbG">
+                    <node concept="37vLTw" id="6BU$YTNEWj1" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                    </node>
+                    <node concept="2ArzE6" id="6BU$YTNEWj2" role="2OqNvi">
+                      <node concept="37vLTw" id="6BU$YTNEWj3" role="25WWJ7">
+                        <ref role="3cqZAo" node="6BU$YTNEWip" resolve="listRole" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6BU$YTNEWf3" role="3cqZAp" />
+              </node>
+              <node concept="2OqwBi" id="67ux3aj$6yd" role="3eO9$A">
+                <node concept="Xl_RD" id="67ux3aj$6ye" role="2Oq$k0">
+                  <property role="Xl_RC" value="list" />
+                </node>
+                <node concept="liA8E" id="67ux3aj$6yf" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                  <node concept="2OqwBi" id="67ux3aj$6yg" role="37wK5m">
+                    <node concept="37vLTw" id="67ux3aj$6yh" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
+                    </node>
+                    <node concept="liA8E" id="67ux3aj$6yi" role="2OqNvi">
+                      <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3eNFk2" id="3t7_2FgQA5E" role="3eNLev">
+              <node concept="3clFbS" id="3t7_2FgQA5F" role="3eOfB_">
+                <node concept="3cpWs8" id="3t7_2FgQA5Y" role="3cqZAp">
+                  <node concept="3cpWsn" id="3t7_2FgQA5Z" role="3cpWs9">
+                    <property role="TrG5h" value="parentNode" />
+                    <node concept="3Tqbb2" id="3t7_2FgQA60" role="1tU5fm">
+                      <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                    </node>
+                    <node concept="1PxgMI" id="3t7_2FgQA61" role="33vP2m">
+                      <ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                      <node concept="2OqwBi" id="3t7_2FgQA62" role="1m5AlR">
+                        <node concept="37vLTw" id="3t7_2FgQA63" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                        </node>
+                        <node concept="2oR75g" id="3t7_2FgQA64" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="3t7_2FgQA65" role="3cqZAp" />
+                <node concept="3cpWs8" id="3t7_2FgQA66" role="3cqZAp">
+                  <node concept="3cpWsn" id="3t7_2FgQA67" role="3cpWs9">
+                    <property role="TrG5h" value="roleNode" />
+                    <node concept="3Tqbb2" id="3t7_2FgQA68" role="1tU5fm">
+                      <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                    </node>
+                    <node concept="2OqwBi" id="3t7_2FgQA69" role="33vP2m">
+                      <node concept="2OqwBi" id="3t7_2FgQA6a" role="2Oq$k0">
+                        <node concept="37vLTw" id="3t7_2FgQA6b" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3t7_2FgQA5Z" resolve="parentNode" />
+                        </node>
+                        <node concept="3Tsc0h" id="3t7_2FgQA6c" role="2OqNvi">
+                          <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
+                        </node>
+                      </node>
+                      <node concept="2DeJg1" id="3t7_2FgQA6d" role="2OqNvi">
+                        <ref role="1A0vxQ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3t7_2FgQA6e" role="3cqZAp">
+                  <node concept="37vLTI" id="3t7_2FgQA6f" role="3clFbG">
+                    <node concept="2OqwBi" id="3t7_2FgQA6g" role="37vLTJ">
+                      <node concept="37vLTw" id="3t7_2FgQA6h" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3t7_2FgQA67" resolve="roleNode" />
+                      </node>
+                      <node concept="3TrcHB" id="3t7_2FgQA6i" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                    <node concept="2YIFZM" id="3t7_2FgQA6j" role="37vLTx">
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                      <node concept="2OqwBi" id="3t7_2FgQA6k" role="37wK5m">
+                        <node concept="37vLTw" id="3t7_2FgQA6l" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
+                        </node>
+                        <node concept="liA8E" id="3t7_2FgQA6m" role="2OqNvi">
+                          <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3t7_2FgQA6n" role="3cqZAp">
+                  <node concept="2OqwBi" id="3t7_2FgQA6o" role="3clFbG">
+                    <node concept="37vLTw" id="3t7_2FgQA6p" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                    </node>
+                    <node concept="2ArzE6" id="3t7_2FgQA6q" role="2OqNvi">
+                      <node concept="37vLTw" id="3t7_2FgQA6r" role="25WWJ7">
+                        <ref role="3cqZAo" node="3t7_2FgQA67" resolve="roleNode" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="3t7_2FgQBNW" role="3cqZAp" />
+              </node>
+              <node concept="2OqwBi" id="3t7_2FgQAQJ" role="3eO9$A">
+                <node concept="2OqwBi" id="3t7_2FgQAQK" role="2Oq$k0">
+                  <node concept="37vLTw" id="3t7_2FgQAQL" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                  </node>
+                  <node concept="2oR75g" id="3t7_2FgQAQM" role="2OqNvi" />
+                </node>
+                <node concept="1mIQ4w" id="3t7_2FgQAQN" role="2OqNvi">
+                  <node concept="chp4Y" id="3t7_2FgQAQO" role="cj9EA">
+                    <ref role="cht4Q" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3eNFk2" id="3t7_2FgQBUa" role="3eNLev">
+              <node concept="3clFbS" id="3t7_2FgQBUb" role="3eOfB_">
+                <node concept="3cpWs8" id="3t7_2FgQDTi" role="3cqZAp">
+                  <node concept="3cpWsn" id="3t7_2FgQDTj" role="3cpWs9">
+                    <property role="TrG5h" value="parentRoleNode" />
+                    <node concept="3Tqbb2" id="3t7_2FgQDTh" role="1tU5fm">
+                      <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                    </node>
+                    <node concept="1PxgMI" id="3t7_2FgQDTk" role="33vP2m">
+                      <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                      <node concept="2OqwBi" id="3t7_2FgQDTl" role="1m5AlR">
+                        <node concept="37vLTw" id="3t7_2FgQDTm" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                        </node>
+                        <node concept="2oR75g" id="3t7_2FgQDTn" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="3t7_2FgQE1C" role="3cqZAp" />
+                <node concept="3cpWs8" id="3t7_2FgQG$J" role="3cqZAp">
+                  <node concept="3cpWsn" id="3t7_2FgQG$K" role="3cpWs9">
+                    <property role="TrG5h" value="roleNode" />
+                    <node concept="3Tqbb2" id="3t7_2FgQG$F" role="1tU5fm">
+                      <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                    </node>
+                    <node concept="2OqwBi" id="3t7_2FgQG$L" role="33vP2m">
+                      <node concept="2OqwBi" id="3t7_2FgQG$M" role="2Oq$k0">
+                        <node concept="37vLTw" id="3t7_2FgQG$N" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3t7_2FgQDTj" resolve="parentRoleNode" />
+                        </node>
+                        <node concept="3Tsc0h" id="3t7_2FgQG$O" role="2OqNvi">
+                          <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
+                        </node>
+                      </node>
+                      <node concept="2DeJg1" id="3t7_2FgQG$P" role="2OqNvi">
+                        <ref role="1A0vxQ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3t7_2FgQGOG" role="3cqZAp">
+                  <node concept="37vLTI" id="3t7_2FgQGOH" role="3clFbG">
+                    <node concept="2OqwBi" id="3t7_2FgQGOI" role="37vLTJ">
+                      <node concept="37vLTw" id="3t7_2FgQGOJ" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3t7_2FgQG$K" resolve="roleNode" />
+                      </node>
+                      <node concept="3TrcHB" id="3t7_2FgQGOK" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                    <node concept="2YIFZM" id="3t7_2FgQGOL" role="37vLTx">
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                      <node concept="2OqwBi" id="3t7_2FgQGOM" role="37wK5m">
+                        <node concept="37vLTw" id="3t7_2FgQGON" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
+                        </node>
+                        <node concept="liA8E" id="3t7_2FgQGOO" role="2OqNvi">
+                          <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3t7_2FgQGOP" role="3cqZAp">
+                  <node concept="2OqwBi" id="3t7_2FgQGOQ" role="3clFbG">
+                    <node concept="37vLTw" id="3t7_2FgQGOR" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                    </node>
+                    <node concept="2ArzE6" id="3t7_2FgQGOS" role="2OqNvi">
+                      <node concept="37vLTw" id="3t7_2FgQGOT" role="25WWJ7">
+                        <ref role="3cqZAo" node="3t7_2FgQG$K" resolve="roleNode" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="3t7_2FgQBUd" role="3cqZAp" />
+              </node>
+              <node concept="2OqwBi" id="3t7_2FgQCih" role="3eO9$A">
+                <node concept="2OqwBi" id="3t7_2FgQCii" role="2Oq$k0">
+                  <node concept="37vLTw" id="3t7_2FgQCij" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                  </node>
+                  <node concept="2oR75g" id="3t7_2FgQCik" role="2OqNvi" />
+                </node>
+                <node concept="1mIQ4w" id="3t7_2FgQCil" role="2OqNvi">
+                  <node concept="chp4Y" id="3t7_2FgQCo5" role="cj9EA">
+                    <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="4sVJFklQkmo" role="3cqZAp" />
+          <node concept="3clFbF" id="4sVJFklRFVk" role="3cqZAp">
+            <node concept="Rm8GO" id="4sVJFklRGx9" role="3clFbG">
+              <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
+              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4sVJFklM74e" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4sVJFklM7c$" role="jymVt" />
+      <node concept="3clFb_" id="4sVJFklM5Q2" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="walkList" />
+        <node concept="3uibUv" id="4sVJFklM5Q3" role="3clF45">
+          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        </node>
+        <node concept="3Tm1VV" id="4sVJFklM5Q4" role="1B3o_S" />
+        <node concept="3clFbS" id="4sVJFklM5Qh" role="3clF47">
+          <node concept="3clFbJ" id="6BU$YTNFpLM" role="3cqZAp">
+            <node concept="9aQIb" id="6BU$YTNFvTa" role="9aQIa">
+              <node concept="3clFbS" id="6BU$YTNFvTb" role="9aQI4">
+                <node concept="3clFbH" id="6BU$YTNFw2I" role="3cqZAp" />
+                <node concept="YS8fn" id="6BU$YTNFw5x" role="3cqZAp">
+                  <node concept="2ShNRf" id="6BU$YTNFw6z" role="YScLw">
+                    <node concept="1pGfFk" id="6BU$YTNF$Y0" role="2ShVmc">
+                      <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+                      <node concept="3cpWs3" id="6BU$YTNFADg" role="37wK5m">
+                        <node concept="3cpWs3" id="6BU$YTNFA7l" role="3uHU7B">
+                          <node concept="3cpWs3" id="6BU$YTNF_Iv" role="3uHU7B">
+                            <node concept="Xl_RD" id="6BU$YTNF_wK" role="3uHU7B">
+                              <property role="Xl_RC" value="unexpected " />
+                            </node>
+                            <node concept="37vLTw" id="6BU$YTNF_Kg" role="3uHU7w">
+                              <ref role="3cqZAo" node="4sVJFklM5Q6" resolve="listb" />
+                            </node>
+                          </node>
+                          <node concept="Xl_RD" id="6BU$YTNFAnZ" role="3uHU7w">
+                            <property role="Xl_RC" value=" in " />
+                          </node>
+                        </node>
+                        <node concept="2YIFZM" id="6BU$YTNFG1r" role="3uHU7w">
+                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                          <node concept="2OqwBi" id="6BU$YTNFBcj" role="37wK5m">
+                            <node concept="37vLTw" id="6BU$YTNFAR5" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                            </node>
+                            <node concept="2oR75g" id="6BU$YTNFD02" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6BU$YTNFuvJ" role="3clFbw">
+              <node concept="2OqwBi" id="6BU$YTNFuvK" role="2Oq$k0">
+                <node concept="37vLTw" id="6BU$YTNFuvL" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                </node>
+                <node concept="2oR75g" id="6BU$YTNFuvM" role="2OqNvi" />
+              </node>
+              <node concept="1mIQ4w" id="6BU$YTNFuvN" role="2OqNvi">
+                <node concept="chp4Y" id="6BU$YTNFuBB" role="cj9EA">
+                  <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="6BU$YTNFumr" role="3clFbx">
+              <node concept="3cpWs8" id="6BU$YTNFvdG" role="3cqZAp">
+                <node concept="3cpWsn" id="6BU$YTNFvdH" role="3cpWs9">
+                  <property role="TrG5h" value="parentRoleNode" />
+                  <node concept="3Tqbb2" id="6BU$YTNFvdI" role="1tU5fm">
+                    <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                  </node>
+                  <node concept="1PxgMI" id="6BU$YTNFvdJ" role="33vP2m">
+                    <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                    <node concept="2OqwBi" id="6BU$YTNFHob" role="1m5AlR">
+                      <node concept="37vLTw" id="6BU$YTNFGTT" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                      </node>
+                      <node concept="2oR75g" id="6BU$YTNFJ6f" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="3t7_2FgXnRt" role="3cqZAp" />
+              <node concept="3cpWs8" id="6BU$YTNFLTq" role="3cqZAp">
+                <node concept="3cpWsn" id="6BU$YTNFLTr" role="3cpWs9">
+                  <property role="TrG5h" value="listNode" />
+                  <node concept="3Tqbb2" id="6BU$YTNFLTs" role="1tU5fm">
+                    <ref role="ehGHo" to="5j4j:1OShD0HAY6y" resolve="List" />
+                  </node>
+                  <node concept="2OqwBi" id="6BU$YTNFLTt" role="33vP2m">
+                    <node concept="2OqwBi" id="6BU$YTNFLTu" role="2Oq$k0">
+                      <node concept="37vLTw" id="6BU$YTNFMaN" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6BU$YTNFvdH" resolve="parentRoleNode" />
+                      </node>
+                      <node concept="3Tsc0h" id="6BU$YTNFNOX" role="2OqNvi">
+                        <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
+                      </node>
+                    </node>
+                    <node concept="2DeJg1" id="6BU$YTNFLTx" role="2OqNvi">
+                      <ref role="1A0vxQ" to="5j4j:1OShD0HAY6y" resolve="List" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="6BU$YTNFLTL" role="3cqZAp">
+                <node concept="2OqwBi" id="6BU$YTNFLTM" role="3clFbG">
+                  <node concept="37vLTw" id="6BU$YTNFLTN" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                  </node>
+                  <node concept="2ArzE6" id="6BU$YTNFLTO" role="2OqNvi">
+                    <node concept="37vLTw" id="6infEALu2Fs" role="25WWJ7">
+                      <ref role="3cqZAo" node="6BU$YTNFLTr" resolve="listNode" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="3t7_2FguP0D" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="4sVJFklRZE_" role="3cqZAp" />
+          <node concept="3clFbF" id="4sVJFklSjTT" role="3cqZAp">
+            <node concept="Rm8GO" id="4sVJFklSku2" role="3clFbG">
+              <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
+              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4sVJFklM7TT" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="37vLTG" id="4sVJFklM5Q6" role="3clF46">
+          <property role="TrG5h" value="listb" />
+          <node concept="3uibUv" id="5YIOneOU7$i" role="1tU5fm">
+            <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4sVJFklM82l" role="jymVt" />
+      <node concept="3clFb_" id="4sVJFklM5PC" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="walkValues" />
+        <node concept="3uibUv" id="4sVJFklM5PD" role="3clF45">
+          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        </node>
+        <node concept="3Tm1VV" id="4sVJFklM5PE" role="1B3o_S" />
+        <node concept="16euLQ" id="4sVJFklM5PM" role="16eVyc">
+          <property role="TrG5h" value="V" />
+        </node>
+        <node concept="3clFbS" id="4sVJFklM5PN" role="3clF47">
+          <node concept="3cpWs8" id="4sVJFklNBfH" role="3cqZAp">
+            <node concept="3cpWsn" id="4sVJFklNBfI" role="3cpWs9">
+              <property role="TrG5h" value="node" />
+              <node concept="3Tqbb2" id="4sVJFklNBfJ" role="1tU5fm">
+                <ref role="ehGHo" to="5j4j:5lJXKARS0" resolve="Atom" />
+              </node>
+              <node concept="1PxgMI" id="4sVJFklQEve" role="33vP2m">
+                <ref role="1m5ApE" to="5j4j:5lJXKARS0" resolve="Atom" />
+                <node concept="2OqwBi" id="4sVJFklNBfK" role="1m5AlR">
+                  <node concept="37vLTw" id="4sVJFklNBfL" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                  </node>
+                  <node concept="2oR75g" id="4sVJFklShbv" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="4sVJFklNBpY" role="3cqZAp" />
+          <node concept="3cpWs8" id="4sVJFklNQvA" role="3cqZAp">
+            <node concept="3cpWsn" id="4sVJFklNQvB" role="3cpWs9">
+              <property role="TrG5h" value="roleNode" />
+              <node concept="3Tqbb2" id="4sVJFklNQvv" role="1tU5fm">
+                <ref role="ehGHo" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+              </node>
+              <node concept="2OqwBi" id="4sVJFklNQvC" role="33vP2m">
+                <node concept="2OqwBi" id="4sVJFklNQvD" role="2Oq$k0">
+                  <node concept="1PxgMI" id="4sVJFklNQvE" role="2Oq$k0">
+                    <ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                    <node concept="37vLTw" id="4sVJFklNQvF" role="1m5AlR">
+                      <ref role="3cqZAo" node="4sVJFklNBfI" resolve="node" />
+                    </node>
+                  </node>
+                  <node concept="3Tsc0h" id="4sVJFklNQvG" role="2OqNvi">
+                    <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
+                  </node>
+                </node>
+                <node concept="2DeJg1" id="4sVJFklNQvH" role="2OqNvi">
+                  <ref role="1A0vxQ" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4sVJFklNKFv" role="3cqZAp">
+            <node concept="37vLTI" id="4sVJFklNS1K" role="3clFbG">
+              <node concept="2OqwBi" id="4sVJFklNQXN" role="37vLTJ">
+                <node concept="37vLTw" id="4sVJFklNQvI" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sVJFklNQvB" resolve="roleNode" />
+                </node>
+                <node concept="3TrcHB" id="4sVJFklNRrJ" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="4sVJFklO5Ix" role="37vLTx">
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <node concept="2OqwBi" id="4sVJFklNT2$" role="37wK5m">
+                  <node concept="37vLTw" id="4sVJFklNStQ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sVJFklM5PG" resolve="valf" />
+                  </node>
+                  <node concept="liA8E" id="4sVJFklO4tI" role="2OqNvi">
+                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="4sVJFklOekC" role="3cqZAp" />
+          <node concept="1DcWWT" id="5YIOneOMTHl" role="3cqZAp">
+            <node concept="3clFbS" id="5YIOneOMTHn" role="2LFqv$">
+              <node concept="3clFbJ" id="2ev$9JFBdgr" role="3cqZAp">
+                <node concept="9aQIb" id="2ev$9JFBeVy" role="9aQIa">
+                  <node concept="3clFbS" id="2ev$9JFBeVz" role="9aQI4">
+                    <node concept="3SKdUt" id="5zfvpQ78WSU" role="3cqZAp">
+                      <node concept="3SKdUq" id="5zfvpQ78WTJ" role="3SKWNk">
+                        <property role="3SKdUp" value="FIXME: use strict typing" />
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="4sVJFklOltJ" role="3cqZAp">
+                      <node concept="3cpWsn" id="4sVJFklOltK" role="3cpWs9">
+                        <property role="TrG5h" value="vhNode" />
+                        <node concept="3Tqbb2" id="4sVJFklOltB" role="1tU5fm">
+                          <ref role="ehGHo" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
+                        </node>
+                        <node concept="2OqwBi" id="4sVJFklOltL" role="33vP2m">
+                          <node concept="2OqwBi" id="4sVJFklOltM" role="2Oq$k0">
+                            <node concept="37vLTw" id="4sVJFklOltN" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4sVJFklNQvB" resolve="roleNode" />
+                            </node>
+                            <node concept="3Tsc0h" id="4sVJFklOltO" role="2OqNvi">
+                              <ref role="3TtcxE" to="5j4j:6$jH9oLmYL8" resolve="contents" />
+                            </node>
+                          </node>
+                          <node concept="2DeJg1" id="4sVJFklOltP" role="2OqNvi">
+                            <ref role="1A0vxQ" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="4sVJFklOhEB" role="3cqZAp">
+                      <node concept="37vLTI" id="4sVJFklOmUP" role="3clFbG">
+                        <node concept="2YIFZM" id="4sVJFklOnbF" role="37vLTx">
+                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                          <node concept="37vLTw" id="2ev$9JFBcWL" role="37wK5m">
+                            <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="4sVJFklOl_3" role="37vLTJ">
+                          <node concept="37vLTw" id="4sVJFklOltQ" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4sVJFklOltK" resolve="vhNode" />
+                          </node>
+                          <node concept="3TrcHB" id="4sVJFklOm$E" role="2OqNvi">
+                            <ref role="3TsBF5" to="5j4j:6$jH9oLmYKA" resolve="value" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="2ev$9JFBFPL" role="3cqZAp" />
+                  </node>
+                </node>
+                <node concept="3eNFk2" id="4OKkcnf5hzz" role="3eNLev">
+                  <node concept="3clFbS" id="4OKkcnf5hz_" role="3eOfB_">
+                    <node concept="3clFbF" id="4OKkcnf53uf" role="3cqZAp">
+                      <node concept="2OqwBi" id="4OKkcnf556v" role="3clFbG">
+                        <node concept="2OqwBi" id="4OKkcnf53yS" role="2Oq$k0">
+                          <node concept="37vLTw" id="4OKkcnf53ud" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4sVJFklNQvB" resolve="roleNode" />
+                          </node>
+                          <node concept="3Tsc0h" id="4OKkcnf54qA" role="2OqNvi">
+                            <ref role="3TtcxE" to="5j4j:6$jH9oLmYL8" resolve="contents" />
+                          </node>
+                        </node>
+                        <node concept="2DeJg1" id="4OKkcnf58do" role="2OqNvi">
+                          <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="4OKkcnf58f3" role="3cqZAp" />
+                  </node>
+                  <node concept="1Wc70l" id="5zfvpQ78WGL" role="3eO9$A">
+                    <node concept="2OqwBi" id="5zfvpQ78WGN" role="3uHU7w">
+                      <node concept="1eOMI4" id="5zfvpQ78WGP" role="2Oq$k0">
+                        <node concept="10QFUN" id="5zfvpQ78WGQ" role="1eOMHV">
+                          <node concept="3uibUv" id="514BAS_WC$F" role="10QFUM">
+                            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                          </node>
+                          <node concept="37vLTw" id="5zfvpQ78WGS" role="10QFUP">
+                            <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="5zfvpQ78WGU" role="2OqNvi">
+                        <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
+                      </node>
+                    </node>
+                    <node concept="2ZW3vV" id="5zfvpQ78WGW" role="3uHU7B">
+                      <node concept="3uibUv" id="514BAS_WCv4" role="2ZW6by">
+                        <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                      </node>
+                      <node concept="37vLTw" id="5zfvpQ78WGY" role="2ZW6bz">
+                        <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1Wc70l" id="5zfvpQ78UU6" role="3clFbw">
+                  <node concept="3fqX7Q" id="5zfvpQ7b1DH" role="3uHU7w">
+                    <node concept="2OqwBi" id="5zfvpQ7b1DJ" role="3fr31v">
+                      <node concept="1eOMI4" id="5zfvpQ7b1DL" role="2Oq$k0">
+                        <node concept="10QFUN" id="5zfvpQ7b1DM" role="1eOMHV">
+                          <node concept="3uibUv" id="514BAS_WCnW" role="10QFUM">
+                            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                          </node>
+                          <node concept="37vLTw" id="5zfvpQ7b1DO" role="10QFUP">
+                            <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="5zfvpQ7b1DQ" role="2OqNvi">
+                        <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2ZW3vV" id="2ev$9JFBdkI" role="3uHU7B">
+                    <node concept="3uibUv" id="514BAS_WCif" role="2ZW6by">
+                      <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                    </node>
+                    <node concept="37vLTw" id="2ev$9JFBdjh" role="2ZW6bz">
+                      <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbS" id="2ev$9JFBdgt" role="3clFbx">
+                  <node concept="3cpWs8" id="4OKkcnf5ioS" role="3cqZAp">
+                    <node concept="3cpWsn" id="4OKkcnf5ioT" role="3cpWs9">
+                      <property role="TrG5h" value="vhNode" />
+                      <node concept="3Tqbb2" id="4OKkcnf5ioU" role="1tU5fm">
+                        <ref role="ehGHo" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
+                      </node>
+                      <node concept="2OqwBi" id="4OKkcnf5ioV" role="33vP2m">
+                        <node concept="2OqwBi" id="4OKkcnf5ioW" role="2Oq$k0">
+                          <node concept="37vLTw" id="4OKkcnf5ioX" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4sVJFklNQvB" resolve="roleNode" />
+                          </node>
+                          <node concept="3Tsc0h" id="4OKkcnf5ioY" role="2OqNvi">
+                            <ref role="3TtcxE" to="5j4j:6$jH9oLmYL8" resolve="contents" />
+                          </node>
+                        </node>
+                        <node concept="2DeJg1" id="4OKkcnf5ioZ" role="2OqNvi">
+                          <ref role="1A0vxQ" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs8" id="2ev$9JFBgrj" role="3cqZAp">
+                    <node concept="3cpWsn" id="2ev$9JFBgrk" role="3cpWs9">
+                      <property role="TrG5h" value="subsNode" />
+                      <node concept="3Tqbb2" id="2ev$9JFBgr2" role="1tU5fm">
+                        <ref role="ehGHo" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                      </node>
+                      <node concept="2OqwBi" id="2ev$9JFBgrl" role="33vP2m">
+                        <node concept="2OqwBi" id="2ev$9JFBgrm" role="2Oq$k0">
+                          <node concept="37vLTw" id="2ev$9JFBgrn" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4OKkcnf5ioT" resolve="vhNode" />
+                          </node>
+                          <node concept="3CFZ6_" id="2ev$9JFBgro" role="2OqNvi">
+                            <node concept="3CFYIy" id="2ev$9JFBgrp" role="3CFYIz">
+                              <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2DeJnY" id="2ev$9JFBgrq" role="2OqNvi">
+                          <ref role="1A9B2P" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="4OKkcnf9xnK" role="3cqZAp" />
+                  <node concept="3cpWs8" id="2ev$9JFBhK3" role="3cqZAp">
+                    <node concept="3cpWsn" id="2ev$9JFBhK4" role="3cpWs9">
+                      <property role="TrG5h" value="lvNode" />
+                      <node concept="3Tqbb2" id="2ev$9JFBhJH" role="1tU5fm">
+                        <ref role="ehGHo" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
+                      </node>
+                      <node concept="2OqwBi" id="2ev$9JFBhK5" role="33vP2m">
+                        <node concept="2OqwBi" id="2ev$9JFBhK6" role="2Oq$k0">
+                          <node concept="37vLTw" id="2ev$9JFBhK7" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2ev$9JFBgrk" resolve="subsNode" />
+                          </node>
+                          <node concept="3TrEf2" id="2ev$9JFBhK8" role="2OqNvi">
+                            <ref role="3Tt5mk" to="5j4j:dfChU1zo4I" resolve="expression" />
+                          </node>
+                        </node>
+                        <node concept="2DeJnY" id="2ev$9JFBhK9" role="2OqNvi">
+                          <ref role="1A9B2P" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3SKdUt" id="514BAS_Xs8l" role="3cqZAp">
+                    <node concept="3SKdUq" id="514BAS_Xs8n" role="3SKWNk">
+                      <property role="3SKdUp" value="FIXME: unchecked cast" />
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7nPD14NOv00" role="3cqZAp">
+                    <node concept="37vLTI" id="7nPD14NOv01" role="3clFbG">
+                      <node concept="2OqwBi" id="7nPD14NOv0e" role="37vLTJ">
+                        <node concept="37vLTw" id="7nPD14NOv0f" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2ev$9JFBhK4" resolve="lvNode" />
+                        </node>
+                        <node concept="3TrcHB" id="7nPD14NOv0g" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="7nPD14NOvlm" role="37vLTx">
+                        <node concept="37vLTw" id="7nPD14NOvft" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2$F5QputLbm" resolve="namingContext" />
+                        </node>
+                        <node concept="liA8E" id="7nPD14NOvoV" role="2OqNvi">
+                          <ref role="37wK5l" to="nz6g:7HUwyZaPiEo" resolve="uniqueName" />
+                          <node concept="2OqwBi" id="7nPD14NOvtS" role="37wK5m">
+                            <node concept="1eOMI4" id="7nPD14NOvtT" role="2Oq$k0">
+                              <node concept="10QFUN" id="7nPD14NOvtU" role="1eOMHV">
+                                <node concept="3uibUv" id="7nPD14NOvtV" role="10QFUM">
+                                  <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalAtom" />
+                                </node>
+                                <node concept="37vLTw" id="7nPD14NOvtW" role="10QFUP">
+                                  <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="7nPD14NOvtX" role="2OqNvi">
+                              <ref role="37wK5l" to="oy3s:514BAS_Xsp_" resolve="metaLogical" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="2ev$9JFBfrS" role="3cqZAp" />
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWsn" id="5YIOneOMTHp" role="1Duv9x">
+              <property role="TrG5h" value="val" />
+              <node concept="16syzq" id="5YIOneOMTHt" role="1tU5fm">
+                <ref role="16sUi3" node="4sVJFklM5PM" resolve="V" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5YIOneOMTHu" role="1DdaDG">
+              <node concept="37vLTw" id="5YIOneOMTHv" role="2Oq$k0">
+                <ref role="3cqZAo" node="4sVJFklM5PG" resolve="valf" />
+              </node>
+              <node concept="liA8E" id="5YIOneOMTHw" role="2OqNvi">
+                <ref role="37wK5l" to="ie8e:5YIOneOMEJi" resolve="values" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="4sVJFklNB$0" role="3cqZAp" />
+          <node concept="3clFbF" id="4sVJFklOdlv" role="3cqZAp">
+            <node concept="Rm8GO" id="4sVJFklOo5G" role="3clFbG">
+              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
+              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4sVJFklM7m3" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="37vLTG" id="4sVJFklM5PG" role="3clF46">
+          <property role="TrG5h" value="valf" />
+          <node concept="3uibUv" id="5YIOneONkSX" role="1tU5fm">
+            <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueFunc" />
+            <node concept="16syzq" id="5YIOneONkSY" role="11_B2D">
+              <ref role="16sUi3" node="4sVJFklM5PM" resolve="V" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="104EUzFtYn2" role="jymVt" />
+      <node concept="3clFb_" id="104EUzG1t_D" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="walkValue" />
+        <node concept="3uibUv" id="104EUzG1t_E" role="3clF45">
+          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        </node>
+        <node concept="3Tm1VV" id="104EUzG1t_F" role="1B3o_S" />
+        <node concept="37vLTG" id="104EUzG1t_H" role="3clF46">
+          <property role="TrG5h" value="value" />
+          <node concept="3uibUv" id="104EUzG1t_I" role="1tU5fm">
+            <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+            <node concept="3qTvmN" id="104EUzG1t_J" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="104EUzG1t_K" role="3clF47">
+          <node concept="3cpWs8" id="6MYr6JxsNgY" role="3cqZAp">
+            <node concept="3cpWsn" id="6MYr6JxsNgZ" role="3cpWs9">
+              <property role="TrG5h" value="parentNode" />
+              <node concept="3Tqbb2" id="6MYr6JxsNh0" role="1tU5fm" />
+              <node concept="2OqwBi" id="6MYr6JxsNh2" role="33vP2m">
+                <node concept="37vLTw" id="6MYr6JxsRIZ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                </node>
+                <node concept="2oR75g" id="6MYr6JxsNh4" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6MYr6JxsS3u" role="3cqZAp" />
+          <node concept="3clFbJ" id="6MYr6JxsS9S" role="3cqZAp">
+            <node concept="3clFbS" id="6MYr6JxsS9U" role="3clFbx">
+              <node concept="3cpWs8" id="6MYr6JxsNp_" role="3cqZAp">
+                <node concept="3cpWsn" id="6MYr6JxsNpA" role="3cpWs9">
+                  <property role="TrG5h" value="vNode" />
+                  <node concept="3Tqbb2" id="6MYr6JxsNpB" role="1tU5fm">
+                    <ref role="ehGHo" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
+                  </node>
+                  <node concept="2OqwBi" id="6MYr6JxsNpC" role="33vP2m">
+                    <node concept="2OqwBi" id="6MYr6JxsNpD" role="2Oq$k0">
+                      <node concept="1PxgMI" id="6MYr6JxsSCf" role="2Oq$k0">
+                        <ref role="1m5ApE" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
+                        <node concept="37vLTw" id="6MYr6JxsSzI" role="1m5AlR">
+                          <ref role="3cqZAo" node="6MYr6JxsNgZ" resolve="parentNode" />
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="6MYr6JxsT3q" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
+                      </node>
+                    </node>
+                    <node concept="2DeJnY" id="6MYr6JxsTeP" role="2OqNvi">
+                      <ref role="1A9B2P" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="6MYr6JxsTne" role="3cqZAp">
+                <node concept="2OqwBi" id="6MYr6JxsTOJ" role="3clFbG">
+                  <node concept="2OqwBi" id="6MYr6JxsTqD" role="2Oq$k0">
+                    <node concept="37vLTw" id="6MYr6JxsTnc" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6MYr6JxsNpA" resolve="vNode" />
+                    </node>
+                    <node concept="3TrcHB" id="6MYr6JxsTv4" role="2OqNvi">
+                      <ref role="3TsBF5" to="5j4j:6$jH9oLmYKA" resolve="value" />
+                    </node>
+                  </node>
+                  <node concept="tyxLq" id="6MYr6JxsTVt" role="2OqNvi">
+                    <node concept="2YIFZM" id="6MYr6JxsTZv" role="tz02z">
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                      <node concept="2OqwBi" id="6MYr6JxsUc8" role="37wK5m">
+                        <node concept="37vLTw" id="6MYr6JxsU2n" role="2Oq$k0">
+                          <ref role="3cqZAo" node="104EUzG1t_H" resolve="value" />
+                        </node>
+                        <node concept="liA8E" id="6MYr6JxsUte" role="2OqNvi">
+                          <ref role="37wK5l" to="ie8e:1msb0mq8QTt" resolve="symbol" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="6MYr6JxsU$B" role="3cqZAp" />
+            </node>
+            <node concept="2OqwBi" id="6MYr6JxsSj1" role="3clFbw">
+              <node concept="37vLTw" id="6MYr6JxsSgf" role="2Oq$k0">
+                <ref role="3cqZAo" node="6MYr6JxsNgZ" resolve="parentNode" />
+              </node>
+              <node concept="1mIQ4w" id="6MYr6JxsSmZ" role="2OqNvi">
+                <node concept="chp4Y" id="6MYr6JxsSnK" role="cj9EA">
+                  <ref role="cht4Q" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
+                </node>
+              </node>
+            </node>
+            <node concept="9aQIb" id="6MYr6JxsUyh" role="9aQIa">
+              <node concept="3clFbS" id="6MYr6JxsUyi" role="9aQI4">
+                <node concept="3SKdUt" id="104EUzGbhRR" role="3cqZAp">
+                  <node concept="3SKdUq" id="104EUzGbhSP" role="3SKWNk">
+                    <property role="3SKdUp" value="FIXME implement me" />
+                  </node>
+                </node>
+                <node concept="YS8fn" id="104EUzFu0Wu" role="3cqZAp">
+                  <node concept="2ShNRf" id="104EUzFu0Zv" role="YScLw">
+                    <node concept="1pGfFk" id="104EUzFu1kd" role="2ShVmc">
+                      <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6MYr6JxsURf" role="3cqZAp" />
+          <node concept="3clFbF" id="6MYr6JxsV8X" role="3cqZAp">
+            <node concept="Rm8GO" id="6MYr6JxsVlt" role="3clFbG">
+              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
+              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="104EUzG1wiH" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4sVJFklM7ur" role="jymVt" />
+      <node concept="3clFb_" id="4sVJFklM5PQ" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="walkVariables" />
+        <node concept="3uibUv" id="4sVJFklM5PR" role="3clF45">
+          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        </node>
+        <node concept="3Tm1VV" id="4sVJFklM5PS" role="1B3o_S" />
+        <node concept="3clFbS" id="4sVJFklM5PZ" role="3clF47">
+          <node concept="3cpWs8" id="4sVJFklNGvZ" role="3cqZAp">
+            <node concept="3cpWsn" id="4sVJFklNGw0" role="3cpWs9">
+              <property role="TrG5h" value="node" />
+              <node concept="3Tqbb2" id="4sVJFklNGw1" role="1tU5fm">
+                <ref role="ehGHo" to="5j4j:5lJXKARS0" resolve="Atom" />
+              </node>
+              <node concept="1PxgMI" id="4sVJFklQCYO" role="33vP2m">
+                <ref role="1m5ApE" to="5j4j:5lJXKARS0" resolve="Atom" />
+                <node concept="2OqwBi" id="4sVJFklNGw2" role="1m5AlR">
+                  <node concept="37vLTw" id="4sVJFklNGw3" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                  </node>
+                  <node concept="2oR75g" id="4sVJFklSiu$" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="4sVJFklNHM3" role="3cqZAp" />
+          <node concept="3cpWs8" id="4sVJFklOBg7" role="3cqZAp">
+            <node concept="3cpWsn" id="4sVJFklOBg8" role="3cpWs9">
+              <property role="TrG5h" value="roleNode" />
+              <node concept="3Tqbb2" id="4sVJFklOBfZ" role="1tU5fm">
+                <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+              </node>
+              <node concept="2OqwBi" id="4sVJFklOBg9" role="33vP2m">
+                <node concept="2OqwBi" id="4sVJFklOBga" role="2Oq$k0">
+                  <node concept="1PxgMI" id="4sVJFklOBgb" role="2Oq$k0">
+                    <ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                    <node concept="37vLTw" id="4sVJFklOBgc" role="1m5AlR">
+                      <ref role="3cqZAo" node="4sVJFklNGw0" resolve="node" />
+                    </node>
+                  </node>
+                  <node concept="3Tsc0h" id="4sVJFklOBgd" role="2OqNvi">
+                    <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
+                  </node>
+                </node>
+                <node concept="2DeJg1" id="4sVJFklOBge" role="2OqNvi">
+                  <ref role="1A0vxQ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4sVJFklOse2" role="3cqZAp">
+            <node concept="37vLTI" id="4sVJFklOCcS" role="3clFbG">
+              <node concept="2YIFZM" id="4sVJFklOCrt" role="37vLTx">
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <node concept="2OqwBi" id="4sVJFklOCUU" role="37wK5m">
+                  <node concept="37vLTw" id="4sVJFklOCEm" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sVJFklM5PU" resolve="varb" />
+                  </node>
+                  <node concept="liA8E" id="4sVJFklOD$o" role="2OqNvi">
+                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="4sVJFklOBFy" role="37vLTJ">
+                <node concept="37vLTw" id="4sVJFklOBgf" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sVJFklOBg8" resolve="roleNode" />
+                </node>
+                <node concept="3TrcHB" id="4sVJFklOBRr" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2q_78a9q1oQ" role="3cqZAp" />
+          <node concept="3SKdUt" id="2q_78a9q0KI" role="3cqZAp">
+            <node concept="3SKdUq" id="2q_78a9q1bG" role="3SKWNk">
+              <property role="3SKdUp" value="TODO avoid code duplication" />
+            </node>
+          </node>
+          <node concept="1DcWWT" id="5YIOneOS3Zh" role="3cqZAp">
+            <node concept="3clFbS" id="5YIOneOS3Zj" role="2LFqv$">
+              <node concept="3cpWs8" id="5YIOneOS5q1" role="3cqZAp">
+                <node concept="3cpWsn" id="5YIOneOS5q2" role="3cpWs9">
+                  <property role="TrG5h" value="varName" />
+                  <node concept="17QB3L" id="5YIOneOS5x5" role="1tU5fm" />
+                  <node concept="2YIFZM" id="5YIOneOS5q3" role="33vP2m">
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                    <node concept="2OqwBi" id="5YIOneOS5q4" role="37wK5m">
+                      <node concept="37vLTw" id="5YIOneOS5q5" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5YIOneOS3Zl" resolve="var" />
+                      </node>
+                      <node concept="liA8E" id="5YIOneOS5q6" role="2OqNvi">
+                        <ref role="37wK5l" to="ie8e:56MMu0Ark7d" resolve="symbol" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="5YIOneOS8Lf" role="3cqZAp" />
+              <node concept="3SKdUt" id="5zfvpQ7a55$" role="3cqZAp">
+                <node concept="3SKdUq" id="5zfvpQ7a57e" role="3SKWNk">
+                  <property role="3SKdUp" value="FIXME: having a string represent a variable is a bad idea" />
+                </node>
+              </node>
+              <node concept="3clFbJ" id="2q_78a8ZKtU" role="3cqZAp">
+                <node concept="3clFbS" id="2q_78a8ZKtX" role="3clFbx">
+                  <node concept="3clFbF" id="2q_78a90b1U" role="3cqZAp">
+                    <node concept="2OqwBi" id="2q_78a90cKo" role="3clFbG">
+                      <node concept="2OqwBi" id="2q_78a90b4U" role="2Oq$k0">
+                        <node concept="37vLTw" id="2q_78a90b1T" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4sVJFklOBg8" resolve="roleNode" />
+                        </node>
+                        <node concept="3Tsc0h" id="2q_78a90bvr" role="2OqNvi">
+                          <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
+                        </node>
+                      </node>
+                      <node concept="2DeJg1" id="2q_78a90g2_" role="2OqNvi">
+                        <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="2q_78a90jPm" role="3cqZAp" />
+                </node>
+                <node concept="9aQIb" id="2q_78a90a1u" role="9aQIa">
+                  <node concept="3clFbS" id="2q_78a90a1v" role="9aQI4">
+                    <node concept="3cpWs8" id="677NV56yAM8" role="3cqZAp">
+                      <node concept="3cpWsn" id="677NV56yAM9" role="3cpWs9">
+                        <property role="TrG5h" value="nodeNode" />
+                        <node concept="3Tqbb2" id="677NV56yAM6" role="1tU5fm">
+                          <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                        </node>
+                        <node concept="2OqwBi" id="677NV56yAMa" role="33vP2m">
+                          <node concept="2OqwBi" id="677NV56yAMb" role="2Oq$k0">
+                            <node concept="37vLTw" id="677NV56yAMc" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4sVJFklOBg8" resolve="roleNode" />
+                            </node>
+                            <node concept="3Tsc0h" id="677NV56yAMd" role="2OqNvi">
+                              <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
+                            </node>
+                          </node>
+                          <node concept="2DeJg1" id="677NV56yAMe" role="2OqNvi">
+                            <ref role="1A0vxQ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="677NV56yBIu" role="3cqZAp">
+                      <node concept="3cpWsn" id="677NV56yBIv" role="3cpWs9">
+                        <property role="TrG5h" value="lsubNode" />
+                        <node concept="3Tqbb2" id="677NV56yBIg" role="1tU5fm">
+                          <ref role="ehGHo" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                        </node>
+                        <node concept="2OqwBi" id="677NV56yBIw" role="33vP2m">
+                          <node concept="2OqwBi" id="677NV56yBIx" role="2Oq$k0">
+                            <node concept="37vLTw" id="677NV56yBIy" role="2Oq$k0">
+                              <ref role="3cqZAo" node="677NV56yAM9" resolve="nodeNode" />
+                            </node>
+                            <node concept="3CFZ6_" id="677NV56yBIz" role="2OqNvi">
+                              <node concept="3CFYIy" id="677NV56yBI$" role="3CFYIz">
+                                <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="677NV56yBI_" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="677NV56yEkV" role="3cqZAp">
+                      <node concept="3cpWsn" id="677NV56yEkW" role="3cpWs9">
+                        <property role="TrG5h" value="lvNode" />
+                        <node concept="3Tqbb2" id="677NV56yEkR" role="1tU5fm">
+                          <ref role="ehGHo" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
+                        </node>
+                        <node concept="2OqwBi" id="677NV56yEkX" role="33vP2m">
+                          <node concept="2OqwBi" id="677NV56yEkY" role="2Oq$k0">
+                            <node concept="37vLTw" id="677NV56yEkZ" role="2Oq$k0">
+                              <ref role="3cqZAo" node="677NV56yBIv" resolve="lsubNode" />
+                            </node>
+                            <node concept="3TrEf2" id="677NV56yEl0" role="2OqNvi">
+                              <ref role="3Tt5mk" to="5j4j:dfChU1zo4I" resolve="expression" />
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="677NV56yEl1" role="2OqNvi">
+                            <ref role="1A9B2P" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="4sVJFklOJbh" role="3cqZAp">
+                      <node concept="37vLTI" id="4sVJFklOP5Y" role="3clFbG">
+                        <node concept="37vLTw" id="677NV56yuDz" role="37vLTx">
+                          <ref role="3cqZAo" node="5YIOneOS5q2" resolve="varName" />
+                        </node>
+                        <node concept="2OqwBi" id="4sVJFklOOho" role="37vLTJ">
+                          <node concept="37vLTw" id="677NV56yErh" role="2Oq$k0">
+                            <ref role="3cqZAo" node="677NV56yEkW" resolve="lvNode" />
+                          </node>
+                          <node concept="3TrcHB" id="4sVJFklOOG_" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="4OKkcnf3Sdv" role="3clFbw">
+                  <node concept="2YIFZM" id="4OKkcnf3RzV" role="2Oq$k0">
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                    <node concept="37vLTw" id="4OKkcnf3RFa" role="37wK5m">
+                      <ref role="3cqZAo" node="5YIOneOS5q2" resolve="varName" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="4OKkcnf3TsT" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
+                    <node concept="Xl_RD" id="4OKkcnf3Tv$" role="37wK5m">
+                      <property role="Xl_RC" value="^__.*" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWsn" id="5YIOneOS3Zl" role="1Duv9x">
+              <property role="TrG5h" value="var" />
+              <node concept="3uibUv" id="5YIOneOS4go" role="1tU5fm">
+                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5YIOneOS3Zr" role="1DdaDG">
+              <node concept="37vLTw" id="5YIOneOS3Zs" role="2Oq$k0">
+                <ref role="3cqZAo" node="4sVJFklM5PU" resolve="varb" />
+              </node>
+              <node concept="liA8E" id="5YIOneOS3Zt" role="2OqNvi">
+                <ref role="37wK5l" to="ie8e:5YIOneORS0h" resolve="variables" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="4sVJFklOEwR" role="3cqZAp" />
+          <node concept="3clFbF" id="4sVJFklOF7e" role="3cqZAp">
+            <node concept="Rm8GO" id="4sVJFklOFAj" role="3clFbG">
+              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
+              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4sVJFklM7BS" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="37vLTG" id="4sVJFklM5PU" role="3clF46">
+          <property role="TrG5h" value="varb" />
+          <node concept="3uibUv" id="5YIOneOSlWl" role="1tU5fm">
+            <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableFunc" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4sVJFklM7Ki" role="jymVt" />
+      <node concept="3clFb_" id="104EUzG3OTs" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="walkVariable" />
+        <node concept="3uibUv" id="104EUzG3OTt" role="3clF45">
+          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        </node>
+        <node concept="3Tm1VV" id="104EUzG3OTu" role="1B3o_S" />
+        <node concept="37vLTG" id="104EUzG3OTw" role="3clF46">
+          <property role="TrG5h" value="var" />
+          <node concept="3uibUv" id="104EUzG3OTx" role="1tU5fm">
+            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="104EUzG3OTy" role="3clF47">
+          <node concept="3SKdUt" id="104EUzG8RLq" role="3cqZAp">
+            <node concept="3SKdUq" id="104EUzG8RMi" role="3SKWNk">
+              <property role="3SKdUp" value="this happens if a role contains multiple children, with variables among them" />
+            </node>
+          </node>
+          <node concept="3cpWs8" id="104EUzG8Sr5" role="3cqZAp">
+            <node concept="3cpWsn" id="104EUzG8Sr6" role="3cpWs9">
+              <property role="TrG5h" value="parentNode" />
+              <node concept="3Tqbb2" id="104EUzG8Sr7" role="1tU5fm" />
+              <node concept="2OqwBi" id="104EUzG8Sr8" role="33vP2m">
+                <node concept="37vLTw" id="104EUzG8Sr9" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                </node>
+                <node concept="2oR75g" id="104EUzG8Sra" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="104EUzG8RZO" role="3cqZAp" />
+          <node concept="3clFbJ" id="104EUzG8SYX" role="3cqZAp">
+            <node concept="3clFbS" id="104EUzG8SZ0" role="3clFbx">
+              <node concept="3clFbJ" id="2q_78a90krK" role="3cqZAp">
+                <node concept="3clFbS" id="2q_78a90krN" role="3clFbx">
+                  <node concept="3clFbF" id="2q_78a90oVy" role="3cqZAp">
+                    <node concept="2OqwBi" id="2q_78a90qgT" role="3clFbG">
+                      <node concept="2OqwBi" id="2q_78a90p3A" role="2Oq$k0">
+                        <node concept="1PxgMI" id="2q_78a90oZ4" role="2Oq$k0">
+                          <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                          <node concept="37vLTw" id="2q_78a90oVw" role="1m5AlR">
+                            <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
+                          </node>
+                        </node>
+                        <node concept="3Tsc0h" id="2q_78a90pyG" role="2OqNvi">
+                          <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
+                        </node>
+                      </node>
+                      <node concept="2DeJg1" id="2q_78a90t$G" role="2OqNvi">
+                        <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="2q_78a90oRv" role="3cqZAp" />
+                </node>
+                <node concept="2OqwBi" id="5zfvpQ7aeZB" role="3clFbw">
+                  <node concept="37vLTw" id="514BAS_WCP2" role="2Oq$k0">
+                    <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
+                  </node>
+                  <node concept="liA8E" id="5zfvpQ7b2cC" role="2OqNvi">
+                    <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
+                  </node>
+                </node>
+                <node concept="9aQIb" id="2q_78a90oeF" role="9aQIa">
+                  <node concept="3clFbS" id="2q_78a90oeG" role="9aQI4">
+                    <node concept="3cpWs8" id="677NV56yIGC" role="3cqZAp">
+                      <node concept="3cpWsn" id="677NV56yIGD" role="3cpWs9">
+                        <property role="TrG5h" value="nodeNode" />
+                        <node concept="3Tqbb2" id="677NV56yIGE" role="1tU5fm">
+                          <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                        </node>
+                        <node concept="2OqwBi" id="677NV56yIGF" role="33vP2m">
+                          <node concept="2OqwBi" id="677NV56yIGG" role="2Oq$k0">
+                            <node concept="3Tsc0h" id="677NV56yIGI" role="2OqNvi">
+                              <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
+                            </node>
+                            <node concept="1PxgMI" id="677NV56yLdW" role="2Oq$k0">
+                              <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                              <node concept="37vLTw" id="677NV56yLdX" role="1m5AlR">
+                                <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2DeJg1" id="677NV56yIGJ" role="2OqNvi">
+                            <ref role="1A0vxQ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="677NV56yIGK" role="3cqZAp">
+                      <node concept="3cpWsn" id="677NV56yIGL" role="3cpWs9">
+                        <property role="TrG5h" value="lsubNode" />
+                        <node concept="3Tqbb2" id="677NV56yIGM" role="1tU5fm">
+                          <ref role="ehGHo" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                        </node>
+                        <node concept="2OqwBi" id="677NV56yIGN" role="33vP2m">
+                          <node concept="2OqwBi" id="677NV56yIGO" role="2Oq$k0">
+                            <node concept="37vLTw" id="677NV56yIGP" role="2Oq$k0">
+                              <ref role="3cqZAo" node="677NV56yIGD" resolve="nodeNode" />
+                            </node>
+                            <node concept="3CFZ6_" id="677NV56yIGQ" role="2OqNvi">
+                              <node concept="3CFYIy" id="677NV56yIGR" role="3CFYIz">
+                                <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="677NV56yIGS" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="677NV56yIGT" role="3cqZAp">
+                      <node concept="3cpWsn" id="677NV56yIGU" role="3cpWs9">
+                        <property role="TrG5h" value="lvNode" />
+                        <node concept="3Tqbb2" id="677NV56yIGV" role="1tU5fm">
+                          <ref role="ehGHo" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
+                        </node>
+                        <node concept="2OqwBi" id="677NV56yIGW" role="33vP2m">
+                          <node concept="2OqwBi" id="677NV56yIGX" role="2Oq$k0">
+                            <node concept="37vLTw" id="677NV56yIGY" role="2Oq$k0">
+                              <ref role="3cqZAo" node="677NV56yIGL" resolve="lsubNode" />
+                            </node>
+                            <node concept="3TrEf2" id="677NV56yIGZ" role="2OqNvi">
+                              <ref role="3Tt5mk" to="5j4j:dfChU1zo4I" resolve="expression" />
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="677NV56yIH0" role="2OqNvi">
+                            <ref role="1A9B2P" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="2q_78a8qfIR" role="3cqZAp">
+                      <node concept="37vLTI" id="2q_78a8qfIS" role="3clFbG">
+                        <node concept="2OqwBi" id="2q_78a8qfIW" role="37vLTJ">
+                          <node concept="37vLTw" id="677NV56yMBn" role="2Oq$k0">
+                            <ref role="3cqZAo" node="677NV56yIGU" resolve="lvNode" />
+                          </node>
+                          <node concept="3TrcHB" id="2q_78a8qfIY" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="2YIFZM" id="31Jz$8bZPXE" role="37vLTx">
+                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                          <node concept="2OqwBi" id="31Jz$8bZRWl" role="37wK5m">
+                            <node concept="37vLTw" id="31Jz$8bZQ4I" role="2Oq$k0">
+                              <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
+                            </node>
+                            <node concept="liA8E" id="31Jz$8bZT96" role="2OqNvi">
+                              <ref role="37wK5l" to="ie8e:56MMu0Ark7d" resolve="symbol" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="2q_78a90AbL" role="3cqZAp" />
+            </node>
+            <node concept="2OqwBi" id="104EUzG8T8Y" role="3clFbw">
+              <node concept="37vLTw" id="104EUzG8T8Z" role="2Oq$k0">
+                <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
+              </node>
+              <node concept="1mIQ4w" id="104EUzG8T90" role="2OqNvi">
+                <node concept="chp4Y" id="104EUzG8T91" role="cj9EA">
+                  <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                </node>
+              </node>
+            </node>
+            <node concept="3eNFk2" id="4JRKVCvgVW8" role="3eNLev">
+              <node concept="2OqwBi" id="4JRKVCvgXaX" role="3eO9$A">
+                <node concept="37vLTw" id="4JRKVCvgWBV" role="2Oq$k0">
+                  <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
+                </node>
+                <node concept="1mIQ4w" id="4JRKVCvgXqM" role="2OqNvi">
+                  <node concept="chp4Y" id="4JRKVCvgXr7" role="cj9EA">
+                    <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="4JRKVCvgVWa" role="3eOfB_">
+                <node concept="3clFbH" id="4JRKVCvgXss" role="3cqZAp" />
+                <node concept="3clFbJ" id="4JRKVCvgY39" role="3cqZAp">
+                  <node concept="3clFbS" id="4JRKVCvgY3a" role="3clFbx">
+                    <node concept="3clFbF" id="4JRKVCvgY3b" role="3cqZAp">
+                      <node concept="2OqwBi" id="4JRKVCvgY3c" role="3clFbG">
+                        <node concept="2OqwBi" id="4JRKVCvgY3d" role="2Oq$k0">
+                          <node concept="1PxgMI" id="4JRKVCvgY3e" role="2Oq$k0">
+                            <ref role="1m5ApE" to="5j4j:1OShD0HAY6y" resolve="List" />
+                            <node concept="37vLTw" id="4JRKVCvgY3f" role="1m5AlR">
+                              <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
+                            </node>
+                          </node>
+                          <node concept="3Tsc0h" id="4JRKVCvgYyD" role="2OqNvi">
+                            <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
+                          </node>
+                        </node>
+                        <node concept="2DeJg1" id="4JRKVCvgY3h" role="2OqNvi">
+                          <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="4JRKVCvgY3i" role="3cqZAp" />
+                  </node>
+                  <node concept="9aQIb" id="4JRKVCvgY3q" role="9aQIa">
+                    <node concept="3clFbS" id="4JRKVCvgY3r" role="9aQI4">
+                      <node concept="3cpWs8" id="4JRKVCvgY3s" role="3cqZAp">
+                        <node concept="3cpWsn" id="4JRKVCvgY3t" role="3cpWs9">
+                          <property role="TrG5h" value="nodeNode" />
+                          <node concept="3Tqbb2" id="4JRKVCvgY3u" role="1tU5fm">
+                            <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                          </node>
+                          <node concept="2OqwBi" id="4JRKVCvgY3v" role="33vP2m">
+                            <node concept="2OqwBi" id="4JRKVCvgY3w" role="2Oq$k0">
+                              <node concept="3Tsc0h" id="4JRKVCvh04n" role="2OqNvi">
+                                <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
+                              </node>
+                              <node concept="1PxgMI" id="4JRKVCvgY3y" role="2Oq$k0">
+                                <ref role="1m5ApE" to="5j4j:1OShD0HAY6y" resolve="List" />
+                                <node concept="37vLTw" id="4JRKVCvgY3z" role="1m5AlR">
+                                  <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="2DeJg1" id="4JRKVCvgY3$" role="2OqNvi">
+                              <ref role="1A0vxQ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs8" id="4JRKVCvgY3_" role="3cqZAp">
+                        <node concept="3cpWsn" id="4JRKVCvgY3A" role="3cpWs9">
+                          <property role="TrG5h" value="lsubNode" />
+                          <node concept="3Tqbb2" id="4JRKVCvgY3B" role="1tU5fm">
+                            <ref role="ehGHo" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                          </node>
+                          <node concept="2OqwBi" id="4JRKVCvgY3C" role="33vP2m">
+                            <node concept="2OqwBi" id="4JRKVCvgY3D" role="2Oq$k0">
+                              <node concept="37vLTw" id="4JRKVCvgY3E" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4JRKVCvgY3t" resolve="nodeNode" />
+                              </node>
+                              <node concept="3CFZ6_" id="4JRKVCvgY3F" role="2OqNvi">
+                                <node concept="3CFYIy" id="4JRKVCvgY3G" role="3CFYIz">
+                                  <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="2DeJnY" id="4JRKVCvgY3H" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs8" id="4JRKVCvgY3I" role="3cqZAp">
+                        <node concept="3cpWsn" id="4JRKVCvgY3J" role="3cpWs9">
+                          <property role="TrG5h" value="lvNode" />
+                          <node concept="3Tqbb2" id="4JRKVCvgY3K" role="1tU5fm">
+                            <ref role="ehGHo" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
+                          </node>
+                          <node concept="2OqwBi" id="4JRKVCvgY3L" role="33vP2m">
+                            <node concept="2OqwBi" id="4JRKVCvgY3M" role="2Oq$k0">
+                              <node concept="37vLTw" id="4JRKVCvgY3N" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4JRKVCvgY3A" resolve="lsubNode" />
+                              </node>
+                              <node concept="3TrEf2" id="4JRKVCvgY3O" role="2OqNvi">
+                                <ref role="3Tt5mk" to="5j4j:dfChU1zo4I" resolve="expression" />
+                              </node>
+                            </node>
+                            <node concept="2DeJnY" id="4JRKVCvgY3P" role="2OqNvi">
+                              <ref role="1A9B2P" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="4JRKVCvgY3Q" role="3cqZAp">
+                        <node concept="37vLTI" id="4JRKVCvgY3R" role="3clFbG">
+                          <node concept="2OqwBi" id="4JRKVCvgY3S" role="37vLTJ">
+                            <node concept="37vLTw" id="4JRKVCvgY3T" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4JRKVCvgY3J" resolve="lvNode" />
+                            </node>
+                            <node concept="3TrcHB" id="4JRKVCvgY3U" role="2OqNvi">
+                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                            </node>
+                          </node>
+                          <node concept="2YIFZM" id="4JRKVCvgY3V" role="37vLTx">
+                            <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                            <node concept="2OqwBi" id="4JRKVCvgY3W" role="37wK5m">
+                              <node concept="37vLTw" id="4JRKVCvgY3X" role="2Oq$k0">
+                                <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
+                              </node>
+                              <node concept="liA8E" id="4JRKVCvgY3Y" role="2OqNvi">
+                                <ref role="37wK5l" to="ie8e:56MMu0Ark7d" resolve="symbol" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="5zfvpQ7afN6" role="3clFbw">
+                    <node concept="37vLTw" id="514BAS_WD6y" role="2Oq$k0">
+                      <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
+                    </node>
+                    <node concept="liA8E" id="2DKqMqOmVqN" role="2OqNvi">
+                      <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="4JRKVCvgXsz" role="3cqZAp" />
+              </node>
+            </node>
+            <node concept="3eNFk2" id="104EUzG90i0" role="3eNLev">
+              <node concept="2OqwBi" id="104EUzG90pA" role="3eO9$A">
+                <node concept="37vLTw" id="104EUzG90mB" role="2Oq$k0">
+                  <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
+                </node>
+                <node concept="1mIQ4w" id="104EUzG90BI" role="2OqNvi">
+                  <node concept="chp4Y" id="104EUzG90D5" role="cj9EA">
+                    <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="104EUzG90i2" role="3eOfB_">
+                <node concept="3SKdUt" id="104EUzGbi1v" role="3cqZAp">
+                  <node concept="3SKdUq" id="104EUzGbi1E" role="3SKWNk">
+                    <property role="3SKdUp" value="FIXME implement me" />
+                  </node>
+                </node>
+                <node concept="YS8fn" id="104EUzG90IL" role="3cqZAp">
+                  <node concept="2ShNRf" id="104EUzG90KW" role="YScLw">
+                    <node concept="1pGfFk" id="104EUzG915C" role="2ShVmc">
+                      <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="104EUzG994x" role="3cqZAp" />
+              </node>
+            </node>
+            <node concept="9aQIb" id="104EUzG917W" role="9aQIa">
+              <node concept="3clFbS" id="104EUzG917X" role="9aQI4">
+                <node concept="3SKdUt" id="104EUzGbhN0" role="3cqZAp">
+                  <node concept="3SKdUq" id="104EUzGbhNf" role="3SKWNk">
+                    <property role="3SKdUp" value="FIXME implement me" />
+                  </node>
+                </node>
+                <node concept="YS8fn" id="104EUzG91Gc" role="3cqZAp">
+                  <node concept="2ShNRf" id="104EUzG91Ha" role="YScLw">
+                    <node concept="1pGfFk" id="104EUzG9221" role="2ShVmc">
+                      <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="104EUzG92qN" role="3cqZAp" />
+          <node concept="3clFbF" id="104EUzG92Zy" role="3cqZAp">
+            <node concept="Rm8GO" id="104EUzG93tD" role="3clFbG">
+              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
+              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="104EUzG3RpE" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="104EUzG3Qe9" role="jymVt" />
+      <node concept="3clFb_" id="4sVJFklM5Qk" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="endWalk" />
+        <node concept="3cqZAl" id="4sVJFklM5Ql" role="3clF45" />
+        <node concept="3Tm1VV" id="4sVJFklM5Qm" role="1B3o_S" />
+        <node concept="3clFbS" id="4sVJFklM5Qo" role="3clF47">
+          <node concept="3clFbF" id="4sVJFklSl$K" role="3cqZAp">
+            <node concept="2OqwBi" id="4sVJFklSlXt" role="3clFbG">
+              <node concept="37vLTw" id="4sVJFklSl$J" role="2Oq$k0">
+                <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+              </node>
+              <node concept="2AryhJ" id="4sVJFklSn11" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4sVJFklM8iV" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4sVJFklNtyl" role="jymVt" />
+      <node concept="312cEg" id="4sVJFklNtS3" role="jymVt">
+        <property role="34CwA1" value="false" />
+        <property role="eg7rD" value="false" />
+        <property role="TrG5h" value="stack" />
+        <property role="3TUv4t" value="false" />
+        <node concept="oyxx6" id="4sVJFklS203" role="1tU5fm">
+          <node concept="3Tqbb2" id="4sVJFklS3RE" role="3O5elw" />
+        </node>
+        <node concept="3Tm6S6" id="4sVJFklNuez" role="1B3o_S" />
+        <node concept="2ShNRf" id="4sVJFklSyi7" role="33vP2m">
+          <node concept="2Jqq0_" id="4sVJFklSy8R" role="2ShVmc">
+            <node concept="3Tqbb2" id="4sVJFklSy8S" role="HW$YZ" />
+          </node>
+        </node>
+      </node>
+      <node concept="312cEg" id="2$F5QputLbm" role="jymVt">
+        <property role="TrG5h" value="namingContext" />
+        <node concept="3Tm6S6" id="2$F5QputLbn" role="1B3o_S" />
+        <node concept="3uibUv" id="2$F5QputLbp" role="1tU5fm">
+          <ref role="3uigEE" to="nz6g:2$F5QputikM" resolve="NamingContext" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sVJFklM5wx" role="jymVt" />
+    <node concept="2tJIrI" id="4sVJFklM5w$" role="jymVt" />
+  </node>
   <node concept="312cEu" id="ZqZbw4QhmZ">
     <property role="TrG5h" value="ChrHandlerProducer" />
     <node concept="2tJIrI" id="ZqZbw4QhoP" role="jymVt" />
@@ -773,7 +2886,7 @@
                         </node>
                         <node concept="2oxUTD" id="ZqZbw4SOEP" role="2OqNvi">
                           <node concept="3B5_sB" id="ZqZbw4SQFi" role="2oxUTC">
-                            <ref role="3B5MYn" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+                            <ref role="3B5MYn" to="95zw:4U_yxogAknZ" resolve="AtomLogical" />
                           </node>
                         </node>
                       </node>
@@ -1300,7 +3413,7 @@
                 <node concept="3clFbF" id="2ev$9JFIWZ3" role="3cqZAp">
                   <node concept="37vLTI" id="2ev$9JFIWZ5" role="3clFbG">
                     <node concept="3B5_sB" id="2ev$9JFIWW$" role="37vLTx">
-                      <ref role="3B5MYn" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+                      <ref role="3B5MYn" to="95zw:4U_yxogAknZ" resolve="AtomLogical" />
                     </node>
                     <node concept="37vLTw" id="2ev$9JFIWZ9" role="37vLTJ">
                       <ref role="3cqZAo" node="2ev$9JFIWWz" resolve="cls" />
@@ -3868,1863 +5981,1514 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="4sVJFklM5v4">
-    <property role="TrG5h" value="AtomProducer" />
-    <node concept="2tJIrI" id="4sVJFklM5wv" role="jymVt" />
-    <node concept="2tJIrI" id="4sVJFklM9Jn" role="jymVt" />
-    <node concept="2YIFZL" id="4sVJFklTh$z" role="jymVt">
-      <property role="TrG5h" value="produceAtom" />
+  <node concept="312cEu" id="3F6vMxqs4Zn">
+    <property role="TrG5h" value="JchrTracer" />
+    <node concept="2tJIrI" id="3F6vMxqs52P" role="jymVt" />
+    <node concept="3clFbW" id="3F6vMxqt$De" role="jymVt">
+      <node concept="37vLTG" id="3F6vMxqt_H_" role="3clF46">
+        <property role="TrG5h" value="messageViewTracer" />
+        <node concept="3uibUv" id="3F6vMxqtAcD" role="1tU5fm">
+          <ref role="3uigEE" to="t5kh:4i4XGQZlbGA" resolve="MessageViewTracer" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="3F6vMxqt$Dg" role="3clF45" />
+      <node concept="3Tm1VV" id="3F6vMxqt$Dh" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqt$Di" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqtB3_" role="3cqZAp">
+          <node concept="37vLTI" id="3F6vMxqtB3B" role="3clFbG">
+            <node concept="2OqwBi" id="3F6vMxqtDBR" role="37vLTJ">
+              <node concept="Xjq3P" id="3F6vMxqtDVV" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3F6vMxqtDBU" role="2OqNvi">
+                <ref role="2Oxat5" node="3F6vMxqtB3x" resolve="myMessageViewTracer" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="3F6vMxqtB3F" role="37vLTx">
+              <ref role="3cqZAo" node="3F6vMxqt_H_" resolve="messageViewTracer" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqtzg1" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqsax_" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="activated" />
+      <property role="DiZV1" value="false" />
+      <property role="IEkAT" value="false" />
+      <node concept="3Tm1VV" id="3F6vMxqsaxA" role="1B3o_S" />
+      <node concept="3cqZAl" id="3F6vMxqsaxB" role="3clF45" />
+      <node concept="37vLTG" id="3F6vMxqsaxC" role="3clF46">
+        <property role="TrG5h" value="constraint" />
+        <node concept="3uibUv" id="6yEjedmh$UV" role="1tU5fm">
+          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3F6vMxqsaxE" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqsaxF" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxqsaxG" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqs5ih" resolve="displayInfo" />
+            <node concept="Rm8GO" id="3F6vMxqsaxH" role="37wK5m">
+              <ref role="Rm8GQ" to="t5kh:61vfVfp5uey" resolve="ACTIVATED" />
+              <ref role="1Px2BO" to="t5kh:61vfVfp5tJN" resolve="MessageViewTracer.Event" />
+            </node>
+            <node concept="1bVj0M" id="3F6vMxqsaxI" role="37wK5m">
+              <node concept="3clFbS" id="3F6vMxqsaxJ" role="1bW5cS">
+                <node concept="3clFbF" id="3F6vMxqsaxK" role="3cqZAp">
+                  <node concept="1Ls8ON" id="3F6vMxqsaxL" role="3clFbG">
+                    <node concept="Xl_RD" id="3F6vMxqsaxM" role="1Lso8e">
+                      <property role="Xl_RC" value="[+++] &lt;activated&gt; " />
+                    </node>
+                    <node concept="2ShNRf" id="3F6vMxqsaxN" role="1Lso8e">
+                      <node concept="3g6Rrh" id="3F6vMxqsaxO" role="2ShVmc">
+                        <node concept="3uibUv" id="3F6vMxqsaxP" role="3g7fb8">
+                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                        </node>
+                        <node concept="37vLTw" id="3F6vMxqsaxQ" role="3g7hyw">
+                          <ref role="3cqZAo" node="3F6vMxqsaxC" resolve="constraint" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3F6vMxqtiSI" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqsaxR" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqsayb" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="reactivated" />
+      <property role="DiZV1" value="false" />
+      <property role="IEkAT" value="false" />
+      <node concept="3Tm1VV" id="3F6vMxqsayc" role="1B3o_S" />
+      <node concept="3cqZAl" id="3F6vMxqsayd" role="3clF45" />
+      <node concept="37vLTG" id="3F6vMxqsaye" role="3clF46">
+        <property role="TrG5h" value="constraint" />
+        <node concept="3uibUv" id="6yEjedmhx2g" role="1tU5fm">
+          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3F6vMxqsayg" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqsayh" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxqsayi" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqs5ih" resolve="displayInfo" />
+            <node concept="Rm8GO" id="3F6vMxqsayj" role="37wK5m">
+              <ref role="Rm8GQ" to="t5kh:61vfVfp5uls" resolve="REACTIVATED" />
+              <ref role="1Px2BO" to="t5kh:61vfVfp5tJN" resolve="MessageViewTracer.Event" />
+            </node>
+            <node concept="1bVj0M" id="3F6vMxqsayk" role="37wK5m">
+              <node concept="3clFbS" id="3F6vMxqsayl" role="1bW5cS">
+                <node concept="3clFbF" id="3F6vMxqsaym" role="3cqZAp">
+                  <node concept="1Ls8ON" id="3F6vMxqsayn" role="3clFbG">
+                    <node concept="Xl_RD" id="3F6vMxqsayo" role="1Lso8e">
+                      <property role="Xl_RC" value="[###] &lt;re-activated&gt; " />
+                    </node>
+                    <node concept="2ShNRf" id="3F6vMxqsayp" role="1Lso8e">
+                      <node concept="3g6Rrh" id="3F6vMxqsayq" role="2ShVmc">
+                        <node concept="3uibUv" id="3F6vMxqsayr" role="3g7fb8">
+                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                        </node>
+                        <node concept="37vLTw" id="3F6vMxqsays" role="3g7hyw">
+                          <ref role="3cqZAo" node="3F6vMxqsaye" resolve="constraint" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3F6vMxqtn$6" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqsayt" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqsayL" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="stored" />
+      <property role="DiZV1" value="false" />
+      <property role="IEkAT" value="false" />
+      <node concept="3Tm1VV" id="3F6vMxqsayM" role="1B3o_S" />
+      <node concept="3cqZAl" id="3F6vMxqsayN" role="3clF45" />
+      <node concept="37vLTG" id="3F6vMxqsayO" role="3clF46">
+        <property role="TrG5h" value="constraint" />
+        <node concept="3uibUv" id="3F6vMxqsayP" role="1tU5fm">
+          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3F6vMxqsayQ" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqsayR" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxqsayS" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqs5ih" resolve="displayInfo" />
+            <node concept="Rm8GO" id="3F6vMxqsayT" role="37wK5m">
+              <ref role="Rm8GQ" to="t5kh:61vfVfp5usz" resolve="STORED" />
+              <ref role="1Px2BO" to="t5kh:61vfVfp5tJN" resolve="MessageViewTracer.Event" />
+            </node>
+            <node concept="1bVj0M" id="3F6vMxqsayU" role="37wK5m">
+              <node concept="3clFbS" id="3F6vMxqsayV" role="1bW5cS">
+                <node concept="3clFbF" id="3F6vMxqsayW" role="3cqZAp">
+                  <node concept="1Ls8ON" id="3F6vMxqsayX" role="3clFbG">
+                    <node concept="Xl_RD" id="3F6vMxqsayY" role="1Lso8e">
+                      <property role="Xl_RC" value="[~~~] &lt;stored&gt; " />
+                    </node>
+                    <node concept="2ShNRf" id="3F6vMxqsayZ" role="1Lso8e">
+                      <node concept="3g6Rrh" id="3F6vMxqsaz0" role="2ShVmc">
+                        <node concept="3uibUv" id="3F6vMxqsaz1" role="3g7fb8">
+                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                        </node>
+                        <node concept="37vLTw" id="3F6vMxqsaz2" role="3g7hyw">
+                          <ref role="3cqZAo" node="3F6vMxqsayO" resolve="constraint" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3F6vMxqtrYC" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqsaz3" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqsaz4" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="suspended" />
+      <property role="DiZV1" value="false" />
+      <property role="IEkAT" value="false" />
+      <node concept="3Tm1VV" id="3F6vMxqsaz5" role="1B3o_S" />
+      <node concept="3cqZAl" id="3F6vMxqsaz6" role="3clF45" />
+      <node concept="37vLTG" id="3F6vMxqsaz7" role="3clF46">
+        <property role="TrG5h" value="constraint" />
+        <node concept="3uibUv" id="3F6vMxqsaz8" role="1tU5fm">
+          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3F6vMxqsaz9" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqsaza" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxqsazb" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqs5ih" resolve="displayInfo" />
+            <node concept="Rm8GO" id="3F6vMxqsazc" role="37wK5m">
+              <ref role="Rm8GQ" to="t5kh:61vfVfp5uz_" resolve="SUSPENDED" />
+              <ref role="1Px2BO" to="t5kh:61vfVfp5tJN" resolve="MessageViewTracer.Event" />
+            </node>
+            <node concept="1bVj0M" id="3F6vMxqsazd" role="37wK5m">
+              <node concept="3clFbS" id="3F6vMxqsaze" role="1bW5cS">
+                <node concept="3clFbF" id="3F6vMxqsazf" role="3cqZAp">
+                  <node concept="1Ls8ON" id="3F6vMxqsazg" role="3clFbG">
+                    <node concept="Xl_RD" id="3F6vMxqsazh" role="1Lso8e">
+                      <property role="Xl_RC" value="[===] &lt;suspended&gt; " />
+                    </node>
+                    <node concept="2ShNRf" id="3F6vMxqsazi" role="1Lso8e">
+                      <node concept="3g6Rrh" id="3F6vMxqsazj" role="2ShVmc">
+                        <node concept="3uibUv" id="3F6vMxqsazk" role="3g7fb8">
+                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                        </node>
+                        <node concept="37vLTw" id="3F6vMxqsazl" role="3g7hyw">
+                          <ref role="3cqZAo" node="3F6vMxqsaz7" resolve="constraint" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3F6vMxqtt94" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqsazD" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqsazE" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="removed" />
+      <property role="DiZV1" value="false" />
+      <property role="IEkAT" value="false" />
+      <node concept="3Tm1VV" id="3F6vMxqsazF" role="1B3o_S" />
+      <node concept="3cqZAl" id="3F6vMxqsazG" role="3clF45" />
+      <node concept="37vLTG" id="3F6vMxqsazH" role="3clF46">
+        <property role="TrG5h" value="constraint" />
+        <node concept="3uibUv" id="3F6vMxqsazI" role="1tU5fm">
+          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3F6vMxqsazJ" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqsazK" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxqsazL" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqs5ih" resolve="displayInfo" />
+            <node concept="Rm8GO" id="3F6vMxqsazM" role="37wK5m">
+              <ref role="Rm8GQ" to="t5kh:61vfVfp5uEI" resolve="REMOVED" />
+              <ref role="1Px2BO" to="t5kh:61vfVfp5tJN" resolve="MessageViewTracer.Event" />
+            </node>
+            <node concept="1bVj0M" id="3F6vMxqsazN" role="37wK5m">
+              <node concept="3clFbS" id="3F6vMxqsazO" role="1bW5cS">
+                <node concept="3clFbF" id="3F6vMxqsazP" role="3cqZAp">
+                  <node concept="1Ls8ON" id="3F6vMxqsazQ" role="3clFbG">
+                    <node concept="Xl_RD" id="3F6vMxqsazR" role="1Lso8e">
+                      <property role="Xl_RC" value="[^^^] &lt;removed&gt; " />
+                    </node>
+                    <node concept="2ShNRf" id="3F6vMxqsazS" role="1Lso8e">
+                      <node concept="3g6Rrh" id="3F6vMxqsazT" role="2ShVmc">
+                        <node concept="3uibUv" id="3F6vMxqsazU" role="3g7fb8">
+                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                        </node>
+                        <node concept="37vLTw" id="3F6vMxqsazV" role="3g7hyw">
+                          <ref role="3cqZAo" node="3F6vMxqsazH" resolve="constraint" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3F6vMxqtwfs" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqsazW" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqsazX" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="terminated" />
+      <property role="DiZV1" value="false" />
+      <property role="IEkAT" value="false" />
+      <node concept="3Tm1VV" id="3F6vMxqsazY" role="1B3o_S" />
+      <node concept="3cqZAl" id="3F6vMxqsazZ" role="3clF45" />
+      <node concept="37vLTG" id="3F6vMxqsa$0" role="3clF46">
+        <property role="TrG5h" value="constraint" />
+        <node concept="3uibUv" id="3F6vMxqsa$1" role="1tU5fm">
+          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3F6vMxqsa$2" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqsa$3" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxqsa$4" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqs5ih" resolve="displayInfo" />
+            <node concept="Rm8GO" id="3F6vMxqsa$5" role="37wK5m">
+              <ref role="Rm8GQ" to="t5kh:61vfVfp5uLV" resolve="TERMINATED" />
+              <ref role="1Px2BO" to="t5kh:61vfVfp5tJN" resolve="MessageViewTracer.Event" />
+            </node>
+            <node concept="1bVj0M" id="3F6vMxqsa$6" role="37wK5m">
+              <node concept="3clFbS" id="3F6vMxqsa$7" role="1bW5cS">
+                <node concept="3clFbF" id="3F6vMxqsa$8" role="3cqZAp">
+                  <node concept="1Ls8ON" id="3F6vMxqsa$9" role="3clFbG">
+                    <node concept="Xl_RD" id="3F6vMxqsa$a" role="1Lso8e">
+                      <property role="Xl_RC" value="[---] &lt;terminated&gt; " />
+                    </node>
+                    <node concept="2ShNRf" id="3F6vMxqsa$b" role="1Lso8e">
+                      <node concept="3g6Rrh" id="3F6vMxqsa$c" role="2ShVmc">
+                        <node concept="3uibUv" id="3F6vMxqsa$d" role="3g7fb8">
+                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                        </node>
+                        <node concept="37vLTw" id="3F6vMxqsa$e" role="3g7hyw">
+                          <ref role="3cqZAo" node="3F6vMxqsa$0" resolve="constraint" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqsa$y" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqsa$z" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="fires" />
+      <property role="DiZV1" value="false" />
+      <property role="IEkAT" value="false" />
+      <node concept="3Tm1VV" id="3F6vMxqsa$$" role="1B3o_S" />
+      <node concept="3cqZAl" id="3F6vMxqsa$_" role="3clF45" />
+      <node concept="37vLTG" id="3F6vMxqsa$A" role="3clF46">
+        <property role="TrG5h" value="rule" />
+        <node concept="3uibUv" id="3F6vMxqsa$B" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3F6vMxqsa$C" role="3clF46">
+        <property role="TrG5h" value="activeIdx" />
+        <node concept="10Oyi0" id="3F6vMxqsa$D" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3F6vMxqsa$E" role="3clF46">
+        <property role="TrG5h" value="constraints" />
+        <node concept="8X2XB" id="3F6vMxqsa$F" role="1tU5fm">
+          <node concept="3uibUv" id="3F6vMxqsa$G" role="8Xvag">
+            <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="3F6vMxqsa$H" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqteRs" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxqteRq" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqt9Wn" resolve="incLastRuleTriggered" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="3F6vMxqsa$L" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxqsa$M" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqs5ih" resolve="displayInfo" />
+            <node concept="Rm8GO" id="3F6vMxqsa$N" role="37wK5m">
+              <ref role="Rm8GQ" to="t5kh:61vfVfp5uMw" resolve="TRIGGERED" />
+              <ref role="1Px2BO" to="t5kh:61vfVfp5tJN" resolve="MessageViewTracer.Event" />
+            </node>
+            <node concept="1bVj0M" id="3F6vMxqsa$O" role="37wK5m">
+              <node concept="3clFbS" id="3F6vMxqsa$P" role="1bW5cS">
+                <node concept="3clFbF" id="3F6vMxqsa$Q" role="3cqZAp">
+                  <node concept="1Ls8ON" id="3F6vMxqsa$R" role="3clFbG">
+                    <node concept="3cpWs3" id="3F6vMxqsa$S" role="1Lso8e">
+                      <node concept="Xl_RD" id="3F6vMxqsa$T" role="3uHU7w">
+                        <property role="Xl_RC" value=") " />
+                      </node>
+                      <node concept="3cpWs3" id="3F6vMxqsa$U" role="3uHU7B">
+                        <node concept="37vLTw" id="3F6vMxqsa$V" role="3uHU7w">
+                          <ref role="3cqZAo" node="3F6vMxqsa$C" resolve="activeIdx" />
+                        </node>
+                        <node concept="3cpWs3" id="3F6vMxqsa$W" role="3uHU7B">
+                          <node concept="3cpWs3" id="3F6vMxqsa$X" role="3uHU7B">
+                            <node concept="Xl_RD" id="3F6vMxqsa$Y" role="3uHU7B">
+                              <property role="Xl_RC" value="[&gt;&gt;&gt;] &lt;triggered&gt; " />
+                            </node>
+                            <node concept="37vLTw" id="3F6vMxqsa$Z" role="3uHU7w">
+                              <ref role="3cqZAo" node="3F6vMxqsa$A" resolve="rule" />
+                            </node>
+                          </node>
+                          <node concept="Xl_RD" id="3F6vMxqsa_0" role="3uHU7w">
+                            <property role="Xl_RC" value=" (" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2YIFZM" id="3F6vMxqsa_1" role="1Lso8e">
+                      <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
+                      <ref role="37wK5l" to="33ny:~Arrays.copyOf(java.lang.Object[],int):java.lang.Object[]" resolve="copyOf" />
+                      <node concept="37vLTw" id="3F6vMxqsa_2" role="37wK5m">
+                        <ref role="3cqZAo" node="3F6vMxqsa$E" resolve="constraints" />
+                      </node>
+                      <node concept="2OqwBi" id="3F6vMxqsa_3" role="37wK5m">
+                        <node concept="37vLTw" id="3F6vMxqsa_4" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3F6vMxqsa$E" resolve="constraints" />
+                        </node>
+                        <node concept="1Rwk04" id="3F6vMxqsa_5" role="2OqNvi" />
+                      </node>
+                      <node concept="3uibUv" id="3F6vMxqsa_6" role="3PaCim">
+                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqs52R" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqsdd_" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="fired" />
+      <property role="DiZV1" value="false" />
+      <property role="IEkAT" value="false" />
+      <node concept="3Tm1VV" id="3F6vMxqsddA" role="1B3o_S" />
+      <node concept="3cqZAl" id="3F6vMxqsddB" role="3clF45" />
+      <node concept="37vLTG" id="3F6vMxqsddC" role="3clF46">
+        <property role="TrG5h" value="rule" />
+        <node concept="3uibUv" id="3F6vMxqsddD" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3F6vMxqsddE" role="3clF46">
+        <property role="TrG5h" value="activeIdx" />
+        <node concept="10Oyi0" id="3F6vMxqsddF" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3F6vMxqsddG" role="3clF46">
+        <property role="TrG5h" value="constraints" />
+        <node concept="8X2XB" id="3F6vMxqsddH" role="1tU5fm">
+          <node concept="3uibUv" id="3F6vMxqsddI" role="8Xvag">
+            <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="3F6vMxqsddJ" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqsddK" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxqsddL" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqs5ih" resolve="displayInfo" />
+            <node concept="Rm8GO" id="3F6vMxqsddM" role="37wK5m">
+              <ref role="Rm8GQ" to="t5kh:61vfVfp5uU4" resolve="FIRED" />
+              <ref role="1Px2BO" to="t5kh:61vfVfp5tJN" resolve="MessageViewTracer.Event" />
+            </node>
+            <node concept="1bVj0M" id="3F6vMxqsddN" role="37wK5m">
+              <node concept="3clFbS" id="3F6vMxqsddO" role="1bW5cS">
+                <node concept="3clFbF" id="3F6vMxqsddP" role="3cqZAp">
+                  <node concept="1Ls8ON" id="3F6vMxqsddQ" role="3clFbG">
+                    <node concept="3cpWs3" id="3F6vMxqsddR" role="1Lso8e">
+                      <node concept="Xl_RD" id="3F6vMxqsddS" role="3uHU7w">
+                        <property role="Xl_RC" value=" " />
+                      </node>
+                      <node concept="3cpWs3" id="3F6vMxqsddT" role="3uHU7B">
+                        <node concept="37vLTw" id="3F6vMxqsddU" role="3uHU7w">
+                          <ref role="3cqZAo" node="3F6vMxqsddE" resolve="activeIdx" />
+                        </node>
+                        <node concept="3cpWs3" id="3F6vMxqsddV" role="3uHU7B">
+                          <node concept="3cpWs3" id="3F6vMxqsddW" role="3uHU7B">
+                            <node concept="Xl_RD" id="3F6vMxqsddX" role="3uHU7B">
+                              <property role="Xl_RC" value="[&lt;&lt;&lt;] &lt;exited&gt; " />
+                            </node>
+                            <node concept="37vLTw" id="3F6vMxqsddY" role="3uHU7w">
+                              <ref role="3cqZAo" node="3F6vMxqsddC" resolve="rule" />
+                            </node>
+                          </node>
+                          <node concept="Xl_RD" id="3F6vMxqsddZ" role="3uHU7w">
+                            <property role="Xl_RC" value="#" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2YIFZM" id="3F6vMxqsde0" role="1Lso8e">
+                      <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
+                      <ref role="37wK5l" to="33ny:~Arrays.copyOf(java.lang.Object[],int):java.lang.Object[]" resolve="copyOf" />
+                      <node concept="37vLTw" id="3F6vMxqsde1" role="37wK5m">
+                        <ref role="3cqZAo" node="3F6vMxqsddG" resolve="constraints" />
+                      </node>
+                      <node concept="2OqwBi" id="3F6vMxqsde2" role="37wK5m">
+                        <node concept="37vLTw" id="3F6vMxqsde3" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3F6vMxqsddG" resolve="constraints" />
+                        </node>
+                        <node concept="1Rwk04" id="3F6vMxqsde4" role="2OqNvi" />
+                      </node>
+                      <node concept="3uibUv" id="3F6vMxqsde5" role="3PaCim">
+                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3F6vMxqthwo" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxqthwm" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqt9Wv" resolve="decLastRuleTriggered" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqsawq" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqt9Wn" role="jymVt">
+      <property role="TrG5h" value="incLastRuleTriggered" />
+      <node concept="3cqZAl" id="3F6vMxqt9Wo" role="3clF45" />
+      <node concept="3Tm1VV" id="3F6vMxqt9Wp" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqt9Wq" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqtF3T" role="3cqZAp">
+          <node concept="2OqwBi" id="3F6vMxqtFGp" role="3clFbG">
+            <node concept="37vLTw" id="3F6vMxqtF3S" role="2Oq$k0">
+              <ref role="3cqZAo" node="3F6vMxqtB3x" resolve="myMessageViewTracer" />
+            </node>
+            <node concept="liA8E" id="3F6vMxqtGnA" role="2OqNvi">
+              <ref role="37wK5l" to="t5kh:3F6vMxqsvUz" resolve="incLastRuleTriggered" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqt9Wu" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqt9Wv" role="jymVt">
+      <property role="TrG5h" value="decLastRuleTriggered" />
+      <node concept="3cqZAl" id="3F6vMxqt9Ww" role="3clF45" />
+      <node concept="3Tm1VV" id="3F6vMxqt9Wx" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqt9Wy" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqtH7I" role="3cqZAp">
+          <node concept="2OqwBi" id="3F6vMxqtH7J" role="3clFbG">
+            <node concept="37vLTw" id="3F6vMxqtH7K" role="2Oq$k0">
+              <ref role="3cqZAo" node="3F6vMxqtB3x" resolve="myMessageViewTracer" />
+            </node>
+            <node concept="liA8E" id="3F6vMxqtH7L" role="2OqNvi">
+              <ref role="37wK5l" to="t5kh:3F6vMxqsUIG" resolve="decLastRuleTriggered" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqsawG" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqs5ih" role="jymVt">
+      <property role="TrG5h" value="displayInfo" />
+      <node concept="37vLTG" id="3F6vMxqs5AF" role="3clF46">
+        <property role="TrG5h" value="evt" />
+        <node concept="3uibUv" id="3F6vMxqs5AG" role="1tU5fm">
+          <ref role="3uigEE" to="t5kh:61vfVfp5tJN" resolve="MessageViewTracer.Event" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3F6vMxqs5AH" role="3clF46">
+        <property role="TrG5h" value="msg" />
+        <node concept="1ajhzC" id="3F6vMxqs5AI" role="1tU5fm">
+          <node concept="1LlUBW" id="3F6vMxqs5AJ" role="1ajl9A">
+            <node concept="17QB3L" id="3F6vMxqs5AK" role="1Lm7xW" />
+            <node concept="10Q1$e" id="3F6vMxqs5AL" role="1Lm7xW">
+              <node concept="3uibUv" id="3F6vMxqs5AM" role="10Q1$1">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="3F6vMxqs5ij" role="3clF45" />
+      <node concept="3Tm1VV" id="3F6vMxqs5ik" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqs5il" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqtJMj" role="3cqZAp">
+          <node concept="2OqwBi" id="3F6vMxqtKr3" role="3clFbG">
+            <node concept="37vLTw" id="3F6vMxqtJMi" role="2Oq$k0">
+              <ref role="3cqZAo" node="3F6vMxqtB3x" resolve="myMessageViewTracer" />
+            </node>
+            <node concept="liA8E" id="3F6vMxqtMMM" role="2OqNvi">
+              <ref role="37wK5l" to="t5kh:7dgRGU4oSTZ" resolve="displayMessage" />
+              <node concept="37vLTw" id="3F6vMxqtNQm" role="37wK5m">
+                <ref role="3cqZAo" node="3F6vMxqs5AF" resolve="evt" />
+              </node>
+              <node concept="Rm8GO" id="3F6vMxqtNQn" role="37wK5m">
+                <ref role="Rm8GQ" to="et5u:~MessageKind.INFORMATION" resolve="INFORMATION" />
+                <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+              </node>
+              <node concept="1bVj0M" id="3F6vMxqxvRq" role="37wK5m">
+                <node concept="3clFbS" id="3F6vMxqxvRs" role="1bW5cS">
+                  <node concept="3cpWs8" id="3F6vMxqxxZQ" role="3cqZAp">
+                    <node concept="3cpWsn" id="3F6vMxqxxZR" role="3cpWs9">
+                      <property role="TrG5h" value="pair" />
+                      <node concept="1LlUBW" id="3F6vMxqxxZE" role="1tU5fm">
+                        <node concept="17QB3L" id="3F6vMxqxxZP" role="1Lm7xW" />
+                        <node concept="10Q1$e" id="3F6vMxqxxZN" role="1Lm7xW">
+                          <node concept="3uibUv" id="3F6vMxqxxZO" role="10Q1$1">
+                            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2Sg_IR" id="3F6vMxqxxZS" role="33vP2m">
+                        <node concept="37vLTw" id="3F6vMxqxxZT" role="2SgG2M">
+                          <ref role="3cqZAo" node="3F6vMxqs5AH" resolve="msg" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="3F6vMxqxGpP" role="3cqZAp">
+                    <node concept="1Ls8ON" id="3F6vMxqxGpN" role="3clFbG">
+                      <node concept="1LFfDK" id="3F6vMxqxHIh" role="1Lso8e">
+                        <node concept="3cmrfG" id="3F6vMxqxIc5" role="1LF_Uc">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="37vLTw" id="3F6vMxqxH0z" role="1LFl5Q">
+                          <ref role="3cqZAo" node="3F6vMxqxxZR" resolve="pair" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="3F6vMxqxJtG" role="1Lso8e">
+                        <node concept="2OqwBi" id="3F6vMxqxIMc" role="2Oq$k0">
+                          <node concept="2OqwBi" id="3F6vMxqxIMd" role="2Oq$k0">
+                            <node concept="1LFfDK" id="3F6vMxqxIMe" role="2Oq$k0">
+                              <node concept="3cmrfG" id="3F6vMxqxIMf" role="1LF_Uc">
+                                <property role="3cmrfH" value="1" />
+                              </node>
+                              <node concept="37vLTw" id="3F6vMxqxIMg" role="1LFl5Q">
+                                <ref role="3cqZAo" node="3F6vMxqxxZR" resolve="pair" />
+                              </node>
+                            </node>
+                            <node concept="39bAoz" id="3F6vMxqxIMh" role="2OqNvi" />
+                          </node>
+                          <node concept="3$u5V9" id="3F6vMxqxIMi" role="2OqNvi">
+                            <node concept="1bVj0M" id="3F6vMxqxIMj" role="23t8la">
+                              <node concept="3clFbS" id="3F6vMxqxIMk" role="1bW5cS">
+                                <node concept="3clFbF" id="3F6vMxqxIMl" role="3cqZAp">
+                                  <node concept="1rXfSq" id="3F6vMxqxIMm" role="3clFbG">
+                                    <ref role="37wK5l" node="3F6vMxqxA84" resolve="debug" />
+                                    <node concept="37vLTw" id="3F6vMxqxIMn" role="37wK5m">
+                                      <ref role="3cqZAo" node="3F6vMxqxIMo" resolve="a" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Rh6nW" id="3F6vMxqxIMo" role="1bW2Oz">
+                                <property role="TrG5h" value="a" />
+                                <node concept="2jxLKc" id="3F6vMxqxIMp" role="1tU5fm" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3_kTaI" id="3F6vMxqxKfW" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqx_Z_" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqxA84" role="jymVt">
+      <property role="TrG5h" value="debug" />
+      <node concept="37vLTG" id="3F6vMxqxA85" role="3clF46">
+        <property role="TrG5h" value="o" />
+        <node concept="3uibUv" id="3F6vMxqxA86" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="3F6vMxqyxl3" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+      </node>
+      <node concept="3Tm6S6" id="3F6vMxqxA88" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqxA89" role="3clF47">
+        <node concept="3clFbJ" id="3F6vMxqxA8a" role="3cqZAp">
+          <node concept="3clFbS" id="3F6vMxqxA8b" role="3clFbx">
+            <node concept="3cpWs6" id="3F6vMxqxA8c" role="3cqZAp">
+              <node concept="2OqwBi" id="3F6vMxqxA8d" role="3cqZAk">
+                <node concept="1eOMI4" id="3F6vMxqxA8e" role="2Oq$k0">
+                  <node concept="10QFUN" id="3F6vMxqxA8f" role="1eOMHV">
+                    <node concept="3uibUv" id="3F6vMxqxA8g" role="10QFUM">
+                      <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
+                    </node>
+                    <node concept="37vLTw" id="3F6vMxqxA8h" role="10QFUP">
+                      <ref role="3cqZAo" node="3F6vMxqxA85" resolve="o" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="3F6vMxqxA8i" role="2OqNvi">
+                  <ref role="37wK5l" to="eifs:~Constraint.toDebugString():java.lang.String" resolve="toDebugString" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="3F6vMxqxA8j" role="3cqZAp" />
+          </node>
+          <node concept="2ZW3vV" id="3F6vMxqxA8k" role="3clFbw">
+            <node concept="3uibUv" id="3F6vMxqxA8l" role="2ZW6by">
+              <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
+            </node>
+            <node concept="37vLTw" id="3F6vMxqxA8m" role="2ZW6bz">
+              <ref role="3cqZAo" node="3F6vMxqxA85" resolve="o" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="3F6vMxqxA8w" role="9aQIa">
+            <node concept="3clFbS" id="3F6vMxqxA8x" role="9aQI4">
+              <node concept="3cpWs6" id="3F6vMxqxA8y" role="3cqZAp">
+                <node concept="2YIFZM" id="3F6vMxqxA8z" role="3cqZAk">
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                  <node concept="37vLTw" id="3F6vMxqxA8$" role="37wK5m">
+                    <ref role="3cqZAo" node="3F6vMxqxA85" resolve="o" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqxA3O" role="jymVt" />
+    <node concept="2tJIrI" id="3F6vMxqs6Gj" role="jymVt" />
+    <node concept="3Tm1VV" id="3F6vMxqs4Zo" role="1B3o_S" />
+    <node concept="3uibUv" id="6yEjedmhzso" role="EKbjA">
+      <ref role="3uigEE" to="iawt:~Tracer" resolve="Tracer" />
+    </node>
+    <node concept="312cEg" id="3F6vMxqtB3x" role="jymVt">
+      <property role="TrG5h" value="myMessageViewTracer" />
+      <node concept="3Tm6S6" id="3F6vMxqtB3y" role="1B3o_S" />
+      <node concept="3uibUv" id="3F6vMxqtB3$" role="1tU5fm">
+        <ref role="3uigEE" to="t5kh:4i4XGQZlbGA" resolve="MessageViewTracer" />
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="3F6vMxqcGYg">
+    <property role="TrG5h" value="JchrTypecheckingHelper" />
+    <node concept="2tJIrI" id="3F6vMxqcHSH" role="jymVt" />
+    <node concept="3clFbW" id="3F6vMxqcI8I" role="jymVt">
+      <node concept="37vLTG" id="3F6vMxqcI9q" role="3clF46">
+        <property role="TrG5h" value="mpsProject" />
+        <node concept="3uibUv" id="3F6vMxqcIrX" role="1tU5fm">
+          <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3F6vMxqcIvP" role="3clF46">
+        <property role="TrG5h" value="doneCallback" />
+        <node concept="3uibUv" id="3F6vMxqcIMs" role="1tU5fm">
+          <ref role="3uigEE" to="t5kh:3F6vMxqaxpm" resolve="TypecheckingHelper.DoneCallback" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="3F6vMxqcI8K" role="3clF45" />
+      <node concept="3Tm1VV" id="3F6vMxqcI8L" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqcI8M" role="3clF47">
+        <node concept="XkiVB" id="3F6vMxqcJ9b" role="3cqZAp">
+          <ref role="37wK5l" to="t5kh:1pPth$lK1ZL" resolve="TypecheckingHelper" />
+          <node concept="37vLTw" id="3F6vMxqcJx7" role="37wK5m">
+            <ref role="3cqZAo" node="3F6vMxqcI9q" resolve="mpsProject" />
+          </node>
+          <node concept="37vLTw" id="3F6vMxqcJTd" role="37wK5m">
+            <ref role="3cqZAo" node="3F6vMxqcIvP" resolve="doneCallback" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqcHSM" role="jymVt" />
+    <node concept="3clFb_" id="1pPth$lBwLp" role="jymVt">
+      <property role="TrG5h" value="produceHandler" />
       <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="4sVJFklM9TS" role="3clF47">
-        <node concept="3clFbH" id="4sVJFklMlSA" role="3cqZAp" />
-        <node concept="3clFbF" id="4sVJFklMnGP" role="3cqZAp">
-          <node concept="2OqwBi" id="4sVJFklSnn$" role="3clFbG">
-            <node concept="2ShNRf" id="4sVJFklMnGN" role="2Oq$k0">
-              <node concept="1pGfFk" id="4sVJFklMonE" role="2ShVmc">
-                <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
-                <node concept="2ShNRf" id="4sVJFklMqNI" role="37wK5m">
-                  <node concept="1pGfFk" id="4sVJFklSvMk" role="2ShVmc">
-                    <ref role="37wK5l" node="4sVJFklSuPv" resolve="AtomProducer.Walker" />
-                    <node concept="37vLTw" id="4sVJFklSR6l" role="37wK5m">
-                      <ref role="3cqZAo" node="4sVJFklMatE" resolve="atomNode" />
-                    </node>
-                    <node concept="37vLTw" id="2$F5QpuuL_k" role="37wK5m">
-                      <ref role="3cqZAo" node="2$F5QputKOD" resolve="namingContext" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="4sVJFklSs1w" role="2OqNvi">
-              <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
-              <node concept="37vLTw" id="4sVJFklSs3T" role="37wK5m">
-                <ref role="3cqZAo" node="5s497VqXKRl" resolve="atom" />
+      <node concept="37vLTG" id="6OUp3PsVw9C" role="3clF46">
+        <property role="TrG5h" value="include" />
+        <node concept="10P_77" id="6OUp3PsVxC2" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="1pPth$lBwLq" role="3clF47">
+        <node concept="3clFbF" id="1pPth$lBwLr" role="3cqZAp">
+          <node concept="2ShNRf" id="1pPth$lBwLs" role="3clFbG">
+            <node concept="1pGfFk" id="6OUp3PsVzI7" role="2ShVmc">
+              <ref role="37wK5l" node="6OUp3PsVz2A" resolve="JchrTypecheckingHelper.ProduceHandler" />
+              <node concept="37vLTw" id="6OUp3PsV$EB" role="37wK5m">
+                <ref role="3cqZAo" node="6OUp3PsVw9C" resolve="include" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="4sVJFklN_7g" role="3cqZAp" />
       </node>
-      <node concept="37vLTG" id="4sVJFklMatE" role="3clF46">
-        <property role="TrG5h" value="atomNode" />
-        <node concept="3Tqbb2" id="4sVJFklMdJa" role="1tU5fm">
-          <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
-        </node>
+      <node concept="3uibUv" id="1pPth$lBwLu" role="3clF45">
+        <ref role="3uigEE" to="t5kh:1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
       </node>
-      <node concept="37vLTG" id="5s497VqXKRl" role="3clF46">
-        <property role="TrG5h" value="atom" />
-        <node concept="3uibUv" id="5s497VqXKRk" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2$F5QputKOD" role="3clF46">
-        <property role="TrG5h" value="namingContext" />
-        <node concept="3uibUv" id="2$F5QputKSI" role="1tU5fm">
-          <ref role="3uigEE" to="nz6g:2$F5QputikM" resolve="NamingContext" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="4sVJFklM9TQ" role="3clF45" />
-      <node concept="3Tm1VV" id="4sVJFklM9TR" role="1B3o_S" />
+      <node concept="3Tm1VV" id="1pPth$lBwLv" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="4sVJFklMowO" role="jymVt" />
-    <node concept="2tJIrI" id="4sVJFklMoyp" role="jymVt" />
-    <node concept="312cEu" id="4sVJFklMoJb" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="Walker" />
-      <node concept="2tJIrI" id="4sVJFklMpRo" role="jymVt" />
-      <node concept="3clFbW" id="4sVJFklSuPv" role="jymVt">
-        <node concept="37vLTG" id="4sVJFklSvYG" role="3clF46">
-          <property role="TrG5h" value="atomNode" />
-          <node concept="3Tqbb2" id="4sVJFklSw9L" role="1tU5fm">
-            <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="2$F5QputL05" role="3clF46">
-          <property role="TrG5h" value="namingContext" />
-          <node concept="3uibUv" id="2$F5QputL6t" role="1tU5fm">
-            <ref role="3uigEE" to="nz6g:2$F5QputikM" resolve="NamingContext" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="4sVJFklSuPx" role="3clF45" />
-        <node concept="3Tm6S6" id="4sVJFklSuPy" role="1B3o_S" />
-        <node concept="3clFbS" id="4sVJFklSuPz" role="3clF47">
-          <node concept="3clFbF" id="4sVJFklSze6" role="3cqZAp">
-            <node concept="2OqwBi" id="4sVJFklSzAN" role="3clFbG">
-              <node concept="37vLTw" id="4sVJFklSze5" role="2Oq$k0">
-                <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-              </node>
-              <node concept="2ArzE6" id="4sVJFklS$L2" role="2OqNvi">
-                <node concept="37vLTw" id="4sVJFklS$VS" role="25WWJ7">
-                  <ref role="3cqZAo" node="4sVJFklSvYG" resolve="atomNode" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="2$F5QputLbq" role="3cqZAp">
-            <node concept="37vLTI" id="2$F5QputLbs" role="3clFbG">
-              <node concept="2OqwBi" id="2$F5QputLbw" role="37vLTJ">
-                <node concept="Xjq3P" id="2$F5QputLbz" role="2Oq$k0" />
-                <node concept="2OwXpG" id="2$F5QputLbv" role="2OqNvi">
-                  <ref role="2Oxat5" node="2$F5QputLbm" resolve="namingContext" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="2$F5QputLb$" role="37vLTx">
-                <ref role="3cqZAo" node="2$F5QputL05" resolve="namingContext" />
+    <node concept="2tJIrI" id="3F6vMxqcJU2" role="jymVt" />
+    <node concept="3clFb_" id="1pPth$lD9_s" role="jymVt">
+      <property role="TrG5h" value="makeHandler" />
+      <property role="IEkAT" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="37vLTG" id="6OUp3PsV$Ok" role="3clF46">
+        <property role="TrG5h" value="include" />
+        <node concept="10P_77" id="6OUp3PsVAHA" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="1pPth$lD9_t" role="3clF47">
+        <node concept="3clFbF" id="1pPth$lD9_u" role="3cqZAp">
+          <node concept="2ShNRf" id="1pPth$lD9_v" role="3clFbG">
+            <node concept="1pGfFk" id="6OUp3PsVCub" role="2ShVmc">
+              <ref role="37wK5l" node="6OUp3PsVBJU" resolve="JchrTypecheckingHelper.MakeHandler" />
+              <node concept="37vLTw" id="6OUp3PsVDGw" role="37wK5m">
+                <ref role="3cqZAo" node="6OUp3PsV$Ok" resolve="include" />
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="2tJIrI" id="4sVJFklStNu" role="jymVt" />
-      <node concept="3Tm6S6" id="4sVJFklMoWf" role="1B3o_S" />
-      <node concept="3uibUv" id="4sVJFklMp_t" role="EKbjA">
-        <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+      <node concept="3uibUv" id="1pPth$lD9_x" role="3clF45">
+        <ref role="3uigEE" to="t5kh:1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
       </node>
-      <node concept="3clFb_" id="4sVJFklM5Pn" role="jymVt">
+      <node concept="3Tm1VV" id="1pPth$lD9_y" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqcKvX" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqcJVn" role="jymVt">
+      <property role="TrG5h" value="runTypechecking" />
+      <property role="IEkAT" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="37vLTG" id="3F6vMxqcJVo" role="3clF46">
+        <property role="TrG5h" value="nodes" />
+        <node concept="2I9FWS" id="3F6vMxqcJVp" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3F6vMxqcJVs" role="3clF46">
+        <property role="TrG5h" value="showTrace" />
+        <node concept="10P_77" id="3F6vMxqcJVt" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="3F6vMxqcJV_" role="3clF45">
+        <ref role="3uigEE" to="t5kh:1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
+      </node>
+      <node concept="3Tm1VV" id="3F6vMxqcJVA" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqcJVB" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqjNaP" role="3cqZAp">
+          <node concept="2ShNRf" id="3F6vMxqjNaN" role="3clFbG">
+            <node concept="1pGfFk" id="3F6vMxqjOcm" role="2ShVmc">
+              <ref role="37wK5l" node="3F6vMxqjKkj" resolve="JchrTypecheckingHelper.RunTypecheckingWithJchr" />
+              <node concept="37vLTw" id="3F6vMxqjOzz" role="37wK5m">
+                <ref role="3cqZAo" node="3F6vMxqcJVo" resolve="nodes" />
+              </node>
+              <node concept="37vLTw" id="3F6vMxqjPC1" role="37wK5m">
+                <ref role="3cqZAo" node="3F6vMxqcJVs" resolve="showTrace" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3F6vMxqcJVC" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqcKvs" role="jymVt" />
+    <node concept="3Tm1VV" id="3F6vMxqcGYh" role="1B3o_S" />
+    <node concept="3uibUv" id="3F6vMxqcHrz" role="1zkMxy">
+      <ref role="3uigEE" to="t5kh:1pPth$l_TFV" resolve="TypecheckingHelper" />
+    </node>
+    <node concept="312cEu" id="1pPth$lB0Q2" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="ProduceHandler" />
+      <node concept="3clFbW" id="6OUp3PsVz2A" role="jymVt">
+        <node concept="3cqZAl" id="6OUp3PsVz2C" role="3clF45" />
+        <node concept="3Tm6S6" id="6OUp3PsVz2D" role="1B3o_S" />
+        <node concept="3clFbS" id="6OUp3PsVz2E" role="3clF47">
+          <node concept="3clFbF" id="6OUp3PsVzZA" role="3cqZAp">
+            <node concept="37vLTI" id="6OUp3PsVzZC" role="3clFbG">
+              <node concept="2OqwBi" id="6OUp3PsVzZG" role="37vLTJ">
+                <node concept="Xjq3P" id="6OUp3PsVzZJ" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6OUp3PsVzZF" role="2OqNvi">
+                  <ref role="2Oxat5" node="6OUp3PsVzZy" resolve="include" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="6OUp3PsWasS" role="37vLTx">
+                <ref role="3cqZAo" node="6OUp3PsVzTO" resolve="include" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6OUp3PsVzTO" role="3clF46">
+          <property role="TrG5h" value="include" />
+          <node concept="10P_77" id="6OUp3PsVzTN" role="1tU5fm" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="1pPth$lMJaQ" role="jymVt">
+        <property role="TrG5h" value="info" />
         <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="walkTerms" />
-        <node concept="3uibUv" id="4sVJFklM5Po" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
-        </node>
-        <node concept="3Tm1VV" id="4sVJFklM5Pp" role="1B3o_S" />
-        <node concept="37vLTG" id="4sVJFklM5Pr" role="3clF46">
-          <property role="TrG5h" value="cb" />
-          <node concept="3uibUv" id="4sVJFklM5Ps" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="4sVJFklM5P_" role="3clF47">
-          <node concept="3SKdUt" id="104EUzG8PQq" role="3cqZAp">
-            <node concept="3SKdUq" id="104EUzG8Qp5" role="3SKWNk">
-              <property role="3SKdUp" value="TODO: extract &quot;node&quot; constant" />
+        <node concept="17QB3L" id="1pPth$lMJaR" role="3clF45" />
+        <node concept="3Tmbuc" id="1pPth$lMJaS" role="1B3o_S" />
+        <node concept="3clFbS" id="1pPth$lMJaU" role="3clF47">
+          <node concept="3clFbF" id="1pPth$lMK0U" role="3cqZAp">
+            <node concept="Xl_RD" id="1pPth$lMK0T" role="3clFbG">
+              <property role="Xl_RC" value="producing rules handler" />
             </node>
           </node>
-          <node concept="3clFbJ" id="4sVJFklQkXP" role="3cqZAp">
-            <node concept="3clFbS" id="4sVJFklQkXS" role="3clFbx">
-              <node concept="3cpWs8" id="4sVJFklS_pj" role="3cqZAp">
-                <node concept="3cpWsn" id="4sVJFklS_pk" role="3cpWs9">
-                  <property role="TrG5h" value="parentNode" />
-                  <node concept="3Tqbb2" id="4sVJFklS_pi" role="1tU5fm" />
-                  <node concept="2OqwBi" id="4sVJFklS_pl" role="33vP2m">
-                    <node concept="37vLTw" id="4sVJFklS_pm" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                    </node>
-                    <node concept="2oR75g" id="4sVJFklS_pn" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="4sVJFklQOaL" role="3cqZAp">
-                <node concept="3cpWsn" id="4sVJFklQOaM" role="3cpWs9">
-                  <property role="TrG5h" value="nodeNode" />
-                  <node concept="3Tqbb2" id="4sVJFklQOaH" role="1tU5fm">
-                    <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="4sVJFklSPl2" role="3cqZAp" />
-              <node concept="3clFbJ" id="4sVJFklSA2Y" role="3cqZAp">
-                <node concept="3clFbS" id="4sVJFklSA31" role="3clFbx">
-                  <node concept="3cpWs8" id="4sVJFklNxrF" role="3cqZAp">
-                    <node concept="3cpWsn" id="4sVJFklNxrG" role="3cpWs9">
-                      <property role="TrG5h" value="parentRoleNode" />
-                      <node concept="3Tqbb2" id="4sVJFklNxrA" role="1tU5fm">
-                        <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                      </node>
-                      <node concept="1PxgMI" id="4sVJFklQ_Yp" role="33vP2m">
-                        <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                        <node concept="37vLTw" id="4sVJFklS_po" role="1m5AlR">
-                          <ref role="3cqZAo" node="4sVJFklS_pk" resolve="parentNode" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbF" id="4sVJFklSECy" role="3cqZAp">
-                    <node concept="37vLTI" id="4sVJFklSEC$" role="3clFbG">
-                      <node concept="2OqwBi" id="4sVJFklQOaN" role="37vLTx">
-                        <node concept="2OqwBi" id="4sVJFklQOaO" role="2Oq$k0">
-                          <node concept="37vLTw" id="4sVJFklQOaP" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4sVJFklNxrG" resolve="parentRoleNode" />
-                          </node>
-                          <node concept="3Tsc0h" id="4sVJFklQOaQ" role="2OqNvi">
-                            <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                          </node>
-                        </node>
-                        <node concept="2DeJg1" id="4sVJFklQOaR" role="2OqNvi">
-                          <ref role="1A0vxQ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="4sVJFklSECC" role="37vLTJ">
-                        <ref role="3cqZAo" node="4sVJFklQOaM" resolve="nodeNode" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="4sVJFklSCbE" role="3cqZAp" />
-                </node>
-                <node concept="2OqwBi" id="4sVJFklSAnp" role="3clFbw">
-                  <node concept="37vLTw" id="4sVJFklSAlo" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sVJFklS_pk" resolve="parentNode" />
-                  </node>
-                  <node concept="1mIQ4w" id="4sVJFklSAu_" role="2OqNvi">
-                    <node concept="chp4Y" id="4sVJFklSAva" role="cj9EA">
-                      <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="9aQIb" id="4sVJFklSLY2" role="9aQIa">
-                  <node concept="3clFbS" id="4sVJFklSLY3" role="9aQI4">
-                    <node concept="3cpWs8" id="4sVJFklSBpE" role="3cqZAp">
-                      <node concept="3cpWsn" id="4sVJFklSBpF" role="3cpWs9">
-                        <property role="TrG5h" value="atom" />
-                        <node concept="3Tqbb2" id="4sVJFklSBpC" role="1tU5fm">
-                          <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
-                        </node>
-                        <node concept="1PxgMI" id="4sVJFklSBpG" role="33vP2m">
-                          <ref role="1m5ApE" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
-                          <node concept="37vLTw" id="4sVJFklSBpH" role="1m5AlR">
-                            <ref role="3cqZAo" node="4sVJFklS_pk" resolve="parentNode" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="4sVJFklSBgS" role="3cqZAp">
-                      <node concept="37vLTI" id="4sVJFklSNRI" role="3clFbG">
-                        <node concept="37vLTw" id="4sVJFklSNV0" role="37vLTJ">
-                          <ref role="3cqZAo" node="4sVJFklQOaM" resolve="nodeNode" />
-                        </node>
-                        <node concept="2OqwBi" id="4sVJFklSNmp" role="37vLTx">
-                          <node concept="2OqwBi" id="4sVJFklSMQq" role="2Oq$k0">
-                            <node concept="37vLTw" id="4sVJFklSBpI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4sVJFklSBpF" resolve="atom" />
-                            </node>
-                            <node concept="3TrEf2" id="4sVJFklSNaf" role="2OqNvi">
-                              <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
-                            </node>
-                          </node>
-                          <node concept="2DeJnY" id="4sVJFklSNB$" role="2OqNvi">
-                            <ref role="1A9B2P" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3eNFk2" id="6infEALvsUH" role="3eNLev">
-                  <node concept="2OqwBi" id="6infEALvsZy" role="3eO9$A">
-                    <node concept="37vLTw" id="6infEALvsXJ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4sVJFklS_pk" resolve="parentNode" />
-                    </node>
-                    <node concept="1mIQ4w" id="6infEALvtck" role="2OqNvi">
-                      <node concept="chp4Y" id="6infEALvtcD" role="cj9EA">
-                        <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="6infEALvsUJ" role="3eOfB_">
-                    <node concept="3cpWs8" id="6infEALvtnG" role="3cqZAp">
-                      <node concept="3cpWsn" id="6infEALvtnH" role="3cpWs9">
-                        <property role="TrG5h" value="listNode" />
-                        <node concept="3Tqbb2" id="6infEALvtnE" role="1tU5fm">
-                          <ref role="ehGHo" to="5j4j:1OShD0HAY6y" resolve="List" />
-                        </node>
-                        <node concept="1PxgMI" id="6infEALvtnI" role="33vP2m">
-                          <ref role="1m5ApE" to="5j4j:1OShD0HAY6y" resolve="List" />
-                          <node concept="37vLTw" id="6infEALvtnJ" role="1m5AlR">
-                            <ref role="3cqZAo" node="4sVJFklS_pk" resolve="parentNode" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="6infEALvtgH" role="3cqZAp">
-                      <node concept="37vLTI" id="6infEALvxAB" role="3clFbG">
-                        <node concept="37vLTw" id="6infEALv_6j" role="37vLTJ">
-                          <ref role="3cqZAo" node="4sVJFklQOaM" resolve="nodeNode" />
-                        </node>
-                        <node concept="2OqwBi" id="6infEALvum5" role="37vLTx">
-                          <node concept="2OqwBi" id="6infEALvtrz" role="2Oq$k0">
-                            <node concept="37vLTw" id="6infEALvtnK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6infEALvtnH" resolve="listNode" />
-                            </node>
-                            <node concept="3Tsc0h" id="6infEALvtJy" role="2OqNvi">
-                              <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
-                            </node>
-                          </node>
-                          <node concept="2DeJg1" id="6infEALvxsz" role="2OqNvi">
-                            <ref role="1A0vxQ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="6infEALvtdU" role="3cqZAp" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="4sVJFklSCcq" role="3cqZAp">
-                <node concept="2OqwBi" id="4sVJFklSCcr" role="3clFbG">
-                  <node concept="37vLTw" id="4sVJFklSCcs" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                  </node>
-                  <node concept="2ArzE6" id="4sVJFklSCct" role="2OqNvi">
-                    <node concept="37vLTw" id="4sVJFklSEhv" role="25WWJ7">
-                      <ref role="3cqZAo" node="4sVJFklQOaM" resolve="nodeNode" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="4sVJFklQXal" role="3cqZAp" />
-            </node>
-            <node concept="2OqwBi" id="4sVJFklQmJS" role="3clFbw">
-              <node concept="Xl_RD" id="4sVJFklQl$v" role="2Oq$k0">
-                <property role="Xl_RC" value="node" />
-              </node>
-              <node concept="liA8E" id="4sVJFklQo5x" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
-                <node concept="2OqwBi" id="4sVJFklQoox" role="37wK5m">
-                  <node concept="37vLTw" id="4sVJFklQodY" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
-                  </node>
-                  <node concept="liA8E" id="4sVJFklQpn_" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
-                  </node>
-                </node>
+        </node>
+      </node>
+      <node concept="3clFb_" id="1pPth$lB26u" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="37vLTG" id="1pPth$lEaxh" role="3clF46">
+          <property role="TrG5h" value="prev" />
+          <node concept="3uibUv" id="1pPth$lEbiS" role="1tU5fm">
+            <ref role="3uigEE" to="t5kh:1pPth$lAwc0" resolve="TypecheckingHelper.CollectRules" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="1pPth$lB26x" role="3clF45" />
+        <node concept="3Tm1VV" id="1pPth$lB26y" role="1B3o_S" />
+        <node concept="3clFbS" id="1pPth$lB26$" role="3clF47">
+          <node concept="3clFbH" id="1pPth$lCaeF" role="3cqZAp" />
+          <node concept="3cpWs8" id="1pPth$l_Zgt" role="3cqZAp">
+            <node concept="3cpWsn" id="1pPth$l_Zgu" role="3cpWs9">
+              <property role="TrG5h" value="errors" />
+              <node concept="10Oyi0" id="1pPth$l_Zgv" role="1tU5fm" />
+              <node concept="3cmrfG" id="1pPth$l_Zgw" role="33vP2m">
+                <property role="3cmrfH" value="0" />
               </node>
             </node>
-            <node concept="3eNFk2" id="67ux3ajzAG1" role="3eNLev">
-              <node concept="3clFbS" id="67ux3ajzAG3" role="3eOfB_">
-                <node concept="3clFbH" id="67ux3aj$7Pt" role="3cqZAp" />
-                <node concept="3cpWs8" id="6BU$YTNEWii" role="3cqZAp">
-                  <node concept="3cpWsn" id="6BU$YTNEWij" role="3cpWs9">
-                    <property role="TrG5h" value="parentNode" />
-                    <node concept="3Tqbb2" id="6BU$YTNEWik" role="1tU5fm" />
-                    <node concept="2OqwBi" id="6BU$YTNEWil" role="33vP2m">
-                      <node concept="37vLTw" id="6BU$YTNEWim" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                      </node>
-                      <node concept="2oR75g" id="6BU$YTNEWin" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="6BU$YTNEWio" role="3cqZAp">
-                  <node concept="3cpWsn" id="6BU$YTNEWip" role="3cpWs9">
-                    <property role="TrG5h" value="listRole" />
-                    <node concept="3Tqbb2" id="6BU$YTNEWiq" role="1tU5fm">
-                      <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="6BU$YTNEWir" role="3cqZAp" />
-                <node concept="3SKdUt" id="6BU$YTNGfVC" role="3cqZAp">
-                  <node concept="3SKdUq" id="6BU$YTNGg4r" role="3SKWNk">
-                    <property role="3SKdUp" value="FIXME: too many hacks" />
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="6BU$YTNEWis" role="3cqZAp">
-                  <node concept="3clFbS" id="6BU$YTNEWit" role="3clFbx">
-                    <node concept="3cpWs8" id="6BU$YTNEWiu" role="3cqZAp">
-                      <node concept="3cpWsn" id="6BU$YTNEWiv" role="3cpWs9">
-                        <property role="TrG5h" value="parentListNode" />
-                        <node concept="3Tqbb2" id="6BU$YTNEWiw" role="1tU5fm">
-                          <ref role="ehGHo" to="5j4j:1OShD0HAY6y" resolve="List" />
-                        </node>
-                        <node concept="1PxgMI" id="6BU$YTNEWix" role="33vP2m">
-                          <ref role="1m5ApE" to="5j4j:1OShD0HAY6y" resolve="List" />
-                          <node concept="37vLTw" id="6BU$YTNEWiy" role="1m5AlR">
-                            <ref role="3cqZAo" node="6BU$YTNEWij" resolve="parentNode" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="6BU$YTNEWiz" role="3cqZAp">
-                      <node concept="37vLTI" id="6BU$YTNEWi$" role="3clFbG">
-                        <node concept="2OqwBi" id="6BU$YTNEWi_" role="37vLTx">
-                          <node concept="2OqwBi" id="6BU$YTNEWiA" role="2Oq$k0">
-                            <node concept="37vLTw" id="6BU$YTNEWiB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6BU$YTNEWiv" resolve="parentListNode" />
-                            </node>
-                            <node concept="3Tsc0h" id="6infEALvagK" role="2OqNvi">
-                              <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
-                            </node>
-                          </node>
-                          <node concept="2DeJg1" id="6BU$YTNEWiD" role="2OqNvi">
-                            <ref role="1A0vxQ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="6BU$YTNEWiE" role="37vLTJ">
-                          <ref role="3cqZAo" node="6BU$YTNEWip" resolve="listRole" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="6BU$YTNF874" role="3cqZAp">
-                      <node concept="37vLTI" id="6BU$YTNF93A" role="3clFbG">
-                        <node concept="Xl_RD" id="6BU$YTNF94O" role="37vLTx">
-                          <property role="Xl_RC" value="list" />
-                        </node>
-                        <node concept="2OqwBi" id="6BU$YTNF8c0" role="37vLTJ">
-                          <node concept="37vLTw" id="6BU$YTNF872" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6BU$YTNEWip" resolve="listRole" />
-                          </node>
-                          <node concept="3TrcHB" id="6BU$YTNF8BV" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="6infEALvaRe" role="3cqZAp" />
-                  </node>
-                  <node concept="2OqwBi" id="6BU$YTNEWiG" role="3clFbw">
-                    <node concept="37vLTw" id="6BU$YTNEWiH" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6BU$YTNEWij" resolve="parentNode" />
-                    </node>
-                    <node concept="1mIQ4w" id="6BU$YTNEWiI" role="2OqNvi">
-                      <node concept="chp4Y" id="6infEALuX1i" role="cj9EA">
-                        <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="9aQIb" id="6BU$YTNEWiK" role="9aQIa">
-                    <node concept="3clFbS" id="6BU$YTNEWiL" role="9aQI4">
-                      <node concept="3cpWs8" id="6BU$YTNEWiM" role="3cqZAp">
-                        <node concept="3cpWsn" id="6BU$YTNEWiN" role="3cpWs9">
-                          <property role="TrG5h" value="atom" />
-                          <node concept="3Tqbb2" id="6BU$YTNEWiO" role="1tU5fm">
-                            <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
-                          </node>
-                          <node concept="1PxgMI" id="6BU$YTNEWiP" role="33vP2m">
-                            <ref role="1m5ApE" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
-                            <node concept="37vLTw" id="6BU$YTNEWiQ" role="1m5AlR">
-                              <ref role="3cqZAo" node="6BU$YTNEWij" resolve="parentNode" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="6BU$YTNEWiR" role="3cqZAp">
-                        <node concept="37vLTI" id="6BU$YTNEWiS" role="3clFbG">
-                          <node concept="37vLTw" id="6BU$YTNEWiT" role="37vLTJ">
-                            <ref role="3cqZAo" node="6BU$YTNEWip" resolve="listRole" />
-                          </node>
-                          <node concept="2OqwBi" id="6BU$YTNEWiU" role="37vLTx">
-                            <node concept="2OqwBi" id="6BU$YTNEWiV" role="2Oq$k0">
-                              <node concept="37vLTw" id="6BU$YTNEWiW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6BU$YTNEWiN" resolve="atom" />
-                              </node>
-                              <node concept="3TrEf2" id="6BU$YTNEWiX" role="2OqNvi">
-                                <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
+          </node>
+          <node concept="1QHqEO" id="1pPth$l_Zgx" role="3cqZAp">
+            <node concept="1QHqEC" id="1pPth$l_Zgy" role="1QHqEI">
+              <node concept="3clFbS" id="1pPth$l_Zgz" role="1bW5cS">
+                <node concept="SfApY" id="1pPth$l_ZgB" role="3cqZAp">
+                  <node concept="3clFbS" id="1pPth$l_ZgC" role="SfCbr">
+                    <node concept="1_o_46" id="2UGjFq4P9ov" role="3cqZAp">
+                      <node concept="3clFbS" id="2UGjFq4P9ox" role="2LFqv$">
+                        <node concept="3clFbJ" id="6OUp3PsVHo4" role="3cqZAp">
+                          <node concept="3clFbS" id="6OUp3PsVHo6" role="3clFbx">
+                            <node concept="3clFbF" id="pIEwD9IsyX" role="3cqZAp">
+                              <node concept="2OqwBi" id="pIEwD9IsyY" role="3clFbG">
+                                <node concept="2ShNRf" id="pIEwD9IsyZ" role="2Oq$k0">
+                                  <node concept="1pGfFk" id="pIEwD9Isz0" role="2ShVmc">
+                                    <ref role="37wK5l" node="ZqZbw4Qjv7" resolve="ChrHandlerProducer" />
+                                    <node concept="3M$PaV" id="2UGjFq4PbSr" role="37wK5m">
+                                      <ref role="3M$S_o" node="2UGjFq4P9oB" resolve="program" />
+                                    </node>
+                                    <node concept="2ShNRf" id="3F6vMxqmPL4" role="37wK5m">
+                                      <node concept="1pGfFk" id="3F6vMxqmPL5" role="2ShVmc">
+                                        <ref role="37wK5l" to="95zw:6MYr6Jwp7cE" resolve="JchrSessionSolver" />
+                                        <node concept="3M$PaV" id="3F6vMxqmQzt" role="37wK5m">
+                                          <ref role="3M$S_o" node="2UGjFq4P9qu" resolve="expressionSolver" />
+                                        </node>
+                                        <node concept="2YIFZM" id="3F6vMxqmPL7" role="37wK5m">
+                                          <ref role="1Pybhc" to="eifs:~ConstraintSystem" resolve="ConstraintSystem" />
+                                          <ref role="37wK5l" to="eifs:~ConstraintSystem.get():runtime.ConstraintSystem" resolve="get" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="pIEwD9Isz1" role="2OqNvi">
+                                  <ref role="37wK5l" node="ZqZbw4Qjwa" resolve="produce" />
+                                  <node concept="2OqwBi" id="pIEwD9Isz2" role="37wK5m">
+                                    <node concept="Xjq3P" id="pIEwD9Isz3" role="2Oq$k0">
+                                      <ref role="1HBi2w" node="3F6vMxqcGYg" resolve="JchrTypecheckingHelper" />
+                                    </node>
+                                    <node concept="liA8E" id="pIEwD9Isz4" role="2OqNvi">
+                                      <ref role="37wK5l" to="t5kh:1pPth$lA589" resolve="rulesModel" />
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
-                            <node concept="2DeJnY" id="6BU$YTNEWiY" role="2OqNvi">
-                              <ref role="1A9B2P" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                            </node>
+                          </node>
+                          <node concept="37vLTw" id="6OUp3PsVHJS" role="3clFbw">
+                            <ref role="3cqZAo" node="6OUp3PsVzZy" resolve="include" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbF" id="6BU$YTNF9IS" role="3cqZAp">
-                        <node concept="37vLTI" id="6BU$YTNF9IT" role="3clFbG">
-                          <node concept="Xl_RD" id="6BU$YTNF9IU" role="37vLTx">
-                            <property role="Xl_RC" value="list" />
+                      <node concept="1_o_bx" id="2UGjFq4P9oz" role="1_o_by">
+                        <node concept="2OqwBi" id="2UGjFq4Pa$1" role="1_o_bz">
+                          <node concept="37vLTw" id="2UGjFq4PahD" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1pPth$lEaxh" resolve="prev" />
                           </node>
-                          <node concept="2OqwBi" id="6BU$YTNF9IV" role="37vLTJ">
-                            <node concept="37vLTw" id="6BU$YTNF9IW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6BU$YTNEWip" resolve="listRole" />
-                            </node>
-                            <node concept="3TrcHB" id="6BU$YTNF9IX" role="2OqNvi">
-                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                            </node>
+                          <node concept="2OwXpG" id="2UGjFq4PaGl" role="2OqNvi">
+                            <ref role="2Oxat5" to="t5kh:1pPth$lE8Xs" resolve="programs" />
+                          </node>
+                        </node>
+                        <node concept="1_o_bG" id="2UGjFq4P9oB" role="1_o_aQ">
+                          <property role="TrG5h" value="program" />
+                        </node>
+                      </node>
+                      <node concept="1_o_bx" id="2UGjFq4P9qs" role="1_o_by">
+                        <node concept="2OqwBi" id="2UGjFq4Pbnu" role="1_o_bz">
+                          <node concept="37vLTw" id="2UGjFq4Pb56" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1pPth$lEaxh" resolve="prev" />
+                          </node>
+                          <node concept="2OwXpG" id="3F6vMxqmNn2" role="2OqNvi">
+                            <ref role="2Oxat5" to="t5kh:3F6vMxqlTiX" resolve="expressionSolvers" />
+                          </node>
+                        </node>
+                        <node concept="1_o_bG" id="2UGjFq4P9qu" role="1_o_aQ">
+                          <property role="TrG5h" value="expressionSolver" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="TDmWw" id="1pPth$l_ZgL" role="TEbGg">
+                    <node concept="3cpWsn" id="1pPth$l_ZgM" role="TDEfY">
+                      <property role="TrG5h" value="ex" />
+                      <node concept="3uibUv" id="1pPth$l_ZgN" role="1tU5fm">
+                        <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+                      </node>
+                    </node>
+                    <node concept="3clFbS" id="1pPth$l_ZgO" role="TDEfX">
+                      <node concept="34ab3g" id="1pPth$l_ZgP" role="3cqZAp">
+                        <property role="35gtTG" value="error" />
+                        <property role="34fQS0" value="true" />
+                        <node concept="Xl_RD" id="1pPth$l_ZgQ" role="34bqiv">
+                          <property role="Xl_RC" value="exception during rules generating" />
+                        </node>
+                        <node concept="37vLTw" id="1pPth$l_ZgR" role="34bMjA">
+                          <ref role="3cqZAo" node="1pPth$l_ZgM" resolve="ex" />
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="1pPth$l_ZgS" role="3cqZAp">
+                        <node concept="d57v9" id="1pPth$l_ZgT" role="3clFbG">
+                          <node concept="3cmrfG" id="1pPth$l_ZgU" role="37vLTx">
+                            <property role="3cmrfH" value="1" />
+                          </node>
+                          <node concept="37vLTw" id="1pPth$l_ZgV" role="37vLTJ">
+                            <ref role="3cqZAo" node="1pPth$l_Zgu" resolve="errors" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbH" id="6BU$YTNF9HC" role="3cqZAp" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="6BU$YTNEWiZ" role="3cqZAp">
-                  <node concept="2OqwBi" id="6BU$YTNEWj0" role="3clFbG">
-                    <node concept="37vLTw" id="6BU$YTNEWj1" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                    </node>
-                    <node concept="2ArzE6" id="6BU$YTNEWj2" role="2OqNvi">
-                      <node concept="37vLTw" id="6BU$YTNEWj3" role="25WWJ7">
-                        <ref role="3cqZAo" node="6BU$YTNEWip" resolve="listRole" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="6BU$YTNEWf3" role="3cqZAp" />
-              </node>
-              <node concept="2OqwBi" id="67ux3aj$6yd" role="3eO9$A">
-                <node concept="Xl_RD" id="67ux3aj$6ye" role="2Oq$k0">
-                  <property role="Xl_RC" value="list" />
-                </node>
-                <node concept="liA8E" id="67ux3aj$6yf" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
-                  <node concept="2OqwBi" id="67ux3aj$6yg" role="37wK5m">
-                    <node concept="37vLTw" id="67ux3aj$6yh" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
-                    </node>
-                    <node concept="liA8E" id="67ux3aj$6yi" role="2OqNvi">
-                      <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3eNFk2" id="3t7_2FgQA5E" role="3eNLev">
-              <node concept="3clFbS" id="3t7_2FgQA5F" role="3eOfB_">
-                <node concept="3cpWs8" id="3t7_2FgQA5Y" role="3cqZAp">
-                  <node concept="3cpWsn" id="3t7_2FgQA5Z" role="3cpWs9">
-                    <property role="TrG5h" value="parentNode" />
-                    <node concept="3Tqbb2" id="3t7_2FgQA60" role="1tU5fm">
-                      <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+            <node concept="2OqwBi" id="1pPth$l_Zh0" role="ukAjM">
+              <node concept="2OqwBi" id="1pPth$l_Zh1" role="2Oq$k0">
+                <node concept="Xjq3P" id="1pPth$l_Zgj" role="2Oq$k0">
+                  <ref role="1HBi2w" node="3F6vMxqcGYg" resolve="JchrTypecheckingHelper" />
+                </node>
+                <node concept="2OwXpG" id="1pPth$lA8Tj" role="2OqNvi">
+                  <ref role="2Oxat5" to="t5kh:1pPth$lA2Na" resolve="mpsProject" />
+                </node>
+              </node>
+              <node concept="liA8E" id="1pPth$l_Zh3" role="2OqNvi">
+                <ref role="37wK5l" to="z1c4:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="1pPth$l_Zh4" role="3cqZAp" />
+          <node concept="3clFbF" id="7dgRGU4Nv9m" role="3cqZAp">
+            <node concept="1rXfSq" id="7dgRGU4Nv9k" role="3clFbG">
+              <ref role="37wK5l" to="t5kh:7dgRGU4Nmfr" resolve="done" />
+              <node concept="3clFbC" id="7dgRGU4NzTI" role="37wK5m">
+                <node concept="37vLTw" id="7dgRGU4NvqZ" role="3uHU7B">
+                  <ref role="3cqZAo" node="1pPth$l_Zgu" resolve="errors" />
+                </node>
+                <node concept="3cmrfG" id="7dgRGU4NweX" role="3uHU7w">
+                  <property role="3cmrfH" value="0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6X5F0NghV_l" role="jymVt" />
+      <node concept="3Tmbuc" id="3F6vMxqcOwW" role="1B3o_S" />
+      <node concept="3uibUv" id="1pPth$lB20z" role="1zkMxy">
+        <ref role="3uigEE" to="t5kh:1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
+        <node concept="3uibUv" id="1pPth$lE9Yx" role="11_B2D">
+          <ref role="3uigEE" to="t5kh:1pPth$lAwc0" resolve="TypecheckingHelper.CollectRules" />
+        </node>
+      </node>
+      <node concept="312cEg" id="6OUp3PsVzZy" role="jymVt">
+        <property role="TrG5h" value="include" />
+        <node concept="3Tm6S6" id="6OUp3PsVzZz" role="1B3o_S" />
+        <node concept="10P_77" id="6OUp3PsVzZ_" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqdBuv" role="jymVt" />
+    <node concept="312cEu" id="1pPth$lBDcr" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="MakeHandler" />
+      <node concept="3clFbW" id="6OUp3PsVBJU" role="jymVt">
+        <node concept="3cqZAl" id="6OUp3PsVBJW" role="3clF45" />
+        <node concept="3Tm6S6" id="6OUp3PsVBJX" role="1B3o_S" />
+        <node concept="3clFbS" id="6OUp3PsVBJY" role="3clF47">
+          <node concept="3clFbF" id="6OUp3PsVCUm" role="3cqZAp">
+            <node concept="37vLTI" id="6OUp3PsVCUo" role="3clFbG">
+              <node concept="2OqwBi" id="6OUp3PsVCUs" role="37vLTJ">
+                <node concept="Xjq3P" id="6OUp3PsVCUv" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6OUp3PsVCUr" role="2OqNvi">
+                  <ref role="2Oxat5" node="6OUp3PsVCUi" resolve="include" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="6OUp3PsVCUw" role="37vLTx">
+                <ref role="3cqZAo" node="6OUp3PsVCNx" resolve="include" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6OUp3PsVCNx" role="3clF46">
+          <property role="TrG5h" value="include" />
+          <node concept="10P_77" id="6OUp3PsVCNw" role="1tU5fm" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="1pPth$lMMWH" role="jymVt">
+        <property role="TrG5h" value="info" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="17QB3L" id="1pPth$lMMWI" role="3clF45" />
+        <node concept="3Tmbuc" id="1pPth$lMMWJ" role="1B3o_S" />
+        <node concept="3clFbS" id="1pPth$lMMWL" role="3clF47">
+          <node concept="3clFbF" id="1pPth$lMOpY" role="3cqZAp">
+            <node concept="Xl_RD" id="1pPth$lMOpX" role="3clFbG">
+              <property role="Xl_RC" value="making rules handler" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFb_" id="1pPth$lBEhE" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="37vLTG" id="1pPth$lEuZa" role="3clF46">
+          <property role="TrG5h" value="prev" />
+          <node concept="3uibUv" id="1pPth$lEx0N" role="1tU5fm">
+            <ref role="3uigEE" node="1pPth$lB0Q2" resolve="JchrTypecheckingHelper.ProduceHandler" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="1pPth$lBEhH" role="3clF45" />
+        <node concept="3Tm1VV" id="1pPth$lBEhI" role="1B3o_S" />
+        <node concept="3clFbS" id="1pPth$lBEhK" role="3clF47">
+          <node concept="3clFbH" id="6X5F0NghVwe" role="3cqZAp" />
+          <node concept="3clFbJ" id="1pPth$l_ZhV" role="3cqZAp">
+            <node concept="1Wc70l" id="63dufnFESNo" role="3clFbw">
+              <node concept="37vLTw" id="6OUp3PsVLim" role="3uHU7B">
+                <ref role="3cqZAo" node="6OUp3PsVCUi" resolve="include" />
+              </node>
+              <node concept="3fqX7Q" id="1pPth$l_Zia" role="3uHU7w">
+                <node concept="2YIFZM" id="1pPth$l_Zib" role="3fr31v">
+                  <ref role="37wK5l" to="t5kh:7RDCjSXjQEP" resolve="make" />
+                  <ref role="1Pybhc" to="t5kh:7RDCjSXgvZa" resolve="MakeCollectedRules" />
+                  <node concept="2OqwBi" id="1pPth$l_Zic" role="37wK5m">
+                    <node concept="Xjq3P" id="1pPth$l_ZhL" role="2Oq$k0">
+                      <ref role="1HBi2w" node="3F6vMxqcGYg" resolve="JchrTypecheckingHelper" />
                     </node>
-                    <node concept="1PxgMI" id="3t7_2FgQA61" role="33vP2m">
-                      <ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                      <node concept="2OqwBi" id="3t7_2FgQA62" role="1m5AlR">
-                        <node concept="37vLTw" id="3t7_2FgQA63" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+                    <node concept="liA8E" id="1pPth$lA8aE" role="2OqNvi">
+                      <ref role="37wK5l" to="t5kh:1pPth$lA589" resolve="rulesModel" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="1pPth$l_Zie" role="37wK5m">
+                    <node concept="Xjq3P" id="1pPth$l_ZhM" role="2Oq$k0">
+                      <ref role="1HBi2w" node="3F6vMxqcGYg" resolve="JchrTypecheckingHelper" />
+                    </node>
+                    <node concept="2OwXpG" id="1pPth$lA81x" role="2OqNvi">
+                      <ref role="2Oxat5" to="t5kh:1pPth$lA2Na" resolve="mpsProject" />
+                    </node>
+                  </node>
+                  <node concept="1bVj0M" id="1pPth$l_Zig" role="37wK5m">
+                    <node concept="3clFbS" id="1pPth$l_Zih" role="1bW5cS">
+                      <node concept="3clFbF" id="7dgRGU4Nj9E" role="3cqZAp">
+                        <node concept="1rXfSq" id="7dgRGU4Nj9C" role="3clFbG">
+                          <ref role="37wK5l" to="t5kh:7dgRGU4Nmfr" resolve="done" />
+                          <node concept="2OqwBi" id="7dgRGU4Nkqq" role="37wK5m">
+                            <node concept="37vLTw" id="7dgRGU4Nkqr" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1pPth$l_ZiX" resolve="res" />
+                            </node>
+                            <node concept="liA8E" id="7dgRGU4Nkqs" role="2OqNvi">
+                              <ref role="37wK5l" to="i9so:17I1R__cQ6v" resolve="isSucessful" />
+                            </node>
+                          </node>
                         </node>
-                        <node concept="2oR75g" id="3t7_2FgQA64" role="2OqNvi" />
+                      </node>
+                      <node concept="3SKdUt" id="6OUp3PsYWZc" role="3cqZAp">
+                        <node concept="3SKdUq" id="6OUp3PsYWZe" role="3SKWNk">
+                          <property role="3SKdUp" value="done() is called in a continuation" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTG" id="1pPth$l_ZiX" role="1bW2Oz">
+                      <property role="TrG5h" value="res" />
+                      <node concept="3uibUv" id="1pPth$l_ZiY" role="1tU5fm">
+                        <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="3t7_2FgQA65" role="3cqZAp" />
-                <node concept="3cpWs8" id="3t7_2FgQA66" role="3cqZAp">
-                  <node concept="3cpWsn" id="3t7_2FgQA67" role="3cpWs9">
-                    <property role="TrG5h" value="roleNode" />
-                    <node concept="3Tqbb2" id="3t7_2FgQA68" role="1tU5fm">
-                      <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                    </node>
-                    <node concept="2OqwBi" id="3t7_2FgQA69" role="33vP2m">
-                      <node concept="2OqwBi" id="3t7_2FgQA6a" role="2Oq$k0">
-                        <node concept="37vLTw" id="3t7_2FgQA6b" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3t7_2FgQA5Z" resolve="parentNode" />
-                        </node>
-                        <node concept="3Tsc0h" id="3t7_2FgQA6c" role="2OqNvi">
-                          <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-                        </node>
-                      </node>
-                      <node concept="2DeJg1" id="3t7_2FgQA6d" role="2OqNvi">
-                        <ref role="1A0vxQ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                      </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="1pPth$l_ZhW" role="3clFbx">
+              <node concept="3clFbF" id="1N_0WA5KFO4" role="3cqZAp">
+                <node concept="1rXfSq" id="1N_0WA5KFO2" role="3clFbG">
+                  <ref role="37wK5l" to="t5kh:7dgRGU4Nmfr" resolve="done" />
+                  <node concept="3clFbT" id="1N_0WA5KG4v" role="37wK5m">
+                    <property role="3clFbU" value="false" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="1N_0WA5KG4S" role="3cqZAp" />
+            </node>
+            <node concept="3eNFk2" id="6OUp3PsYXIj" role="3eNLev">
+              <node concept="3clFbS" id="6OUp3PsYXIk" role="3eOfB_">
+                <node concept="3clFbF" id="6OUp3PsYXIl" role="3cqZAp">
+                  <node concept="1rXfSq" id="6OUp3PsYXIm" role="3clFbG">
+                    <ref role="37wK5l" to="t5kh:7dgRGU4Nmfr" resolve="done" />
+                    <node concept="3clFbT" id="6OUp3PsYXIn" role="37wK5m">
+                      <property role="3clFbU" value="true" />
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbF" id="3t7_2FgQA6e" role="3cqZAp">
-                  <node concept="37vLTI" id="3t7_2FgQA6f" role="3clFbG">
-                    <node concept="2OqwBi" id="3t7_2FgQA6g" role="37vLTJ">
-                      <node concept="37vLTw" id="3t7_2FgQA6h" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3t7_2FgQA67" resolve="roleNode" />
+              </node>
+              <node concept="3fqX7Q" id="6OUp3PsYY4r" role="3eO9$A">
+                <node concept="37vLTw" id="6OUp3PsYYfe" role="3fr31v">
+                  <ref role="3cqZAo" node="6OUp3PsVCUi" resolve="include" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="65McoJv1q7E" role="3cqZAp" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6X5F0NghI3j" role="jymVt" />
+      <node concept="3Tmbuc" id="3F6vMxqcPat" role="1B3o_S" />
+      <node concept="3uibUv" id="1pPth$lBEfy" role="1zkMxy">
+        <ref role="3uigEE" to="t5kh:1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
+        <node concept="3uibUv" id="1pPth$lErhx" role="11_B2D">
+          <ref role="3uigEE" node="1pPth$lB0Q2" resolve="JchrTypecheckingHelper.ProduceHandler" />
+        </node>
+      </node>
+      <node concept="312cEg" id="6OUp3PsVCUi" role="jymVt">
+        <property role="TrG5h" value="include" />
+        <node concept="3Tm6S6" id="6OUp3PsVCUj" role="1B3o_S" />
+        <node concept="10P_77" id="6OUp3PsVCUl" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqjFWB" role="jymVt" />
+    <node concept="312cEu" id="3F6vMxqjGYr" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="RunTypecheckingWithJchr" />
+      <node concept="2tJIrI" id="3F6vMxqjJUb" role="jymVt" />
+      <node concept="3clFbW" id="3F6vMxqjKkj" role="jymVt">
+        <node concept="37vLTG" id="3F6vMxqjKpA" role="3clF46">
+          <property role="TrG5h" value="nodes" />
+          <node concept="2I9FWS" id="3F6vMxqjKpB" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="3F6vMxqjKpE" role="3clF46">
+          <property role="TrG5h" value="showTrace" />
+          <node concept="10P_77" id="3F6vMxqjKpF" role="1tU5fm" />
+        </node>
+        <node concept="3cqZAl" id="3F6vMxqjKkl" role="3clF45" />
+        <node concept="3Tmbuc" id="3F6vMxqjKkm" role="1B3o_S" />
+        <node concept="3clFbS" id="3F6vMxqjKkn" role="3clF47">
+          <node concept="XkiVB" id="3F6vMxqjKXA" role="3cqZAp">
+            <ref role="37wK5l" to="t5kh:1pPth$lHpLU" resolve="TypecheckingHelper.RunTypechecking" />
+            <node concept="37vLTw" id="3F6vMxqjLru" role="37wK5m">
+              <ref role="3cqZAo" node="3F6vMxqjKpA" resolve="nodes" />
+            </node>
+            <node concept="37vLTw" id="3F6vMxqjMMU" role="37wK5m">
+              <ref role="3cqZAo" node="3F6vMxqjKpE" resolve="showTrace" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3F6vMxqjPIm" role="jymVt" />
+      <node concept="3clFb_" id="3F6vMxqjPRB" role="jymVt">
+        <property role="TrG5h" value="deinitSession" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="3Tmbuc" id="3F6vMxqjPRC" role="1B3o_S" />
+        <node concept="3cqZAl" id="3F6vMxqjPRD" role="3clF45" />
+        <node concept="3clFbS" id="3F6vMxqjPRQ" role="3clF47">
+          <node concept="3clFbF" id="3F6vMxqk9Je" role="3cqZAp">
+            <node concept="2YIFZM" id="3F6vMxqk9Jf" role="3clFbG">
+              <ref role="1Pybhc" to="stgg:7ISVfSIedQ" resolve="JchrEvaluationSession" />
+              <ref role="37wK5l" to="stgg:5jPBdKCn3Z" resolve="deinit" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3F6vMxqjPRR" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3F6vMxqjR5s" role="jymVt" />
+      <node concept="3clFb_" id="3F6vMxqjPRU" role="jymVt">
+        <property role="TrG5h" value="initSession" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="3Tmbuc" id="3F6vMxqjPRV" role="1B3o_S" />
+        <node concept="3cqZAl" id="3F6vMxqjPRW" role="3clF45" />
+        <node concept="3clFbS" id="3F6vMxqjPSa" role="3clF47">
+          <node concept="3clFbF" id="3F6vMxqk5d1" role="3cqZAp">
+            <node concept="2YIFZM" id="3F6vMxqk5d2" role="3clFbG">
+              <ref role="37wK5l" to="stgg:7ISVfSIf0j" resolve="init" />
+              <ref role="1Pybhc" to="stgg:7ISVfSIedQ" resolve="JchrEvaluationSession" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3F6vMxqjPSb" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3F6vMxqjRxd" role="jymVt" />
+      <node concept="3clFb_" id="3F6vMxqmXm9" role="jymVt">
+        <property role="TrG5h" value="createSessionSolver" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="37vLTG" id="3F6vMxqmXma" role="3clF46">
+          <property role="TrG5h" value="expressionSolver" />
+          <node concept="3uibUv" id="3F6vMxqmXmb" role="1tU5fm">
+            <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="3F6vMxqmXmc" role="3clF45">
+          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        </node>
+        <node concept="3Tmbuc" id="3F6vMxqmXmd" role="1B3o_S" />
+        <node concept="3clFbS" id="3F6vMxqmXmk" role="3clF47">
+          <node concept="3clFbF" id="3F6vMxqmYX$" role="3cqZAp">
+            <node concept="2ShNRf" id="3F6vMxqmYX_" role="3clFbG">
+              <node concept="1pGfFk" id="3F6vMxqmYXA" role="2ShVmc">
+                <ref role="37wK5l" to="95zw:6MYr6Jwp7cE" resolve="JchrSessionSolver" />
+                <node concept="37vLTw" id="3F6vMxqmYXB" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqmXma" resolve="expressionSolver" />
+                </node>
+                <node concept="2YIFZM" id="3F6vMxqmYXC" role="37wK5m">
+                  <ref role="37wK5l" to="eifs:~ConstraintSystem.get():runtime.ConstraintSystem" resolve="get" />
+                  <ref role="1Pybhc" to="eifs:~ConstraintSystem" resolve="ConstraintSystem" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3F6vMxqmXml" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3F6vMxqmYfb" role="jymVt" />
+      <node concept="3clFb_" id="3F6vMxqjPSe" role="jymVt">
+        <property role="TrG5h" value="createConfig" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="3Tmbuc" id="3F6vMxqjPSf" role="1B3o_S" />
+        <node concept="3uibUv" id="3F6vMxqjPSg" role="3clF45">
+          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+        </node>
+        <node concept="37vLTG" id="3F6vMxqjPSh" role="3clF46">
+          <property role="TrG5h" value="program" />
+          <node concept="3uibUv" id="3F6vMxqjPSi" role="1tU5fm">
+            <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="3F6vMxqjPSj" role="3clF46">
+          <property role="TrG5h" value="rulesModel" />
+          <node concept="H_c77" id="3F6vMxqjPSk" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="3F6vMxqjPSl" role="3clF46">
+          <property role="TrG5h" value="containingRoot" />
+          <node concept="3uibUv" id="3F6vMxqjPSm" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="3F6vMxqjPSZ" role="3clF47">
+          <node concept="3cpWs8" id="3F6vMxqjRXu" role="3cqZAp">
+            <node concept="3cpWsn" id="3F6vMxqjRXv" role="3cpWs9">
+              <property role="TrG5h" value="config" />
+              <node concept="3uibUv" id="3F6vMxqjRXq" role="1tU5fm">
+                <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+              </node>
+              <node concept="3nyPlj" id="3F6vMxqjRXw" role="33vP2m">
+                <ref role="37wK5l" to="t5kh:3F6vMxqjkf6" resolve="createConfig" />
+                <node concept="37vLTw" id="3F6vMxqjRXx" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqjPSh" resolve="program" />
+                </node>
+                <node concept="37vLTw" id="3F6vMxqjRXy" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqjPSj" resolve="rulesModel" />
+                </node>
+                <node concept="37vLTw" id="3F6vMxqjRXz" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqjPSl" resolve="containingRoot" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="3F6vMxqjPT5" role="3cqZAp">
+            <node concept="2OqwBi" id="3F6vMxqvxYI" role="3clFbG">
+              <node concept="2OqwBi" id="3F6vMxqjSJ2" role="2Oq$k0">
+                <node concept="37vLTw" id="3F6vMxqjRX$" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3F6vMxqjRXv" resolve="config" />
+                </node>
+                <node concept="liA8E" id="3F6vMxqjSQ_" role="2OqNvi">
+                  <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
+                  <node concept="Xl_RD" id="3F6vMxqjSQA" role="37wK5m">
+                    <property role="Xl_RC" value="jchr.handler.class" />
+                  </node>
+                  <node concept="1rXfSq" id="3F6vMxqjSQB" role="37wK5m">
+                    <ref role="37wK5l" node="3F6vMxqeykH" resolve="findHandlerClass" />
+                    <node concept="2OqwBi" id="3F6vMxqjSQC" role="37wK5m">
+                      <node concept="2JrnkZ" id="3F6vMxqjSQD" role="2Oq$k0">
+                        <node concept="37vLTw" id="3F6vMxqjSQE" role="2JrQYb">
+                          <ref role="3cqZAo" node="3F6vMxqjPSj" resolve="rulesModel" />
+                        </node>
                       </node>
-                      <node concept="3TrcHB" id="3t7_2FgQA6i" role="2OqNvi">
+                      <node concept="liA8E" id="3F6vMxqjSQF" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SModel.getModule():org.jetbrains.mps.openapi.module.SModule" resolve="getModule" />
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="3F6vMxqjSQG" role="37wK5m">
+                      <ref role="3cqZAo" node="3F6vMxqjPSj" resolve="rulesModel" />
+                    </node>
+                    <node concept="2OqwBi" id="3F6vMxqjSQH" role="37wK5m">
+                      <node concept="1PxgMI" id="3F6vMxqjSQI" role="2Oq$k0">
+                        <ref role="1m5ApE" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+                        <node concept="37vLTw" id="3F6vMxqjSQJ" role="1m5AlR">
+                          <ref role="3cqZAo" node="3F6vMxqjPSl" resolve="containingRoot" />
+                        </node>
+                      </node>
+                      <node concept="3TrcHB" id="3F6vMxqjSQK" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                       </node>
                     </node>
-                    <node concept="2YIFZM" id="3t7_2FgQA6j" role="37vLTx">
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <node concept="2OqwBi" id="3t7_2FgQA6k" role="37wK5m">
-                        <node concept="37vLTw" id="3t7_2FgQA6l" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
-                        </node>
-                        <node concept="liA8E" id="3t7_2FgQA6m" role="2OqNvi">
-                          <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="3t7_2FgQA6n" role="3cqZAp">
-                  <node concept="2OqwBi" id="3t7_2FgQA6o" role="3clFbG">
-                    <node concept="37vLTw" id="3t7_2FgQA6p" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                    </node>
-                    <node concept="2ArzE6" id="3t7_2FgQA6q" role="2OqNvi">
-                      <node concept="37vLTw" id="3t7_2FgQA6r" role="25WWJ7">
-                        <ref role="3cqZAo" node="3t7_2FgQA67" resolve="roleNode" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="3t7_2FgQBNW" role="3cqZAp" />
-              </node>
-              <node concept="2OqwBi" id="3t7_2FgQAQJ" role="3eO9$A">
-                <node concept="2OqwBi" id="3t7_2FgQAQK" role="2Oq$k0">
-                  <node concept="37vLTw" id="3t7_2FgQAQL" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                  </node>
-                  <node concept="2oR75g" id="3t7_2FgQAQM" role="2OqNvi" />
-                </node>
-                <node concept="1mIQ4w" id="3t7_2FgQAQN" role="2OqNvi">
-                  <node concept="chp4Y" id="3t7_2FgQAQO" role="cj9EA">
-                    <ref role="cht4Q" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3eNFk2" id="3t7_2FgQBUa" role="3eNLev">
-              <node concept="3clFbS" id="3t7_2FgQBUb" role="3eOfB_">
-                <node concept="3cpWs8" id="3t7_2FgQDTi" role="3cqZAp">
-                  <node concept="3cpWsn" id="3t7_2FgQDTj" role="3cpWs9">
-                    <property role="TrG5h" value="parentRoleNode" />
-                    <node concept="3Tqbb2" id="3t7_2FgQDTh" role="1tU5fm">
-                      <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                    </node>
-                    <node concept="1PxgMI" id="3t7_2FgQDTk" role="33vP2m">
-                      <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                      <node concept="2OqwBi" id="3t7_2FgQDTl" role="1m5AlR">
-                        <node concept="37vLTw" id="3t7_2FgQDTm" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                        </node>
-                        <node concept="2oR75g" id="3t7_2FgQDTn" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
+              <node concept="liA8E" id="3F6vMxqvyt$" role="2OqNvi">
+                <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
+                <node concept="Xl_RD" id="3F6vMxqvz2b" role="37wK5m">
+                  <property role="Xl_RC" value="jchr.tracer" />
                 </node>
-                <node concept="3clFbH" id="3t7_2FgQE1C" role="3cqZAp" />
-                <node concept="3cpWs8" id="3t7_2FgQG$J" role="3cqZAp">
-                  <node concept="3cpWsn" id="3t7_2FgQG$K" role="3cpWs9">
-                    <property role="TrG5h" value="roleNode" />
-                    <node concept="3Tqbb2" id="3t7_2FgQG$F" role="1tU5fm">
-                      <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                <node concept="2ShNRf" id="3F6vMxqw8I9" role="37wK5m">
+                  <node concept="1pGfFk" id="3F6vMxqwbhp" role="2ShVmc">
+                    <ref role="37wK5l" node="3F6vMxqt$De" resolve="JchrTracer" />
+                    <node concept="37vLTw" id="3F6vMxqwcAW" role="37wK5m">
+                      <ref role="3cqZAo" to="t5kh:3F6vMxqv_px" resolve="msgtrace" />
                     </node>
-                    <node concept="2OqwBi" id="3t7_2FgQG$L" role="33vP2m">
-                      <node concept="2OqwBi" id="3t7_2FgQG$M" role="2Oq$k0">
-                        <node concept="37vLTw" id="3t7_2FgQG$N" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3t7_2FgQDTj" resolve="parentRoleNode" />
-                        </node>
-                        <node concept="3Tsc0h" id="3t7_2FgQG$O" role="2OqNvi">
-                          <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                        </node>
-                      </node>
-                      <node concept="2DeJg1" id="3t7_2FgQG$P" role="2OqNvi">
-                        <ref role="1A0vxQ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="3t7_2FgQGOG" role="3cqZAp">
-                  <node concept="37vLTI" id="3t7_2FgQGOH" role="3clFbG">
-                    <node concept="2OqwBi" id="3t7_2FgQGOI" role="37vLTJ">
-                      <node concept="37vLTw" id="3t7_2FgQGOJ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3t7_2FgQG$K" resolve="roleNode" />
-                      </node>
-                      <node concept="3TrcHB" id="3t7_2FgQGOK" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                    </node>
-                    <node concept="2YIFZM" id="3t7_2FgQGOL" role="37vLTx">
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <node concept="2OqwBi" id="3t7_2FgQGOM" role="37wK5m">
-                        <node concept="37vLTw" id="3t7_2FgQGON" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
-                        </node>
-                        <node concept="liA8E" id="3t7_2FgQGOO" role="2OqNvi">
-                          <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="3t7_2FgQGOP" role="3cqZAp">
-                  <node concept="2OqwBi" id="3t7_2FgQGOQ" role="3clFbG">
-                    <node concept="37vLTw" id="3t7_2FgQGOR" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                    </node>
-                    <node concept="2ArzE6" id="3t7_2FgQGOS" role="2OqNvi">
-                      <node concept="37vLTw" id="3t7_2FgQGOT" role="25WWJ7">
-                        <ref role="3cqZAo" node="3t7_2FgQG$K" resolve="roleNode" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="3t7_2FgQBUd" role="3cqZAp" />
-              </node>
-              <node concept="2OqwBi" id="3t7_2FgQCih" role="3eO9$A">
-                <node concept="2OqwBi" id="3t7_2FgQCii" role="2Oq$k0">
-                  <node concept="37vLTw" id="3t7_2FgQCij" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                  </node>
-                  <node concept="2oR75g" id="3t7_2FgQCik" role="2OqNvi" />
-                </node>
-                <node concept="1mIQ4w" id="3t7_2FgQCil" role="2OqNvi">
-                  <node concept="chp4Y" id="3t7_2FgQCo5" role="cj9EA">
-                    <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="4sVJFklQkmo" role="3cqZAp" />
-          <node concept="3clFbF" id="4sVJFklRFVk" role="3cqZAp">
-            <node concept="Rm8GO" id="4sVJFklRGx9" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-            </node>
-          </node>
         </node>
-        <node concept="2AHcQZ" id="4sVJFklM74e" role="2AJF6D">
+        <node concept="2AHcQZ" id="3F6vMxqjPT0" role="2AJF6D">
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
-      <node concept="2tJIrI" id="4sVJFklM7c$" role="jymVt" />
-      <node concept="3clFb_" id="4sVJFklM5Q2" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="walkList" />
-        <node concept="3uibUv" id="4sVJFklM5Q3" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
-        </node>
-        <node concept="3Tm1VV" id="4sVJFklM5Q4" role="1B3o_S" />
-        <node concept="3clFbS" id="4sVJFklM5Qh" role="3clF47">
-          <node concept="3clFbJ" id="6BU$YTNFpLM" role="3cqZAp">
-            <node concept="9aQIb" id="6BU$YTNFvTa" role="9aQIa">
-              <node concept="3clFbS" id="6BU$YTNFvTb" role="9aQI4">
-                <node concept="3clFbH" id="6BU$YTNFw2I" role="3cqZAp" />
-                <node concept="YS8fn" id="6BU$YTNFw5x" role="3cqZAp">
-                  <node concept="2ShNRf" id="6BU$YTNFw6z" role="YScLw">
-                    <node concept="1pGfFk" id="6BU$YTNF$Y0" role="2ShVmc">
-                      <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-                      <node concept="3cpWs3" id="6BU$YTNFADg" role="37wK5m">
-                        <node concept="3cpWs3" id="6BU$YTNFA7l" role="3uHU7B">
-                          <node concept="3cpWs3" id="6BU$YTNF_Iv" role="3uHU7B">
-                            <node concept="Xl_RD" id="6BU$YTNF_wK" role="3uHU7B">
-                              <property role="Xl_RC" value="unexpected " />
-                            </node>
-                            <node concept="37vLTw" id="6BU$YTNF_Kg" role="3uHU7w">
-                              <ref role="3cqZAo" node="4sVJFklM5Q6" resolve="listb" />
-                            </node>
-                          </node>
-                          <node concept="Xl_RD" id="6BU$YTNFAnZ" role="3uHU7w">
-                            <property role="Xl_RC" value=" in " />
-                          </node>
-                        </node>
-                        <node concept="2YIFZM" id="6BU$YTNFG1r" role="3uHU7w">
-                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                          <node concept="2OqwBi" id="6BU$YTNFBcj" role="37wK5m">
-                            <node concept="37vLTw" id="6BU$YTNFAR5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                            </node>
-                            <node concept="2oR75g" id="6BU$YTNFD02" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="6BU$YTNFuvJ" role="3clFbw">
-              <node concept="2OqwBi" id="6BU$YTNFuvK" role="2Oq$k0">
-                <node concept="37vLTw" id="6BU$YTNFuvL" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                </node>
-                <node concept="2oR75g" id="6BU$YTNFuvM" role="2OqNvi" />
-              </node>
-              <node concept="1mIQ4w" id="6BU$YTNFuvN" role="2OqNvi">
-                <node concept="chp4Y" id="6BU$YTNFuBB" role="cj9EA">
-                  <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbS" id="6BU$YTNFumr" role="3clFbx">
-              <node concept="3cpWs8" id="6BU$YTNFvdG" role="3cqZAp">
-                <node concept="3cpWsn" id="6BU$YTNFvdH" role="3cpWs9">
-                  <property role="TrG5h" value="parentRoleNode" />
-                  <node concept="3Tqbb2" id="6BU$YTNFvdI" role="1tU5fm">
-                    <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                  </node>
-                  <node concept="1PxgMI" id="6BU$YTNFvdJ" role="33vP2m">
-                    <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                    <node concept="2OqwBi" id="6BU$YTNFHob" role="1m5AlR">
-                      <node concept="37vLTw" id="6BU$YTNFGTT" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                      </node>
-                      <node concept="2oR75g" id="6BU$YTNFJ6f" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="3t7_2FgXnRt" role="3cqZAp" />
-              <node concept="3cpWs8" id="6BU$YTNFLTq" role="3cqZAp">
-                <node concept="3cpWsn" id="6BU$YTNFLTr" role="3cpWs9">
-                  <property role="TrG5h" value="listNode" />
-                  <node concept="3Tqbb2" id="6BU$YTNFLTs" role="1tU5fm">
-                    <ref role="ehGHo" to="5j4j:1OShD0HAY6y" resolve="List" />
-                  </node>
-                  <node concept="2OqwBi" id="6BU$YTNFLTt" role="33vP2m">
-                    <node concept="2OqwBi" id="6BU$YTNFLTu" role="2Oq$k0">
-                      <node concept="37vLTw" id="6BU$YTNFMaN" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6BU$YTNFvdH" resolve="parentRoleNode" />
-                      </node>
-                      <node concept="3Tsc0h" id="6BU$YTNFNOX" role="2OqNvi">
-                        <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                      </node>
-                    </node>
-                    <node concept="2DeJg1" id="6BU$YTNFLTx" role="2OqNvi">
-                      <ref role="1A0vxQ" to="5j4j:1OShD0HAY6y" resolve="List" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="6BU$YTNFLTL" role="3cqZAp">
-                <node concept="2OqwBi" id="6BU$YTNFLTM" role="3clFbG">
-                  <node concept="37vLTw" id="6BU$YTNFLTN" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                  </node>
-                  <node concept="2ArzE6" id="6BU$YTNFLTO" role="2OqNvi">
-                    <node concept="37vLTw" id="6infEALu2Fs" role="25WWJ7">
-                      <ref role="3cqZAo" node="6BU$YTNFLTr" resolve="listNode" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="3t7_2FguP0D" role="3cqZAp" />
-            </node>
-          </node>
-          <node concept="3clFbH" id="4sVJFklRZE_" role="3cqZAp" />
-          <node concept="3clFbF" id="4sVJFklSjTT" role="3cqZAp">
-            <node concept="Rm8GO" id="4sVJFklSku2" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="4sVJFklM7TT" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-        <node concept="37vLTG" id="4sVJFklM5Q6" role="3clF46">
-          <property role="TrG5h" value="listb" />
-          <node concept="3uibUv" id="5YIOneOU7$i" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
-          </node>
-        </node>
+      <node concept="2tJIrI" id="3F6vMxqjWPO" role="jymVt" />
+      <node concept="3Tmbuc" id="3F6vMxqjHMu" role="1B3o_S" />
+      <node concept="3uibUv" id="3F6vMxqjJy3" role="1zkMxy">
+        <ref role="3uigEE" to="t5kh:1pPth$lBNWG" resolve="TypecheckingHelper.RunTypechecking" />
       </node>
-      <node concept="2tJIrI" id="4sVJFklM82l" role="jymVt" />
-      <node concept="3clFb_" id="4sVJFklM5PC" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="walkValues" />
-        <node concept="3uibUv" id="4sVJFklM5PD" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+      <node concept="3clFb_" id="3F6vMxqeykH" role="jymVt">
+        <property role="TrG5h" value="findHandlerClass" />
+        <property role="DiZV1" value="false" />
+        <node concept="3uibUv" id="3F6vMxqeqbS" role="3clF45">
+          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+          <node concept="3uibUv" id="3F6vMxqeqbT" role="11_B2D">
+            <ref role="3uigEE" to="eifs:~Handler" resolve="Handler" />
+          </node>
         </node>
-        <node concept="3Tm1VV" id="4sVJFklM5PE" role="1B3o_S" />
-        <node concept="16euLQ" id="4sVJFklM5PM" role="16eVyc">
-          <property role="TrG5h" value="V" />
+        <node concept="37vLTG" id="3F6vMxqeqbU" role="3clF46">
+          <property role="TrG5h" value="handlerMod" />
+          <node concept="3uibUv" id="3F6vMxqeqbV" role="1tU5fm">
+            <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+          </node>
         </node>
-        <node concept="3clFbS" id="4sVJFklM5PN" role="3clF47">
-          <node concept="3cpWs8" id="4sVJFklNBfH" role="3cqZAp">
-            <node concept="3cpWsn" id="4sVJFklNBfI" role="3cpWs9">
-              <property role="TrG5h" value="node" />
-              <node concept="3Tqbb2" id="4sVJFklNBfJ" role="1tU5fm">
-                <ref role="ehGHo" to="5j4j:5lJXKARS0" resolve="Atom" />
-              </node>
-              <node concept="1PxgMI" id="4sVJFklQEve" role="33vP2m">
-                <ref role="1m5ApE" to="5j4j:5lJXKARS0" resolve="Atom" />
-                <node concept="2OqwBi" id="4sVJFklNBfK" role="1m5AlR">
-                  <node concept="37vLTw" id="4sVJFklNBfL" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                  </node>
-                  <node concept="2oR75g" id="4sVJFklShbv" role="2OqNvi" />
+        <node concept="37vLTG" id="3F6vMxqeqbW" role="3clF46">
+          <property role="TrG5h" value="handlerMdl" />
+          <node concept="H_c77" id="3F6vMxqeqbX" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="3F6vMxqeqbY" role="3clF46">
+          <property role="TrG5h" value="name" />
+          <node concept="17QB3L" id="3F6vMxqeqbZ" role="1tU5fm" />
+        </node>
+        <node concept="3clFbS" id="3F6vMxqeqc0" role="3clF47">
+          <node concept="3cpWs8" id="3F6vMxqeqc1" role="3cqZAp">
+            <node concept="3cpWsn" id="3F6vMxqeqc2" role="3cpWs9">
+              <property role="TrG5h" value="handlerCls" />
+              <node concept="3uibUv" id="3F6vMxqeqc3" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+                <node concept="3uibUv" id="3F6vMxqeqc4" role="11_B2D">
+                  <ref role="3uigEE" to="eifs:~Handler" resolve="Handler" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="4sVJFklNBpY" role="3cqZAp" />
-          <node concept="3cpWs8" id="4sVJFklNQvA" role="3cqZAp">
-            <node concept="3cpWsn" id="4sVJFklNQvB" role="3cpWs9">
-              <property role="TrG5h" value="roleNode" />
-              <node concept="3Tqbb2" id="4sVJFklNQvv" role="1tU5fm">
-                <ref role="ehGHo" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
-              </node>
-              <node concept="2OqwBi" id="4sVJFklNQvC" role="33vP2m">
-                <node concept="2OqwBi" id="4sVJFklNQvD" role="2Oq$k0">
-                  <node concept="1PxgMI" id="4sVJFklNQvE" role="2Oq$k0">
-                    <ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                    <node concept="37vLTw" id="4sVJFklNQvF" role="1m5AlR">
-                      <ref role="3cqZAo" node="4sVJFklNBfI" resolve="node" />
-                    </node>
-                  </node>
-                  <node concept="3Tsc0h" id="4sVJFklNQvG" role="2OqNvi">
-                    <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-                  </node>
-                </node>
-                <node concept="2DeJg1" id="4sVJFklNQvH" role="2OqNvi">
-                  <ref role="1A0vxQ" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="4sVJFklNKFv" role="3cqZAp">
-            <node concept="37vLTI" id="4sVJFklNS1K" role="3clFbG">
-              <node concept="2OqwBi" id="4sVJFklNQXN" role="37vLTJ">
-                <node concept="37vLTw" id="4sVJFklNQvI" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4sVJFklNQvB" resolve="roleNode" />
-                </node>
-                <node concept="3TrcHB" id="4sVJFklNRrJ" role="2OqNvi">
-                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                </node>
-              </node>
-              <node concept="2YIFZM" id="4sVJFklO5Ix" role="37vLTx">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <node concept="2OqwBi" id="4sVJFklNT2$" role="37wK5m">
-                  <node concept="37vLTw" id="4sVJFklNStQ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sVJFklM5PG" resolve="valf" />
-                  </node>
-                  <node concept="liA8E" id="4sVJFklO4tI" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="4sVJFklOekC" role="3cqZAp" />
-          <node concept="1DcWWT" id="5YIOneOMTHl" role="3cqZAp">
-            <node concept="3clFbS" id="5YIOneOMTHn" role="2LFqv$">
-              <node concept="3clFbJ" id="2ev$9JFBdgr" role="3cqZAp">
-                <node concept="9aQIb" id="2ev$9JFBeVy" role="9aQIa">
-                  <node concept="3clFbS" id="2ev$9JFBeVz" role="9aQI4">
-                    <node concept="3SKdUt" id="5zfvpQ78WSU" role="3cqZAp">
-                      <node concept="3SKdUq" id="5zfvpQ78WTJ" role="3SKWNk">
-                        <property role="3SKdUp" value="FIXME: use strict typing" />
+          <node concept="SfApY" id="3F6vMxqeqc5" role="3cqZAp">
+            <node concept="3clFbS" id="3F6vMxqeqc6" role="SfCbr">
+              <node concept="3clFbF" id="3F6vMxqeqc7" role="3cqZAp">
+                <node concept="37vLTI" id="3F6vMxqeqc8" role="3clFbG">
+                  <node concept="10QFUN" id="3F6vMxqeqc9" role="37vLTx">
+                    <node concept="3uibUv" id="3F6vMxqeqca" role="10QFUM">
+                      <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+                      <node concept="3uibUv" id="3F6vMxqeqcb" role="11_B2D">
+                        <ref role="3uigEE" to="eifs:~Handler" resolve="Handler" />
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="4sVJFklOltJ" role="3cqZAp">
-                      <node concept="3cpWsn" id="4sVJFklOltK" role="3cpWs9">
-                        <property role="TrG5h" value="vhNode" />
-                        <node concept="3Tqbb2" id="4sVJFklOltB" role="1tU5fm">
-                          <ref role="ehGHo" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
+                    <node concept="2OqwBi" id="3F6vMxqeqcc" role="10QFUP">
+                      <node concept="1eOMI4" id="3F6vMxqeqcd" role="2Oq$k0">
+                        <node concept="10QFUN" id="3F6vMxqeqce" role="1eOMHV">
+                          <node concept="37vLTw" id="3F6vMxqeqcf" role="10QFUP">
+                            <ref role="3cqZAo" node="3F6vMxqeqbU" resolve="handlerMod" />
+                          </node>
+                          <node concept="3uibUv" id="3F6vMxqeqcg" role="10QFUM">
+                            <ref role="3uigEE" to="j8aq:~ReloadableModuleBase" resolve="ReloadableModuleBase" />
+                          </node>
                         </node>
-                        <node concept="2OqwBi" id="4sVJFklOltL" role="33vP2m">
-                          <node concept="2OqwBi" id="4sVJFklOltM" role="2Oq$k0">
-                            <node concept="37vLTw" id="4sVJFklOltN" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4sVJFklNQvB" resolve="roleNode" />
+                      </node>
+                      <node concept="liA8E" id="3F6vMxqeqch" role="2OqNvi">
+                        <ref role="37wK5l" to="j8aq:~ReloadableModuleBase.getClass(java.lang.String):java.lang.Class" resolve="getClass" />
+                        <node concept="2YIFZM" id="3F6vMxqeqci" role="37wK5m">
+                          <ref role="37wK5l" to="18ew:~JavaNameUtil.fqClassName(org.jetbrains.mps.openapi.model.SModel,java.lang.String):java.lang.String" resolve="fqClassName" />
+                          <ref role="1Pybhc" to="18ew:~JavaNameUtil" resolve="JavaNameUtil" />
+                          <node concept="37vLTw" id="3F6vMxqeqcj" role="37wK5m">
+                            <ref role="3cqZAo" node="3F6vMxqeqbW" resolve="handlerMdl" />
+                          </node>
+                          <node concept="3cpWs3" id="3F6vMxqeqck" role="37wK5m">
+                            <node concept="Xl_RD" id="3F6vMxqeqcl" role="3uHU7w">
+                              <property role="Xl_RC" value="Handler" />
                             </node>
-                            <node concept="3Tsc0h" id="4sVJFklOltO" role="2OqNvi">
-                              <ref role="3TtcxE" to="5j4j:6$jH9oLmYL8" resolve="contents" />
-                            </node>
-                          </node>
-                          <node concept="2DeJg1" id="4sVJFklOltP" role="2OqNvi">
-                            <ref role="1A0vxQ" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="4sVJFklOhEB" role="3cqZAp">
-                      <node concept="37vLTI" id="4sVJFklOmUP" role="3clFbG">
-                        <node concept="2YIFZM" id="4sVJFklOnbF" role="37vLTx">
-                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                          <node concept="37vLTw" id="2ev$9JFBcWL" role="37wK5m">
-                            <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="4sVJFklOl_3" role="37vLTJ">
-                          <node concept="37vLTw" id="4sVJFklOltQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4sVJFklOltK" resolve="vhNode" />
-                          </node>
-                          <node concept="3TrcHB" id="4sVJFklOm$E" role="2OqNvi">
-                            <ref role="3TsBF5" to="5j4j:6$jH9oLmYKA" resolve="value" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="2ev$9JFBFPL" role="3cqZAp" />
-                  </node>
-                </node>
-                <node concept="3eNFk2" id="4OKkcnf5hzz" role="3eNLev">
-                  <node concept="3clFbS" id="4OKkcnf5hz_" role="3eOfB_">
-                    <node concept="3clFbF" id="4OKkcnf53uf" role="3cqZAp">
-                      <node concept="2OqwBi" id="4OKkcnf556v" role="3clFbG">
-                        <node concept="2OqwBi" id="4OKkcnf53yS" role="2Oq$k0">
-                          <node concept="37vLTw" id="4OKkcnf53ud" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4sVJFklNQvB" resolve="roleNode" />
-                          </node>
-                          <node concept="3Tsc0h" id="4OKkcnf54qA" role="2OqNvi">
-                            <ref role="3TtcxE" to="5j4j:6$jH9oLmYL8" resolve="contents" />
-                          </node>
-                        </node>
-                        <node concept="2DeJg1" id="4OKkcnf58do" role="2OqNvi">
-                          <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="4OKkcnf58f3" role="3cqZAp" />
-                  </node>
-                  <node concept="1Wc70l" id="5zfvpQ78WGL" role="3eO9$A">
-                    <node concept="2OqwBi" id="5zfvpQ78WGN" role="3uHU7w">
-                      <node concept="1eOMI4" id="5zfvpQ78WGP" role="2Oq$k0">
-                        <node concept="10QFUN" id="5zfvpQ78WGQ" role="1eOMHV">
-                          <node concept="3uibUv" id="514BAS_WC$F" role="10QFUM">
-                            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
-                          </node>
-                          <node concept="37vLTw" id="5zfvpQ78WGS" role="10QFUP">
-                            <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="5zfvpQ78WGU" role="2OqNvi">
-                        <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
-                      </node>
-                    </node>
-                    <node concept="2ZW3vV" id="5zfvpQ78WGW" role="3uHU7B">
-                      <node concept="3uibUv" id="514BAS_WCv4" role="2ZW6by">
-                        <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
-                      </node>
-                      <node concept="37vLTw" id="5zfvpQ78WGY" role="2ZW6bz">
-                        <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1Wc70l" id="5zfvpQ78UU6" role="3clFbw">
-                  <node concept="3fqX7Q" id="5zfvpQ7b1DH" role="3uHU7w">
-                    <node concept="2OqwBi" id="5zfvpQ7b1DJ" role="3fr31v">
-                      <node concept="1eOMI4" id="5zfvpQ7b1DL" role="2Oq$k0">
-                        <node concept="10QFUN" id="5zfvpQ7b1DM" role="1eOMHV">
-                          <node concept="3uibUv" id="514BAS_WCnW" role="10QFUM">
-                            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
-                          </node>
-                          <node concept="37vLTw" id="5zfvpQ7b1DO" role="10QFUP">
-                            <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="5zfvpQ7b1DQ" role="2OqNvi">
-                        <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2ZW3vV" id="2ev$9JFBdkI" role="3uHU7B">
-                    <node concept="3uibUv" id="514BAS_WCif" role="2ZW6by">
-                      <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
-                    </node>
-                    <node concept="37vLTw" id="2ev$9JFBdjh" role="2ZW6bz">
-                      <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbS" id="2ev$9JFBdgt" role="3clFbx">
-                  <node concept="3cpWs8" id="4OKkcnf5ioS" role="3cqZAp">
-                    <node concept="3cpWsn" id="4OKkcnf5ioT" role="3cpWs9">
-                      <property role="TrG5h" value="vhNode" />
-                      <node concept="3Tqbb2" id="4OKkcnf5ioU" role="1tU5fm">
-                        <ref role="ehGHo" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
-                      </node>
-                      <node concept="2OqwBi" id="4OKkcnf5ioV" role="33vP2m">
-                        <node concept="2OqwBi" id="4OKkcnf5ioW" role="2Oq$k0">
-                          <node concept="37vLTw" id="4OKkcnf5ioX" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4sVJFklNQvB" resolve="roleNode" />
-                          </node>
-                          <node concept="3Tsc0h" id="4OKkcnf5ioY" role="2OqNvi">
-                            <ref role="3TtcxE" to="5j4j:6$jH9oLmYL8" resolve="contents" />
-                          </node>
-                        </node>
-                        <node concept="2DeJg1" id="4OKkcnf5ioZ" role="2OqNvi">
-                          <ref role="1A0vxQ" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWs8" id="2ev$9JFBgrj" role="3cqZAp">
-                    <node concept="3cpWsn" id="2ev$9JFBgrk" role="3cpWs9">
-                      <property role="TrG5h" value="subsNode" />
-                      <node concept="3Tqbb2" id="2ev$9JFBgr2" role="1tU5fm">
-                        <ref role="ehGHo" to="5j4j:dfChU1zo4B" resolve="Splice" />
-                      </node>
-                      <node concept="2OqwBi" id="2ev$9JFBgrl" role="33vP2m">
-                        <node concept="2OqwBi" id="2ev$9JFBgrm" role="2Oq$k0">
-                          <node concept="37vLTw" id="2ev$9JFBgrn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4OKkcnf5ioT" resolve="vhNode" />
-                          </node>
-                          <node concept="3CFZ6_" id="2ev$9JFBgro" role="2OqNvi">
-                            <node concept="3CFYIy" id="2ev$9JFBgrp" role="3CFYIz">
-                              <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2DeJnY" id="2ev$9JFBgrq" role="2OqNvi">
-                          <ref role="1A9B2P" to="5j4j:dfChU1zo4B" resolve="Splice" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="4OKkcnf9xnK" role="3cqZAp" />
-                  <node concept="3cpWs8" id="2ev$9JFBhK3" role="3cqZAp">
-                    <node concept="3cpWsn" id="2ev$9JFBhK4" role="3cpWs9">
-                      <property role="TrG5h" value="lvNode" />
-                      <node concept="3Tqbb2" id="2ev$9JFBhJH" role="1tU5fm">
-                        <ref role="ehGHo" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
-                      </node>
-                      <node concept="2OqwBi" id="2ev$9JFBhK5" role="33vP2m">
-                        <node concept="2OqwBi" id="2ev$9JFBhK6" role="2Oq$k0">
-                          <node concept="37vLTw" id="2ev$9JFBhK7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2ev$9JFBgrk" resolve="subsNode" />
-                          </node>
-                          <node concept="3TrEf2" id="2ev$9JFBhK8" role="2OqNvi">
-                            <ref role="3Tt5mk" to="5j4j:dfChU1zo4I" resolve="expression" />
-                          </node>
-                        </node>
-                        <node concept="2DeJnY" id="2ev$9JFBhK9" role="2OqNvi">
-                          <ref role="1A9B2P" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3SKdUt" id="514BAS_Xs8l" role="3cqZAp">
-                    <node concept="3SKdUq" id="514BAS_Xs8n" role="3SKWNk">
-                      <property role="3SKdUp" value="FIXME: unchecked cast" />
-                    </node>
-                  </node>
-                  <node concept="3clFbF" id="7nPD14NOv00" role="3cqZAp">
-                    <node concept="37vLTI" id="7nPD14NOv01" role="3clFbG">
-                      <node concept="2OqwBi" id="7nPD14NOv0e" role="37vLTJ">
-                        <node concept="37vLTw" id="7nPD14NOv0f" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2ev$9JFBhK4" resolve="lvNode" />
-                        </node>
-                        <node concept="3TrcHB" id="7nPD14NOv0g" role="2OqNvi">
-                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="7nPD14NOvlm" role="37vLTx">
-                        <node concept="37vLTw" id="7nPD14NOvft" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2$F5QputLbm" resolve="namingContext" />
-                        </node>
-                        <node concept="liA8E" id="7nPD14NOvoV" role="2OqNvi">
-                          <ref role="37wK5l" to="nz6g:7HUwyZaPiEo" resolve="uniqueName" />
-                          <node concept="2OqwBi" id="7nPD14NOvtS" role="37wK5m">
-                            <node concept="1eOMI4" id="7nPD14NOvtT" role="2Oq$k0">
-                              <node concept="10QFUN" id="7nPD14NOvtU" role="1eOMHV">
-                                <node concept="3uibUv" id="7nPD14NOvtV" role="10QFUM">
-                                  <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalAtom" />
-                                </node>
-                                <node concept="37vLTw" id="7nPD14NOvtW" role="10QFUP">
-                                  <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
-                                </node>
+                            <node concept="3cpWs3" id="3F6vMxqeqcm" role="3uHU7B">
+                              <node concept="Xl_RD" id="3F6vMxqeqcn" role="3uHU7B">
+                                <property role="Xl_RC" value="Types" />
                               </node>
-                            </node>
-                            <node concept="liA8E" id="7nPD14NOvtX" role="2OqNvi">
-                              <ref role="37wK5l" to="oy3s:514BAS_Xsp_" resolve="metaLogical" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="2ev$9JFBfrS" role="3cqZAp" />
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWsn" id="5YIOneOMTHp" role="1Duv9x">
-              <property role="TrG5h" value="val" />
-              <node concept="16syzq" id="5YIOneOMTHt" role="1tU5fm">
-                <ref role="16sUi3" node="4sVJFklM5PM" resolve="V" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="5YIOneOMTHu" role="1DdaDG">
-              <node concept="37vLTw" id="5YIOneOMTHv" role="2Oq$k0">
-                <ref role="3cqZAo" node="4sVJFklM5PG" resolve="valf" />
-              </node>
-              <node concept="liA8E" id="5YIOneOMTHw" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:5YIOneOMEJi" resolve="values" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="4sVJFklNB$0" role="3cqZAp" />
-          <node concept="3clFbF" id="4sVJFklOdlv" role="3cqZAp">
-            <node concept="Rm8GO" id="4sVJFklOo5G" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="4sVJFklM7m3" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-        <node concept="37vLTG" id="4sVJFklM5PG" role="3clF46">
-          <property role="TrG5h" value="valf" />
-          <node concept="3uibUv" id="5YIOneONkSX" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueFunc" />
-            <node concept="16syzq" id="5YIOneONkSY" role="11_B2D">
-              <ref role="16sUi3" node="4sVJFklM5PM" resolve="V" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="104EUzFtYn2" role="jymVt" />
-      <node concept="3clFb_" id="104EUzG1t_D" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="walkValue" />
-        <node concept="3uibUv" id="104EUzG1t_E" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
-        </node>
-        <node concept="3Tm1VV" id="104EUzG1t_F" role="1B3o_S" />
-        <node concept="37vLTG" id="104EUzG1t_H" role="3clF46">
-          <property role="TrG5h" value="value" />
-          <node concept="3uibUv" id="104EUzG1t_I" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
-            <node concept="3qTvmN" id="104EUzG1t_J" role="11_B2D" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="104EUzG1t_K" role="3clF47">
-          <node concept="3cpWs8" id="6MYr6JxsNgY" role="3cqZAp">
-            <node concept="3cpWsn" id="6MYr6JxsNgZ" role="3cpWs9">
-              <property role="TrG5h" value="parentNode" />
-              <node concept="3Tqbb2" id="6MYr6JxsNh0" role="1tU5fm" />
-              <node concept="2OqwBi" id="6MYr6JxsNh2" role="33vP2m">
-                <node concept="37vLTw" id="6MYr6JxsRIZ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                </node>
-                <node concept="2oR75g" id="6MYr6JxsNh4" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="6MYr6JxsS3u" role="3cqZAp" />
-          <node concept="3clFbJ" id="6MYr6JxsS9S" role="3cqZAp">
-            <node concept="3clFbS" id="6MYr6JxsS9U" role="3clFbx">
-              <node concept="3cpWs8" id="6MYr6JxsNp_" role="3cqZAp">
-                <node concept="3cpWsn" id="6MYr6JxsNpA" role="3cpWs9">
-                  <property role="TrG5h" value="vNode" />
-                  <node concept="3Tqbb2" id="6MYr6JxsNpB" role="1tU5fm">
-                    <ref role="ehGHo" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
-                  </node>
-                  <node concept="2OqwBi" id="6MYr6JxsNpC" role="33vP2m">
-                    <node concept="2OqwBi" id="6MYr6JxsNpD" role="2Oq$k0">
-                      <node concept="1PxgMI" id="6MYr6JxsSCf" role="2Oq$k0">
-                        <ref role="1m5ApE" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
-                        <node concept="37vLTw" id="6MYr6JxsSzI" role="1m5AlR">
-                          <ref role="3cqZAo" node="6MYr6JxsNgZ" resolve="parentNode" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="6MYr6JxsT3q" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
-                      </node>
-                    </node>
-                    <node concept="2DeJnY" id="6MYr6JxsTeP" role="2OqNvi">
-                      <ref role="1A9B2P" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="6MYr6JxsTne" role="3cqZAp">
-                <node concept="2OqwBi" id="6MYr6JxsTOJ" role="3clFbG">
-                  <node concept="2OqwBi" id="6MYr6JxsTqD" role="2Oq$k0">
-                    <node concept="37vLTw" id="6MYr6JxsTnc" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6MYr6JxsNpA" resolve="vNode" />
-                    </node>
-                    <node concept="3TrcHB" id="6MYr6JxsTv4" role="2OqNvi">
-                      <ref role="3TsBF5" to="5j4j:6$jH9oLmYKA" resolve="value" />
-                    </node>
-                  </node>
-                  <node concept="tyxLq" id="6MYr6JxsTVt" role="2OqNvi">
-                    <node concept="2YIFZM" id="6MYr6JxsTZv" role="tz02z">
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <node concept="2OqwBi" id="6MYr6JxsUc8" role="37wK5m">
-                        <node concept="37vLTw" id="6MYr6JxsU2n" role="2Oq$k0">
-                          <ref role="3cqZAo" node="104EUzG1t_H" resolve="value" />
-                        </node>
-                        <node concept="liA8E" id="6MYr6JxsUte" role="2OqNvi">
-                          <ref role="37wK5l" to="ie8e:1msb0mq8QTt" resolve="symbol" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="6MYr6JxsU$B" role="3cqZAp" />
-            </node>
-            <node concept="2OqwBi" id="6MYr6JxsSj1" role="3clFbw">
-              <node concept="37vLTw" id="6MYr6JxsSgf" role="2Oq$k0">
-                <ref role="3cqZAo" node="6MYr6JxsNgZ" resolve="parentNode" />
-              </node>
-              <node concept="1mIQ4w" id="6MYr6JxsSmZ" role="2OqNvi">
-                <node concept="chp4Y" id="6MYr6JxsSnK" role="cj9EA">
-                  <ref role="cht4Q" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
-                </node>
-              </node>
-            </node>
-            <node concept="9aQIb" id="6MYr6JxsUyh" role="9aQIa">
-              <node concept="3clFbS" id="6MYr6JxsUyi" role="9aQI4">
-                <node concept="3SKdUt" id="104EUzGbhRR" role="3cqZAp">
-                  <node concept="3SKdUq" id="104EUzGbhSP" role="3SKWNk">
-                    <property role="3SKdUp" value="FIXME implement me" />
-                  </node>
-                </node>
-                <node concept="YS8fn" id="104EUzFu0Wu" role="3cqZAp">
-                  <node concept="2ShNRf" id="104EUzFu0Zv" role="YScLw">
-                    <node concept="1pGfFk" id="104EUzFu1kd" role="2ShVmc">
-                      <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="6MYr6JxsURf" role="3cqZAp" />
-          <node concept="3clFbF" id="6MYr6JxsV8X" role="3cqZAp">
-            <node concept="Rm8GO" id="6MYr6JxsVlt" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="104EUzG1wiH" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4sVJFklM7ur" role="jymVt" />
-      <node concept="3clFb_" id="4sVJFklM5PQ" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="walkVariables" />
-        <node concept="3uibUv" id="4sVJFklM5PR" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
-        </node>
-        <node concept="3Tm1VV" id="4sVJFklM5PS" role="1B3o_S" />
-        <node concept="3clFbS" id="4sVJFklM5PZ" role="3clF47">
-          <node concept="3cpWs8" id="4sVJFklNGvZ" role="3cqZAp">
-            <node concept="3cpWsn" id="4sVJFklNGw0" role="3cpWs9">
-              <property role="TrG5h" value="node" />
-              <node concept="3Tqbb2" id="4sVJFklNGw1" role="1tU5fm">
-                <ref role="ehGHo" to="5j4j:5lJXKARS0" resolve="Atom" />
-              </node>
-              <node concept="1PxgMI" id="4sVJFklQCYO" role="33vP2m">
-                <ref role="1m5ApE" to="5j4j:5lJXKARS0" resolve="Atom" />
-                <node concept="2OqwBi" id="4sVJFklNGw2" role="1m5AlR">
-                  <node concept="37vLTw" id="4sVJFklNGw3" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                  </node>
-                  <node concept="2oR75g" id="4sVJFklSiu$" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="4sVJFklNHM3" role="3cqZAp" />
-          <node concept="3cpWs8" id="4sVJFklOBg7" role="3cqZAp">
-            <node concept="3cpWsn" id="4sVJFklOBg8" role="3cpWs9">
-              <property role="TrG5h" value="roleNode" />
-              <node concept="3Tqbb2" id="4sVJFklOBfZ" role="1tU5fm">
-                <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-              </node>
-              <node concept="2OqwBi" id="4sVJFklOBg9" role="33vP2m">
-                <node concept="2OqwBi" id="4sVJFklOBga" role="2Oq$k0">
-                  <node concept="1PxgMI" id="4sVJFklOBgb" role="2Oq$k0">
-                    <ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                    <node concept="37vLTw" id="4sVJFklOBgc" role="1m5AlR">
-                      <ref role="3cqZAo" node="4sVJFklNGw0" resolve="node" />
-                    </node>
-                  </node>
-                  <node concept="3Tsc0h" id="4sVJFklOBgd" role="2OqNvi">
-                    <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-                  </node>
-                </node>
-                <node concept="2DeJg1" id="4sVJFklOBge" role="2OqNvi">
-                  <ref role="1A0vxQ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="4sVJFklOse2" role="3cqZAp">
-            <node concept="37vLTI" id="4sVJFklOCcS" role="3clFbG">
-              <node concept="2YIFZM" id="4sVJFklOCrt" role="37vLTx">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <node concept="2OqwBi" id="4sVJFklOCUU" role="37wK5m">
-                  <node concept="37vLTw" id="4sVJFklOCEm" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sVJFklM5PU" resolve="varb" />
-                  </node>
-                  <node concept="liA8E" id="4sVJFklOD$o" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="4sVJFklOBFy" role="37vLTJ">
-                <node concept="37vLTw" id="4sVJFklOBgf" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4sVJFklOBg8" resolve="roleNode" />
-                </node>
-                <node concept="3TrcHB" id="4sVJFklOBRr" role="2OqNvi">
-                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="2q_78a9q1oQ" role="3cqZAp" />
-          <node concept="3SKdUt" id="2q_78a9q0KI" role="3cqZAp">
-            <node concept="3SKdUq" id="2q_78a9q1bG" role="3SKWNk">
-              <property role="3SKdUp" value="TODO avoid code duplication" />
-            </node>
-          </node>
-          <node concept="1DcWWT" id="5YIOneOS3Zh" role="3cqZAp">
-            <node concept="3clFbS" id="5YIOneOS3Zj" role="2LFqv$">
-              <node concept="3cpWs8" id="5YIOneOS5q1" role="3cqZAp">
-                <node concept="3cpWsn" id="5YIOneOS5q2" role="3cpWs9">
-                  <property role="TrG5h" value="varName" />
-                  <node concept="17QB3L" id="5YIOneOS5x5" role="1tU5fm" />
-                  <node concept="2YIFZM" id="5YIOneOS5q3" role="33vP2m">
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <node concept="2OqwBi" id="5YIOneOS5q4" role="37wK5m">
-                      <node concept="37vLTw" id="5YIOneOS5q5" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5YIOneOS3Zl" resolve="var" />
-                      </node>
-                      <node concept="liA8E" id="5YIOneOS5q6" role="2OqNvi">
-                        <ref role="37wK5l" to="ie8e:56MMu0Ark7d" resolve="symbol" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="5YIOneOS8Lf" role="3cqZAp" />
-              <node concept="3SKdUt" id="5zfvpQ7a55$" role="3cqZAp">
-                <node concept="3SKdUq" id="5zfvpQ7a57e" role="3SKWNk">
-                  <property role="3SKdUp" value="FIXME: having a string represent a variable is a bad idea" />
-                </node>
-              </node>
-              <node concept="3clFbJ" id="2q_78a8ZKtU" role="3cqZAp">
-                <node concept="3clFbS" id="2q_78a8ZKtX" role="3clFbx">
-                  <node concept="3clFbF" id="2q_78a90b1U" role="3cqZAp">
-                    <node concept="2OqwBi" id="2q_78a90cKo" role="3clFbG">
-                      <node concept="2OqwBi" id="2q_78a90b4U" role="2Oq$k0">
-                        <node concept="37vLTw" id="2q_78a90b1T" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4sVJFklOBg8" resolve="roleNode" />
-                        </node>
-                        <node concept="3Tsc0h" id="2q_78a90bvr" role="2OqNvi">
-                          <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                        </node>
-                      </node>
-                      <node concept="2DeJg1" id="2q_78a90g2_" role="2OqNvi">
-                        <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="2q_78a90jPm" role="3cqZAp" />
-                </node>
-                <node concept="9aQIb" id="2q_78a90a1u" role="9aQIa">
-                  <node concept="3clFbS" id="2q_78a90a1v" role="9aQI4">
-                    <node concept="3cpWs8" id="677NV56yAM8" role="3cqZAp">
-                      <node concept="3cpWsn" id="677NV56yAM9" role="3cpWs9">
-                        <property role="TrG5h" value="nodeNode" />
-                        <node concept="3Tqbb2" id="677NV56yAM6" role="1tU5fm">
-                          <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                        </node>
-                        <node concept="2OqwBi" id="677NV56yAMa" role="33vP2m">
-                          <node concept="2OqwBi" id="677NV56yAMb" role="2Oq$k0">
-                            <node concept="37vLTw" id="677NV56yAMc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4sVJFklOBg8" resolve="roleNode" />
-                            </node>
-                            <node concept="3Tsc0h" id="677NV56yAMd" role="2OqNvi">
-                              <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                            </node>
-                          </node>
-                          <node concept="2DeJg1" id="677NV56yAMe" role="2OqNvi">
-                            <ref role="1A0vxQ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWs8" id="677NV56yBIu" role="3cqZAp">
-                      <node concept="3cpWsn" id="677NV56yBIv" role="3cpWs9">
-                        <property role="TrG5h" value="lsubNode" />
-                        <node concept="3Tqbb2" id="677NV56yBIg" role="1tU5fm">
-                          <ref role="ehGHo" to="5j4j:dfChU1zo4B" resolve="Splice" />
-                        </node>
-                        <node concept="2OqwBi" id="677NV56yBIw" role="33vP2m">
-                          <node concept="2OqwBi" id="677NV56yBIx" role="2Oq$k0">
-                            <node concept="37vLTw" id="677NV56yBIy" role="2Oq$k0">
-                              <ref role="3cqZAo" node="677NV56yAM9" resolve="nodeNode" />
-                            </node>
-                            <node concept="3CFZ6_" id="677NV56yBIz" role="2OqNvi">
-                              <node concept="3CFYIy" id="677NV56yBI$" role="3CFYIz">
-                                <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2DeJnY" id="677NV56yBI_" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWs8" id="677NV56yEkV" role="3cqZAp">
-                      <node concept="3cpWsn" id="677NV56yEkW" role="3cpWs9">
-                        <property role="TrG5h" value="lvNode" />
-                        <node concept="3Tqbb2" id="677NV56yEkR" role="1tU5fm">
-                          <ref role="ehGHo" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
-                        </node>
-                        <node concept="2OqwBi" id="677NV56yEkX" role="33vP2m">
-                          <node concept="2OqwBi" id="677NV56yEkY" role="2Oq$k0">
-                            <node concept="37vLTw" id="677NV56yEkZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="677NV56yBIv" resolve="lsubNode" />
-                            </node>
-                            <node concept="3TrEf2" id="677NV56yEl0" role="2OqNvi">
-                              <ref role="3Tt5mk" to="5j4j:dfChU1zo4I" resolve="expression" />
-                            </node>
-                          </node>
-                          <node concept="2DeJnY" id="677NV56yEl1" role="2OqNvi">
-                            <ref role="1A9B2P" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="4sVJFklOJbh" role="3cqZAp">
-                      <node concept="37vLTI" id="4sVJFklOP5Y" role="3clFbG">
-                        <node concept="37vLTw" id="677NV56yuDz" role="37vLTx">
-                          <ref role="3cqZAo" node="5YIOneOS5q2" resolve="varName" />
-                        </node>
-                        <node concept="2OqwBi" id="4sVJFklOOho" role="37vLTJ">
-                          <node concept="37vLTw" id="677NV56yErh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="677NV56yEkW" resolve="lvNode" />
-                          </node>
-                          <node concept="3TrcHB" id="4sVJFklOOG_" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="4OKkcnf3Sdv" role="3clFbw">
-                  <node concept="2YIFZM" id="4OKkcnf3RzV" role="2Oq$k0">
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <node concept="37vLTw" id="4OKkcnf3RFa" role="37wK5m">
-                      <ref role="3cqZAo" node="5YIOneOS5q2" resolve="varName" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="4OKkcnf3TsT" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
-                    <node concept="Xl_RD" id="4OKkcnf3Tv$" role="37wK5m">
-                      <property role="Xl_RC" value="^__.*" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWsn" id="5YIOneOS3Zl" role="1Duv9x">
-              <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="5YIOneOS4go" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="5YIOneOS3Zr" role="1DdaDG">
-              <node concept="37vLTw" id="5YIOneOS3Zs" role="2Oq$k0">
-                <ref role="3cqZAo" node="4sVJFklM5PU" resolve="varb" />
-              </node>
-              <node concept="liA8E" id="5YIOneOS3Zt" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:5YIOneORS0h" resolve="variables" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="4sVJFklOEwR" role="3cqZAp" />
-          <node concept="3clFbF" id="4sVJFklOF7e" role="3cqZAp">
-            <node concept="Rm8GO" id="4sVJFklOFAj" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="4sVJFklM7BS" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-        <node concept="37vLTG" id="4sVJFklM5PU" role="3clF46">
-          <property role="TrG5h" value="varb" />
-          <node concept="3uibUv" id="5YIOneOSlWl" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableFunc" />
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4sVJFklM7Ki" role="jymVt" />
-      <node concept="3clFb_" id="104EUzG3OTs" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="walkVariable" />
-        <node concept="3uibUv" id="104EUzG3OTt" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
-        </node>
-        <node concept="3Tm1VV" id="104EUzG3OTu" role="1B3o_S" />
-        <node concept="37vLTG" id="104EUzG3OTw" role="3clF46">
-          <property role="TrG5h" value="var" />
-          <node concept="3uibUv" id="104EUzG3OTx" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="104EUzG3OTy" role="3clF47">
-          <node concept="3SKdUt" id="104EUzG8RLq" role="3cqZAp">
-            <node concept="3SKdUq" id="104EUzG8RMi" role="3SKWNk">
-              <property role="3SKdUp" value="this happens if a role contains multiple children, with variables among them" />
-            </node>
-          </node>
-          <node concept="3cpWs8" id="104EUzG8Sr5" role="3cqZAp">
-            <node concept="3cpWsn" id="104EUzG8Sr6" role="3cpWs9">
-              <property role="TrG5h" value="parentNode" />
-              <node concept="3Tqbb2" id="104EUzG8Sr7" role="1tU5fm" />
-              <node concept="2OqwBi" id="104EUzG8Sr8" role="33vP2m">
-                <node concept="37vLTw" id="104EUzG8Sr9" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
-                </node>
-                <node concept="2oR75g" id="104EUzG8Sra" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="104EUzG8RZO" role="3cqZAp" />
-          <node concept="3clFbJ" id="104EUzG8SYX" role="3cqZAp">
-            <node concept="3clFbS" id="104EUzG8SZ0" role="3clFbx">
-              <node concept="3clFbJ" id="2q_78a90krK" role="3cqZAp">
-                <node concept="3clFbS" id="2q_78a90krN" role="3clFbx">
-                  <node concept="3clFbF" id="2q_78a90oVy" role="3cqZAp">
-                    <node concept="2OqwBi" id="2q_78a90qgT" role="3clFbG">
-                      <node concept="2OqwBi" id="2q_78a90p3A" role="2Oq$k0">
-                        <node concept="1PxgMI" id="2q_78a90oZ4" role="2Oq$k0">
-                          <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                          <node concept="37vLTw" id="2q_78a90oVw" role="1m5AlR">
-                            <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
-                          </node>
-                        </node>
-                        <node concept="3Tsc0h" id="2q_78a90pyG" role="2OqNvi">
-                          <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                        </node>
-                      </node>
-                      <node concept="2DeJg1" id="2q_78a90t$G" role="2OqNvi">
-                        <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="2q_78a90oRv" role="3cqZAp" />
-                </node>
-                <node concept="2OqwBi" id="5zfvpQ7aeZB" role="3clFbw">
-                  <node concept="37vLTw" id="514BAS_WCP2" role="2Oq$k0">
-                    <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
-                  </node>
-                  <node concept="liA8E" id="5zfvpQ7b2cC" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
-                  </node>
-                </node>
-                <node concept="9aQIb" id="2q_78a90oeF" role="9aQIa">
-                  <node concept="3clFbS" id="2q_78a90oeG" role="9aQI4">
-                    <node concept="3cpWs8" id="677NV56yIGC" role="3cqZAp">
-                      <node concept="3cpWsn" id="677NV56yIGD" role="3cpWs9">
-                        <property role="TrG5h" value="nodeNode" />
-                        <node concept="3Tqbb2" id="677NV56yIGE" role="1tU5fm">
-                          <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                        </node>
-                        <node concept="2OqwBi" id="677NV56yIGF" role="33vP2m">
-                          <node concept="2OqwBi" id="677NV56yIGG" role="2Oq$k0">
-                            <node concept="3Tsc0h" id="677NV56yIGI" role="2OqNvi">
-                              <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                            </node>
-                            <node concept="1PxgMI" id="677NV56yLdW" role="2Oq$k0">
-                              <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                              <node concept="37vLTw" id="677NV56yLdX" role="1m5AlR">
-                                <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2DeJg1" id="677NV56yIGJ" role="2OqNvi">
-                            <ref role="1A0vxQ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWs8" id="677NV56yIGK" role="3cqZAp">
-                      <node concept="3cpWsn" id="677NV56yIGL" role="3cpWs9">
-                        <property role="TrG5h" value="lsubNode" />
-                        <node concept="3Tqbb2" id="677NV56yIGM" role="1tU5fm">
-                          <ref role="ehGHo" to="5j4j:dfChU1zo4B" resolve="Splice" />
-                        </node>
-                        <node concept="2OqwBi" id="677NV56yIGN" role="33vP2m">
-                          <node concept="2OqwBi" id="677NV56yIGO" role="2Oq$k0">
-                            <node concept="37vLTw" id="677NV56yIGP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="677NV56yIGD" resolve="nodeNode" />
-                            </node>
-                            <node concept="3CFZ6_" id="677NV56yIGQ" role="2OqNvi">
-                              <node concept="3CFYIy" id="677NV56yIGR" role="3CFYIz">
-                                <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2DeJnY" id="677NV56yIGS" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWs8" id="677NV56yIGT" role="3cqZAp">
-                      <node concept="3cpWsn" id="677NV56yIGU" role="3cpWs9">
-                        <property role="TrG5h" value="lvNode" />
-                        <node concept="3Tqbb2" id="677NV56yIGV" role="1tU5fm">
-                          <ref role="ehGHo" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
-                        </node>
-                        <node concept="2OqwBi" id="677NV56yIGW" role="33vP2m">
-                          <node concept="2OqwBi" id="677NV56yIGX" role="2Oq$k0">
-                            <node concept="37vLTw" id="677NV56yIGY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="677NV56yIGL" resolve="lsubNode" />
-                            </node>
-                            <node concept="3TrEf2" id="677NV56yIGZ" role="2OqNvi">
-                              <ref role="3Tt5mk" to="5j4j:dfChU1zo4I" resolve="expression" />
-                            </node>
-                          </node>
-                          <node concept="2DeJnY" id="677NV56yIH0" role="2OqNvi">
-                            <ref role="1A9B2P" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="2q_78a8qfIR" role="3cqZAp">
-                      <node concept="37vLTI" id="2q_78a8qfIS" role="3clFbG">
-                        <node concept="2OqwBi" id="2q_78a8qfIW" role="37vLTJ">
-                          <node concept="37vLTw" id="677NV56yMBn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="677NV56yIGU" resolve="lvNode" />
-                          </node>
-                          <node concept="3TrcHB" id="2q_78a8qfIY" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                        <node concept="2YIFZM" id="31Jz$8bZPXE" role="37vLTx">
-                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                          <node concept="2OqwBi" id="31Jz$8bZRWl" role="37wK5m">
-                            <node concept="37vLTw" id="31Jz$8bZQ4I" role="2Oq$k0">
-                              <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
-                            </node>
-                            <node concept="liA8E" id="31Jz$8bZT96" role="2OqNvi">
-                              <ref role="37wK5l" to="ie8e:56MMu0Ark7d" resolve="symbol" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="2q_78a90AbL" role="3cqZAp" />
-            </node>
-            <node concept="2OqwBi" id="104EUzG8T8Y" role="3clFbw">
-              <node concept="37vLTw" id="104EUzG8T8Z" role="2Oq$k0">
-                <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
-              </node>
-              <node concept="1mIQ4w" id="104EUzG8T90" role="2OqNvi">
-                <node concept="chp4Y" id="104EUzG8T91" role="cj9EA">
-                  <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                </node>
-              </node>
-            </node>
-            <node concept="3eNFk2" id="4JRKVCvgVW8" role="3eNLev">
-              <node concept="2OqwBi" id="4JRKVCvgXaX" role="3eO9$A">
-                <node concept="37vLTw" id="4JRKVCvgWBV" role="2Oq$k0">
-                  <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
-                </node>
-                <node concept="1mIQ4w" id="4JRKVCvgXqM" role="2OqNvi">
-                  <node concept="chp4Y" id="4JRKVCvgXr7" role="cj9EA">
-                    <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbS" id="4JRKVCvgVWa" role="3eOfB_">
-                <node concept="3clFbH" id="4JRKVCvgXss" role="3cqZAp" />
-                <node concept="3clFbJ" id="4JRKVCvgY39" role="3cqZAp">
-                  <node concept="3clFbS" id="4JRKVCvgY3a" role="3clFbx">
-                    <node concept="3clFbF" id="4JRKVCvgY3b" role="3cqZAp">
-                      <node concept="2OqwBi" id="4JRKVCvgY3c" role="3clFbG">
-                        <node concept="2OqwBi" id="4JRKVCvgY3d" role="2Oq$k0">
-                          <node concept="1PxgMI" id="4JRKVCvgY3e" role="2Oq$k0">
-                            <ref role="1m5ApE" to="5j4j:1OShD0HAY6y" resolve="List" />
-                            <node concept="37vLTw" id="4JRKVCvgY3f" role="1m5AlR">
-                              <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
-                            </node>
-                          </node>
-                          <node concept="3Tsc0h" id="4JRKVCvgYyD" role="2OqNvi">
-                            <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
-                          </node>
-                        </node>
-                        <node concept="2DeJg1" id="4JRKVCvgY3h" role="2OqNvi">
-                          <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="4JRKVCvgY3i" role="3cqZAp" />
-                  </node>
-                  <node concept="9aQIb" id="4JRKVCvgY3q" role="9aQIa">
-                    <node concept="3clFbS" id="4JRKVCvgY3r" role="9aQI4">
-                      <node concept="3cpWs8" id="4JRKVCvgY3s" role="3cqZAp">
-                        <node concept="3cpWsn" id="4JRKVCvgY3t" role="3cpWs9">
-                          <property role="TrG5h" value="nodeNode" />
-                          <node concept="3Tqbb2" id="4JRKVCvgY3u" role="1tU5fm">
-                            <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                          </node>
-                          <node concept="2OqwBi" id="4JRKVCvgY3v" role="33vP2m">
-                            <node concept="2OqwBi" id="4JRKVCvgY3w" role="2Oq$k0">
-                              <node concept="3Tsc0h" id="4JRKVCvh04n" role="2OqNvi">
-                                <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
-                              </node>
-                              <node concept="1PxgMI" id="4JRKVCvgY3y" role="2Oq$k0">
-                                <ref role="1m5ApE" to="5j4j:1OShD0HAY6y" resolve="List" />
-                                <node concept="37vLTw" id="4JRKVCvgY3z" role="1m5AlR">
-                                  <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="2DeJg1" id="4JRKVCvgY3$" role="2OqNvi">
-                              <ref role="1A0vxQ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs8" id="4JRKVCvgY3_" role="3cqZAp">
-                        <node concept="3cpWsn" id="4JRKVCvgY3A" role="3cpWs9">
-                          <property role="TrG5h" value="lsubNode" />
-                          <node concept="3Tqbb2" id="4JRKVCvgY3B" role="1tU5fm">
-                            <ref role="ehGHo" to="5j4j:dfChU1zo4B" resolve="Splice" />
-                          </node>
-                          <node concept="2OqwBi" id="4JRKVCvgY3C" role="33vP2m">
-                            <node concept="2OqwBi" id="4JRKVCvgY3D" role="2Oq$k0">
-                              <node concept="37vLTw" id="4JRKVCvgY3E" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4JRKVCvgY3t" resolve="nodeNode" />
-                              </node>
-                              <node concept="3CFZ6_" id="4JRKVCvgY3F" role="2OqNvi">
-                                <node concept="3CFYIy" id="4JRKVCvgY3G" role="3CFYIz">
-                                  <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="2DeJnY" id="4JRKVCvgY3H" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs8" id="4JRKVCvgY3I" role="3cqZAp">
-                        <node concept="3cpWsn" id="4JRKVCvgY3J" role="3cpWs9">
-                          <property role="TrG5h" value="lvNode" />
-                          <node concept="3Tqbb2" id="4JRKVCvgY3K" role="1tU5fm">
-                            <ref role="ehGHo" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
-                          </node>
-                          <node concept="2OqwBi" id="4JRKVCvgY3L" role="33vP2m">
-                            <node concept="2OqwBi" id="4JRKVCvgY3M" role="2Oq$k0">
-                              <node concept="37vLTw" id="4JRKVCvgY3N" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4JRKVCvgY3A" resolve="lsubNode" />
-                              </node>
-                              <node concept="3TrEf2" id="4JRKVCvgY3O" role="2OqNvi">
-                                <ref role="3Tt5mk" to="5j4j:dfChU1zo4I" resolve="expression" />
-                              </node>
-                            </node>
-                            <node concept="2DeJnY" id="4JRKVCvgY3P" role="2OqNvi">
-                              <ref role="1A9B2P" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="4JRKVCvgY3Q" role="3cqZAp">
-                        <node concept="37vLTI" id="4JRKVCvgY3R" role="3clFbG">
-                          <node concept="2OqwBi" id="4JRKVCvgY3S" role="37vLTJ">
-                            <node concept="37vLTw" id="4JRKVCvgY3T" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4JRKVCvgY3J" resolve="lvNode" />
-                            </node>
-                            <node concept="3TrcHB" id="4JRKVCvgY3U" role="2OqNvi">
-                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                            </node>
-                          </node>
-                          <node concept="2YIFZM" id="4JRKVCvgY3V" role="37vLTx">
-                            <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                            <node concept="2OqwBi" id="4JRKVCvgY3W" role="37wK5m">
-                              <node concept="37vLTw" id="4JRKVCvgY3X" role="2Oq$k0">
-                                <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
-                              </node>
-                              <node concept="liA8E" id="4JRKVCvgY3Y" role="2OqNvi">
-                                <ref role="37wK5l" to="ie8e:56MMu0Ark7d" resolve="symbol" />
+                              <node concept="37vLTw" id="3F6vMxqeqco" role="3uHU7w">
+                                <ref role="3cqZAo" node="3F6vMxqeqbY" resolve="name" />
                               </node>
                             </node>
                           </node>
@@ -5732,120 +7496,320 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="5zfvpQ7afN6" role="3clFbw">
-                    <node concept="37vLTw" id="514BAS_WD6y" role="2Oq$k0">
-                      <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
-                    </node>
-                    <node concept="liA8E" id="2DKqMqOmVqN" role="2OqNvi">
-                      <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
-                    </node>
+                  <node concept="37vLTw" id="3F6vMxqeqcp" role="37vLTJ">
+                    <ref role="3cqZAo" node="3F6vMxqeqc2" resolve="handlerCls" />
                   </node>
                 </node>
-                <node concept="3clFbH" id="4JRKVCvgXsz" role="3cqZAp" />
               </node>
             </node>
-            <node concept="3eNFk2" id="104EUzG90i0" role="3eNLev">
-              <node concept="2OqwBi" id="104EUzG90pA" role="3eO9$A">
-                <node concept="37vLTw" id="104EUzG90mB" role="2Oq$k0">
-                  <ref role="3cqZAo" node="104EUzG8Sr6" resolve="parentNode" />
-                </node>
-                <node concept="1mIQ4w" id="104EUzG90BI" role="2OqNvi">
-                  <node concept="chp4Y" id="104EUzG90D5" role="cj9EA">
-                    <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbS" id="104EUzG90i2" role="3eOfB_">
-                <node concept="3SKdUt" id="104EUzGbi1v" role="3cqZAp">
-                  <node concept="3SKdUq" id="104EUzGbi1E" role="3SKWNk">
-                    <property role="3SKdUp" value="FIXME implement me" />
-                  </node>
-                </node>
-                <node concept="YS8fn" id="104EUzG90IL" role="3cqZAp">
-                  <node concept="2ShNRf" id="104EUzG90KW" role="YScLw">
-                    <node concept="1pGfFk" id="104EUzG915C" role="2ShVmc">
-                      <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="104EUzG994x" role="3cqZAp" />
-              </node>
-            </node>
-            <node concept="9aQIb" id="104EUzG917W" role="9aQIa">
-              <node concept="3clFbS" id="104EUzG917X" role="9aQI4">
-                <node concept="3SKdUt" id="104EUzGbhN0" role="3cqZAp">
-                  <node concept="3SKdUq" id="104EUzGbhNf" role="3SKWNk">
-                    <property role="3SKdUp" value="FIXME implement me" />
-                  </node>
-                </node>
-                <node concept="YS8fn" id="104EUzG91Gc" role="3cqZAp">
-                  <node concept="2ShNRf" id="104EUzG91Ha" role="YScLw">
-                    <node concept="1pGfFk" id="104EUzG9221" role="2ShVmc">
-                      <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            <node concept="TDmWw" id="3F6vMxqeqcq" role="TEbGg">
+              <node concept="3clFbS" id="3F6vMxqeqcr" role="TDEfX">
+                <node concept="YS8fn" id="3F6vMxqeqcs" role="3cqZAp">
+                  <node concept="2ShNRf" id="3F6vMxqeqct" role="YScLw">
+                    <node concept="1pGfFk" id="3F6vMxqeqcu" role="2ShVmc">
+                      <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.Throwable)" resolve="RuntimeException" />
+                      <node concept="37vLTw" id="3F6vMxqeqcv" role="37wK5m">
+                        <ref role="3cqZAo" node="3F6vMxqeqcw" resolve="e" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="104EUzG92qN" role="3cqZAp" />
-          <node concept="3clFbF" id="104EUzG92Zy" role="3cqZAp">
-            <node concept="Rm8GO" id="104EUzG93tD" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="104EUzG3RpE" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="104EUzG3Qe9" role="jymVt" />
-      <node concept="3clFb_" id="4sVJFklM5Qk" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="endWalk" />
-        <node concept="3cqZAl" id="4sVJFklM5Ql" role="3clF45" />
-        <node concept="3Tm1VV" id="4sVJFklM5Qm" role="1B3o_S" />
-        <node concept="3clFbS" id="4sVJFklM5Qo" role="3clF47">
-          <node concept="3clFbF" id="4sVJFklSl$K" role="3cqZAp">
-            <node concept="2OqwBi" id="4sVJFklSlXt" role="3clFbG">
-              <node concept="37vLTw" id="4sVJFklSl$J" role="2Oq$k0">
-                <ref role="3cqZAo" node="4sVJFklNtS3" resolve="stack" />
+              <node concept="3cpWsn" id="3F6vMxqeqcw" role="TDEfY">
+                <property role="TrG5h" value="e" />
+                <node concept="3uibUv" id="3F6vMxqeqcx" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~ClassNotFoundException" resolve="ClassNotFoundException" />
+                </node>
               </node>
-              <node concept="2AryhJ" id="4sVJFklSn11" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3cpWs6" id="3F6vMxqeqcy" role="3cqZAp">
+            <node concept="37vLTw" id="3F6vMxqeqcz" role="3cqZAk">
+              <ref role="3cqZAo" node="3F6vMxqeqc2" resolve="handlerCls" />
             </node>
           </node>
         </node>
-        <node concept="2AHcQZ" id="4sVJFklM8iV" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4sVJFklNtyl" role="jymVt" />
-      <node concept="312cEg" id="4sVJFklNtS3" role="jymVt">
-        <property role="34CwA1" value="false" />
-        <property role="eg7rD" value="false" />
-        <property role="TrG5h" value="stack" />
-        <property role="3TUv4t" value="false" />
-        <node concept="oyxx6" id="4sVJFklS203" role="1tU5fm">
-          <node concept="3Tqbb2" id="4sVJFklS3RE" role="3O5elw" />
-        </node>
-        <node concept="3Tm6S6" id="4sVJFklNuez" role="1B3o_S" />
-        <node concept="2ShNRf" id="4sVJFklSyi7" role="33vP2m">
-          <node concept="2Jqq0_" id="4sVJFklSy8R" role="2ShVmc">
-            <node concept="3Tqbb2" id="4sVJFklSy8S" role="HW$YZ" />
-          </node>
-        </node>
-      </node>
-      <node concept="312cEg" id="2$F5QputLbm" role="jymVt">
-        <property role="TrG5h" value="namingContext" />
-        <node concept="3Tm6S6" id="2$F5QputLbn" role="1B3o_S" />
-        <node concept="3uibUv" id="2$F5QputLbp" role="1tU5fm">
-          <ref role="3uigEE" to="nz6g:2$F5QputikM" resolve="NamingContext" />
-        </node>
+        <node concept="3Tm6S6" id="3F6vMxqeqbR" role="1B3o_S" />
       </node>
     </node>
-    <node concept="2tJIrI" id="4sVJFklM5wx" role="jymVt" />
-    <node concept="2tJIrI" id="4sVJFklM5w$" role="jymVt" />
   </node>
+  <node concept="sE7Ow" id="6OUp3PsWo3r">
+    <property role="TrG5h" value="MarkTypesJchr" />
+    <property role="2uzpH1" value="Mark Types Using JCHR" />
+    <property role="72QZ$" value="true" />
+    <node concept="tnohg" id="6OUp3PsWo3s" role="tncku">
+      <node concept="3clFbS" id="6OUp3PsWo3t" role="2VODD2">
+        <node concept="3clFbF" id="6OUp3PsWo3u" role="3cqZAp">
+          <node concept="2YIFZM" id="33j_O21qPuz" role="3clFbG">
+            <ref role="37wK5l" to="t5kh:3WU9yfAbTWe" resolve="clearAll" />
+            <ref role="1Pybhc" to="t5kh:41ox5VnpFrR" resolve="MarkPlugin" />
+            <node concept="2OqwBi" id="33j_O21qPu$" role="37wK5m">
+              <node concept="2WthIp" id="33j_O21qPu_" role="2Oq$k0" />
+              <node concept="1DTwFV" id="33j_O21qPuA" role="2OqNvi">
+                <ref role="2WH_rO" node="6OUp3PsWo4C" resolve="mpsProject" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6OUp3PsWo3z" role="3cqZAp" />
+        <node concept="3cpWs8" id="6OUp3PsWo3$" role="3cqZAp">
+          <node concept="3cpWsn" id="6OUp3PsWo3_" role="3cpWs9">
+            <property role="TrG5h" value="helper" />
+            <node concept="3uibUv" id="3F6vMxqd3zO" role="1tU5fm">
+              <ref role="3uigEE" node="3F6vMxqcGYg" resolve="JchrTypecheckingHelper" />
+            </node>
+            <node concept="2ShNRf" id="6OUp3PsWo3B" role="33vP2m">
+              <node concept="1pGfFk" id="3F6vMxqbHll" role="2ShVmc">
+                <ref role="37wK5l" node="3F6vMxqcI8I" resolve="JchrTypecheckingHelper" />
+                <node concept="2OqwBi" id="6OUp3PsWo3E" role="37wK5m">
+                  <node concept="2WthIp" id="6OUp3PsWo3F" role="2Oq$k0">
+                    <ref role="32nkFo" node="6OUp3PsWo3r" resolve="MarkTypesJchr" />
+                  </node>
+                  <node concept="1DTwFV" id="6OUp3PsWo3G" role="2OqNvi">
+                    <ref role="2WH_rO" node="6OUp3PsWo4C" resolve="mpsProject" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="3F6vMxqbDRh" role="37wK5m">
+                  <node concept="YeOm9" id="3F6vMxqbGEY" role="2ShVmc">
+                    <node concept="1Y3b0j" id="3F6vMxqbGF1" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <ref role="1Y3XeK" to="t5kh:3F6vMxqaxpm" resolve="TypecheckingHelper.DoneCallback" />
+                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                      <node concept="3Tm1VV" id="3F6vMxqbGF2" role="1B3o_S" />
+                      <node concept="3clFb_" id="3F6vMxqbGF3" role="jymVt">
+                        <property role="TrG5h" value="finished" />
+                        <property role="1EzhhJ" value="false" />
+                        <property role="IEkAT" value="false" />
+                        <node concept="37vLTG" id="3F6vMxqbGF4" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="3F6vMxqbGF5" role="1tU5fm" />
+                        </node>
+                        <node concept="3cqZAl" id="3F6vMxqbGF6" role="3clF45" />
+                        <node concept="3Tm1VV" id="3F6vMxqbGF7" role="1B3o_S" />
+                        <node concept="3clFbS" id="3F6vMxqbGF9" role="3clF47">
+                          <node concept="3clFbF" id="6OUp3PsWo3O" role="3cqZAp">
+                            <node concept="2YIFZM" id="6OUp3PsWo3P" role="3clFbG">
+                              <ref role="37wK5l" to="jkm4:~Messages.showInfoMessage(java.lang.String,java.lang.String):void" resolve="showInfoMessage" />
+                              <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                              <node concept="37vLTw" id="6OUp3PsWo3Q" role="37wK5m">
+                                <ref role="3cqZAo" node="3F6vMxqbGF4" resolve="message" />
+                              </node>
+                              <node concept="Xl_RD" id="6OUp3PsWo3R" role="37wK5m">
+                                <property role="Xl_RC" value="Mark Types" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFb_" id="3F6vMxqbGFb" role="jymVt">
+                        <property role="TrG5h" value="failed" />
+                        <property role="1EzhhJ" value="false" />
+                        <node concept="37vLTG" id="3F6vMxqbGFc" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="3F6vMxqbGFd" role="1tU5fm" />
+                        </node>
+                        <node concept="3cqZAl" id="3F6vMxqbGFe" role="3clF45" />
+                        <node concept="3Tm1VV" id="3F6vMxqbGFf" role="1B3o_S" />
+                        <node concept="3clFbS" id="3F6vMxqbGFh" role="3clF47">
+                          <node concept="3clFbF" id="6OUp3PsWo3Y" role="3cqZAp">
+                            <node concept="2YIFZM" id="6OUp3PsWo3Z" role="3clFbG">
+                              <ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
+                              <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                              <node concept="37vLTw" id="6OUp3PsWo40" role="37wK5m">
+                                <ref role="3cqZAo" node="3F6vMxqbGFc" resolve="message" />
+                              </node>
+                              <node concept="Xl_RD" id="6OUp3PsWo41" role="37wK5m">
+                                <property role="Xl_RC" value="Mark Types" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6OUp3PsWo42" role="3cqZAp">
+          <node concept="2OqwBi" id="6OUp3PsWo43" role="3clFbG">
+            <node concept="37vLTw" id="6OUp3PsWo44" role="2Oq$k0">
+              <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
+            </node>
+            <node concept="liA8E" id="6OUp3PsWo45" role="2OqNvi">
+              <ref role="37wK5l" to="t5kh:1pPth$lNtBJ" resolve="withSteps" />
+              <node concept="2OqwBi" id="6OUp3PsWo46" role="37wK5m">
+                <node concept="37vLTw" id="6OUp3PsWo47" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
+                </node>
+                <node concept="liA8E" id="6OUp3PsWo48" role="2OqNvi">
+                  <ref role="37wK5l" to="t5kh:1pPth$lBvOo" resolve="collectRules" />
+                  <node concept="2YIFZM" id="6OUp3PsWo49" role="37wK5m">
+                    <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+                    <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
+                    <node concept="2OqwBi" id="6OUp3PsWo4a" role="37wK5m">
+                      <node concept="2WthIp" id="6OUp3PsWo4b" role="2Oq$k0" />
+                      <node concept="1DTwFV" id="6OUp3PsWo4c" role="2OqNvi">
+                        <ref role="2WH_rO" node="6OUp3PsWo4E" resolve="node" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6OUp3PsWo4d" role="37wK5m">
+                <node concept="37vLTw" id="6OUp3PsWo4e" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
+                </node>
+                <node concept="liA8E" id="6OUp3PsWo4f" role="2OqNvi">
+                  <ref role="37wK5l" node="1pPth$lBwLp" resolve="produceHandler" />
+                  <node concept="3clFbT" id="6OUp3PsWpqJ" role="37wK5m">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6OUp3PsWo4h" role="37wK5m">
+                <node concept="37vLTw" id="6OUp3PsWo4i" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
+                </node>
+                <node concept="liA8E" id="6OUp3PsWo4j" role="2OqNvi">
+                  <ref role="37wK5l" node="1pPth$lD9_s" resolve="makeHandler" />
+                  <node concept="3clFbT" id="6OUp3PsWpzG" role="37wK5m">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6OUp3PsWo4l" role="37wK5m">
+                <node concept="37vLTw" id="6OUp3PsWo4m" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
+                </node>
+                <node concept="liA8E" id="6OUp3PsWo4n" role="2OqNvi">
+                  <ref role="37wK5l" node="3F6vMxqcJVn" resolve="runTypechecking" />
+                  <node concept="2YIFZM" id="6OUp3PsWo4o" role="37wK5m">
+                    <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+                    <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
+                    <node concept="2OqwBi" id="6OUp3PsWo4p" role="37wK5m">
+                      <node concept="2WthIp" id="6OUp3PsWo4q" role="2Oq$k0" />
+                      <node concept="1DTwFV" id="6OUp3PsWo4r" role="2OqNvi">
+                        <ref role="2WH_rO" node="6OUp3PsWo4E" resolve="node" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbT" id="1N_0WA5Ii8F" role="37wK5m">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6OUp3PsWo4t" role="37wK5m">
+                <node concept="37vLTw" id="6OUp3PsWo4u" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
+                </node>
+                <node concept="liA8E" id="6OUp3PsWo4v" role="2OqNvi">
+                  <ref role="37wK5l" to="t5kh:1pPth$lDplP" resolve="highlightTypesAndErrors" />
+                  <node concept="2OqwBi" id="6OUp3PsWo4w" role="37wK5m">
+                    <node concept="2WthIp" id="6OUp3PsWo4x" role="2Oq$k0" />
+                    <node concept="1DTwFV" id="6OUp3PsWo4y" role="2OqNvi">
+                      <ref role="2WH_rO" node="6OUp3PsWo4G" resolve="editorComponent" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6OUp3PsWo4z" role="3cqZAp" />
+        <node concept="3clFbF" id="6OUp3PsWo4$" role="3cqZAp">
+          <node concept="2OqwBi" id="6OUp3PsWo4_" role="3clFbG">
+            <node concept="37vLTw" id="6OUp3PsWo4A" role="2Oq$k0">
+              <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
+            </node>
+            <node concept="liA8E" id="6OUp3PsWo4B" role="2OqNvi">
+              <ref role="37wK5l" to="t5kh:1pPth$lNVW2" resolve="execute" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1DS2jV" id="6OUp3PsWo4C" role="1NuT2Z">
+      <property role="TrG5h" value="mpsProject" />
+      <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
+      <node concept="1oajcY" id="6OUp3PsWo4D" role="1oa70y" />
+    </node>
+    <node concept="1DS2jV" id="6OUp3PsWo4E" role="1NuT2Z">
+      <property role="TrG5h" value="node" />
+      <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.NODE" resolve="NODE" />
+      <node concept="1oajcY" id="6OUp3PsWo4F" role="1oa70y" />
+    </node>
+    <node concept="1DS2jV" id="6OUp3PsWo4G" role="1NuT2Z">
+      <property role="TrG5h" value="editorComponent" />
+      <ref role="1DUlNI" to="k3nr:~MPSEditorDataKeys.EDITOR_COMPONENT" resolve="EDITOR_COMPONENT" />
+      <node concept="1oajcY" id="6OUp3PsWo4H" role="1oa70y" />
+    </node>
+    <node concept="2ScWuX" id="6OUp3PsWo4I" role="tmbBb">
+      <node concept="3clFbS" id="6OUp3PsWo4J" role="2VODD2">
+        <node concept="3cpWs8" id="6OUp3PsWo4K" role="3cqZAp">
+          <node concept="3cpWsn" id="6OUp3PsWo4L" role="3cpWs9">
+            <property role="TrG5h" value="containingRoot" />
+            <node concept="3Tqbb2" id="6OUp3PsWo4M" role="1tU5fm" />
+            <node concept="2OqwBi" id="6OUp3PsWo4N" role="33vP2m">
+              <node concept="2OqwBi" id="6OUp3PsWo4O" role="2Oq$k0">
+                <node concept="2WthIp" id="6OUp3PsWo4P" role="2Oq$k0" />
+                <node concept="1DTwFV" id="6OUp3PsWo4Q" role="2OqNvi">
+                  <ref role="2WH_rO" node="6OUp3PsWo4E" resolve="node" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6OUp3PsWo4R" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6OUp3PsWo4S" role="3cqZAp">
+          <node concept="1Wc70l" id="6OUp3PsWo4T" role="3clFbG">
+            <node concept="1Wc70l" id="6OUp3PsWo4U" role="3uHU7B">
+              <node concept="3clFbC" id="6OUp3PsWo4V" role="3uHU7w">
+                <node concept="37vLTw" id="6OUp3PsWo4W" role="3uHU7B">
+                  <ref role="3cqZAo" node="6OUp3PsWo4L" resolve="containingRoot" />
+                </node>
+                <node concept="2OqwBi" id="6OUp3PsWo4X" role="3uHU7w">
+                  <node concept="2OqwBi" id="6OUp3PsWo4Y" role="2Oq$k0">
+                    <node concept="2WthIp" id="6OUp3PsWo4Z" role="2Oq$k0" />
+                    <node concept="1DTwFV" id="6OUp3PsWo50" role="2OqNvi">
+                      <ref role="2WH_rO" node="6OUp3PsWo4G" resolve="editorComponent" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="6OUp3PsWo51" role="2OqNvi">
+                    <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6OUp3PsWo52" role="3uHU7B">
+                <node concept="37vLTw" id="6OUp3PsWo53" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6OUp3PsWo4L" resolve="containingRoot" />
+                </node>
+                <node concept="1mIQ4w" id="6OUp3PsWo54" role="2OqNvi">
+                  <node concept="chp4Y" id="6OUp3PsWo55" role="cj9EA">
+                    <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3fqX7Q" id="6OUp3PsWo56" role="3uHU7w">
+              <node concept="2OqwBi" id="6OUp3PsWo57" role="3fr31v">
+                <node concept="2YIFZM" id="6OUp3PsWo58" role="2Oq$k0">
+                  <ref role="37wK5l" to="hfuk:7yGn3z4MRr2" resolve="get" />
+                  <ref role="1Pybhc" to="hfuk:7yGn3z4MRqM" resolve="IMakeService.INSTANCE" />
+                </node>
+                <node concept="liA8E" id="6OUp3PsWo59" role="2OqNvi">
+                  <ref role="37wK5l" to="hfuk:7yGn3z4N64o" resolve="isSessionActive" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="2DaZZR" id="3Qp4N06byoy" />
 </model>
 
diff --git a/logic/solutions/jetbrains.mps.logic.jchr/Logic.jchr.iml b/jchr/solutions/jetbrains.mps.logic.jchr/Logic.jchr.iml
similarity index 100%
rename from logic/solutions/jetbrains.mps.logic.jchr/Logic.jchr.iml
rename to jchr/solutions/jetbrains.mps.logic.jchr/Logic.jchr.iml
diff --git a/logic/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd b/jchr/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd
similarity index 57%
rename from logic/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd
rename to jchr/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd
index 14046ac5..0c337525 100644
--- a/logic/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd
+++ b/jchr/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd
@@ -11,16 +11,17 @@
     <dependency reexport="true">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
+    <dependency reexport="false">c3941617-f429-4b63-b06e-42126b247dcb(jetbrains.mps.logic_jchr.runtime)</dependency>
   </dependencies>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
@@ -29,6 +30,7 @@
     <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
+    <module reference="c3941617-f429-4b63-b06e-42126b247dcb(jetbrains.mps.logic_jchr.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps b/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
similarity index 92%
rename from logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
rename to jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
index dd801686..f982fc3a 100644
--- a/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
+++ b/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
@@ -8,20 +8,18 @@
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="f8dg" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:annotations(jetbrains.mps.jchr.runtime/)" />
     <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="eift" ref="a5478664-6b44-4c62-a9f7-434f8aa57eee/java:runtime(jetbrains.mps.logic.runtime/)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="9js4" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime.hash(jetbrains.mps.jchr.runtime/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
     <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="eift" ref="c3941617-f429-4b63-b06e-42126b247dcb/java:runtime(jetbrains.mps.logic_jchr.runtime/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -215,6 +213,11 @@
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
         <child id="1107797138135" name="extendedInterface" index="3HQHJm" />
       </concept>
+      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
+        <child id="1163668914799" name="condition" index="3K4Cdx" />
+        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
+        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
+      </concept>
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -246,6 +249,7 @@
       <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -449,7 +453,7 @@
       <node concept="37vLTG" id="4U_yxogCcGL" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCd0t" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="3cqZAl" id="4U_yxogCcGN" role="3clF45" />
@@ -473,7 +477,7 @@
       <node concept="37vLTG" id="4U_yxogCdjZ" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogCdk0" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogCdjX" role="3clF46">
@@ -503,13 +507,13 @@
       <node concept="37vLTG" id="4U_yxogCe_V" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogCe_W" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogCe_X" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCf2Z" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="3cqZAl" id="4U_yxogCe_Z" role="3clF45" />
@@ -569,7 +573,7 @@
       <node concept="37vLTG" id="4U_yxogC9UK" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCabD" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="10P_77" id="4U_yxogCc3n" role="3clF45" />
@@ -593,7 +597,7 @@
       <node concept="37vLTG" id="4U_yxogCan0" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogCan1" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogCamY" role="3clF46">
@@ -623,13 +627,13 @@
       <node concept="37vLTG" id="4U_yxogCbuE" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogCbuF" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogCbuG" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCbIA" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="10P_77" id="4U_yxogCcuX" role="3clF45" />
@@ -4506,7 +4510,7 @@
       <node concept="37vLTG" id="6MYr6JwItZZ" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwIu00" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="3cqZAl" id="6MYr6JwIu01" role="3clF45" />
@@ -4545,7 +4549,7 @@
       <node concept="37vLTG" id="6MYr6JwIu09" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwIu0a" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwIu0b" role="3clF46">
@@ -4590,13 +4594,13 @@
       <node concept="37vLTG" id="6MYr6JwIu0l" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwIu0m" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwIu0n" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwIu0o" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="3cqZAl" id="6MYr6JwIu0p" role="3clF45" />
@@ -4686,7 +4690,7 @@
       <node concept="37vLTG" id="6MYr6JwUNOE" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwUNOF" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="10P_77" id="6MYr6JwUNOG" role="3clF45" />
@@ -4725,7 +4729,7 @@
       <node concept="37vLTG" id="6MYr6JwUNP3" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwUNP4" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwUNP5" role="3clF46">
@@ -4770,13 +4774,13 @@
       <node concept="37vLTG" id="6MYr6JwUNPu" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwUNPv" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwUNPw" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwUNPx" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
         </node>
       </node>
       <node concept="10P_77" id="6MYr6JwUNPy" role="3clF45" />
@@ -5220,5 +5224,413 @@
       <ref role="3uigEE" to="45ys:6MYr6JwANOa" resolve="LogicalUnification" />
     </node>
   </node>
+  <node concept="312cEu" id="4U_yxogAknZ">
+    <property role="TrG5h" value="AtomLogical" />
+    <node concept="2tJIrI" id="4U_yxogB9ZV" role="jymVt" />
+    <node concept="3clFbW" id="4U_yxogBkww" role="jymVt">
+      <node concept="3cqZAl" id="4U_yxogBkwx" role="3clF45" />
+      <node concept="3clFbS" id="4U_yxogBkwz" role="3clF47">
+        <node concept="XkiVB" id="4U_yxogBkBp" role="3cqZAp">
+          <ref role="37wK5l" node="3HJTsBmBUfM" resolve="JchrLogical" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6SkxsM$bMnC" role="1B3o_S" />
+      <node concept="2AHcQZ" id="6SkxsM$bLTa" role="2AJF6D">
+        <ref role="2AI5Lk" to="f8dg:~JCHR_Declare" resolve="JCHR_Declare" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2DKqMqOlUqa" role="jymVt" />
+    <node concept="3clFbW" id="2DKqMqOlTiR" role="jymVt">
+      <node concept="2AHcQZ" id="2DKqMqOlTiW" role="2AJF6D">
+        <ref role="2AI5Lk" to="f8dg:~JCHR_Declare" resolve="JCHR_Declare" />
+      </node>
+      <node concept="3cqZAl" id="2DKqMqOlTiS" role="3clF45" />
+      <node concept="3clFbS" id="2DKqMqOlTiT" role="3clF47">
+        <node concept="XkiVB" id="2DKqMqOlTiU" role="3cqZAp">
+          <ref role="37wK5l" node="2DKqMqOlOj4" resolve="JchrLogical" />
+          <node concept="37vLTw" id="2DKqMqOlVIe" role="37wK5m">
+            <ref role="3cqZAo" node="2DKqMqOlVxk" resolve="wildcard" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2DKqMqOlTiV" role="1B3o_S" />
+      <node concept="37vLTG" id="2DKqMqOlVxk" role="3clF46">
+        <property role="TrG5h" value="wildcard" />
+        <node concept="10P_77" id="2DKqMqOlVxj" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6SkxsM$30ID" role="jymVt" />
+    <node concept="3clFbW" id="6SkxsM$96Z2" role="jymVt">
+      <node concept="2AHcQZ" id="6SkxsM$bM5w" role="2AJF6D">
+        <ref role="2AI5Lk" to="f8dg:~JCHR_Declare" resolve="JCHR_Declare" />
+      </node>
+      <node concept="37vLTG" id="6SkxsM$96Z3" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="6SkxsM$96Z4" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="6SkxsM$96Z5" role="3clF45" />
+      <node concept="3clFbS" id="6SkxsM$96Z6" role="3clF47">
+        <node concept="XkiVB" id="6SkxsM$96Z7" role="3cqZAp">
+          <ref role="37wK5l" node="3HJTsBmBV0W" resolve="JchrLogical" />
+          <node concept="37vLTw" id="6SkxsM$96Z8" role="37wK5m">
+            <ref role="3cqZAo" node="6SkxsM$96Z3" resolve="name" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6SkxsM$bMwH" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7nuzzkr21VL" role="jymVt" />
+    <node concept="3clFbW" id="7nuzzkr2143" role="jymVt">
+      <node concept="2AHcQZ" id="7nuzzkr214b" role="2AJF6D">
+        <ref role="2AI5Lk" to="f8dg:~JCHR_Declare" resolve="JCHR_Declare" />
+      </node>
+      <node concept="37vLTG" id="7nuzzkr2144" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="7nuzzkr2145" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7nuzzkr22MK" role="3clF46">
+        <property role="TrG5h" value="wildcard" />
+        <node concept="10P_77" id="7nuzzkr231n" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="7nuzzkr2146" role="3clF45" />
+      <node concept="3clFbS" id="7nuzzkr2147" role="3clF47">
+        <node concept="XkiVB" id="7nuzzkr2148" role="3cqZAp">
+          <ref role="37wK5l" node="7nuzzkr1W8y" resolve="JchrLogical" />
+          <node concept="37vLTw" id="7nuzzkr2149" role="37wK5m">
+            <ref role="3cqZAo" node="7nuzzkr2144" resolve="name" />
+          </node>
+          <node concept="37vLTw" id="7nuzzkr23aF" role="37wK5m">
+            <ref role="3cqZAo" node="7nuzzkr22MK" resolve="wildcard" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7nuzzkr214a" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="6SkxsM$96Z1" role="jymVt" />
+    <node concept="3clFbW" id="6SkxsM$2Uu7" role="jymVt">
+      <node concept="2AHcQZ" id="6SkxsM$bMc$" role="2AJF6D">
+        <ref role="2AI5Lk" to="f8dg:~JCHR_Init" resolve="JCHR_Init" />
+      </node>
+      <node concept="3cqZAl" id="6SkxsM$2Uua" role="3clF45" />
+      <node concept="3clFbS" id="6SkxsM$2Uub" role="3clF47">
+        <node concept="XkiVB" id="6SkxsM$301q" role="3cqZAp">
+          <ref role="37wK5l" node="3HJTsBmBVmo" resolve="JchrLogical" />
+          <node concept="10Nm6u" id="3HJTsBmCNtN" role="37wK5m" />
+          <node concept="37vLTw" id="6SkxsM$302O" role="37wK5m">
+            <ref role="3cqZAo" node="6SkxsM$2XXX" resolve="atom" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6SkxsM$bMBA" role="1B3o_S" />
+      <node concept="37vLTG" id="6SkxsM$2XXX" role="3clF46">
+        <property role="TrG5h" value="atom" />
+        <node concept="3uibUv" id="6SkxsM$2XXW" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1GDBwhEEL81" role="jymVt" />
+    <node concept="3clFbW" id="1GDBwhEEL82" role="jymVt">
+      <node concept="2AHcQZ" id="1GDBwhEEL8a" role="2AJF6D">
+        <ref role="2AI5Lk" to="f8dg:~JCHR_Init" resolve="JCHR_Init" />
+      </node>
+      <node concept="3cqZAl" id="1GDBwhEEL83" role="3clF45" />
+      <node concept="3clFbS" id="1GDBwhEEL84" role="3clF47">
+        <node concept="XkiVB" id="1GDBwhEEL85" role="3cqZAp">
+          <ref role="37wK5l" node="3HJTsBmBVmo" resolve="JchrLogical" />
+          <node concept="37vLTw" id="1GDBwhEEM8m" role="37wK5m">
+            <ref role="3cqZAo" node="1GDBwhEEM36" resolve="name" />
+          </node>
+          <node concept="37vLTw" id="1GDBwhEEL86" role="37wK5m">
+            <ref role="3cqZAo" node="1GDBwhEEL88" resolve="atom" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1GDBwhEEL87" role="1B3o_S" />
+      <node concept="37vLTG" id="1GDBwhEEM36" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="1GDBwhEEM3$" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1GDBwhEEL88" role="3clF46">
+        <property role="TrG5h" value="atom" />
+        <node concept="3uibUv" id="1GDBwhEEL89" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2h41Ezbxe8N" role="jymVt" />
+    <node concept="3clFb_" id="3mz2_dYqEdN" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="withMeta" />
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <node concept="37vLTG" id="3mz2_dYqKiz" role="3clF46">
+        <property role="TrG5h" value="metaLogical" />
+        <node concept="3uibUv" id="3mz2_dYqL9h" role="1tU5fm">
+          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3mz2_dYqEdQ" role="3clF47">
+        <node concept="3clFbF" id="3mz2_dYqLkZ" role="3cqZAp">
+          <node concept="37vLTI" id="3mz2_dYqLl1" role="3clFbG">
+            <node concept="2OqwBi" id="3mz2_dYqLl5" role="37vLTJ">
+              <node concept="Xjq3P" id="3mz2_dYqLl8" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3mz2_dYqLl4" role="2OqNvi">
+                <ref role="2Oxat5" node="3mz2_dYqLkV" resolve="metaLogical" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="3mz2_dYqLl9" role="37vLTx">
+              <ref role="3cqZAo" node="3mz2_dYqKiz" resolve="metaLogical" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3mz2_dYqQgU" role="3cqZAp">
+          <node concept="Xjq3P" id="3mz2_dYqQgS" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3mz2_dYqDhF" role="1B3o_S" />
+      <node concept="3uibUv" id="3mz2_dYqNyR" role="3clF45">
+        <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4U_yxogCsEV" role="jymVt" />
+    <node concept="3clFb_" id="dfChU1gcsX" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="findRoot" />
+      <node concept="3uibUv" id="3HJTsBn63I2" role="3clF45">
+        <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+      </node>
+      <node concept="3Tm1VV" id="dfChU1gct0" role="1B3o_S" />
+      <node concept="3clFbS" id="dfChU1gct6" role="3clF47">
+        <node concept="3clFbF" id="dfChU1ggsh" role="3cqZAp">
+          <node concept="10QFUN" id="3HJTsBmKpNm" role="3clFbG">
+            <node concept="3uibUv" id="3HJTsBn64qV" role="10QFUM">
+              <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+            </node>
+            <node concept="1rXfSq" id="dfChU1ggsg" role="10QFUP">
+              <ref role="37wK5l" to="eifs:~Logical.find():runtime.Logical" resolve="find" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="dfChU1gf8K" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3mz2_dYyCli" role="jymVt" />
+    <node concept="3clFb_" id="6yEjedmaeEv" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="metaLogical" />
+      <node concept="3Tm1VV" id="6yEjedmaeEw" role="1B3o_S" />
+      <node concept="3uibUv" id="6yEjedmaeEx" role="3clF45">
+        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+        <node concept="3uibUv" id="20WMLipvJgu" role="11_B2D">
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="6yEjedmaeEy" role="3clF47">
+        <node concept="3clFbJ" id="3mz2_dYqMn1" role="3cqZAp">
+          <node concept="3clFbS" id="3mz2_dYqMn3" role="3clFbx">
+            <node concept="YS8fn" id="3mz2_dYqMJb" role="3cqZAp">
+              <node concept="2ShNRf" id="3mz2_dYqMMu" role="YScLw">
+                <node concept="1pGfFk" id="3mz2_dYqN04" role="2ShVmc">
+                  <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="3mz2_dYqMy7" role="3clFbw">
+            <node concept="10Nm6u" id="3mz2_dYqMAm" role="3uHU7w" />
+            <node concept="37vLTw" id="3mz2_dYqMt_" role="3uHU7B">
+              <ref role="3cqZAo" node="3mz2_dYqLkV" resolve="metaLogical" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3mz2_dYqNgJ" role="3cqZAp">
+          <node concept="37vLTw" id="3mz2_dYqNgH" role="3clFbG">
+            <ref role="3cqZAo" node="3mz2_dYqLkV" resolve="metaLogical" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6yEjedmaeEz" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2ev$9JFO5ru" role="jymVt" />
+    <node concept="3clFb_" id="5NuEpF1xPNu" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="toString" />
+      <property role="DiZV1" value="false" />
+      <property role="IEkAT" value="false" />
+      <node concept="3Tm1VV" id="5NuEpF1xPNv" role="1B3o_S" />
+      <node concept="17QB3L" id="77AxcO5bvNn" role="3clF45" />
+      <node concept="3clFbS" id="5NuEpF1xPNy" role="3clF47">
+        <node concept="3cpWs8" id="5NuEpF1xSwy" role="3cqZAp">
+          <node concept="3cpWsn" id="5NuEpF1xSwz" role="3cpWs9">
+            <property role="TrG5h" value="repr" />
+            <node concept="3uibUv" id="7HUwyZazx80" role="1tU5fm">
+              <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+              <node concept="3uibUv" id="7HUwyZazx81" role="11_B2D">
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              </node>
+            </node>
+            <node concept="1rXfSq" id="5NuEpF1xSw$" role="33vP2m">
+              <ref role="37wK5l" node="dfChU1gcsX" resolve="findRoot" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3v$7B1Kczo0" role="3cqZAp">
+          <node concept="3cpWsn" id="3v$7B1Kczo1" role="3cpWs9">
+            <property role="TrG5h" value="value" />
+            <node concept="3uibUv" id="3v$7B1KcznY" role="1tU5fm">
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            </node>
+            <node concept="2OqwBi" id="3v$7B1Kczo2" role="33vP2m">
+              <node concept="37vLTw" id="3v$7B1Kczo3" role="2Oq$k0">
+                <ref role="3cqZAo" node="5NuEpF1xSwz" resolve="repr" />
+              </node>
+              <node concept="liA8E" id="3v$7B1Kczo4" role="2OqNvi">
+                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2QE4RCGhZVd" role="3cqZAp">
+          <node concept="3cpWsn" id="2QE4RCGhZVe" role="3cpWs9">
+            <property role="TrG5h" value="fullName" />
+            <node concept="17QB3L" id="6tTPqJZ13Gf" role="1tU5fm" />
+            <node concept="3K4zz7" id="2QE4RCGhZVf" role="33vP2m">
+              <node concept="1rXfSq" id="2QE4RCGhZVg" role="3K4E3e">
+                <ref role="37wK5l" to="eifs:~Logical.getName():java.lang.String" resolve="getName" />
+              </node>
+              <node concept="3clFbC" id="2QE4RCGhZVh" role="3K4Cdx">
+                <node concept="37vLTw" id="2QE4RCGhZVi" role="3uHU7w">
+                  <ref role="3cqZAo" node="5NuEpF1xSwz" resolve="repr" />
+                </node>
+                <node concept="Xjq3P" id="2QE4RCGhZVj" role="3uHU7B" />
+              </node>
+              <node concept="3cpWs3" id="2QE4RCGhZVk" role="3K4GZi">
+                <node concept="2OqwBi" id="2QE4RCGhZVl" role="3uHU7w">
+                  <node concept="37vLTw" id="2QE4RCGhZVm" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5NuEpF1xSwz" resolve="repr" />
+                  </node>
+                  <node concept="liA8E" id="2QE4RCGhZVn" role="2OqNvi">
+                    <ref role="37wK5l" to="45ys:677NV56hh2k" resolve="name" />
+                  </node>
+                </node>
+                <node concept="3cpWs3" id="2QE4RCGhZVo" role="3uHU7B">
+                  <node concept="1rXfSq" id="2QE4RCGhZVp" role="3uHU7B">
+                    <ref role="37wK5l" to="eifs:~Logical.getName():java.lang.String" resolve="getName" />
+                  </node>
+                  <node concept="Xl_RD" id="2QE4RCGhZVq" role="3uHU7w">
+                    <property role="Xl_RC" value=":" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5NuEpF1xSlQ" role="3cqZAp">
+          <node concept="3K4zz7" id="5NuEpF1xUF9" role="3clFbG">
+            <node concept="3cpWs3" id="2QE4RCGi0Vz" role="3K4E3e">
+              <node concept="3cpWs3" id="2QE4RCGi1gc" role="3uHU7B">
+                <node concept="Xl_RD" id="2QE4RCGi1m6" role="3uHU7w">
+                  <property role="Xl_RC" value="=" />
+                </node>
+                <node concept="37vLTw" id="2QE4RCGi0Zs" role="3uHU7B">
+                  <ref role="3cqZAo" node="2QE4RCGhZVe" resolve="fullName" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="5NuEpF1y3Hh" role="3uHU7w">
+                <node concept="37vLTw" id="3v$7B1KczTq" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3v$7B1Kczo1" resolve="value" />
+                </node>
+                <node concept="liA8E" id="5NuEpF1y45Z" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                </node>
+              </node>
+            </node>
+            <node concept="3y3z36" id="5NuEpF1xUat" role="3K4Cdx">
+              <node concept="10Nm6u" id="5NuEpF1xUr8" role="3uHU7w" />
+              <node concept="37vLTw" id="3v$7B1Kczo5" role="3uHU7B">
+                <ref role="3cqZAo" node="3v$7B1Kczo1" resolve="value" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2QE4RCGhZVr" role="3K4GZi">
+              <ref role="3cqZAo" node="2QE4RCGhZVe" resolve="fullName" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5NuEpF1xPNz" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="4U_yxogAko0" role="1B3o_S" />
+    <node concept="3uibUv" id="4U_yxogB8or" role="1zkMxy">
+      <ref role="3uigEE" node="3HJTsBmBSJa" resolve="JchrLogical" />
+      <node concept="3uibUv" id="4U_yxogB8yy" role="11_B2D">
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+      </node>
+    </node>
+    <node concept="3uibUv" id="7HUwyZazx8k" role="EKbjA">
+      <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+      <node concept="3uibUv" id="7HUwyZazx8l" role="11_B2D">
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+      </node>
+    </node>
+    <node concept="3UR2Jj" id="2ev$9JF$huc" role="lGtFl">
+      <node concept="TZ5HA" id="2ev$9JF$hud" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$hue" role="1dT_Ay">
+          <property role="1dT_AB" value="" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iKo" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iKp" role="1dT_Ay">
+          <property role="1dT_AB" value="TODO: the existance of this class and the possibility to present a logical variable referring " />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iKi" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iKj" role="1dT_Ay">
+          <property role="1dT_AB" value="to its instance effectively makes an Atom mutable, so it should be supported in reactive schemes, such" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iLe" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iLf" role="1dT_Ay">
+          <property role="1dT_AB" value="as a constraint occurrence. " />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iLq" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iLr" role="1dT_Ay">
+          <property role="1dT_AB" value="" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iLC" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iLD" role="1dT_Ay">
+          <property role="1dT_AB" value="So far Atom has been treated as an immutable construct, constraints are matched with its instances as " />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iMa" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iMb" role="1dT_Ay">
+          <property role="1dT_AB" value="with opaque objects. This may change in the future. " />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="2ev$9JF$iKM" role="TZ5H$">
+        <node concept="1dT_AC" id="2ev$9JF$iKN" role="1dT_Ay">
+          <property role="1dT_AB" value="" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3mz2_dYyUvA" role="jymVt" />
+    <node concept="312cEg" id="3mz2_dYqLkV" role="jymVt">
+      <property role="TrG5h" value="metaLogical" />
+      <node concept="3Tm6S6" id="3mz2_dYqLkW" role="1B3o_S" />
+      <node concept="3uibUv" id="3mz2_dYqLkY" role="1tU5fm">
+        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps b/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
similarity index 100%
rename from logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
rename to jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
diff --git a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index d3ac4377..9b5bad87 100644
--- a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -14,9 +14,7 @@
   <imports>
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
-    <import index="vgt0" ref="r:f36c95e5-e428-4945-91ae-1005e20c7971(jetbrains.mps.jchr.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -24,13 +22,8 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -44,33 +37,22 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
@@ -93,9 +75,6 @@
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
@@ -103,16 +82,12 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
       </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
@@ -134,7 +109,6 @@
         <child id="1200911492601" name="mappingLabel" index="2rTMjI" />
         <child id="7473026166162327259" name="dropAttrubuteRule" index="CYSdJ" />
         <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
-        <child id="1167514678247" name="rootMappingRule" index="3lj3bC" />
       </concept>
       <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
         <child id="1177093586806" name="templateNode" index="gfFT$" />
@@ -147,9 +121,6 @@
         <child id="1168558750579" name="defaultConsequence" index="jxRDz" />
         <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
       </concept>
-      <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4">
-        <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
-      </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
       <concept id="1200911316486" name="jetbrains.mps.lang.generator.structure.MappingLabelDeclaration" flags="lg" index="2rT7sh">
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
@@ -159,9 +130,6 @@
         <reference id="1722980698497626483" name="template" index="v9R2y" />
         <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
       </concept>
-      <concept id="1194565793557" name="jetbrains.mps.lang.generator.structure.IncludeMacro" flags="ln" index="xERo3">
-        <reference id="1194566366375" name="includeTemplate" index="xH3mL" />
-      </concept>
       <concept id="7473026166162297915" name="jetbrains.mps.lang.generator.structure.DropAttributeRule" flags="lg" index="CY16f">
         <reference id="7473026166162297918" name="applicableConcept" index="CY16a" />
       </concept>
@@ -169,7 +137,6 @@
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
       <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
         <property id="1167272244852" name="applyToConceptInheritors" index="36QftV" />
-        <reference id="1200917515464" name="labelDeclaration" index="2sgKRv" />
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
         <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
@@ -188,16 +155,9 @@
       <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
         <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
       </concept>
-      <concept id="1087833466690" name="jetbrains.mps.lang.generator.structure.NodeMacro" flags="lg" index="17VmuZ">
-        <reference id="1200912223215" name="mappingLabel" index="2rW$FS" />
-      </concept>
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
-      <concept id="1167514355419" name="jetbrains.mps.lang.generator.structure.Root_MappingRule" flags="lg" index="3lhOvk">
-        <property id="1177959072138" name="keepSourceRoot" index="13Pg2o" />
-        <reference id="1167514355421" name="template" index="3lhOvi" />
-      </concept>
       <concept id="1169670156577" name="jetbrains.mps.lang.generator.structure.GeneratorMessage" flags="lg" index="1lLz0L">
         <property id="1169670173015" name="messageText" index="1lLB17" />
         <property id="1169670356567" name="messageType" index="1lMjX7" />
@@ -209,7 +169,6 @@
         <child id="982871510068000158" name="sourceNodeQuery" index="1sPUBK" />
       </concept>
       <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
-      <concept id="1167756221419" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_templatePropertyValue" flags="nn" index="3zGtF$" />
       <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
       <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
       <concept id="8900764248744213868" name="jetbrains.mps.lang.generator.structure.InlineTemplateWithContext_RuleConsequence" flags="lg" index="1Koe21">
@@ -219,9 +178,6 @@
         <child id="1805153994415893199" name="type" index="1N15GL" />
       </concept>
       <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
-      <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="ln" index="1WS0z7">
-        <child id="1167952069335" name="sourceNodesQuery" index="3Jn$fo" />
-      </concept>
       <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
         <child id="1167770376702" name="referentFunction" index="3$ytzL" />
       </concept>
@@ -233,10 +189,6 @@
       </concept>
     </language>
     <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
-      <concept id="1217889725928" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_SessionObjectAccess" flags="nn" index="2fSANN" />
-      <concept id="1217889960776" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_UserObjectAccessBase" flags="nn" index="2fTw9j">
-        <child id="1217890689512" name="userKey" index="2fWi3N" />
-      </concept>
       <concept id="1229477454423" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalCopiedInputByOutput" flags="nn" index="12$id9">
         <child id="1229477520175" name="outputNode" index="12$y8L" />
       </concept>
@@ -262,12 +214,6 @@
         <child id="1174642936809" name="pattern" index="1YbcFS" />
       </concept>
     </language>
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
-      <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
-        <property id="1167245565795" name="severity" index="35gtTG" />
-        <child id="1167227463056" name="logExpression" index="34bqiv" />
-      </concept>
-    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -275,21 +221,11 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1803469493727536395" name="jetbrains.mps.lang.smodel.structure.OperationParm_StopConceptList" flags="ng" index="hTh3S">
-        <child id="1803469493727536396" name="concept" index="hTh3Z" />
-      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
       </concept>
-      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
-        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
-      </concept>
-      <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
-        <reference id="1154546997487" name="concept" index="3gnhBz" />
-      </concept>
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
@@ -336,13 +272,6 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="linkRole" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
@@ -360,112 +289,10 @@
   <node concept="bUwia" id="5JQSuNswW1q">
     <property role="TrG5h" value="ast" />
     <property role="3GE5qa" value="" />
-    <node concept="2rT7sh" id="35Lj3TiRogF" role="2rTMjI">
-      <property role="TrG5h" value="Handler_AstHelper" />
-      <ref role="2rTdP9" to="vgt0:pmDhvH6q87" resolve="Handler" />
-      <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
-    </node>
-    <node concept="2rT7sh" id="35Lj3TiRCeh" role="2rTMjI">
-      <property role="TrG5h" value="Ast_Method" />
-      <ref role="2rTdP9" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
-      <ref role="2rZz_L" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
-    </node>
     <node concept="3aamgX" id="1pt0VTMwlBi" role="3acgRq">
       <ref role="30HIoZ" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
-      <node concept="14YyZ8" id="35Lj3TiR1cg" role="1lVwrX">
-        <node concept="14ZrTv" id="35Lj3TiR1hN" role="14ZwWg">
-          <node concept="30G5F_" id="35Lj3TiR1hO" role="150hEN">
-            <node concept="3clFbS" id="35Lj3TiR1hP" role="2VODD2">
-              <node concept="3clFbF" id="35Lj3TiR1xw" role="3cqZAp">
-                <node concept="2OqwBi" id="35Lj3TiR2c_" role="3clFbG">
-                  <node concept="2OqwBi" id="35Lj3TiR1A3" role="2Oq$k0">
-                    <node concept="30H73N" id="35Lj3TiR1xv" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="6eERcOeDMou" role="2OqNvi">
-                      <node concept="1xMEDy" id="6eERcOeDMow" role="1xVPHs">
-                        <node concept="chp4Y" id="5dz6b5419MW" role="ri$Ld">
-                          <ref role="cht4Q" to="vgt0:5dz6b540Jzm" resolve="AbstractConstraint" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="6eERcOeDNmZ" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="35Lj3TiR81W" role="150oIE">
-            <node concept="2YIFZM" id="35Lj3TiSCY2" role="gfFT$">
-              <ref role="37wK5l" node="35Lj3TiRjRb" resolve="atom" />
-              <ref role="1Pybhc" node="35Lj3TiR8No" resolve="Stuff" />
-              <node concept="10Nm6u" id="35Lj3TiSD25" role="37wK5m">
-                <node concept="2b32R4" id="35Lj3TiSFbs" role="lGtFl">
-                  <node concept="3JmXsc" id="35Lj3TiSFbu" role="2P8S$">
-                    <node concept="3clFbS" id="35Lj3TiSFbw" role="2VODD2">
-                      <node concept="3clFbF" id="35Lj3TiSFvI" role="3cqZAp">
-                        <node concept="2OqwBi" id="35Lj3TiSF$y" role="3clFbG">
-                          <node concept="30H73N" id="35Lj3TiSFvH" role="2Oq$k0" />
-                          <node concept="2Rf3mk" id="35Lj3TiSG24" role="2OqNvi">
-                            <node concept="1xMEDy" id="35Lj3TiSG26" role="1xVPHs">
-                              <node concept="chp4Y" id="35Lj3TiSGh9" role="ri$Ld">
-                                <ref role="cht4Q" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1ZhdrF" id="35Lj3TiSD6Y" role="lGtFl">
-                <property role="2qtEX8" value="classConcept" />
-                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1081236700937/1144433194310" />
-                <node concept="3$xsQk" id="35Lj3TiSD6Z" role="3$ytzL">
-                  <node concept="3clFbS" id="35Lj3TiSD70" role="2VODD2">
-                    <node concept="3clFbF" id="35Lj3TiSDfG" role="3cqZAp">
-                      <node concept="2OqwBi" id="35Lj3TiSDhZ" role="3clFbG">
-                        <node concept="1iwH7S" id="35Lj3TiSDfF" role="2Oq$k0" />
-                        <node concept="1iwH70" id="35Lj3TiSDwt" role="2OqNvi">
-                          <ref role="1iwH77" node="35Lj3TiRogF" resolve="Handler_AstHelper" />
-                          <node concept="2OqwBi" id="35Lj3TiSDHn" role="1iwH7V">
-                            <node concept="30H73N" id="35Lj3TiSDEz" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="35Lj3TiSE37" role="2OqNvi">
-                              <node concept="1xMEDy" id="35Lj3TiSE39" role="1xVPHs">
-                                <node concept="chp4Y" id="35Lj3TiSE7S" role="ri$Ld">
-                                  <ref role="cht4Q" to="vgt0:pmDhvH6q87" resolve="Handler" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1ZhdrF" id="35Lj3TiSEiQ" role="lGtFl">
-                <property role="2qtEX8" value="baseMethodDeclaration" />
-                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                <node concept="3$xsQk" id="35Lj3TiSEiR" role="3$ytzL">
-                  <node concept="3clFbS" id="35Lj3TiSEiS" role="2VODD2">
-                    <node concept="3clFbF" id="35Lj3TiSEtU" role="3cqZAp">
-                      <node concept="2OqwBi" id="35Lj3TiSEwd" role="3clFbG">
-                        <node concept="1iwH7S" id="35Lj3TiSEtT" role="2Oq$k0" />
-                        <node concept="1iwH70" id="35Lj3TiSEFj" role="2OqNvi">
-                          <ref role="1iwH77" node="35Lj3TiRCeh" resolve="Ast_Method" />
-                          <node concept="30H73N" id="35Lj3TiSEMR" role="1iwH7V" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="j$656" id="35Lj3TiT73t" role="14YRTM">
-          <ref role="v9R2y" node="35Lj3TiT1Wl" resolve="Ast_Builder" />
-        </node>
+      <node concept="j$656" id="6yEjedms87m" role="1lVwrX">
+        <ref role="v9R2y" node="35Lj3TiT1Wl" resolve="Ast_Builder" />
       </node>
     </node>
     <node concept="3aamgX" id="4OKkcneVYzR" role="3acgRq">
@@ -989,297 +816,6 @@
     <node concept="CY16f" id="4lNgnaL7HgZ" role="CYSdJ">
       <ref role="CY16a" to="5j4j:dfChU1zo4B" resolve="Splice" />
     </node>
-    <node concept="3lhOvk" id="35Lj3TiRdbZ" role="3lj3bC">
-      <property role="13Pg2o" value="true" />
-      <ref role="30HIoZ" to="vgt0:pmDhvH6q87" resolve="Handler" />
-      <ref role="3lhOvi" node="35Lj3TiR8No" resolve="Stuff" />
-      <ref role="2sgKRv" node="35Lj3TiRogF" resolve="Handler_AstHelper" />
-    </node>
-    <node concept="2rT7sh" id="2AXhyOGWQ20" role="2rTMjI">
-      <property role="TrG5h" value="LogicVariable" />
-      <ref role="2rTdP9" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
-      <ref role="2rZz_L" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
-    </node>
-  </node>
-  <node concept="312cEu" id="35Lj3TiR8No">
-    <property role="TrG5h" value="Stuff" />
-    <node concept="2tJIrI" id="35Lj3TiRjxl" role="jymVt" />
-    <node concept="2YIFZL" id="35Lj3TiRjRb" role="jymVt">
-      <property role="TrG5h" value="atom" />
-      <node concept="37vLTG" id="35Lj3TiRke1" role="3clF46">
-        <property role="TrG5h" value="param" />
-        <node concept="3uibUv" id="35Lj3TiRkkj" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          <node concept="29HgVG" id="35Lj3TiSfZe" role="lGtFl">
-            <node concept="3NFfHV" id="35Lj3TiSgqy" role="3NFExx">
-              <node concept="3clFbS" id="35Lj3TiSgqz" role="2VODD2">
-                <node concept="3cpWs8" id="2AXhyOGXrUf" role="3cqZAp">
-                  <node concept="3cpWsn" id="2AXhyOGXrUg" role="3cpWs9">
-                    <property role="TrG5h" value="type" />
-                    <node concept="3Tqbb2" id="2AXhyOGXrU8" role="1tU5fm" />
-                    <node concept="2OqwBi" id="2AXhyOGXrUh" role="33vP2m">
-                      <node concept="30H73N" id="2AXhyOGXrUi" role="2Oq$k0" />
-                      <node concept="3JvlWi" id="2AXhyOGXrUj" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1X3_iC" id="6UqNvvALqpw" role="lGtFl">
-                  <property role="3V$3am" value="statement" />
-                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                  <node concept="3SKdUt" id="2AXhyOGXzgm" role="8Wnug">
-                    <node concept="3SKdUq" id="2AXhyOGXzgo" role="3SKWNk">
-                      <property role="3SKdUp" value="FIXME hack!" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1X3_iC" id="6UqNvvALqpx" role="lGtFl">
-                  <property role="3V$3am" value="statement" />
-                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                  <node concept="3cpWs8" id="2AXhyOGXvid" role="8Wnug">
-                    <node concept="3cpWsn" id="2AXhyOGXvie" role="3cpWs9">
-                      <property role="TrG5h" value="key" />
-                      <node concept="17QB3L" id="2AXhyOGXvia" role="1tU5fm" />
-                      <node concept="3cpWs3" id="2AXhyOGXvif" role="33vP2m">
-                        <node concept="Xl_RD" id="2AXhyOGXvig" role="3uHU7w">
-                          <property role="Xl_RC" value=")" />
-                        </node>
-                        <node concept="3cpWs3" id="2AXhyOGXvih" role="3uHU7B">
-                          <node concept="Xl_RD" id="2AXhyOGXvii" role="3uHU7B">
-                            <property role="Xl_RC" value="typeOf(" />
-                          </node>
-                          <node concept="2OqwBi" id="2AXhyOGXvij" role="3uHU7w">
-                            <node concept="2JrnkZ" id="2AXhyOGXvik" role="2Oq$k0">
-                              <node concept="30H73N" id="2AXhyOGXvil" role="2JrQYb" />
-                            </node>
-                            <node concept="liA8E" id="2AXhyOGXvim" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1X3_iC" id="6UqNvvALqpy" role="lGtFl">
-                  <property role="3V$3am" value="statement" />
-                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                  <node concept="3clFbF" id="2AXhyOGXsaw" role="8Wnug">
-                    <node concept="37vLTI" id="2AXhyOGXwSY" role="3clFbG">
-                      <node concept="37vLTw" id="2AXhyOGXx6G" role="37vLTx">
-                        <ref role="3cqZAo" node="2AXhyOGXrUg" resolve="type" />
-                      </node>
-                      <node concept="2OqwBi" id="2AXhyOGXsh8" role="37vLTJ">
-                        <node concept="1iwH7S" id="2AXhyOGXsau" role="2Oq$k0" />
-                        <node concept="2fSANN" id="2AXhyOGXsqd" role="2OqNvi">
-                          <node concept="37vLTw" id="2AXhyOGXvin" role="2fWi3N">
-                            <ref role="3cqZAo" node="2AXhyOGXvie" resolve="key" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1X3_iC" id="6UqNvvALqpz" role="lGtFl">
-                  <property role="3V$3am" value="statement" />
-                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                  <node concept="3clFbH" id="2AXhyOGXGie" role="8Wnug" />
-                </node>
-                <node concept="1X3_iC" id="6UqNvvALqp$" role="lGtFl">
-                  <property role="3V$3am" value="statement" />
-                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                  <node concept="34ab3g" id="2AXhyOGXGFi" role="8Wnug">
-                    <property role="35gtTG" value="warn" />
-                    <node concept="3cpWs3" id="2AXhyOGXJ4L" role="34bqiv">
-                      <node concept="37vLTw" id="2AXhyOGXJlq" role="3uHU7w">
-                        <ref role="3cqZAo" node="2AXhyOGXrUg" resolve="type" />
-                      </node>
-                      <node concept="3cpWs3" id="2AXhyOGXI4J" role="3uHU7B">
-                        <node concept="3cpWs3" id="2AXhyOGXH$R" role="3uHU7B">
-                          <node concept="Xl_RD" id="2AXhyOGXGFk" role="3uHU7B">
-                            <property role="Xl_RC" value="*** set " />
-                          </node>
-                          <node concept="37vLTw" id="2AXhyOGXHLT" role="3uHU7w">
-                            <ref role="3cqZAo" node="2AXhyOGXvie" resolve="key" />
-                          </node>
-                        </node>
-                        <node concept="Xl_RD" id="2AXhyOGXIkC" role="3uHU7w">
-                          <property role="Xl_RC" value=" = " />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="2AXhyOGXJ_E" role="3cqZAp" />
-                <node concept="3clFbF" id="35Lj3TiSgFt" role="3cqZAp">
-                  <node concept="37vLTw" id="2AXhyOGXrUk" role="3clFbG">
-                    <ref role="3cqZAo" node="2AXhyOGXrUg" resolve="type" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1WS0z7" id="35Lj3TiRYjY" role="lGtFl">
-          <node concept="3JmXsc" id="35Lj3TiRYk0" role="3Jn$fo">
-            <node concept="3clFbS" id="35Lj3TiRYk2" role="2VODD2">
-              <node concept="3SKdUt" id="514BAS_QPhQ" role="3cqZAp">
-                <node concept="3SKdUq" id="514BAS_QPhS" role="3SKWNk">
-                  <property role="3SKdUp" value="FIXME: using the type information to derive unrelated property" />
-                </node>
-              </node>
-              <node concept="3clFbF" id="35Lj3TiRYE3" role="3cqZAp">
-                <node concept="2OqwBi" id="514BAS_QITw" role="3clFbG">
-                  <node concept="2OqwBi" id="35Lj3TiRYJj" role="2Oq$k0">
-                    <node concept="30H73N" id="35Lj3TiRYE2" role="2Oq$k0" />
-                    <node concept="2Rf3mk" id="35Lj3TiS02r" role="2OqNvi">
-                      <node concept="1xMEDy" id="35Lj3TiS02t" role="1xVPHs">
-                        <node concept="chp4Y" id="35Lj3TiS0m3" role="ri$Ld">
-                          <ref role="cht4Q" to="vgt0:pmDhvH6BD8" resolve="LogicVariable" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3zZkjj" id="514BAS_QKlY" role="2OqNvi">
-                    <node concept="1bVj0M" id="514BAS_QKm0" role="23t8la">
-                      <node concept="3clFbS" id="514BAS_QKm1" role="1bW5cS">
-                        <node concept="3clFbF" id="514BAS_QL$3" role="3cqZAp">
-                          <node concept="2OqwBi" id="514BAS_QO6m" role="3clFbG">
-                            <node concept="2OqwBi" id="514BAS_QLQ$" role="2Oq$k0">
-                              <node concept="37vLTw" id="514BAS_QL$2" role="2Oq$k0">
-                                <ref role="3cqZAo" node="514BAS_QKm2" resolve="it" />
-                              </node>
-                              <node concept="3JvlWi" id="514BAS_QMei" role="2OqNvi" />
-                            </node>
-                            <node concept="3x8VRR" id="514BAS_QOox" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="514BAS_QKm2" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="514BAS_QKm3" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="17Uvod" id="35Lj3TiSmUq" role="lGtFl">
-          <property role="2qtEX9" value="name" />
-          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-          <node concept="3zFVjK" id="35Lj3TiSmUr" role="3zH0cK">
-            <node concept="3clFbS" id="35Lj3TiSmUs" role="2VODD2">
-              <node concept="3clFbF" id="35Lj3TiSnv4" role="3cqZAp">
-                <node concept="2OqwBi" id="35Lj3TiSn$v" role="3clFbG">
-                  <node concept="30H73N" id="35Lj3TiSnv3" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="35Lj3TiSoj0" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="35Lj3TiSq77" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
-      </node>
-      <node concept="3Tm1VV" id="35Lj3TiRjRe" role="1B3o_S" />
-      <node concept="3clFbS" id="35Lj3TiRjRf" role="3clF47">
-        <node concept="3clFbF" id="4pNU3yqbFhP" role="3cqZAp">
-          <node concept="10Nm6u" id="4pNU3yqbFhN" role="3clFbG">
-            <node concept="xERo3" id="4pNU3yqbFnX" role="lGtFl">
-              <ref role="xH3mL" node="35Lj3TiT1Wl" resolve="Ast_Builder" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1WS0z7" id="35Lj3TiRKla" role="lGtFl">
-        <ref role="2rW$FS" node="35Lj3TiRCeh" resolve="Ast_Method" />
-        <node concept="3JmXsc" id="35Lj3TiRKlc" role="3Jn$fo">
-          <node concept="3clFbS" id="35Lj3TiRKle" role="2VODD2">
-            <node concept="3clFbF" id="35Lj3TiRKyw" role="3cqZAp">
-              <node concept="2OqwBi" id="35Lj3TiRKIX" role="3clFbG">
-                <node concept="30H73N" id="35Lj3TiRKyv" role="2Oq$k0" />
-                <node concept="2Rf3mk" id="35Lj3TiRM7X" role="2OqNvi">
-                  <node concept="1xMEDy" id="35Lj3TiRM7Z" role="1xVPHs">
-                    <node concept="chp4Y" id="35Lj3TiRMkw" role="ri$Ld">
-                      <ref role="cht4Q" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
-                    </node>
-                  </node>
-                  <node concept="hTh3S" id="35Lj3TiRMJO" role="1xVPHs">
-                    <node concept="3gn64h" id="35Lj3TiRN1c" role="hTh3Z">
-                      <ref role="3gnhBz" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="17Uvod" id="35Lj3TiROzp" role="lGtFl">
-        <property role="2qtEX9" value="name" />
-        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-        <node concept="3zFVjK" id="35Lj3TiROzq" role="3zH0cK">
-          <node concept="3clFbS" id="35Lj3TiROzr" role="2VODD2">
-            <node concept="3clFbF" id="35Lj3TiROZV" role="3cqZAp">
-              <node concept="3cpWs3" id="35Lj3TiRPXV" role="3clFbG">
-                <node concept="2OqwBi" id="35Lj3TiRTNs" role="3uHU7w">
-                  <node concept="2OqwBi" id="35Lj3TiRSV6" role="2Oq$k0">
-                    <node concept="2JrnkZ" id="35Lj3TiRSCu" role="2Oq$k0">
-                      <node concept="30H73N" id="35Lj3TiRQeB" role="2JrQYb" />
-                    </node>
-                    <node concept="liA8E" id="35Lj3TiRTum" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="35Lj3TiRViR" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
-                  </node>
-                </node>
-                <node concept="3cpWs3" id="35Lj3TiRPh_" role="3uHU7B">
-                  <node concept="3zGtF$" id="35Lj3TiROZU" role="3uHU7B" />
-                  <node concept="Xl_RD" id="35Lj3TiRPhE" role="3uHU7w">
-                    <property role="Xl_RC" value="_" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="35Lj3TiRm6B" role="jymVt" />
-    <node concept="3Tm1VV" id="35Lj3TiR8Np" role="1B3o_S" />
-    <node concept="n94m4" id="35Lj3TiR8Nq" role="lGtFl">
-      <ref role="n9lRv" to="vgt0:pmDhvH6q87" resolve="Handler" />
-    </node>
-    <node concept="17Uvod" id="35Lj3TiR923" role="lGtFl">
-      <property role="2qtEX9" value="name" />
-      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-      <node concept="3zFVjK" id="35Lj3TiR924" role="3zH0cK">
-        <node concept="3clFbS" id="35Lj3TiR925" role="2VODD2">
-          <node concept="3clFbF" id="35Lj3TiR9kh" role="3cqZAp">
-            <node concept="3cpWs3" id="35Lj3TiSzIF" role="3clFbG">
-              <node concept="3zGtF$" id="35Lj3TiS$4Z" role="3uHU7w" />
-              <node concept="3cpWs3" id="35Lj3TiSyG0" role="3uHU7B">
-                <node concept="2OqwBi" id="35Lj3TiRb5d" role="3uHU7B">
-                  <node concept="30H73N" id="35Lj3TiRaS4" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="35Lj3TiRbQV" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
-                </node>
-                <node concept="Xl_RD" id="35Lj3TiSyRq" role="3uHU7w">
-                  <property role="Xl_RC" value="_" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="13MO4I" id="35Lj3TiT1Wl">
     <property role="TrG5h" value="Ast_Builder" />
diff --git a/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index bc2031f1..eb44a740 100644
--- a/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -16,9 +16,7 @@
       <external-templates />
       <dependencies>
         <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
-        <dependency reexport="false">3805ea9c-bac0-45ea-9157-1b3b93c1c0cc(jetbrains.mps.jchr#456733934405380506)</dependency>
         <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-        <dependency reexport="false">894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)</dependency>
         <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
       </dependencies>
       <usedDevKits>
@@ -49,9 +47,6 @@
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
         <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-        <module reference="894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)" version="0" />
-        <module reference="3805ea9c-bac0-45ea-9157-1b3b93c1c0cc(jetbrains.mps.jchr#456733934405380506)" version="0" />
-        <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
@@ -59,7 +54,6 @@
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
         <module reference="85f64970-3326-4ea7-966e-1ac904686424(jetbrains.mps.logic#6626732309150416985)" version="0" />
         <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-        <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
         <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
         <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
       </dependencyVersions>
@@ -93,7 +87,6 @@
     <dependency reexport="false">e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="false">894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)</dependency>
     <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
   </dependencies>
@@ -138,8 +131,6 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
@@ -147,7 +138,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
@@ -156,7 +146,6 @@
   </runtime>
   <extendedLanguages>
     <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
-    <extendedLanguage>894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
index 7b10aa2f..d1bb1c60 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
+++ b/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
@@ -4,19 +4,13 @@
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
-    <modelRoot contentPath="${module}" type="java_source_stubs">
-      <sourceRoot location="source" />
-    </modelRoot>
+    <modelRoot contentPath="${module}" type="java_source_stubs" />
   </models>
-  <sourcePath>
-    <source path="${module}/source" />
-  </sourcePath>
+  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="true">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
     <dependency reexport="true">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-    <dependency reexport="true">760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -36,9 +30,7 @@
   </languageVersions>
   <dependencyVersions>
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
index 6fb7c99a..1762193c 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
@@ -11,11 +11,9 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
-    <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
   </imports>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
index 3809cb71..a424d4a6 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
@@ -12,7 +12,6 @@
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -20,6 +19,9 @@
       <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
         <child id="1219921048460" name="componentType" index="8Xvag" />
       </concept>
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -58,6 +60,16 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
+        <child id="1164991057263" name="throwable" index="YScLw" />
+      </concept>
+      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
+        <child id="1081256993305" name="classType" index="2ZW6by" />
+        <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
+      </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
@@ -104,8 +116,10 @@
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <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" />
@@ -126,6 +140,10 @@
       </concept>
       <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>
@@ -141,6 +159,9 @@
         <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>
       <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
         <property id="8355037393041754995" name="isNative" index="2aFKle" />
       </concept>
@@ -170,6 +191,10 @@
       </concept>
       <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>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@@ -256,7 +281,7 @@
       <node concept="3clFbS" id="4TCblo5Mg6j" role="3clF47">
         <node concept="3clFbF" id="4TCblo5Zx$M" role="3cqZAp">
           <node concept="1rXfSq" id="4TCblo5Zx$K" role="3clFbG">
-            <ref role="37wK5l" to="yg8f:4TCblo5M6dy" resolve="concreteArguments" />
+            <ref role="37wK5l" to="yg8f:4TCblo5M6dy" resolve="instanceArguments" />
             <node concept="37vLTw" id="4TCblo5Zy07" role="37wK5m">
               <ref role="3cqZAo" node="4TCblo5Nrp7" resolve="logicalContext" />
             </node>
@@ -1075,5 +1100,574 @@
       <ref role="3uigEE" node="6Kcfpq7B0Wu" resolve="AbstractPredicate" />
     </node>
   </node>
+  <node concept="312cEu" id="3F6vMxqo13Y">
+    <property role="TrG5h" value="DefaultSessionSolver" />
+    <node concept="2tJIrI" id="3F6vMxqo1bG" role="jymVt" />
+    <node concept="3clFbW" id="3F6vMxqo1c$" role="jymVt">
+      <node concept="37vLTG" id="3F6vMxqo1cY" role="3clF46">
+        <property role="TrG5h" value="javaExpressionSolver" />
+        <node concept="3uibUv" id="3F6vMxqo1dR" role="1tU5fm">
+          <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="3F6vMxqo1cA" role="3clF45" />
+      <node concept="3Tm1VV" id="3F6vMxqo1cB" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqo1cC" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqo1jU" role="3cqZAp">
+          <node concept="37vLTI" id="3F6vMxqo1jW" role="3clFbG">
+            <node concept="2OqwBi" id="3F6vMxqo1vB" role="37vLTJ">
+              <node concept="Xjq3P" id="3F6vMxqo1wG" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3F6vMxqo1vE" role="2OqNvi">
+                <ref role="2Oxat5" node="3F6vMxqo1jQ" resolve="myJavaExpressionSolver" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="3F6vMxqo1k0" role="37vLTx">
+              <ref role="3cqZAo" node="3F6vMxqo1cY" resolve="javaExpressionSolver" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqo1_0" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqo1Bx" role="jymVt">
+      <property role="TrG5h" value="queueIfBusy" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="37vLTG" id="3F6vMxqo1By" role="3clF46">
+        <property role="TrG5h" value="runnable" />
+        <node concept="3uibUv" id="3F6vMxqo1Bz" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Runnable" resolve="Runnable" />
+        </node>
+      </node>
+      <node concept="10P_77" id="3F6vMxqo1B$" role="3clF45" />
+      <node concept="3Tm1VV" id="3F6vMxqo1B_" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqo1BB" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqo1BE" role="3cqZAp">
+          <node concept="3clFbT" id="3F6vMxqo1BD" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3F6vMxqo1BC" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqo1Qa" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqo1BF" role="jymVt">
+      <property role="TrG5h" value="fail" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="37vLTG" id="3F6vMxqo1BG" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="17QB3L" id="3F6vMxqo1BH" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="3F6vMxqo1BI" role="3clF45" />
+      <node concept="3Tm1VV" id="3F6vMxqo1BJ" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqo1BL" role="3clF47">
+        <node concept="YS8fn" id="3eLgHzX3On1" role="3cqZAp">
+          <node concept="2ShNRf" id="3eLgHzX3OnK" role="YScLw">
+            <node concept="1pGfFk" id="3eLgHzX3PBQ" role="2ShVmc">
+              <ref role="37wK5l" to="qrld:7vxJ_H4qql2" resolve="EvaluationFailureException" />
+              <node concept="37vLTw" id="3eLgHzX3PF4" role="37wK5m">
+                <ref role="3cqZAo" node="3F6vMxqo1BG" resolve="message" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3F6vMxqo1BM" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqo22N" role="jymVt" />
+    <node concept="2tJIrI" id="3F6vMxqo23u" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqo28Q" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="registerSymbol" />
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <node concept="3Tmbuc" id="3F6vMxqo28S" role="1B3o_S" />
+      <node concept="3cqZAl" id="3F6vMxqo28T" role="3clF45" />
+      <node concept="37vLTG" id="3F6vMxqo28U" role="3clF46">
+        <property role="TrG5h" value="symbol" />
+        <node concept="3uibUv" id="3F6vMxqo28V" role="1tU5fm">
+          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3F6vMxqo28W" role="3clF46">
+        <property role="TrG5h" value="computingTracer" />
+        <node concept="3uibUv" id="3F6vMxqo28X" role="1tU5fm">
+          <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3F6vMxqo28Y" role="3clF47">
+        <node concept="3clFbJ" id="7ISVfSIIXN" role="3cqZAp">
+          <node concept="3clFbS" id="7ISVfSIIXO" role="3clFbx">
+            <node concept="3clFbF" id="7ISVfSIVrg" role="3cqZAp">
+              <node concept="2OqwBi" id="7ISVfSIVrQ" role="3clFbG">
+                <node concept="Xjq3P" id="2tcGHBEecgK" role="2Oq$k0" />
+                <node concept="liA8E" id="7ISVfSIVsU" role="2OqNvi">
+                  <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                  <node concept="10QFUN" id="7ISVfSIYFl" role="37wK5m">
+                    <node concept="3uibUv" id="7ISVfSIYFj" role="10QFUM">
+                      <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                    </node>
+                    <node concept="37vLTw" id="7ISVfSIYFk" role="10QFUP">
+                      <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                    </node>
+                  </node>
+                  <node concept="2ShNRf" id="7ISVfSIVIp" role="37wK5m">
+                    <node concept="1pGfFk" id="7ISVfSIWk9" role="2ShVmc">
+                      <ref role="37wK5l" to="omn0:5p8T3QHGKJ7" resolve="UnificationSolver" />
+                      <node concept="2ShNRf" id="3F6vMxqobJ8" role="37wK5m">
+                        <node concept="HV5vD" id="3F6vMxqpo6z" role="2ShVmc">
+                          <ref role="HV5vE" to="45ys:3F6vMxqplHq" resolve="LogicalUnification.Default" />
+                        </node>
+                      </node>
+                      <node concept="Xjq3P" id="2tcGHBEecLr" role="37wK5m" />
+                      <node concept="37vLTw" id="5mr7UHchcsc" role="37wK5m">
+                        <ref role="3cqZAo" node="3F6vMxqo28W" resolve="computingTracer" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="7ISVfSIYJ8" role="3cqZAp" />
+          </node>
+          <node concept="2OqwBi" id="7ISVfSIJwN" role="3clFbw">
+            <node concept="10M0yZ" id="7ISVfSIJ9U" role="2Oq$k0">
+              <ref role="1PxDUh" node="2GO7tyJVmP4" resolve="UnificationPredicate" />
+              <ref role="3cqZAo" node="5uFPQ7C29mw" resolve="UNI_SYM" />
+            </node>
+            <node concept="liA8E" id="7ISVfSIJyd" role="2OqNvi">
+              <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+              <node concept="37vLTw" id="7ISVfSIJzc" role="37wK5m">
+                <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+              </node>
+            </node>
+          </node>
+          <node concept="3eNFk2" id="7ISVfSIJml" role="3eNLev">
+            <node concept="2OqwBi" id="7ISVfSIJ_2" role="3eO9$A">
+              <node concept="10M0yZ" id="7ISVfSIJrd" role="2Oq$k0">
+                <ref role="3cqZAo" node="5uFPQ7C23RV" resolve="EQ_SYM" />
+                <ref role="1PxDUh" node="3HJTsBn4kk_" resolve="EqualsPredicate" />
+              </node>
+              <node concept="liA8E" id="7ISVfSIJAs" role="2OqNvi">
+                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <node concept="37vLTw" id="7ISVfSIJBV" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="7ISVfSIJmn" role="3eOfB_">
+              <node concept="3clFbF" id="7ISVfSIYOv" role="3cqZAp">
+                <node concept="2OqwBi" id="7ISVfSIYOw" role="3clFbG">
+                  <node concept="Xjq3P" id="2tcGHBEecj3" role="2Oq$k0" />
+                  <node concept="liA8E" id="7ISVfSIYOy" role="2OqNvi">
+                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <node concept="10QFUN" id="7ISVfSIYOz" role="37wK5m">
+                      <node concept="3uibUv" id="7ISVfSIYO$" role="10QFUM">
+                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                      </node>
+                      <node concept="37vLTw" id="7ISVfSIYO_" role="10QFUP">
+                        <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                      </node>
+                    </node>
+                    <node concept="2ShNRf" id="7ISVfSIYOA" role="37wK5m">
+                      <node concept="1pGfFk" id="7ISVfSIYOB" role="2ShVmc">
+                        <ref role="37wK5l" to="omn0:5p8T3QHE69j" resolve="EqualsSolver" />
+                        <node concept="Xjq3P" id="2tcGHBEecMU" role="37wK5m" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="7ISVfSIYSU" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="3eNFk2" id="7ISVfSIJuG" role="3eNLev">
+            <node concept="2OqwBi" id="7ISVfSIJGK" role="3eO9$A">
+              <node concept="10M0yZ" id="7ISVfSIJCI" role="2Oq$k0">
+                <ref role="3cqZAo" node="5uFPQ7BZnLB" resolve="ASSERT_SYM" />
+                <ref role="1PxDUh" node="6infEALAfer" resolve="AssertPredicate" />
+              </node>
+              <node concept="liA8E" id="7ISVfSIJIa" role="2OqNvi">
+                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <node concept="37vLTw" id="7ISVfSIJJb" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="7ISVfSIJuI" role="3eOfB_">
+              <node concept="3clFbF" id="7ISVfSIZhm" role="3cqZAp">
+                <node concept="2OqwBi" id="7ISVfSIZhn" role="3clFbG">
+                  <node concept="Xjq3P" id="2tcGHBEeclc" role="2Oq$k0" />
+                  <node concept="liA8E" id="7ISVfSIZhp" role="2OqNvi">
+                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <node concept="10QFUN" id="7ISVfSIZhq" role="37wK5m">
+                      <node concept="3uibUv" id="7ISVfSIZhr" role="10QFUM">
+                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                      </node>
+                      <node concept="37vLTw" id="7ISVfSIZhs" role="10QFUP">
+                        <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                      </node>
+                    </node>
+                    <node concept="2ShNRf" id="7ISVfSIZht" role="37wK5m">
+                      <node concept="1pGfFk" id="6MYr6Jx04tk" role="2ShVmc">
+                        <ref role="37wK5l" to="omn0:6infEALANZc" resolve="AssertSolver" />
+                        <node concept="Xjq3P" id="6MYr6Jx04uA" role="37wK5m" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="7ISVfSIZlS" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="3eNFk2" id="7ISVfSIJJE" role="3eNLev">
+            <node concept="2OqwBi" id="7ISVfSIJJF" role="3eO9$A">
+              <node concept="10M0yZ" id="7ISVfSIK8M" role="2Oq$k0">
+                <ref role="3cqZAo" node="5uFPQ7C26$b" resolve="BOUND_SYM" />
+                <ref role="1PxDUh" node="5$WbtTOYoMb" resolve="LogicalPredicate" />
+              </node>
+              <node concept="liA8E" id="7ISVfSIJJH" role="2OqNvi">
+                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <node concept="37vLTw" id="7ISVfSIJJI" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="7ISVfSIJJJ" role="3eOfB_">
+              <node concept="3clFbF" id="7ISVfSJ2P6" role="3cqZAp">
+                <node concept="2OqwBi" id="7ISVfSJ2P7" role="3clFbG">
+                  <node concept="Xjq3P" id="2tcGHBEecmS" role="2Oq$k0" />
+                  <node concept="liA8E" id="7ISVfSJ2P9" role="2OqNvi">
+                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <node concept="10QFUN" id="7ISVfSJ2Pa" role="37wK5m">
+                      <node concept="3uibUv" id="7ISVfSJ2Pb" role="10QFUM">
+                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                      </node>
+                      <node concept="37vLTw" id="7ISVfSJ2Pc" role="10QFUP">
+                        <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                      </node>
+                    </node>
+                    <node concept="2ShNRf" id="7ISVfSJ2Pd" role="37wK5m">
+                      <node concept="HV5vD" id="3F6vMxqpinf" role="2ShVmc">
+                        <ref role="HV5vE" to="omn0:7ISVfSJ0DF" resolve="LogicalSolver.Bound" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="7ISVfSJ2Np" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="3eNFk2" id="7ISVfSJ2Gd" role="3eNLev">
+            <node concept="2OqwBi" id="7ISVfSJ2Ge" role="3eO9$A">
+              <node concept="10M0yZ" id="7ISVfSJ2Gf" role="2Oq$k0">
+                <ref role="1PxDUh" node="5$WbtTOYoMb" resolve="LogicalPredicate" />
+                <ref role="3cqZAo" node="5uFPQ7C279$" resolve="FREE_SYM" />
+              </node>
+              <node concept="liA8E" id="7ISVfSJ2Gg" role="2OqNvi">
+                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <node concept="37vLTw" id="7ISVfSJ2Gh" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="7ISVfSJ2Gi" role="3eOfB_">
+              <node concept="3clFbF" id="7ISVfSJ30n" role="3cqZAp">
+                <node concept="2OqwBi" id="7ISVfSJ30o" role="3clFbG">
+                  <node concept="Xjq3P" id="2tcGHBEecoN" role="2Oq$k0" />
+                  <node concept="liA8E" id="7ISVfSJ30q" role="2OqNvi">
+                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <node concept="10QFUN" id="7ISVfSJ30r" role="37wK5m">
+                      <node concept="3uibUv" id="7ISVfSJ30s" role="10QFUM">
+                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                      </node>
+                      <node concept="37vLTw" id="7ISVfSJ30t" role="10QFUP">
+                        <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                      </node>
+                    </node>
+                    <node concept="2ShNRf" id="7ISVfSJ30u" role="37wK5m">
+                      <node concept="HV5vD" id="3F6vMxqpiPO" role="2ShVmc">
+                        <ref role="HV5vE" to="omn0:7ISVfSJ1oi" resolve="LogicalSolver.Free" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="7ISVfSJ2Nu" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="3eNFk2" id="1ggxSI7qGPJ" role="3eNLev">
+            <node concept="3clFbS" id="1ggxSI7qGPO" role="3eOfB_">
+              <node concept="3clFbJ" id="1ggxSI7xGoB" role="3cqZAp">
+                <node concept="3clFbS" id="1ggxSI7xGoD" role="3clFbx">
+                  <node concept="YS8fn" id="1ggxSI7xGvh" role="3cqZAp">
+                    <node concept="2ShNRf" id="1ggxSI7xGwU" role="YScLw">
+                      <node concept="1pGfFk" id="1ggxSI7xGLe" role="2ShVmc">
+                        <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+                        <node concept="Xl_RD" id="1ggxSI7xGM3" role="37wK5m">
+                          <property role="Xl_RC" value="no java expression solver" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbC" id="1ggxSI7xGsE" role="3clFbw">
+                  <node concept="10Nm6u" id="1ggxSI7xGtI" role="3uHU7w" />
+                  <node concept="37vLTw" id="3F6vMxqoq$n" role="3uHU7B">
+                    <ref role="3cqZAo" node="3F6vMxqo1jQ" resolve="myJavaExpressionSolver" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="1ggxSI7xGPS" role="3cqZAp" />
+              <node concept="3clFbF" id="1ggxSI7qGPP" role="3cqZAp">
+                <node concept="2OqwBi" id="1ggxSI7qGPQ" role="3clFbG">
+                  <node concept="Xjq3P" id="1ggxSI7qGPR" role="2Oq$k0" />
+                  <node concept="liA8E" id="1ggxSI7qGPS" role="2OqNvi">
+                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                    <node concept="10QFUN" id="1ggxSI7qGPT" role="37wK5m">
+                      <node concept="3uibUv" id="1ggxSI7qGPU" role="10QFUM">
+                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                      </node>
+                      <node concept="37vLTw" id="1ggxSI7qGPV" role="10QFUP">
+                        <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                      </node>
+                    </node>
+                    <node concept="2ShNRf" id="1ggxSI7qGPW" role="37wK5m">
+                      <node concept="1pGfFk" id="1ggxSI7xcbQ" role="2ShVmc">
+                        <ref role="37wK5l" to="omn0:6MYr6Jx1c2W" resolve="JavaSolver" />
+                        <node concept="37vLTw" id="3F6vMxqosAS" role="37wK5m">
+                          <ref role="3cqZAo" node="3F6vMxqo1jQ" resolve="myJavaExpressionSolver" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="1ggxSI7qGPY" role="3cqZAp" />
+            </node>
+            <node concept="2ZW3vV" id="1ggxSI7qHdm" role="3eO9$A">
+              <node concept="3uibUv" id="1ggxSI7qHiX" role="2ZW6by">
+                <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+              </node>
+              <node concept="37vLTw" id="1ggxSI7qH82" role="2ZW6bz">
+                <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+              </node>
+            </node>
+          </node>
+          <node concept="9aQIb" id="5mr7UHchgcy" role="9aQIa">
+            <node concept="3clFbS" id="5mr7UHchgcz" role="9aQI4">
+              <node concept="YS8fn" id="5mr7UHchgjZ" role="3cqZAp">
+                <node concept="2ShNRf" id="5mr7UHchgme" role="YScLw">
+                  <node concept="1pGfFk" id="5mr7UHchgDA" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
+                    <node concept="3cpWs3" id="5mr7UHchgIt" role="37wK5m">
+                      <node concept="37vLTw" id="5mr7UHchgKN" role="3uHU7w">
+                        <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                      </node>
+                      <node concept="Xl_RD" id="5mr7UHchgEB" role="3uHU7B">
+                        <property role="Xl_RC" value="unknown symbol: " />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3F6vMxqo28Z" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqo1bP" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqottl" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="solverClass" />
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <node concept="3Tm1VV" id="3F6vMxqottn" role="1B3o_S" />
+      <node concept="3uibUv" id="3F6vMxqotto" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+        <node concept="3qUE_q" id="3F6vMxqottp" role="11_B2D">
+          <node concept="3uibUv" id="3F6vMxqottq" role="3qUE_r">
+            <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="3F6vMxqottr" role="3clF46">
+        <property role="TrG5h" value="symbol" />
+        <node concept="3uibUv" id="3F6vMxqotts" role="1tU5fm">
+          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3F6vMxqottt" role="3clF47">
+        <node concept="3clFbJ" id="2tcGHBEvbMP" role="3cqZAp">
+          <node concept="3clFbS" id="2tcGHBEvbMQ" role="3clFbx">
+            <node concept="3cpWs6" id="2tcGHBEvfUa" role="3cqZAp">
+              <node concept="3VsKOn" id="2tcGHBEvgfM" role="3cqZAk">
+                <ref role="3VsUkX" to="omn0:6GYQG_Spvw5" resolve="UnificationSolver" />
+              </node>
+            </node>
+            <node concept="3clFbH" id="2tcGHBEvgqn" role="3cqZAp" />
+          </node>
+          <node concept="2OqwBi" id="2tcGHBEvbN3" role="3clFbw">
+            <node concept="10M0yZ" id="2tcGHBEvbN4" role="2Oq$k0">
+              <ref role="1PxDUh" node="2GO7tyJVmP4" resolve="UnificationPredicate" />
+              <ref role="3cqZAo" node="5uFPQ7C29mw" resolve="UNI_SYM" />
+            </node>
+            <node concept="liA8E" id="2tcGHBEvbN5" role="2OqNvi">
+              <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+              <node concept="37vLTw" id="2tcGHBEvbN6" role="37wK5m">
+                <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
+              </node>
+            </node>
+          </node>
+          <node concept="3eNFk2" id="2tcGHBEvbN7" role="3eNLev">
+            <node concept="2OqwBi" id="2tcGHBEvbN8" role="3eO9$A">
+              <node concept="10M0yZ" id="2tcGHBEvbN9" role="2Oq$k0">
+                <ref role="1PxDUh" node="3HJTsBn4kk_" resolve="EqualsPredicate" />
+                <ref role="3cqZAo" node="5uFPQ7C23RV" resolve="EQ_SYM" />
+              </node>
+              <node concept="liA8E" id="2tcGHBEvbNa" role="2OqNvi">
+                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <node concept="37vLTw" id="2tcGHBEvbNb" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="2tcGHBEvbNc" role="3eOfB_">
+              <node concept="3cpWs6" id="2tcGHBEvgBd" role="3cqZAp">
+                <node concept="3VsKOn" id="2tcGHBEvh5M" role="3cqZAk">
+                  <ref role="3VsUkX" to="omn0:3HJTsBn4ogZ" resolve="EqualsSolver" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="2tcGHBEvbNn" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="3eNFk2" id="2tcGHBEvbNo" role="3eNLev">
+            <node concept="2OqwBi" id="2tcGHBEvbNp" role="3eO9$A">
+              <node concept="10M0yZ" id="2tcGHBEvbNq" role="2Oq$k0">
+                <ref role="1PxDUh" node="6infEALAfer" resolve="AssertPredicate" />
+                <ref role="3cqZAo" node="5uFPQ7BZnLB" resolve="ASSERT_SYM" />
+              </node>
+              <node concept="liA8E" id="2tcGHBEvbNr" role="2OqNvi">
+                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <node concept="37vLTw" id="2tcGHBEvbNs" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="2tcGHBEvbNt" role="3eOfB_">
+              <node concept="3cpWs6" id="2tcGHBEvhtS" role="3cqZAp">
+                <node concept="3VsKOn" id="2tcGHBEvhLT" role="3cqZAk">
+                  <ref role="3VsUkX" to="omn0:6infEALAKBG" resolve="AssertSolver" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="2tcGHBEvbNB" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="3eNFk2" id="2tcGHBEvbNC" role="3eNLev">
+            <node concept="2OqwBi" id="2tcGHBEvbND" role="3eO9$A">
+              <node concept="10M0yZ" id="2tcGHBEvbNE" role="2Oq$k0">
+                <ref role="1PxDUh" node="5$WbtTOYoMb" resolve="LogicalPredicate" />
+                <ref role="3cqZAo" node="5uFPQ7C26$b" resolve="BOUND_SYM" />
+              </node>
+              <node concept="liA8E" id="2tcGHBEvbNF" role="2OqNvi">
+                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <node concept="37vLTw" id="2tcGHBEvbNG" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="2tcGHBEvbNH" role="3eOfB_">
+              <node concept="3cpWs6" id="2tcGHBEviab" role="3cqZAp">
+                <node concept="3VsKOn" id="2tcGHBEviCP" role="3cqZAk">
+                  <ref role="3VsUkX" to="omn0:4xBopTzrd8Y" resolve="LogicalSolver" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="2tcGHBEvbNR" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="3eNFk2" id="2tcGHBEvbNS" role="3eNLev">
+            <node concept="2OqwBi" id="2tcGHBEvbNT" role="3eO9$A">
+              <node concept="10M0yZ" id="2tcGHBEvbNU" role="2Oq$k0">
+                <ref role="3cqZAo" node="5uFPQ7C279$" resolve="FREE_SYM" />
+                <ref role="1PxDUh" node="5$WbtTOYoMb" resolve="LogicalPredicate" />
+              </node>
+              <node concept="liA8E" id="2tcGHBEvbNV" role="2OqNvi">
+                <ref role="37wK5l" to="rchb:54i3Fxd17bK" resolve="equals" />
+                <node concept="37vLTw" id="2tcGHBEvbNW" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="2tcGHBEvbNX" role="3eOfB_">
+              <node concept="3cpWs6" id="2tcGHBEviXX" role="3cqZAp">
+                <node concept="3VsKOn" id="2tcGHBEviXY" role="3cqZAk">
+                  <ref role="3VsUkX" to="omn0:4xBopTzrd8Y" resolve="LogicalSolver" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="2tcGHBEvbO7" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="3eNFk2" id="2tcGHBEBfnQ" role="3eNLev">
+            <node concept="2ZW3vV" id="1ggxSI7oiK8" role="3eO9$A">
+              <node concept="3uibUv" id="1ggxSI7oiW9" role="2ZW6by">
+                <ref role="3uigEE" to="rchb:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+              </node>
+              <node concept="37vLTw" id="1ggxSI7oifj" role="2ZW6bz">
+                <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="2tcGHBEBfnS" role="3eOfB_">
+              <node concept="3cpWs6" id="2tcGHBEBhbq" role="3cqZAp">
+                <node concept="3VsKOn" id="1ggxSI7ojmR" role="3cqZAk">
+                  <ref role="3VsUkX" to="omn0:6MYr6Jx1bvI" resolve="JavaSolver" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="2tcGHBEBhHz" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="2tcGHBEvbO8" role="9aQIa">
+            <node concept="3clFbS" id="2tcGHBEvbO9" role="9aQI4">
+              <node concept="YS8fn" id="2tcGHBEvbOa" role="3cqZAp">
+                <node concept="2ShNRf" id="2tcGHBEvbOb" role="YScLw">
+                  <node concept="1pGfFk" id="2tcGHBEvbOc" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
+                    <node concept="3cpWs3" id="2tcGHBEvbOd" role="37wK5m">
+                      <node concept="37vLTw" id="2tcGHBEvbOe" role="3uHU7w">
+                        <ref role="3cqZAo" node="3F6vMxqottr" resolve="symbol" />
+                      </node>
+                      <node concept="Xl_RD" id="2tcGHBEvbOf" role="3uHU7B">
+                        <property role="Xl_RC" value="unknown symbol: " />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3F6vMxqottu" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqougm" role="jymVt" />
+    <node concept="3Tm1VV" id="3F6vMxqo13Z" role="1B3o_S" />
+    <node concept="3uibUv" id="3F6vMxqo15F" role="1zkMxy">
+      <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+    </node>
+    <node concept="312cEg" id="3F6vMxqo1jQ" role="jymVt">
+      <property role="TrG5h" value="myJavaExpressionSolver" />
+      <node concept="3Tm6S6" id="3F6vMxqo1jR" role="1B3o_S" />
+      <node concept="3uibUv" id="3F6vMxqo1jT" role="1tU5fm">
+        <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
index a788a116..f803b413 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
@@ -2070,7 +2070,7 @@
   </node>
   <node concept="312cEu" id="6MYr6Jx1bvI">
     <property role="TrG5h" value="JavaSolver" />
-    <property role="1sVAO0" value="true" />
+    <property role="1sVAO0" value="false" />
     <node concept="2tJIrI" id="6MYr6Jx1byU" role="jymVt" />
     <node concept="3clFbW" id="6MYr6Jx1c2W" role="jymVt">
       <node concept="3cqZAl" id="6MYr6Jx1c2Y" role="3clF45" />
@@ -3319,7 +3319,7 @@
     <node concept="2tJIrI" id="2UGjFq4lURm" role="jymVt" />
     <node concept="3clFb_" id="2UGjFq4lTDy" role="jymVt">
       <property role="TrG5h" value="doAsk" />
-      <node concept="3Tm6S6" id="2UGjFq4masH" role="1B3o_S" />
+      <node concept="3Tmbuc" id="6yEjedm66M5" role="1B3o_S" />
       <node concept="10P_77" id="2UGjFq4lTD$" role="3clF45" />
       <node concept="37vLTG" id="2UGjFq4lTDc" role="3clF46">
         <property role="TrG5h" value="left" />
@@ -3599,7 +3599,7 @@
     <node concept="2tJIrI" id="2UGjFq4mcDg" role="jymVt" />
     <node concept="3clFb_" id="2UGjFq4mbmq" role="jymVt">
       <property role="TrG5h" value="doTell" />
-      <node concept="3Tm6S6" id="2UGjFq4mbmr" role="1B3o_S" />
+      <node concept="3Tmbuc" id="6yEjedm67P8" role="1B3o_S" />
       <node concept="3cqZAl" id="2UGjFq4mbms" role="3clF45" />
       <node concept="37vLTG" id="2UGjFq4mbm4" role="3clF46">
         <property role="TrG5h" value="left" />
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
index f0ec359e..72e8387c 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
@@ -7,14 +7,10 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="f8dg" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:annotations(jetbrains.mps.jchr.runtime/)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
-    <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
     <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-    <import index="95zw" ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -47,17 +43,8 @@
         <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
         <reference id="1144432896254" name="enumClass" index="1Px2BO" />
       </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
       <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">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
-        <child id="1164991057263" name="throwable" index="YScLw" />
-      </concept>
       <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
         <child id="1081256993305" name="classType" index="2ZW6by" />
         <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
@@ -76,7 +63,6 @@
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
-        <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
         <child id="1214996921760" name="bound" index="3ztrMU" />
@@ -131,10 +117,6 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <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="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
@@ -146,7 +128,6 @@
         <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="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
@@ -157,7 +138,6 @@
       <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
         <property id="8355037393041754995" name="isNative" index="2aFKle" />
       </concept>
-      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
@@ -170,11 +150,6 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
-      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
-        <child id="1163668914799" name="condition" index="3K4Cdx" />
-        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
-        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
-      </concept>
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -184,435 +159,12 @@
       <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" />
     </language>
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <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="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
-      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
-    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
   </registry>
-  <node concept="312cEu" id="4U_yxogAknZ">
-    <property role="TrG5h" value="AtomLogical" />
-    <node concept="2tJIrI" id="4U_yxogB9ZV" role="jymVt" />
-    <node concept="3clFbW" id="4U_yxogBkww" role="jymVt">
-      <node concept="3cqZAl" id="4U_yxogBkwx" role="3clF45" />
-      <node concept="3clFbS" id="4U_yxogBkwz" role="3clF47">
-        <node concept="XkiVB" id="4U_yxogBkBp" role="3cqZAp">
-          <ref role="37wK5l" to="95zw:3HJTsBmBUfM" resolve="JchrLogical" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6SkxsM$bMnC" role="1B3o_S" />
-      <node concept="2AHcQZ" id="6SkxsM$bLTa" role="2AJF6D">
-        <ref role="2AI5Lk" to="f8dg:~JCHR_Declare" resolve="JCHR_Declare" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2DKqMqOlUqa" role="jymVt" />
-    <node concept="3clFbW" id="2DKqMqOlTiR" role="jymVt">
-      <node concept="3cqZAl" id="2DKqMqOlTiS" role="3clF45" />
-      <node concept="3clFbS" id="2DKqMqOlTiT" role="3clF47">
-        <node concept="XkiVB" id="2DKqMqOlTiU" role="3cqZAp">
-          <ref role="37wK5l" to="95zw:2DKqMqOlOj4" resolve="JchrLogical" />
-          <node concept="37vLTw" id="2DKqMqOlVIe" role="37wK5m">
-            <ref role="3cqZAo" node="2DKqMqOlVxk" resolve="wildcard" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="2DKqMqOlTiV" role="1B3o_S" />
-      <node concept="2AHcQZ" id="2DKqMqOlTiW" role="2AJF6D">
-        <ref role="2AI5Lk" to="f8dg:~JCHR_Declare" resolve="JCHR_Declare" />
-      </node>
-      <node concept="37vLTG" id="2DKqMqOlVxk" role="3clF46">
-        <property role="TrG5h" value="wildcard" />
-        <node concept="10P_77" id="2DKqMqOlVxj" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6SkxsM$30ID" role="jymVt" />
-    <node concept="3clFbW" id="6SkxsM$96Z2" role="jymVt">
-      <node concept="37vLTG" id="6SkxsM$96Z3" role="3clF46">
-        <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="6SkxsM$96Z4" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="6SkxsM$96Z5" role="3clF45" />
-      <node concept="3clFbS" id="6SkxsM$96Z6" role="3clF47">
-        <node concept="XkiVB" id="6SkxsM$96Z7" role="3cqZAp">
-          <ref role="37wK5l" to="95zw:3HJTsBmBV0W" resolve="JchrLogical" />
-          <node concept="37vLTw" id="6SkxsM$96Z8" role="37wK5m">
-            <ref role="3cqZAo" node="6SkxsM$96Z3" resolve="name" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6SkxsM$bMwH" role="1B3o_S" />
-      <node concept="2AHcQZ" id="6SkxsM$bM5w" role="2AJF6D">
-        <ref role="2AI5Lk" to="f8dg:~JCHR_Declare" resolve="JCHR_Declare" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7nuzzkr21VL" role="jymVt" />
-    <node concept="3clFbW" id="7nuzzkr2143" role="jymVt">
-      <node concept="37vLTG" id="7nuzzkr2144" role="3clF46">
-        <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="7nuzzkr2145" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7nuzzkr22MK" role="3clF46">
-        <property role="TrG5h" value="wildcard" />
-        <node concept="10P_77" id="7nuzzkr231n" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="7nuzzkr2146" role="3clF45" />
-      <node concept="3clFbS" id="7nuzzkr2147" role="3clF47">
-        <node concept="XkiVB" id="7nuzzkr2148" role="3cqZAp">
-          <ref role="37wK5l" to="95zw:7nuzzkr1W8y" resolve="JchrLogical" />
-          <node concept="37vLTw" id="7nuzzkr2149" role="37wK5m">
-            <ref role="3cqZAo" node="7nuzzkr2144" resolve="name" />
-          </node>
-          <node concept="37vLTw" id="7nuzzkr23aF" role="37wK5m">
-            <ref role="3cqZAo" node="7nuzzkr22MK" resolve="wildcard" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7nuzzkr214a" role="1B3o_S" />
-      <node concept="2AHcQZ" id="7nuzzkr214b" role="2AJF6D">
-        <ref role="2AI5Lk" to="f8dg:~JCHR_Declare" resolve="JCHR_Declare" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6SkxsM$96Z1" role="jymVt" />
-    <node concept="3clFbW" id="6SkxsM$2Uu7" role="jymVt">
-      <node concept="3cqZAl" id="6SkxsM$2Uua" role="3clF45" />
-      <node concept="3clFbS" id="6SkxsM$2Uub" role="3clF47">
-        <node concept="XkiVB" id="6SkxsM$301q" role="3cqZAp">
-          <ref role="37wK5l" to="95zw:3HJTsBmBVmo" resolve="JchrLogical" />
-          <node concept="10Nm6u" id="3HJTsBmCNtN" role="37wK5m" />
-          <node concept="37vLTw" id="6SkxsM$302O" role="37wK5m">
-            <ref role="3cqZAo" node="6SkxsM$2XXX" resolve="atom" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6SkxsM$bMBA" role="1B3o_S" />
-      <node concept="37vLTG" id="6SkxsM$2XXX" role="3clF46">
-        <property role="TrG5h" value="atom" />
-        <node concept="3uibUv" id="6SkxsM$2XXW" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6SkxsM$bMc$" role="2AJF6D">
-        <ref role="2AI5Lk" to="f8dg:~JCHR_Init" resolve="JCHR_Init" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1GDBwhEEL81" role="jymVt" />
-    <node concept="3clFbW" id="1GDBwhEEL82" role="jymVt">
-      <node concept="3cqZAl" id="1GDBwhEEL83" role="3clF45" />
-      <node concept="3clFbS" id="1GDBwhEEL84" role="3clF47">
-        <node concept="XkiVB" id="1GDBwhEEL85" role="3cqZAp">
-          <ref role="37wK5l" to="95zw:3HJTsBmBVmo" resolve="JchrLogical" />
-          <node concept="37vLTw" id="1GDBwhEEM8m" role="37wK5m">
-            <ref role="3cqZAo" node="1GDBwhEEM36" resolve="name" />
-          </node>
-          <node concept="37vLTw" id="1GDBwhEEL86" role="37wK5m">
-            <ref role="3cqZAo" node="1GDBwhEEL88" resolve="atom" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1GDBwhEEL87" role="1B3o_S" />
-      <node concept="37vLTG" id="1GDBwhEEM36" role="3clF46">
-        <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="1GDBwhEEM3$" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1GDBwhEEL88" role="3clF46">
-        <property role="TrG5h" value="atom" />
-        <node concept="3uibUv" id="1GDBwhEEL89" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="1GDBwhEEL8a" role="2AJF6D">
-        <ref role="2AI5Lk" to="f8dg:~JCHR_Init" resolve="JCHR_Init" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2h41Ezbxe8N" role="jymVt" />
-    <node concept="3clFb_" id="3mz2_dYqEdN" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="withMeta" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="2aFKle" value="false" />
-      <node concept="37vLTG" id="3mz2_dYqKiz" role="3clF46">
-        <property role="TrG5h" value="metaLogical" />
-        <node concept="3uibUv" id="3mz2_dYqL9h" role="1tU5fm">
-          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="3mz2_dYqEdQ" role="3clF47">
-        <node concept="3clFbF" id="3mz2_dYqLkZ" role="3cqZAp">
-          <node concept="37vLTI" id="3mz2_dYqLl1" role="3clFbG">
-            <node concept="2OqwBi" id="3mz2_dYqLl5" role="37vLTJ">
-              <node concept="Xjq3P" id="3mz2_dYqLl8" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3mz2_dYqLl4" role="2OqNvi">
-                <ref role="2Oxat5" node="3mz2_dYqLkV" resolve="metaLogical" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="3mz2_dYqLl9" role="37vLTx">
-              <ref role="3cqZAo" node="3mz2_dYqKiz" resolve="metaLogical" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3mz2_dYqQgU" role="3cqZAp">
-          <node concept="Xjq3P" id="3mz2_dYqQgS" role="3clFbG" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3mz2_dYqDhF" role="1B3o_S" />
-      <node concept="3uibUv" id="3mz2_dYqNyR" role="3clF45">
-        <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4U_yxogCsEV" role="jymVt" />
-    <node concept="3clFb_" id="dfChU1gcsX" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="findRoot" />
-      <node concept="3uibUv" id="3HJTsBn63I2" role="3clF45">
-        <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
-      </node>
-      <node concept="3Tm1VV" id="dfChU1gct0" role="1B3o_S" />
-      <node concept="3clFbS" id="dfChU1gct6" role="3clF47">
-        <node concept="3clFbF" id="dfChU1ggsh" role="3cqZAp">
-          <node concept="10QFUN" id="3HJTsBmKpNm" role="3clFbG">
-            <node concept="3uibUv" id="3HJTsBn64qV" role="10QFUM">
-              <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
-            </node>
-            <node concept="1rXfSq" id="dfChU1ggsg" role="10QFUP">
-              <ref role="37wK5l" to="eifs:~Logical.find():runtime.Logical" resolve="find" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="dfChU1gf8K" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3mz2_dYyCli" role="jymVt" />
-    <node concept="3clFb_" id="7HUwyZaOeBH" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="metaLogical" />
-      <node concept="3Tm1VV" id="7HUwyZaOeBJ" role="1B3o_S" />
-      <node concept="3uibUv" id="7HUwyZaOeBK" role="3clF45">
-        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
-        <node concept="3uibUv" id="20WMLipvJgu" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="7HUwyZaOeBR" role="3clF47">
-        <node concept="3clFbJ" id="3mz2_dYqMn1" role="3cqZAp">
-          <node concept="3clFbS" id="3mz2_dYqMn3" role="3clFbx">
-            <node concept="YS8fn" id="3mz2_dYqMJb" role="3cqZAp">
-              <node concept="2ShNRf" id="3mz2_dYqMMu" role="YScLw">
-                <node concept="1pGfFk" id="3mz2_dYqN04" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="3mz2_dYqMy7" role="3clFbw">
-            <node concept="10Nm6u" id="3mz2_dYqMAm" role="3uHU7w" />
-            <node concept="37vLTw" id="3mz2_dYqMt_" role="3uHU7B">
-              <ref role="3cqZAo" node="3mz2_dYqLkV" resolve="metaLogical" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3mz2_dYqNgJ" role="3cqZAp">
-          <node concept="37vLTw" id="3mz2_dYqNgH" role="3clFbG">
-            <ref role="3cqZAo" node="3mz2_dYqLkV" resolve="metaLogical" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="7HUwyZaOhSh" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2ev$9JFO5ru" role="jymVt" />
-    <node concept="3clFb_" id="5NuEpF1xPNu" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="toString" />
-      <property role="DiZV1" value="false" />
-      <property role="IEkAT" value="false" />
-      <node concept="3Tm1VV" id="5NuEpF1xPNv" role="1B3o_S" />
-      <node concept="17QB3L" id="77AxcO5bvNn" role="3clF45" />
-      <node concept="3clFbS" id="5NuEpF1xPNy" role="3clF47">
-        <node concept="3cpWs8" id="5NuEpF1xSwy" role="3cqZAp">
-          <node concept="3cpWsn" id="5NuEpF1xSwz" role="3cpWs9">
-            <property role="TrG5h" value="repr" />
-            <node concept="3uibUv" id="7HUwyZazx80" role="1tU5fm">
-              <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
-              <node concept="3uibUv" id="7HUwyZazx81" role="11_B2D">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
-              </node>
-            </node>
-            <node concept="1rXfSq" id="5NuEpF1xSw$" role="33vP2m">
-              <ref role="37wK5l" node="dfChU1gcsX" resolve="findRoot" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3v$7B1Kczo0" role="3cqZAp">
-          <node concept="3cpWsn" id="3v$7B1Kczo1" role="3cpWs9">
-            <property role="TrG5h" value="value" />
-            <node concept="3uibUv" id="3v$7B1KcznY" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
-            </node>
-            <node concept="2OqwBi" id="3v$7B1Kczo2" role="33vP2m">
-              <node concept="37vLTw" id="3v$7B1Kczo3" role="2Oq$k0">
-                <ref role="3cqZAo" node="5NuEpF1xSwz" resolve="repr" />
-              </node>
-              <node concept="liA8E" id="3v$7B1Kczo4" role="2OqNvi">
-                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2QE4RCGhZVd" role="3cqZAp">
-          <node concept="3cpWsn" id="2QE4RCGhZVe" role="3cpWs9">
-            <property role="TrG5h" value="fullName" />
-            <node concept="17QB3L" id="6tTPqJZ13Gf" role="1tU5fm" />
-            <node concept="3K4zz7" id="2QE4RCGhZVf" role="33vP2m">
-              <node concept="1rXfSq" id="2QE4RCGhZVg" role="3K4E3e">
-                <ref role="37wK5l" to="eifs:~Logical.getName():java.lang.String" resolve="getName" />
-              </node>
-              <node concept="3clFbC" id="2QE4RCGhZVh" role="3K4Cdx">
-                <node concept="37vLTw" id="2QE4RCGhZVi" role="3uHU7w">
-                  <ref role="3cqZAo" node="5NuEpF1xSwz" resolve="repr" />
-                </node>
-                <node concept="Xjq3P" id="2QE4RCGhZVj" role="3uHU7B" />
-              </node>
-              <node concept="3cpWs3" id="2QE4RCGhZVk" role="3K4GZi">
-                <node concept="2OqwBi" id="2QE4RCGhZVl" role="3uHU7w">
-                  <node concept="37vLTw" id="2QE4RCGhZVm" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5NuEpF1xSwz" resolve="repr" />
-                  </node>
-                  <node concept="liA8E" id="2QE4RCGhZVn" role="2OqNvi">
-                    <ref role="37wK5l" to="45ys:677NV56hh2k" resolve="name" />
-                  </node>
-                </node>
-                <node concept="3cpWs3" id="2QE4RCGhZVo" role="3uHU7B">
-                  <node concept="1rXfSq" id="2QE4RCGhZVp" role="3uHU7B">
-                    <ref role="37wK5l" to="eifs:~Logical.getName():java.lang.String" resolve="getName" />
-                  </node>
-                  <node concept="Xl_RD" id="2QE4RCGhZVq" role="3uHU7w">
-                    <property role="Xl_RC" value=":" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5NuEpF1xSlQ" role="3cqZAp">
-          <node concept="3K4zz7" id="5NuEpF1xUF9" role="3clFbG">
-            <node concept="3cpWs3" id="2QE4RCGi0Vz" role="3K4E3e">
-              <node concept="3cpWs3" id="2QE4RCGi1gc" role="3uHU7B">
-                <node concept="Xl_RD" id="2QE4RCGi1m6" role="3uHU7w">
-                  <property role="Xl_RC" value="=" />
-                </node>
-                <node concept="37vLTw" id="2QE4RCGi0Zs" role="3uHU7B">
-                  <ref role="3cqZAo" node="2QE4RCGhZVe" resolve="fullName" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="5NuEpF1y3Hh" role="3uHU7w">
-                <node concept="37vLTw" id="3v$7B1KczTq" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3v$7B1Kczo1" resolve="value" />
-                </node>
-                <node concept="liA8E" id="5NuEpF1y45Z" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
-                </node>
-              </node>
-            </node>
-            <node concept="3y3z36" id="5NuEpF1xUat" role="3K4Cdx">
-              <node concept="10Nm6u" id="5NuEpF1xUr8" role="3uHU7w" />
-              <node concept="37vLTw" id="3v$7B1Kczo5" role="3uHU7B">
-                <ref role="3cqZAo" node="3v$7B1Kczo1" resolve="value" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="2QE4RCGhZVr" role="3K4GZi">
-              <ref role="3cqZAo" node="2QE4RCGhZVe" resolve="fullName" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5NuEpF1xPNz" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="4U_yxogAko0" role="1B3o_S" />
-    <node concept="3uibUv" id="4U_yxogB8or" role="1zkMxy">
-      <ref role="3uigEE" to="95zw:3HJTsBmBSJa" resolve="JchrLogical" />
-      <node concept="3uibUv" id="4U_yxogB8yy" role="11_B2D">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
-      </node>
-    </node>
-    <node concept="3uibUv" id="7HUwyZazx8k" role="EKbjA">
-      <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
-      <node concept="3uibUv" id="7HUwyZazx8l" role="11_B2D">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
-      </node>
-    </node>
-    <node concept="3UR2Jj" id="2ev$9JF$huc" role="lGtFl">
-      <node concept="TZ5HA" id="2ev$9JF$hud" role="TZ5H$">
-        <node concept="1dT_AC" id="2ev$9JF$hue" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="2ev$9JF$iKo" role="TZ5H$">
-        <node concept="1dT_AC" id="2ev$9JF$iKp" role="1dT_Ay">
-          <property role="1dT_AB" value="TODO: the existance of this class and the possibility to present a logical variable referring " />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="2ev$9JF$iKi" role="TZ5H$">
-        <node concept="1dT_AC" id="2ev$9JF$iKj" role="1dT_Ay">
-          <property role="1dT_AB" value="to its instance effectively makes an Atom mutable, so it should be supported in reactive schemes, such" />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="2ev$9JF$iLe" role="TZ5H$">
-        <node concept="1dT_AC" id="2ev$9JF$iLf" role="1dT_Ay">
-          <property role="1dT_AB" value="as a constraint occurrence. " />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="2ev$9JF$iLq" role="TZ5H$">
-        <node concept="1dT_AC" id="2ev$9JF$iLr" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="2ev$9JF$iLC" role="TZ5H$">
-        <node concept="1dT_AC" id="2ev$9JF$iLD" role="1dT_Ay">
-          <property role="1dT_AB" value="So far Atom has been treated as an immutable construct, constraints are matched with its instances as " />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="2ev$9JF$iMa" role="TZ5H$">
-        <node concept="1dT_AC" id="2ev$9JF$iMb" role="1dT_Ay">
-          <property role="1dT_AB" value="with opaque objects. This may change in the future. " />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="2ev$9JF$iKM" role="TZ5H$">
-        <node concept="1dT_AC" id="2ev$9JF$iKN" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3mz2_dYyUvA" role="jymVt" />
-    <node concept="312cEg" id="3mz2_dYqLkV" role="jymVt">
-      <property role="TrG5h" value="metaLogical" />
-      <node concept="3Tm6S6" id="3mz2_dYqLkW" role="1B3o_S" />
-      <node concept="3uibUv" id="3mz2_dYqLkY" role="1tU5fm">
-        <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
-      </node>
-    </node>
-  </node>
   <node concept="312cEu" id="7HUwyZbdMWH">
     <property role="TrG5h" value="MetaLogicalAtom" />
     <node concept="2tJIrI" id="7HUwyZbdN_B" role="jymVt" />
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
index 2de626cc..9254f3a6 100644
--- a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
+++ b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
@@ -24,12 +24,12 @@
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -37,9 +37,7 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps
index a65b704e..b98532de 100644
--- a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps
+++ b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps
@@ -8,6 +8,7 @@
   <imports>
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
+    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -52,6 +53,10 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
+        <child id="1081256993305" name="classType" index="2ZW6by" />
+        <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
+      </concept>
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
@@ -60,11 +65,16 @@
       <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
         <child id="1070534760952" name="componentType" index="10Q1$1" />
       </concept>
+      <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">
         <property id="8606350594693632173" name="isTransient" index="eg7rD" />
         <property id="1240249534625" name="isVolatile" index="34CwA1" />
       </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -1116,6 +1126,145 @@
       <node concept="3clFbS" id="6MYr6JwRKzU" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="6MYr6JwSESa" role="jymVt" />
+    <node concept="312cEu" id="3F6vMxqplHq" role="jymVt">
+      <property role="TrG5h" value="Default" />
+      <node concept="2tJIrI" id="3F6vMxqpmaY" role="jymVt" />
+      <node concept="3clFb_" id="3FIATxbQg$x" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="asRoot" />
+        <node concept="37vLTG" id="3FIATxbQg$y" role="3clF46">
+          <property role="TrG5h" value="term" />
+          <node concept="16syzq" id="3FIATxbQg$z" role="1tU5fm">
+            <ref role="16sUi3" node="3FIATxbQg$A" resolve="TERM" />
+          </node>
+        </node>
+        <node concept="16syzq" id="3FIATxbQg$$" role="3clF45">
+          <ref role="16sUi3" node="3FIATxbQg$A" resolve="TERM" />
+        </node>
+        <node concept="3Tm1VV" id="3FIATxbQg$_" role="1B3o_S" />
+        <node concept="16euLQ" id="3FIATxbQg$A" role="16eVyc">
+          <property role="TrG5h" value="TERM" />
+          <node concept="3uibUv" id="3FIATxbQg$B" role="3ztrMU">
+            <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="3FIATxbQg$C" role="3clF47">
+          <node concept="3clFbF" id="3FIATxbQg$D" role="3cqZAp">
+            <node concept="10QFUN" id="3FIATxbQg$E" role="3clFbG">
+              <node concept="2OqwBi" id="3FIATxbQg$F" role="10QFUP">
+                <node concept="1eOMI4" id="3FIATxbQg$G" role="2Oq$k0">
+                  <node concept="10QFUN" id="3FIATxbQg$H" role="1eOMHV">
+                    <node concept="37vLTw" id="3FIATxbQg$I" role="10QFUP">
+                      <ref role="3cqZAo" node="3FIATxbQg$y" resolve="term" />
+                    </node>
+                    <node concept="3uibUv" id="3FIATxbQg$J" role="10QFUM">
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="3FIATxbQg$K" role="2OqNvi">
+                  <ref role="37wK5l" to="ie8e:2QE4RCGndD7" resolve="asRoot" />
+                </node>
+              </node>
+              <node concept="16syzq" id="3FIATxbQg$L" role="10QFUM">
+                <ref role="16sUi3" node="3FIATxbQg$A" resolve="TERM" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3F6vMxqpmU8" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3FIATxbQg$M" role="jymVt" />
+      <node concept="3clFb_" id="3FIATxbQg$N" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="logical" />
+        <node concept="37vLTG" id="3FIATxbQg$O" role="3clF46">
+          <property role="TrG5h" value="var" />
+          <node concept="16syzq" id="3FIATxbQg$P" role="1tU5fm">
+            <ref role="16sUi3" node="3FIATxbQg$T" resolve="TERM" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="3FIATxbQg$Q" role="3clF45">
+          <ref role="3uigEE" node="6MYr6JwxYwB" resolve="SolverLogical" />
+          <node concept="16syzq" id="3FIATxbQg$R" role="11_B2D">
+            <ref role="16sUi3" node="3FIATxbQg$T" resolve="TERM" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="3FIATxbQg$S" role="1B3o_S" />
+        <node concept="16euLQ" id="3FIATxbQg$T" role="16eVyc">
+          <property role="TrG5h" value="TERM" />
+          <node concept="3uibUv" id="3FIATxbQg$U" role="3ztrMU">
+            <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="3FIATxbQg$V" role="3clF47">
+          <node concept="3clFbF" id="3FIATxbQg$W" role="3cqZAp">
+            <node concept="10QFUN" id="3FIATxbQg$X" role="3clFbG">
+              <node concept="2OqwBi" id="3FIATxbQg$Y" role="10QFUP">
+                <node concept="1eOMI4" id="3FIATxbQg$Z" role="2Oq$k0">
+                  <node concept="10QFUN" id="3FIATxbQg_0" role="1eOMHV">
+                    <node concept="37vLTw" id="3FIATxbQg_1" role="10QFUP">
+                      <ref role="3cqZAo" node="3FIATxbQg$O" resolve="var" />
+                    </node>
+                    <node concept="3uibUv" id="3FIATxbQg_2" role="10QFUM">
+                      <ref role="3uigEE" node="46l0wJhtOD_" resolve="LogicalOwner" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="3FIATxbQg_3" role="2OqNvi">
+                  <ref role="37wK5l" node="46l0wJhtXlr" resolve="logical" />
+                </node>
+              </node>
+              <node concept="3uibUv" id="3FIATxbQg_4" role="10QFUM">
+                <ref role="3uigEE" node="6MYr6JwxYwB" resolve="SolverLogical" />
+                <node concept="16syzq" id="3FIATxbQg_5" role="11_B2D">
+                  <ref role="16sUi3" node="3FIATxbQg$T" resolve="TERM" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3F6vMxqpn8w" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3FIATxbQg_6" role="jymVt" />
+      <node concept="3clFb_" id="3FIATxbQg_7" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="isLogical" />
+        <node concept="37vLTG" id="3FIATxbQg_8" role="3clF46">
+          <property role="TrG5h" value="term" />
+          <node concept="3uibUv" id="3FIATxbQg_9" role="1tU5fm">
+            <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
+          </node>
+        </node>
+        <node concept="10P_77" id="3FIATxbQg_a" role="3clF45" />
+        <node concept="3Tm1VV" id="3FIATxbQg_b" role="1B3o_S" />
+        <node concept="3clFbS" id="3FIATxbQg_c" role="3clF47">
+          <node concept="3clFbF" id="3FIATxbQg_d" role="3cqZAp">
+            <node concept="2ZW3vV" id="3FIATxbQg_e" role="3clFbG">
+              <node concept="3uibUv" id="3FIATxbQg_f" role="2ZW6by">
+                <ref role="3uigEE" node="46l0wJhtOD_" resolve="LogicalOwner" />
+              </node>
+              <node concept="37vLTw" id="3FIATxbQg_g" role="2ZW6bz">
+                <ref role="3cqZAo" node="3FIATxbQg_8" resolve="term" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3F6vMxqpnmm" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3F6vMxqpmb3" role="jymVt" />
+      <node concept="3Tm1VV" id="3F6vMxqplHr" role="1B3o_S" />
+      <node concept="3uibUv" id="3F6vMxqpm4y" role="EKbjA">
+        <ref role="3uigEE" node="6MYr6JwANOa" resolve="LogicalUnification" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqplBc" role="jymVt" />
     <node concept="3Tm1VV" id="6MYr6JwANOb" role="1B3o_S" />
   </node>
   <node concept="3HP615" id="46l0wJhtOD_">
diff --git a/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd b/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
index f71fc171..451333a2 100644
--- a/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
+++ b/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
@@ -16,10 +16,8 @@
   <dependencies>
     <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="false">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-    <dependency reexport="false">760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)</dependency>
     <dependency reexport="false">e4a4c488-aaf8-4c5b-bc98-e65c5dd9acb9(jetbrains.mps.lang.typesystem2.samplechecker.handler.test)</dependency>
   </dependencies>
   <usedDevKits>
@@ -35,7 +33,6 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <language slang="l:894463aa-8754-49c0-bf4b-6a32af66b376:jetbrains.mps.jchr" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
@@ -50,8 +47,6 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
@@ -59,7 +54,6 @@
     <module reference="e4a4c488-aaf8-4c5b-bc98-e65c5dd9acb9(jetbrains.mps.lang.typesystem2.samplechecker.handler.test)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
     <module reference="b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)" version="0" />
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical.mps
index a616ef94..8b43746f 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical.mps
@@ -15,6 +15,7 @@
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="98" ref="b189d6c6-9397-4d64-88af-1ac73760a4f5/java:org.mockito.stubbing(jetbrains.mps.logic.test/)" implicit="true" />
   </imports>
   <registry>
@@ -38,6 +39,7 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </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="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
         <child id="1070534760952" name="componentType" index="10Q1$1" />
@@ -86,9 +88,6 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -98,7 +97,9 @@
         <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">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
@@ -124,6 +125,7 @@
         <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
       </concept>
       <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="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
@@ -629,6 +631,35 @@
   </node>
   <node concept="3s_ewN" id="dfChU1ddiN">
     <property role="3s_ewP" value="LogicalExpression" />
+    <node concept="2tJIrI" id="6yEjedm6$c8" role="jymVt" />
+    <node concept="3clFb_" id="6yEjedm6G_P" role="jymVt">
+      <property role="TrG5h" value="logical" />
+      <node concept="37vLTG" id="6yEjedm6GJE" role="3clF46">
+        <property role="TrG5h" value="atom" />
+        <node concept="3uibUv" id="6yEjedm6GNi" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="6yEjedm6GEk" role="3clF45">
+        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <node concept="3uibUv" id="6yEjedm6GEG" role="11_B2D">
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6yEjedm6GE4" role="1B3o_S" />
+      <node concept="3clFbS" id="6yEjedm6G_T" role="3clF47">
+        <node concept="3clFbF" id="6yEjedm6GSD" role="3cqZAp">
+          <node concept="2ShNRf" id="6yEjedm6GSB" role="3clFbG">
+            <node concept="1pGfFk" id="6yEjedm6H80" role="2ShVmc">
+              <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+              <node concept="37vLTw" id="6yEjedm6Ha_" role="37wK5m">
+                <ref role="3cqZAo" node="6yEjedm6GJE" resolve="atom" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3Tm1VV" id="dfChU1ddiO" role="1B3o_S" />
     <node concept="3s_gsd" id="dfChU1ddiP" role="3s_ewO">
       <node concept="3s$Bmu" id="dfChU1ddiQ" role="3s_gse">
@@ -637,22 +668,23 @@
         <node concept="3Tm1VV" id="dfChU1ddiU" role="1B3o_S" />
         <node concept="3clFbS" id="dfChU1ddiV" role="3clF47">
           <node concept="3clFbH" id="dfChU1ddj0" role="3cqZAp" />
-          <node concept="3cpWs8" id="dfChU1dmCT" role="3cqZAp">
-            <node concept="3cpWsn" id="dfChU1dmCW" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm6PYb" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm6PYc" role="3cpWs9">
               <property role="TrG5h" value="Node" />
-              <node concept="3uibUv" id="7FFmDVAOQX4" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm6PY7" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm6PYa" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="dfChU1jq1z" role="33vP2m">
-                <node concept="1pGfFk" id="dfChU1jqTS" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                  <node concept="1oi1Uc" id="dfChU1j1P0" role="37wK5m">
-                    <node concept="1oi5UN" id="dfChU1j1PO" role="1oi0x0">
-                      <node concept="1oi5Wm" id="dfChU1j1PP" role="1ojpOf">
-                        <property role="TrG5h" value="bar" />
-                        <node concept="1oi5XN" id="dfChU1j1PQ" role="1oi5zu">
-                          <property role="1oi5yK" value="abc" />
-                        </node>
+              <node concept="1rXfSq" id="6yEjedm6PYd" role="33vP2m">
+                <ref role="37wK5l" node="6yEjedm6G_P" resolve="logical" />
+                <node concept="1oi1Uc" id="6yEjedm6PYe" role="37wK5m">
+                  <node concept="1oi5UN" id="6yEjedm6PYf" role="1oi0x0">
+                    <node concept="1oi5Wm" id="6yEjedm6PYg" role="1ojpOf">
+                      <property role="TrG5h" value="bar" />
+                      <node concept="1oi5XN" id="6yEjedm6PYh" role="1oi5zu">
+                        <property role="1oi5yK" value="abc" />
                       </node>
                     </node>
                   </node>
@@ -698,7 +730,7 @@
                     <node concept="1oi5UN" id="1OShD0HAxLa" role="1oi5TL">
                       <node concept="22Ky0T" id="1OShD0HAxLc" role="lGtFl">
                         <node concept="37vLTw" id="1OShD0HAxLA" role="22Ky0K">
-                          <ref role="3cqZAo" node="dfChU1dmCW" resolve="Node" />
+                          <ref role="3cqZAo" node="6yEjedm6PYc" resolve="Node" />
                         </node>
                       </node>
                     </node>
@@ -728,22 +760,23 @@
         <node concept="3Tm1VV" id="1jo82tq3J3B" role="1B3o_S" />
         <node concept="3clFbS" id="1jo82tq3J3C" role="3clF47">
           <node concept="3clFbH" id="1jo82tq3J3D" role="3cqZAp" />
-          <node concept="3cpWs8" id="1jo82tq3J3E" role="3cqZAp">
-            <node concept="3cpWsn" id="1jo82tq3J3F" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm6Hof" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm6Hog" role="3cpWs9">
               <property role="TrG5h" value="Node1" />
-              <node concept="3uibUv" id="7FFmDVAOQXF" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm6Hob" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm6Hoe" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="1jo82tq3J3H" role="33vP2m">
-                <node concept="1pGfFk" id="1jo82tq3J3I" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                  <node concept="1oi1Uc" id="1jo82tq3J3J" role="37wK5m">
-                    <node concept="1oi5UN" id="1jo82tq3J3K" role="1oi0x0">
-                      <node concept="1oi5Wm" id="1jo82tq3J3L" role="1ojpOf">
-                        <property role="TrG5h" value="bar" />
-                        <node concept="1oi5XN" id="1jo82tq3J3M" role="1oi5zu">
-                          <property role="1oi5yK" value="abc" />
-                        </node>
+              <node concept="1rXfSq" id="6yEjedm6Hoh" role="33vP2m">
+                <ref role="37wK5l" node="6yEjedm6G_P" resolve="logical" />
+                <node concept="1oi1Uc" id="6yEjedm6Hoi" role="37wK5m">
+                  <node concept="1oi5UN" id="6yEjedm6Hoj" role="1oi0x0">
+                    <node concept="1oi5Wm" id="6yEjedm6Hok" role="1ojpOf">
+                      <property role="TrG5h" value="bar" />
+                      <node concept="1oi5XN" id="6yEjedm6Hol" role="1oi5zu">
+                        <property role="1oi5yK" value="abc" />
                       </node>
                     </node>
                   </node>
@@ -752,30 +785,31 @@
             </node>
           </node>
           <node concept="3clFbH" id="1jo82tq3JLi" role="3cqZAp" />
-          <node concept="3cpWs8" id="1jo82tq3JIs" role="3cqZAp">
-            <node concept="3cpWsn" id="1jo82tq3JIt" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm6QC2" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm6QC3" role="3cpWs9">
               <property role="TrG5h" value="Node2" />
-              <node concept="3uibUv" id="7FFmDVAOQYk" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm6QBT" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm6QBW" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="1jo82tq3JIv" role="33vP2m">
-                <node concept="1pGfFk" id="1jo82tq3JIw" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                  <node concept="1oi1Uc" id="1jo82tq3JIx" role="37wK5m">
-                    <node concept="1oi5UN" id="1jo82tq3JIy" role="1oi0x0">
-                      <node concept="1oi5Wm" id="1jo82tq3JIz" role="1ojpOf">
-                        <property role="TrG5h" value="baz" />
-                        <node concept="1oi5XN" id="1jo82tq3JI$" role="1oi5zu">
-                          <property role="1oi5yK" value="xyz" />
-                        </node>
+              <node concept="1rXfSq" id="6yEjedm6QC4" role="33vP2m">
+                <ref role="37wK5l" node="6yEjedm6G_P" resolve="logical" />
+                <node concept="1oi1Uc" id="6yEjedm6QC5" role="37wK5m">
+                  <node concept="1oi5UN" id="6yEjedm6QC6" role="1oi0x0">
+                    <node concept="1oi5Wm" id="6yEjedm6QC7" role="1ojpOf">
+                      <property role="TrG5h" value="baz" />
+                      <node concept="1oi5XN" id="6yEjedm6QC8" role="1oi5zu">
+                        <property role="1oi5yK" value="xyz" />
                       </node>
-                      <node concept="1oi5ST" id="1jo82tq3JNk" role="1ojpOf">
-                        <property role="TrG5h" value="qux" />
-                        <node concept="1oi5UN" id="1jo82tq3JNo" role="1oi5TL">
-                          <node concept="22Ky0T" id="1jo82tq3JNq" role="lGtFl">
-                            <node concept="37vLTw" id="1jo82tq3JNX" role="22Ky0K">
-                              <ref role="3cqZAo" node="1jo82tq3J3F" resolve="Node1" />
-                            </node>
+                    </node>
+                    <node concept="1oi5ST" id="6yEjedm6QC9" role="1ojpOf">
+                      <property role="TrG5h" value="qux" />
+                      <node concept="1oi5UN" id="6yEjedm6QCa" role="1oi5TL">
+                        <node concept="22Ky0T" id="6yEjedm6QCb" role="lGtFl">
+                          <node concept="37vLTw" id="6yEjedm6QCc" role="22Ky0K">
+                            <ref role="3cqZAo" node="6yEjedm6Hog" resolve="Node1" />
                           </node>
                         </node>
                       </node>
@@ -846,7 +880,7 @@
                     <node concept="1oi5UN" id="1jo82tq3J44" role="1oi5TL">
                       <node concept="22Ky0T" id="1jo82tq3J45" role="lGtFl">
                         <node concept="37vLTw" id="1jo82tq3JQY" role="22Ky0K">
-                          <ref role="3cqZAo" node="1jo82tq3JIt" resolve="Node2" />
+                          <ref role="3cqZAo" node="6yEjedm6QC3" resolve="Node2" />
                         </node>
                       </node>
                     </node>
@@ -876,35 +910,23 @@
         <node concept="3Tm1VV" id="1OShD0HAz3J" role="1B3o_S" />
         <node concept="3clFbS" id="1OShD0HAz3K" role="3clF47">
           <node concept="3clFbH" id="1OShD0HAz3L" role="3cqZAp" />
-          <node concept="3cpWs8" id="1OShD0HAz3M" role="3cqZAp">
-            <node concept="3cpWsn" id="1OShD0HAz3N" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm6IgQ" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm6IgR" role="3cpWs9">
               <property role="TrG5h" value="Node" />
-              <node concept="3uibUv" id="7FFmDVAOQYX" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
-              </node>
-              <node concept="2OqwBi" id="3mz2_dYr2wC" role="33vP2m">
-                <node concept="2ShNRf" id="1OShD0HAz3P" role="2Oq$k0">
-                  <node concept="1pGfFk" id="1OShD0HAz3Q" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="1oi1Uc" id="1OShD0HAz3R" role="37wK5m">
-                      <node concept="1oi5UN" id="1OShD0HA$aZ" role="1oi0x0">
-                        <node concept="1oi5Wm" id="1OShD0HA$b0" role="1ojpOf">
-                          <property role="TrG5h" value="qux" />
-                          <node concept="1oi5XN" id="1OShD0HA$b1" role="1oi5zu">
-                            <property role="1oi5yK" value="xyz" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
+              <node concept="3uibUv" id="6yEjedm6IgL" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm6IgO" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
                 </node>
-                <node concept="liA8E" id="3mz2_dYr3jb" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:3mz2_dYqEdN" resolve="withMeta" />
-                  <node concept="2ShNRf" id="3mz2_dYr3rP" role="37wK5m">
-                    <node concept="1pGfFk" id="3mz2_dYr3EY" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
-                      <node concept="3VsKOn" id="3mz2_dYr3os" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+              </node>
+              <node concept="1rXfSq" id="6yEjedm6IgS" role="33vP2m">
+                <ref role="37wK5l" node="6yEjedm6G_P" resolve="logical" />
+                <node concept="1oi1Uc" id="6yEjedm6IgT" role="37wK5m">
+                  <node concept="1oi5UN" id="6yEjedm6IgU" role="1oi0x0">
+                    <node concept="1oi5Wm" id="6yEjedm6IgV" role="1ojpOf">
+                      <property role="TrG5h" value="qux" />
+                      <node concept="1oi5XN" id="6yEjedm6IgW" role="1oi5zu">
+                        <property role="1oi5yK" value="xyz" />
                       </node>
                     </node>
                   </node>
@@ -969,7 +991,7 @@
                       <node concept="1oi5UN" id="1OShD0HAz4c" role="KCVpo">
                         <node concept="22Ky0T" id="1OShD0HAz4d" role="lGtFl">
                           <node concept="37vLTw" id="1OShD0HAz4e" role="22Ky0K">
-                            <ref role="3cqZAo" node="1OShD0HAz3N" resolve="Node" />
+                            <ref role="3cqZAo" node="6yEjedm6IgR" resolve="Node" />
                           </node>
                         </node>
                       </node>
@@ -1000,45 +1022,33 @@
         <node concept="3Tm1VV" id="1OShD0HRNoB" role="1B3o_S" />
         <node concept="3clFbS" id="1OShD0HRNoC" role="3clF47">
           <node concept="3clFbH" id="1OShD0HRNoD" role="3cqZAp" />
-          <node concept="3cpWs8" id="1OShD0HRNoE" role="3cqZAp">
-            <node concept="3cpWsn" id="1OShD0HRNoF" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm6JaL" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm6JaM" role="3cpWs9">
               <property role="TrG5h" value="Node" />
-              <node concept="3uibUv" id="7FFmDVAOQZB" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm6JaG" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm6JaJ" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2OqwBi" id="3mz2_dYqWV9" role="33vP2m">
-                <node concept="2ShNRf" id="1OShD0HRNoH" role="2Oq$k0">
-                  <node concept="1pGfFk" id="1OShD0HRNoI" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="1oi1Uc" id="1OShD0HRNoJ" role="37wK5m">
-                      <node concept="KCUsM" id="1OShD0HTdS0" role="1oi0x0">
-                        <node concept="1oi5UN" id="1OShD0HTdS1" role="KCVpo">
-                          <node concept="1oi5Wm" id="1OShD0HTdS2" role="1ojpOf">
-                            <property role="TrG5h" value="bar" />
-                            <node concept="1oi5XN" id="1OShD0HTdS3" role="1oi5zu">
-                              <property role="1oi5yK" value="abc" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="1oi5UN" id="1OShD0HTdS4" role="KCVpo">
-                          <node concept="1oi5Wm" id="1OShD0HTdS5" role="1ojpOf">
-                            <property role="TrG5h" value="qux" />
-                            <node concept="1oi5XN" id="1OShD0HTdS6" role="1oi5zu">
-                              <property role="1oi5yK" value="xyz" />
-                            </node>
-                          </node>
+              <node concept="1rXfSq" id="6yEjedm6JaN" role="33vP2m">
+                <ref role="37wK5l" node="6yEjedm6G_P" resolve="logical" />
+                <node concept="1oi1Uc" id="6yEjedm6JaO" role="37wK5m">
+                  <node concept="KCUsM" id="6yEjedm6JaP" role="1oi0x0">
+                    <node concept="1oi5UN" id="6yEjedm6JaQ" role="KCVpo">
+                      <node concept="1oi5Wm" id="6yEjedm6JaR" role="1ojpOf">
+                        <property role="TrG5h" value="bar" />
+                        <node concept="1oi5XN" id="6yEjedm6JaS" role="1oi5zu">
+                          <property role="1oi5yK" value="abc" />
                         </node>
                       </node>
                     </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="3mz2_dYqXHW" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:3mz2_dYqEdN" resolve="withMeta" />
-                  <node concept="2ShNRf" id="3mz2_dYqXJu" role="37wK5m">
-                    <node concept="1pGfFk" id="3mz2_dYqXYB" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
-                      <node concept="3VsKOn" id="3mz2_dYqY1N" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+                    <node concept="1oi5UN" id="6yEjedm6JaT" role="KCVpo">
+                      <node concept="1oi5Wm" id="6yEjedm6JaU" role="1ojpOf">
+                        <property role="TrG5h" value="qux" />
+                        <node concept="1oi5XN" id="6yEjedm6JaV" role="1oi5zu">
+                          <property role="1oi5yK" value="xyz" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -1094,7 +1104,7 @@
                     <node concept="KCUsM" id="1OShD0HRNQR" role="1oi5TL">
                       <node concept="22Ky0T" id="1OShD0HTdYX" role="lGtFl">
                         <node concept="37vLTw" id="1OShD0HTdZb" role="22Ky0K">
-                          <ref role="3cqZAo" node="1OShD0HRNoF" resolve="Node" />
+                          <ref role="3cqZAo" node="6yEjedm6JaM" resolve="Node" />
                         </node>
                       </node>
                     </node>
@@ -1124,18 +1134,19 @@
         <node concept="3Tm1VV" id="1OShD0Ifj4i" role="1B3o_S" />
         <node concept="3clFbS" id="1OShD0Ifj4j" role="3clF47">
           <node concept="3clFbH" id="1OShD0Ifj4k" role="3cqZAp" />
-          <node concept="3cpWs8" id="1OShD0Ifj4l" role="3cqZAp">
-            <node concept="3cpWsn" id="1OShD0Ifj4m" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm6JV2" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm6JV3" role="3cpWs9">
               <property role="TrG5h" value="Node" />
-              <node concept="3uibUv" id="7FFmDVAOR0i" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm6JUY" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm6JV1" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="1OShD0Ifj4o" role="33vP2m">
-                <node concept="1pGfFk" id="1OShD0Ifj4p" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                  <node concept="1oi1Uc" id="1OShD0Ifj4q" role="37wK5m">
-                    <node concept="KCUsM" id="1OShD0Ifj4r" role="1oi0x0" />
-                  </node>
+              <node concept="1rXfSq" id="6yEjedm6JV4" role="33vP2m">
+                <ref role="37wK5l" node="6yEjedm6G_P" resolve="logical" />
+                <node concept="1oi1Uc" id="6yEjedm6JV5" role="37wK5m">
+                  <node concept="KCUsM" id="6yEjedm6JV6" role="1oi0x0" />
                 </node>
               </node>
             </node>
@@ -1171,7 +1182,7 @@
                     <node concept="KCUsM" id="1OShD0Ifj4R" role="1oi5TL">
                       <node concept="22Ky0T" id="1OShD0Ifj4S" role="lGtFl">
                         <node concept="37vLTw" id="1OShD0Ifj4T" role="22Ky0K">
-                          <ref role="3cqZAo" node="1OShD0Ifj4m" resolve="Node" />
+                          <ref role="3cqZAo" node="6yEjedm6JV3" resolve="Node" />
                         </node>
                       </node>
                     </node>
@@ -1201,28 +1212,28 @@
         <node concept="3Tm1VV" id="dfChU1yMl6" role="1B3o_S" />
         <node concept="3clFbS" id="dfChU1yMl7" role="3clF47">
           <node concept="3clFbH" id="dfChU1yMl8" role="3cqZAp" />
-          <node concept="3cpWs8" id="dfChU1yMl9" role="3cqZAp">
-            <node concept="3cpWsn" id="dfChU1yMla" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm6Ktz" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm6Kt$" role="3cpWs9">
               <property role="TrG5h" value="Role" />
-              <node concept="3uibUv" id="7FFmDVAOR0Y" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm6Ktu" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm6Ktx" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="dfChU1yMlc" role="33vP2m">
-                <node concept="1pGfFk" id="dfChU1yMld" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                  <node concept="1oi1Uc" id="dfChU1yMle" role="37wK5m">
-                    <node concept="1oi5Wm" id="dfChU1ySfn" role="1oi0x0">
-                      <property role="TrG5h" value="bar" />
-                      <node concept="1oi5XN" id="dfChU1ySfo" role="1oi5zu">
-                        <property role="1oi5yK" value="abc" />
-                      </node>
+              <node concept="1rXfSq" id="6yEjedm6Kt_" role="33vP2m">
+                <ref role="37wK5l" node="6yEjedm6G_P" resolve="logical" />
+                <node concept="1oi1Uc" id="6yEjedm6KtA" role="37wK5m">
+                  <node concept="1oi5Wm" id="6yEjedm6KtB" role="1oi0x0">
+                    <property role="TrG5h" value="bar" />
+                    <node concept="1oi5XN" id="6yEjedm6KtC" role="1oi5zu">
+                      <property role="1oi5yK" value="abc" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="dfChU1yMli" role="3cqZAp" />
           <node concept="3cpWs8" id="dfChU1yMlj" role="3cqZAp">
             <node concept="3cpWsn" id="dfChU1yMlk" role="3cpWs9">
               <property role="TrG5h" value="a" />
@@ -1266,7 +1277,7 @@
                     <property role="TrG5h" value="_" />
                     <node concept="22Ky0T" id="dfChU1DQU6" role="lGtFl">
                       <node concept="37vLTw" id="dfChU1DQUk" role="22Ky0K">
-                        <ref role="3cqZAo" node="dfChU1yMla" resolve="Role" />
+                        <ref role="3cqZAo" node="6yEjedm6Kt$" resolve="Role" />
                       </node>
                     </node>
                   </node>
@@ -1295,26 +1306,26 @@
         <node concept="3Tm1VV" id="dfChU1DQLi" role="1B3o_S" />
         <node concept="3clFbS" id="dfChU1DQLj" role="3clF47">
           <node concept="3clFbH" id="dfChU1DQLk" role="3cqZAp" />
-          <node concept="3cpWs8" id="dfChU1DQLl" role="3cqZAp">
-            <node concept="3cpWsn" id="dfChU1DQLm" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm6L2w" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm6L2x" role="3cpWs9">
               <property role="TrG5h" value="Role" />
-              <node concept="3uibUv" id="7FFmDVAOR1F" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm6L2s" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm6L2v" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="dfChU1DQLo" role="33vP2m">
-                <node concept="1pGfFk" id="dfChU1DQLp" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                  <node concept="1oi1Uc" id="dfChU1DQLq" role="37wK5m">
-                    <node concept="1oi5ST" id="dfChU1DQYI" role="1oi0x0">
-                      <property role="TrG5h" value="foo" />
-                      <node concept="1oi5UN" id="dfChU1DQYJ" role="1oi5TL" />
-                    </node>
+              <node concept="1rXfSq" id="6yEjedm6L2y" role="33vP2m">
+                <ref role="37wK5l" node="6yEjedm6G_P" resolve="logical" />
+                <node concept="1oi1Uc" id="6yEjedm6L2z" role="37wK5m">
+                  <node concept="1oi5ST" id="6yEjedm6L2$" role="1oi0x0">
+                    <property role="TrG5h" value="foo" />
+                    <node concept="1oi5UN" id="6yEjedm6L2_" role="1oi5TL" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="dfChU1DQLt" role="3cqZAp" />
           <node concept="3cpWs8" id="dfChU1DQLu" role="3cqZAp">
             <node concept="3cpWsn" id="dfChU1DQLv" role="3cpWs9">
               <property role="TrG5h" value="a" />
@@ -1344,7 +1355,7 @@
                     <property role="TrG5h" value="_" />
                     <node concept="22Ky0T" id="dfChU1DQLG" role="lGtFl">
                       <node concept="37vLTw" id="dfChU1DQLH" role="22Ky0K">
-                        <ref role="3cqZAo" node="dfChU1DQLm" resolve="Role" />
+                        <ref role="3cqZAo" node="6yEjedm6L2x" resolve="Role" />
                       </node>
                     </node>
                   </node>
@@ -3372,12 +3383,18 @@
       </node>
       <node concept="3Tm1VV" id="2DKqMqOqk7n" role="1B3o_S" />
       <node concept="3clFbS" id="2DKqMqOqk7o" role="3clF47">
-        <node concept="3cpWs6" id="2DKqMqOqt3s" role="3cqZAp">
-          <node concept="2ShNRf" id="7FFmDVAP17H" role="3cqZAk">
-            <node concept="1pGfFk" id="7FFmDVAP1tG" role="2ShVmc">
-              <ref role="37wK5l" to="oy3s:2DKqMqOlTiR" resolve="AtomLogical" />
-              <node concept="37vLTw" id="7FFmDVAP1WC" role="37wK5m">
-                <ref role="3cqZAo" node="2DKqMqOqLKG" resolve="wildcard" />
+        <node concept="3clFbF" id="6yEjedm5aa$" role="3cqZAp">
+          <node concept="2ShNRf" id="6yEjedm5aaw" role="3clFbG">
+            <node concept="1pGfFk" id="6yEjedm5bMh" role="2ShVmc">
+              <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+              <node concept="10QFUN" id="6yEjedm5h65" role="37wK5m">
+                <node concept="3uibUv" id="6yEjedm5hgr" role="10QFUM">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
+                <node concept="10Nm6u" id="6yEjedm5h64" role="10QFUP" />
+              </node>
+              <node concept="3uibUv" id="6yEjedm5cAk" role="1pMfVU">
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
               </node>
             </node>
           </node>
@@ -3405,19 +3422,23 @@
       </node>
       <node concept="3Tm1VV" id="2DKqMqOq_PG" role="1B3o_S" />
       <node concept="3clFbS" id="2DKqMqOq_PH" role="3clF47">
-        <node concept="3cpWs6" id="2DKqMqOq_PI" role="3cqZAp">
-          <node concept="2ShNRf" id="7FFmDVAP42C" role="3cqZAk">
-            <node concept="1pGfFk" id="7FFmDVAP42D" role="2ShVmc">
-              <ref role="37wK5l" to="oy3s:1GDBwhEEL82" resolve="AtomLogical" />
-              <node concept="37vLTw" id="7FFmDVAP4yM" role="37wK5m">
+        <node concept="3clFbF" id="6yEjedm5dee" role="3cqZAp">
+          <node concept="2ShNRf" id="6yEjedm5def" role="3clFbG">
+            <node concept="1pGfFk" id="6yEjedm5deg" role="2ShVmc">
+              <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String,java.lang.Object)" resolve="MemLogical" />
+              <node concept="37vLTw" id="6yEjedm5dzi" role="37wK5m">
                 <ref role="3cqZAo" node="2DKqMqOq_P$" resolve="name" />
               </node>
-              <node concept="37vLTw" id="7FFmDVAP5nk" role="37wK5m">
+              <node concept="37vLTw" id="6yEjedm5dC2" role="37wK5m">
                 <ref role="3cqZAo" node="2DKqMqOq_PA" resolve="atom" />
               </node>
+              <node concept="3uibUv" id="6yEjedm5dei" role="1pMfVU">
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="6yEjedm5d2V" role="3cqZAp" />
       </node>
     </node>
     <node concept="3Tm1VV" id="2DKqMqOqk3v" role="1B3o_S" />
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index 3312b299..fec72a1c 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -8,19 +8,17 @@
     <use id="5dc5fc0d-37ef-4782-8192-8b5ce1f69f80" name="jetbrains.mps.baseLanguage.extensionMethods" version="0" />
   </languages>
   <imports>
-    <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="95zw" ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)" />
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
+    <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -51,6 +49,7 @@
       </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">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
@@ -62,6 +61,7 @@
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </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="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
         <child id="1070534760952" name="componentType" index="10Q1$1" />
       </concept>
@@ -103,9 +103,6 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
@@ -122,7 +119,9 @@
         <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" />
@@ -225,18 +224,11 @@
   <node concept="3s_ewN" id="5NuEpF1$W3N">
     <property role="3s_ewP" value="AskUniSolver" />
     <node concept="2tJIrI" id="5NuEpF1$Wqi" role="jymVt" />
-    <node concept="312cEg" id="71LvIRuyoUF" role="jymVt">
-      <property role="TrG5h" value="constraintSystem" />
-      <node concept="3Tm6S6" id="71LvIRuyoUG" role="1B3o_S" />
-      <node concept="3uibUv" id="71LvIRuz57H" role="1tU5fm">
-        <ref role="3uigEE" to="eifs:~ConstraintSystem" resolve="ConstraintSystem" />
-      </node>
-    </node>
     <node concept="312cEg" id="fHk0tWuntB" role="jymVt">
       <property role="TrG5h" value="unificationSolver" />
       <node concept="3Tm6S6" id="fHk0tWuntC" role="1B3o_S" />
-      <node concept="3uibUv" id="fHk0tWun$f" role="1tU5fm">
-        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="JchrUnificationSolver" />
+      <node concept="3uibUv" id="6yEjedm5Xb1" role="1tU5fm">
+        <ref role="3uigEE" node="6yEjedm5WkE" resolve="TestingUnificationSolver" />
       </node>
     </node>
     <node concept="2tJIrI" id="21Zu7ABuukF" role="jymVt" />
@@ -256,22 +248,16 @@
             <node concept="2YIFZM" id="3mz2_dYuDAz" role="10QFUP">
               <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-              <node concept="2OqwBi" id="3mz2_dYuJ$b" role="37wK5m">
-                <node concept="2ShNRf" id="1OShD0I14HM" role="2Oq$k0">
-                  <node concept="1pGfFk" id="1OShD0I14HN" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:1GDBwhEEL82" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="1OShD0I14HO" role="37wK5m">
-                      <ref role="3cqZAo" node="21Zu7ABuute" resolve="name" />
-                    </node>
-                    <node concept="10Nm6u" id="46l0wJhwVT1" role="37wK5m" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="3mz2_dYuJLm" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:3mz2_dYqEdN" resolve="withMeta" />
-                  <node concept="2ShNRf" id="3mz2_dYuJZn" role="37wK5m">
-                    <node concept="1pGfFk" id="3mz2_dYuKjv" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
-                      <node concept="3VsKOn" id="3mz2_dYuKxT" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm5rGN" role="37wK5m">
+                <node concept="1pGfFk" id="6yEjedm5sqz" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="MemLogical" />
+                  <node concept="2ShNRf" id="6yEjedm5tUz" role="37wK5m">
+                    <node concept="1pGfFk" id="6yEjedm5tU$" role="2ShVmc">
+                      <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                      <node concept="37vLTw" id="6yEjedm5vce" role="37wK5m">
+                        <ref role="3cqZAo" node="21Zu7ABuute" resolve="name" />
+                      </node>
+                      <node concept="3VsKOn" id="6yEjedm5tU_" role="37wK5m">
                         <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
                       </node>
                     </node>
@@ -303,22 +289,16 @@
             <node concept="2YIFZM" id="3mz2_dYxTYL" role="10QFUP">
               <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-              <node concept="2OqwBi" id="3mz2_dYxTYM" role="37wK5m">
-                <node concept="2ShNRf" id="3mz2_dYxTYN" role="2Oq$k0">
-                  <node concept="1pGfFk" id="3mz2_dYxTYO" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:1GDBwhEEL82" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3mz2_dYxTYP" role="37wK5m">
-                      <ref role="3cqZAo" node="3mz2_dYxTYE" resolve="name" />
-                    </node>
-                    <node concept="10Nm6u" id="3mz2_dYxTYQ" role="37wK5m" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="3mz2_dYxTYR" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:3mz2_dYqEdN" resolve="withMeta" />
-                  <node concept="2ShNRf" id="3mz2_dYxTYS" role="37wK5m">
-                    <node concept="1pGfFk" id="3mz2_dYxTYT" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
-                      <node concept="3VsKOn" id="3mz2_dYxTYU" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm5vBK" role="37wK5m">
+                <node concept="1pGfFk" id="6yEjedm5vBL" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="MemLogical" />
+                  <node concept="2ShNRf" id="6yEjedm5vBM" role="37wK5m">
+                    <node concept="1pGfFk" id="6yEjedm5vBN" role="2ShVmc">
+                      <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                      <node concept="37vLTw" id="6yEjedm5vBO" role="37wK5m">
+                        <ref role="3cqZAo" node="3mz2_dYxTYE" resolve="name" />
+                      </node>
+                      <node concept="3VsKOn" id="6yEjedm5vBP" role="37wK5m">
                         <ref role="3VsUkX" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
                       </node>
                     </node>
@@ -350,10 +330,18 @@
               <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="5cGCTtqzoJT" role="37wK5m">
-                <node concept="1pGfFk" id="5cGCTtqzoJU" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:2DKqMqOlTiR" resolve="AtomLogical" />
-                  <node concept="3clFbT" id="2DKqMqOmtXN" role="37wK5m">
-                    <property role="3clFbU" value="true" />
+                <node concept="1pGfFk" id="6yEjedm5xLL" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                  <node concept="2ShNRf" id="6yEjedm6$x1" role="37wK5m">
+                    <node concept="1pGfFk" id="6yEjedm6$Su" role="2ShVmc">
+                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                      <node concept="3VsKOn" id="6yEjedm6_je" role="37wK5m">
+                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3uibUv" id="6yEjedm5xWn" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
                   </node>
                 </node>
               </node>
@@ -399,7 +387,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="fHk0tWuttq" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="fHk0tWuKfb" role="37wK5m">
                   <ref role="3cqZAo" node="fHk0tWu_Mt" resolve="a" />
                 </node>
@@ -460,7 +448,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="21Zu7ABuiLQ" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="21Zu7ABuiLR" role="37wK5m">
                   <ref role="3cqZAo" node="21Zu7ABuiLB" resolve="a" />
                 </node>
@@ -529,7 +517,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="53iOybEHDaW" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="53iOybEHDaX" role="37wK5m">
                   <ref role="3cqZAo" node="53iOybEHDaF" resolve="a" />
                 </node>
@@ -620,7 +608,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="21Zu7ABuni8" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="21Zu7ABuni9" role="37wK5m">
                   <ref role="3cqZAo" node="21Zu7ABunhN" resolve="a" />
                 </node>
@@ -709,7 +697,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="21Zu7ABupTS" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="21Zu7ABupTT" role="37wK5m">
                   <ref role="3cqZAo" node="21Zu7ABupTt" resolve="a" />
                 </node>
@@ -804,7 +792,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="1OShD0I0umL" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="1OShD0I0umM" role="37wK5m">
                   <ref role="3cqZAo" node="1OShD0I0umo" resolve="a" />
                 </node>
@@ -909,7 +897,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="1OShD0I169i" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="1OShD0I169j" role="37wK5m">
                   <ref role="3cqZAo" node="1OShD0I168P" resolve="a" />
                 </node>
@@ -1019,7 +1007,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="1OShD0I1vDC" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="1OShD0I1vDD" role="37wK5m">
                   <ref role="3cqZAo" node="1OShD0I1vD7" resolve="a" />
                 </node>
@@ -1096,7 +1084,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="1OShD0If5ve" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="1OShD0If5vf" role="37wK5m">
                   <ref role="3cqZAo" node="1OShD0If5uE" resolve="a" />
                 </node>
@@ -1268,7 +1256,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="5_6ImQYXMfD" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAlI6" resolve="tellUni" />
+                <ref role="37wK5l" node="6yEjedm623c" resolve="tellUni" />
                 <node concept="37vLTw" id="5_6ImQYXMli" role="37wK5m">
                   <ref role="3cqZAo" node="5_6ImQYXLG2" resolve="list1" />
                 </node>
@@ -1284,7 +1272,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="5_6ImQYXMr0" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="5_6ImQYXMvo" role="37wK5m">
                   <ref role="3cqZAo" node="5_6ImQYXM2W" resolve="head" />
                 </node>
@@ -1337,7 +1325,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="5_6ImQYXMzm" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="5_6ImQYXMBW" role="37wK5m">
                   <ref role="3cqZAo" node="5_6ImQYXM86" resolve="tail" />
                 </node>
@@ -1459,7 +1447,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="5_6ImQYY3sd" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAlI6" resolve="tellUni" />
+                <ref role="37wK5l" node="6yEjedm623c" resolve="tellUni" />
                 <node concept="37vLTw" id="5_6ImQYY3se" role="37wK5m">
                   <ref role="3cqZAo" node="5_6ImQYY3r$" resolve="list1" />
                 </node>
@@ -1475,7 +1463,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="5_6ImQYY3sj" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="5_6ImQYY3sk" role="37wK5m">
                   <ref role="3cqZAo" node="5_6ImQYY3rO" resolve="head" />
                 </node>
@@ -1503,7 +1491,7 @@
                 <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="5_6ImQYY3sD" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4OsiK2BAnTP" resolve="askUni" />
+                <ref role="37wK5l" node="6yEjedm5XWy" resolve="askUni" />
                 <node concept="37vLTw" id="5_6ImQYY3sE" role="37wK5m">
                   <ref role="3cqZAo" node="5_6ImQYY3rT" resolve="tail" />
                 </node>
@@ -1603,7 +1591,7 @@
                   <ref role="3cqZAo" node="fHk0tWuntB" resolve="unificationSolver" />
                 </node>
                 <node concept="liA8E" id="5_6ImQYY8ZW" role="2OqNvi">
-                  <ref role="37wK5l" to="95zw:4OsiK2BAlI6" resolve="tellUni" />
+                  <ref role="37wK5l" node="6yEjedm623c" resolve="tellUni" />
                   <node concept="37vLTw" id="5_6ImQYY8ZX" role="37wK5m">
                     <ref role="3cqZAo" node="5_6ImQYY68i" resolve="list1" />
                   </node>
@@ -1619,43 +1607,16 @@
     </node>
     <node concept="1KhYhu" id="5NuEpF1$Wpa" role="1KhZu4">
       <node concept="3clFbS" id="5NuEpF1$Wpb" role="2VODD2">
-        <node concept="3clFbF" id="71LvIRuz6e5" role="3cqZAp">
-          <node concept="37vLTI" id="71LvIRuz6gg" role="3clFbG">
-            <node concept="37vLTw" id="71LvIRuz6e3" role="37vLTJ">
-              <ref role="3cqZAo" node="71LvIRuyoUF" resolve="constraintSystem" />
-            </node>
-            <node concept="2ShNRf" id="fHk0tWuNK3" role="37vLTx">
-              <node concept="1pGfFk" id="fHk0tWuNK2" role="2ShVmc">
-                <ref role="37wK5l" to="eifs:~ConstraintSystem.&lt;init&gt;()" resolve="ConstraintSystem" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="fHk0tWuNOj" role="3cqZAp">
-          <node concept="2OqwBi" id="fHk0tWuNRK" role="3clFbG">
-            <node concept="37vLTw" id="fHk0tWuNOh" role="2Oq$k0">
-              <ref role="3cqZAo" node="71LvIRuyoUF" resolve="constraintSystem" />
-            </node>
-            <node concept="liA8E" id="fHk0tWuNVy" role="2OqNvi">
-              <ref role="37wK5l" to="eifs:~ConstraintSystem.setQueuing(boolean):void" resolve="setQueuing" />
-              <node concept="3clFbT" id="fHk0tWuNX6" role="37wK5m">
-                <property role="3clFbU" value="false" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="2tcGHBEiyPe" role="3cqZAp">
           <node concept="3cpWsn" id="2tcGHBEiyPf" role="3cpWs9">
             <property role="TrG5h" value="symbols" />
-            <node concept="3uibUv" id="2tcGHBEiyPc" role="1tU5fm">
-              <ref role="3uigEE" to="95zw:7ISVfSIxNO" resolve="JchrSessionSolver" />
+            <node concept="3uibUv" id="6yEjedm5Ixb" role="1tU5fm">
+              <ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
             </node>
             <node concept="2ShNRf" id="2tcGHBEiyPg" role="33vP2m">
               <node concept="1pGfFk" id="1ggxSI7$Ov9" role="2ShVmc">
-                <ref role="37wK5l" to="95zw:6MYr6Jwp62r" resolve="JchrSessionSolver" />
-                <node concept="37vLTw" id="6MYr6JwotS8" role="37wK5m">
-                  <ref role="3cqZAo" node="71LvIRuyoUF" resolve="constraintSystem" />
-                </node>
+                <ref role="37wK5l" to="cxk7:3F6vMxqo1c$" resolve="DefaultSessionSolver" />
+                <node concept="10Nm6u" id="6yEjedm5IGU" role="37wK5m" />
               </node>
             </node>
           </node>
@@ -1687,7 +1648,12 @@
           <node concept="37vLTI" id="fHk0tWuoPJ" role="3clFbG">
             <node concept="2ShNRf" id="fHk0tWuoQm" role="37vLTx">
               <node concept="1pGfFk" id="fHk0tWutdI" role="2ShVmc">
-                <ref role="37wK5l" to="95zw:6MYr6JwUN9q" resolve="JchrUnificationSolverImpl" />
+                <ref role="37wK5l" node="6yEjedm5WI7" resolve="TestingUnificationSolver" />
+                <node concept="2ShNRf" id="6yEjedm5KqE" role="37wK5m">
+                  <node concept="HV5vD" id="6yEjedm5KE4" role="2ShVmc">
+                    <ref role="HV5vE" to="45ys:3F6vMxqplHq" resolve="LogicalUnification.Default" />
+                  </node>
+                </node>
                 <node concept="37vLTw" id="2tcGHBEiyPi" role="37wK5m">
                   <ref role="3cqZAo" node="2tcGHBEiyPf" resolve="symbols" />
                 </node>
@@ -1711,71 +1677,74 @@
   <node concept="3s_ewN" id="1OShD0IfsNp">
     <property role="3s_ewP" value="TellUniSolver" />
     <node concept="2tJIrI" id="2tcGHBEipQe" role="jymVt" />
-    <node concept="3clFb_" id="1OShD0Ifu8d" role="jymVt">
+    <node concept="2tJIrI" id="6yEjedm71gP" role="jymVt" />
+    <node concept="3clFb_" id="6yEjedm71gQ" role="jymVt">
       <property role="TrG5h" value="var" />
-      <node concept="37vLTG" id="1OShD0Ifu8e" role="3clF46">
+      <node concept="37vLTG" id="6yEjedm71gR" role="3clF46">
         <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="1OShD0Ifu8f" role="1tU5fm" />
+        <node concept="17QB3L" id="6yEjedm71gS" role="1tU5fm" />
       </node>
-      <node concept="3uibUv" id="1OShD0Ifu8g" role="3clF45">
+      <node concept="3uibUv" id="6yEjedm71gT" role="3clF45">
         <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
       </node>
-      <node concept="3Tm6S6" id="1OShD0Ifwg0" role="1B3o_S" />
-      <node concept="3clFbS" id="1OShD0Ifu8i" role="3clF47">
-        <node concept="3clFbF" id="1OShD0Ifu8j" role="3cqZAp">
-          <node concept="10QFUN" id="1OShD0Ifu8k" role="3clFbG">
-            <node concept="2YIFZM" id="3mz2_dYuEFA" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+      <node concept="3Tm6S6" id="6yEjedm71gU" role="1B3o_S" />
+      <node concept="3clFbS" id="6yEjedm71gV" role="3clF47">
+        <node concept="3clFbF" id="6yEjedm71gW" role="3cqZAp">
+          <node concept="10QFUN" id="6yEjedm71gX" role="3clFbG">
+            <node concept="2YIFZM" id="6yEjedm71gY" role="10QFUP">
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-              <node concept="2ShNRf" id="1OShD0Ifu8m" role="37wK5m">
-                <node concept="1pGfFk" id="1OShD0Ifu8n" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="37vLTw" id="1OShD0Ifu8o" role="37wK5m">
-                    <ref role="3cqZAo" node="1OShD0Ifu8e" resolve="name" />
+              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+              <node concept="2ShNRf" id="6yEjedm71gZ" role="37wK5m">
+                <node concept="1pGfFk" id="6yEjedm71h0" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="MemLogical" />
+                  <node concept="2ShNRf" id="6yEjedm71h1" role="37wK5m">
+                    <node concept="1pGfFk" id="6yEjedm71h2" role="2ShVmc">
+                      <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                      <node concept="37vLTw" id="6yEjedm71h3" role="37wK5m">
+                        <ref role="3cqZAo" node="6yEjedm71gR" resolve="name" />
+                      </node>
+                      <node concept="3VsKOn" id="6yEjedm71h4" role="37wK5m">
+                        <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3uibUv" id="1OShD0Ifu8q" role="10QFUM">
+            <node concept="3uibUv" id="6yEjedm71h5" role="10QFUM">
               <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4$OyT8ITs7T" role="jymVt" />
-    <node concept="3clFb_" id="4$OyT8ITrpL" role="jymVt">
+    <node concept="2tJIrI" id="6yEjedm71h6" role="jymVt" />
+    <node concept="3clFb_" id="6yEjedm71h7" role="jymVt">
       <property role="TrG5h" value="listVar" />
-      <node concept="37vLTG" id="4$OyT8ITrpM" role="3clF46">
+      <node concept="37vLTG" id="6yEjedm71h8" role="3clF46">
         <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="4$OyT8ITrpN" role="1tU5fm" />
+        <node concept="17QB3L" id="6yEjedm71h9" role="1tU5fm" />
       </node>
-      <node concept="3uibUv" id="4$OyT8ITrpO" role="3clF45">
+      <node concept="3uibUv" id="6yEjedm71ha" role="3clF45">
         <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
       </node>
-      <node concept="3Tm6S6" id="4$OyT8ITrpP" role="1B3o_S" />
-      <node concept="3clFbS" id="4$OyT8ITrpQ" role="3clF47">
-        <node concept="3clFbF" id="4$OyT8ITrpR" role="3cqZAp">
-          <node concept="10QFUN" id="4$OyT8ITrpS" role="3clFbG">
-            <node concept="2YIFZM" id="4$OyT8ITrpT" role="10QFUP">
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+      <node concept="3Tm6S6" id="6yEjedm71hb" role="1B3o_S" />
+      <node concept="3clFbS" id="6yEjedm71hc" role="3clF47">
+        <node concept="3clFbF" id="6yEjedm71hd" role="3cqZAp">
+          <node concept="10QFUN" id="6yEjedm71he" role="3clFbG">
+            <node concept="2YIFZM" id="6yEjedm71hf" role="10QFUP">
               <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
-              <node concept="2OqwBi" id="4$OyT8ITrpU" role="37wK5m">
-                <node concept="2ShNRf" id="4$OyT8ITrpV" role="2Oq$k0">
-                  <node concept="1pGfFk" id="4$OyT8ITrpW" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:1GDBwhEEL82" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="4$OyT8ITrpX" role="37wK5m">
-                      <ref role="3cqZAo" node="4$OyT8ITrpM" resolve="name" />
-                    </node>
-                    <node concept="10Nm6u" id="4$OyT8ITrpY" role="37wK5m" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="4$OyT8ITrpZ" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:3mz2_dYqEdN" resolve="withMeta" />
-                  <node concept="2ShNRf" id="4$OyT8ITrq0" role="37wK5m">
-                    <node concept="1pGfFk" id="4$OyT8ITrq1" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
-                      <node concept="3VsKOn" id="4$OyT8ITrq2" role="37wK5m">
+              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+              <node concept="2ShNRf" id="6yEjedm71hg" role="37wK5m">
+                <node concept="1pGfFk" id="6yEjedm71hh" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="MemLogical" />
+                  <node concept="2ShNRf" id="6yEjedm71hi" role="37wK5m">
+                    <node concept="1pGfFk" id="6yEjedm71hj" role="2ShVmc">
+                      <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                      <node concept="37vLTw" id="6yEjedm71hk" role="37wK5m">
+                        <ref role="3cqZAo" node="6yEjedm71h8" resolve="name" />
+                      </node>
+                      <node concept="3VsKOn" id="6yEjedm71hl" role="37wK5m">
                         <ref role="3VsUkX" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
                       </node>
                     </node>
@@ -1783,34 +1752,42 @@
                 </node>
               </node>
             </node>
-            <node concept="3uibUv" id="4$OyT8ITrq3" role="10QFUM">
+            <node concept="3uibUv" id="6yEjedm71hm" role="10QFUM">
               <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="5cGCTtq$bBZ" role="jymVt" />
-    <node concept="3clFb_" id="5cGCTtq$bC0" role="jymVt">
+    <node concept="2tJIrI" id="6yEjedm71hn" role="jymVt" />
+    <node concept="3clFb_" id="6yEjedm71ho" role="jymVt">
       <property role="TrG5h" value="wildcard" />
-      <node concept="3uibUv" id="5cGCTtq$bC3" role="3clF45">
+      <node concept="3uibUv" id="6yEjedm71hp" role="3clF45">
         <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
       </node>
-      <node concept="3Tm6S6" id="5cGCTtq$bC4" role="1B3o_S" />
-      <node concept="3clFbS" id="5cGCTtq$bC5" role="3clF47">
-        <node concept="3clFbF" id="5cGCTtq$bC6" role="3cqZAp">
-          <node concept="10QFUN" id="5cGCTtq$bC7" role="3clFbG">
-            <node concept="3uibUv" id="5cGCTtq$bCg" role="10QFUM">
+      <node concept="3Tm6S6" id="6yEjedm71hq" role="1B3o_S" />
+      <node concept="3clFbS" id="6yEjedm71hr" role="3clF47">
+        <node concept="3clFbF" id="6yEjedm71hs" role="3cqZAp">
+          <node concept="10QFUN" id="6yEjedm71ht" role="3clFbG">
+            <node concept="3uibUv" id="6yEjedm71hu" role="10QFUM">
               <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
             </node>
-            <node concept="2YIFZM" id="3mz2_dYuEPh" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+            <node concept="2YIFZM" id="6yEjedm71hv" role="10QFUP">
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-              <node concept="2ShNRf" id="5cGCTtq$bC9" role="37wK5m">
-                <node concept="1pGfFk" id="5cGCTtq$bCa" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:2DKqMqOlTiR" resolve="AtomLogical" />
-                  <node concept="3clFbT" id="2DKqMqOmrUu" role="37wK5m">
-                    <property role="3clFbU" value="true" />
+              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+              <node concept="2ShNRf" id="6yEjedm71hw" role="37wK5m">
+                <node concept="1pGfFk" id="6yEjedm71hx" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                  <node concept="2ShNRf" id="6yEjedm71hy" role="37wK5m">
+                    <node concept="1pGfFk" id="6yEjedm71hz" role="2ShVmc">
+                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                      <node concept="3VsKOn" id="6yEjedm71h$" role="37wK5m">
+                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3uibUv" id="6yEjedm71h_" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
                   </node>
                 </node>
               </node>
@@ -1837,12 +1814,14 @@
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="7nuzzkr25az" role="37wK5m">
                 <node concept="1pGfFk" id="7nuzzkr25a$" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:7nuzzkr2143" resolve="AtomLogical" />
-                  <node concept="37vLTw" id="7nuzzkr26aF" role="37wK5m">
-                    <ref role="3cqZAo" node="7nuzzkr266n" resolve="id" />
-                  </node>
-                  <node concept="3clFbT" id="7nuzzkr25a_" role="37wK5m">
-                    <property role="3clFbU" value="true" />
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String,java.lang.Object)" resolve="MemLogical" />
+                  <node concept="2ShNRf" id="6yEjedm9JNO" role="37wK5m">
+                    <node concept="1pGfFk" id="6yEjedm9KbK" role="2ShVmc">
+                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
+                      <node concept="3VsKOn" id="6yEjedm9KAr" role="37wK5m">
+                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -1904,7 +1883,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfHOF" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="1OShD0IfHOG" role="37wK5m">
                   <property role="Xl_RC" value="X" />
                 </node>
@@ -1946,7 +1925,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfHTZ" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="1OShD0IfHU0" role="37wK5m">
                   <property role="Xl_RC" value="Y" />
                 </node>
@@ -2048,7 +2027,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="3HJTsBn443d" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="3HJTsBn443e" role="37wK5m">
                   <property role="Xl_RC" value="X" />
                 </node>
@@ -2184,7 +2163,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4XqG8ivynhN" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="4XqG8ivynhO" role="37wK5m">
                   <property role="Xl_RC" value="X" />
                 </node>
@@ -2454,7 +2433,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfO6I" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="1OShD0IfO6J" role="37wK5m">
                   <property role="Xl_RC" value="X" />
                 </node>
@@ -2496,7 +2475,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfP4b" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="1OShD0IfP4c" role="37wK5m">
                   <property role="Xl_RC" value="Y" />
                 </node>
@@ -2756,7 +2735,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4XqG8ivylRc" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="4XqG8ivylRd" role="37wK5m">
                   <property role="Xl_RC" value="X" />
                 </node>
@@ -2799,7 +2778,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4XqG8ivylRs" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="4XqG8ivylRt" role="37wK5m">
                   <property role="Xl_RC" value="Y" />
                 </node>
@@ -3069,7 +3048,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfXUT" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="1OShD0IfXUU" role="37wK5m">
                   <property role="Xl_RC" value="X" />
                 </node>
@@ -3284,7 +3263,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IgkRJ" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="1OShD0IgkRK" role="37wK5m">
                   <property role="Xl_RC" value="X" />
                 </node>
@@ -3298,7 +3277,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IglCC" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="1OShD0IglCD" role="37wK5m">
                   <property role="Xl_RC" value="Y" />
                 </node>
@@ -3760,7 +3739,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IgaBW" role="33vP2m">
-                <ref role="37wK5l" node="5cGCTtq$bC0" resolve="wildcard" />
+                <ref role="37wK5l" node="6yEjedm71ho" resolve="wildcard" />
               </node>
             </node>
           </node>
@@ -3925,7 +3904,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IgiMe" role="33vP2m">
-                <ref role="37wK5l" node="5cGCTtq$bC0" resolve="wildcard" />
+                <ref role="37wK5l" node="6yEjedm71ho" resolve="wildcard" />
               </node>
             </node>
           </node>
@@ -4084,7 +4063,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8ISnwz" role="33vP2m">
-                <ref role="37wK5l" node="1OShD0Ifu8d" resolve="var" />
+                <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
                 <node concept="Xl_RD" id="4$OyT8ISnw$" role="37wK5m">
                   <property role="Xl_RC" value="HEAD" />
                 </node>
@@ -4098,7 +4077,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8ISnwC" role="33vP2m">
-                <ref role="37wK5l" node="4$OyT8ITrpL" resolve="listVar" />
+                <ref role="37wK5l" node="6yEjedm71h7" resolve="listVar" />
                 <node concept="Xl_RD" id="4$OyT8ISnwD" role="37wK5m">
                   <property role="Xl_RC" value="TAIL" />
                 </node>
@@ -4303,7 +4282,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8ITVLq" role="33vP2m">
-                <ref role="37wK5l" node="4$OyT8ITrpL" resolve="listVar" />
+                <ref role="37wK5l" node="6yEjedm71h7" resolve="listVar" />
                 <node concept="Xl_RD" id="4$OyT8ITVLr" role="37wK5m">
                   <property role="Xl_RC" value="TAIL1" />
                 </node>
@@ -4317,7 +4296,7 @@
                 <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8IUcum" role="33vP2m">
-                <ref role="37wK5l" node="4$OyT8ITrpL" resolve="listVar" />
+                <ref role="37wK5l" node="6yEjedm71h7" resolve="listVar" />
                 <node concept="Xl_RD" id="4$OyT8IUcun" role="37wK5m">
                   <property role="Xl_RC" value="TAIL2" />
                 </node>
@@ -4335,7 +4314,7 @@
                   <node concept="1oi5UN" id="4$OyT8IUqH1" role="KCVpo">
                     <node concept="22Ky0T" id="4$OyT8IUrr1" role="lGtFl">
                       <node concept="1rXfSq" id="4$OyT8IUs9O" role="22Ky0K">
-                        <ref role="37wK5l" node="5cGCTtq$bC0" resolve="wildcard" />
+                        <ref role="37wK5l" node="6yEjedm71ho" resolve="wildcard" />
                       </node>
                     </node>
                   </node>
@@ -4361,7 +4340,7 @@
                   <node concept="1oi5UN" id="4$OyT8IUuji" role="KCVpo">
                     <node concept="22Ky0T" id="4$OyT8IUv16" role="lGtFl">
                       <node concept="1rXfSq" id="4$OyT8IUvK0" role="22Ky0K">
-                        <ref role="37wK5l" node="5cGCTtq$bC0" resolve="wildcard" />
+                        <ref role="37wK5l" node="6yEjedm71ho" resolve="wildcard" />
                       </node>
                     </node>
                   </node>
@@ -4552,25 +4531,19 @@
   </node>
   <node concept="3s_ewN" id="3K_0akS$KOB">
     <property role="3s_ewP" value="UniEqSolverCommute" />
-    <node concept="312cEg" id="3K_0akS$LOh" role="jymVt">
-      <property role="TrG5h" value="constraintSystem" />
-      <node concept="3Tm6S6" id="3K_0akS$LOi" role="1B3o_S" />
-      <node concept="3uibUv" id="3K_0akS$LOj" role="1tU5fm">
-        <ref role="3uigEE" to="eifs:~ConstraintSystem" resolve="ConstraintSystem" />
-      </node>
-    </node>
+    <node concept="2tJIrI" id="6yEjedm8dfv" role="jymVt" />
     <node concept="312cEg" id="3K_0akS$LOk" role="jymVt">
       <property role="TrG5h" value="unificationSolver" />
       <node concept="3Tm6S6" id="3K_0akS$LOl" role="1B3o_S" />
-      <node concept="3uibUv" id="3K_0akS$LOm" role="1tU5fm">
-        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="JchrUnificationSolver" />
+      <node concept="3uibUv" id="6yEjedm8e0F" role="1tU5fm">
+        <ref role="3uigEE" node="6yEjedm5WkE" resolve="TestingUnificationSolver" />
       </node>
     </node>
     <node concept="312cEg" id="3K_0akS$Mx8" role="jymVt">
       <property role="TrG5h" value="eqSolver" />
       <node concept="3Tm6S6" id="3K_0akS$Mx6" role="1B3o_S" />
-      <node concept="3uibUv" id="6MYr6JwZKR$" role="1tU5fm">
-        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="JchrEqualsSolver" />
+      <node concept="3uibUv" id="6yEjedm8vLy" role="1tU5fm">
+        <ref role="3uigEE" node="6yEjedm8s$A" resolve="TestingEqualsSolver" />
       </node>
     </node>
     <node concept="2tJIrI" id="3K_0akS$LPO" role="jymVt" />
@@ -4595,7 +4568,7 @@
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="3K_0akS$LQt" role="37wK5m">
                 <node concept="1pGfFk" id="3K_0akS$LQu" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
                   <node concept="37vLTw" id="3K_0akS$LQv" role="37wK5m">
                     <ref role="3cqZAo" node="3K_0akS$LQl" resolve="name" />
                   </node>
@@ -4609,18 +4582,24 @@
     <node concept="2tJIrI" id="3K_0akS$Nwv" role="jymVt" />
     <node concept="3clFb_" id="3K_0akS$NEa" role="jymVt">
       <property role="TrG5h" value="logical" />
-      <node concept="3uibUv" id="3K_0akS$NJg" role="3clF45">
-        <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+      <node concept="3uibUv" id="6yEjedm86Fb" role="3clF45">
+        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <node concept="3uibUv" id="6yEjedm887F" role="11_B2D">
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        </node>
       </node>
       <node concept="3Tm1VV" id="3K_0akS$NEd" role="1B3o_S" />
       <node concept="3clFbS" id="3K_0akS$NEe" role="3clF47">
         <node concept="3clFbF" id="3K_0akS$NJW" role="3cqZAp">
           <node concept="2ShNRf" id="3K_0akS$NJY" role="3clFbG">
             <node concept="1pGfFk" id="3K_0akS$NJZ" role="2ShVmc">
-              <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-              <node concept="37vLTw" id="3K_0akS$NK0" role="37wK5m">
+              <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+              <node concept="37vLTw" id="6yEjedm8aw_" role="37wK5m">
                 <ref role="3cqZAo" node="3K_0akS$NJK" resolve="name" />
               </node>
+              <node concept="3uibUv" id="6yEjedm895I" role="1pMfVU">
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              </node>
             </node>
           </node>
         </node>
@@ -4630,6 +4609,46 @@
         <node concept="17QB3L" id="3K_0akS$NJJ" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="6yEjedm8GlC" role="jymVt" />
+    <node concept="3clFb_" id="6yEjedm8Fwq" role="jymVt">
+      <property role="TrG5h" value="logical" />
+      <node concept="3uibUv" id="6yEjedm8Fwr" role="3clF45">
+        <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+        <node concept="3uibUv" id="6yEjedm8Fws" role="11_B2D">
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6yEjedm8Fwt" role="1B3o_S" />
+      <node concept="3clFbS" id="6yEjedm8Fwu" role="3clF47">
+        <node concept="3clFbF" id="6yEjedm8Fwv" role="3cqZAp">
+          <node concept="2ShNRf" id="6yEjedm8Fww" role="3clFbG">
+            <node concept="1pGfFk" id="6yEjedm8Fwx" role="2ShVmc">
+              <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+              <node concept="10QFUN" id="6yEjedm9wbU" role="37wK5m">
+                <node concept="3uibUv" id="6yEjedm9wg_" role="10QFUM">
+                  <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+                </node>
+                <node concept="37vLTw" id="6yEjedm8HxY" role="10QFUP">
+                  <ref role="3cqZAo" node="6yEjedm8H7d" resolve="meta" />
+                </node>
+              </node>
+              <node concept="3uibUv" id="6yEjedm8Fwz" role="1pMfVU">
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6yEjedm8H7d" role="3clF46">
+        <property role="TrG5h" value="meta" />
+        <node concept="3uibUv" id="6yEjedm8H9p" role="1tU5fm">
+          <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
+          <node concept="3uibUv" id="6yEjedm8Hc_" role="11_B2D">
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3Tm1VV" id="3K_0akS$KOC" role="1B3o_S" />
     <node concept="3s_gsd" id="3K_0akS$KOD" role="3s_ewO">
       <node concept="3s$Bmu" id="3K_0akS$LPz" role="3s_gse">
@@ -4641,8 +4660,11 @@
           <node concept="3cpWs8" id="3K_0akS$NRq" role="3cqZAp">
             <node concept="3cpWsn" id="3K_0akS$NRr" role="3cpWs9">
               <property role="TrG5h" value="x1" />
-              <node concept="3uibUv" id="3K_0akS$NRp" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm8aLn" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm8bg7" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
               <node concept="1rXfSq" id="3K_0akS$NRs" role="33vP2m">
                 <ref role="37wK5l" node="3K_0akS$NEa" resolve="logical" />
@@ -4655,15 +4677,18 @@
           <node concept="3cpWs8" id="3K_0akS$O10" role="3cqZAp">
             <node concept="3cpWsn" id="3K_0akS$O11" role="3cpWs9">
               <property role="TrG5h" value="y1" />
-              <node concept="3uibUv" id="3K_0akS$O0Y" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
-              </node>
               <node concept="1rXfSq" id="3K_0akS$O12" role="33vP2m">
                 <ref role="37wK5l" node="3K_0akS$NEa" resolve="logical" />
                 <node concept="Xl_RD" id="3K_0akS$O13" role="37wK5m">
                   <property role="Xl_RC" value="Y1" />
                 </node>
               </node>
+              <node concept="3uibUv" id="6yEjedm8btC" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm8btD" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
+              </node>
             </node>
           </node>
           <node concept="3clFbH" id="3K_0akS_e8b" role="3cqZAp" />
@@ -4691,7 +4716,7 @@
                 <ref role="3cqZAo" node="3K_0akS$LOk" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="3K_0akS_faY" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4U_yxogCdjW" resolve="tellUni" />
+                <ref role="37wK5l" node="6yEjedm623c" resolve="tellUni" />
                 <node concept="37vLTw" id="3K_0akS_fco" role="37wK5m">
                   <ref role="3cqZAo" node="3K_0akS$O11" resolve="y1" />
                 </node>
@@ -4708,7 +4733,7 @@
                 <ref role="3cqZAo" node="3K_0akS$LOk" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="3K_0akS$NrP" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4U_yxogCe_U" resolve="tellUni" />
+                <ref role="37wK5l" node="6yEjedm623c" resolve="tellUni" />
                 <node concept="37vLTw" id="3K_0akS$OfN" role="37wK5m">
                   <ref role="3cqZAo" node="3K_0akS$NRr" resolve="x1" />
                 </node>
@@ -4722,24 +4747,22 @@
           <node concept="3cpWs8" id="3K_0akS$OxK" role="3cqZAp">
             <node concept="3cpWsn" id="3K_0akS$OxL" role="3cpWs9">
               <property role="TrG5h" value="w1" />
-              <node concept="3uibUv" id="3K_0akS$OxI" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
-              </node>
-              <node concept="2OqwBi" id="3mz2_dYrb1a" role="33vP2m">
-                <node concept="1rXfSq" id="3K_0akS$OxM" role="2Oq$k0">
-                  <ref role="37wK5l" node="3K_0akS$NEa" resolve="logical" />
-                  <node concept="Xl_RD" id="3K_0akS$OxN" role="37wK5m">
-                    <property role="Xl_RC" value="W1" />
-                  </node>
+              <node concept="3uibUv" id="6yEjedm8iQc" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm8jdG" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
                 </node>
-                <node concept="liA8E" id="3mz2_dYrbe2" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:3mz2_dYqEdN" resolve="withMeta" />
-                  <node concept="2ShNRf" id="3mz2_dYrbhD" role="37wK5m">
-                    <node concept="1pGfFk" id="3mz2_dYrb$g" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
-                      <node concept="3VsKOn" id="3mz2_dYrbGJ" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
-                      </node>
+              </node>
+              <node concept="1rXfSq" id="3K_0akS$OxM" role="33vP2m">
+                <ref role="37wK5l" node="6yEjedm8Fwq" resolve="logical" />
+                <node concept="2ShNRf" id="6yEjedm8P1E" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm8P1F" role="2ShVmc">
+                    <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                    <node concept="Xl_RD" id="6yEjedm9_u$" role="37wK5m">
+                      <property role="Xl_RC" value="w1" />
+                    </node>
+                    <node concept="3VsKOn" id="6yEjedm8P1G" role="37wK5m">
+                      <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
                     </node>
                   </node>
                 </node>
@@ -4753,7 +4776,7 @@
                 <ref role="3cqZAo" node="3K_0akS$Mx8" resolve="eqSolver" />
               </node>
               <node concept="liA8E" id="3K_0akS$OWu" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBn4xBY" resolve="tellEq" />
+                <ref role="37wK5l" node="6yEjedm8tAi" resolve="tellEq" />
                 <node concept="37vLTw" id="3K_0akS$PlX" role="37wK5m">
                   <ref role="3cqZAo" node="3K_0akS$OxL" resolve="w1" />
                 </node>
@@ -4767,15 +4790,18 @@
           <node concept="3cpWs8" id="3K_0akS_bIu" role="3cqZAp">
             <node concept="3cpWsn" id="3K_0akS_bIv" role="3cpWs9">
               <property role="TrG5h" value="p1" />
-              <node concept="3uibUv" id="3K_0akS_bIs" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
-              </node>
               <node concept="1rXfSq" id="3K_0akS_bIw" role="33vP2m">
                 <ref role="37wK5l" node="3K_0akS$NEa" resolve="logical" />
                 <node concept="Xl_RD" id="3K_0akS_bIx" role="37wK5m">
                   <property role="Xl_RC" value="P1" />
                 </node>
               </node>
+              <node concept="3uibUv" id="6yEjedm8lL4" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm8lL5" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
+              </node>
             </node>
           </node>
           <node concept="3clFbH" id="3K_0akS$OFn" role="3cqZAp" />
@@ -4815,7 +4841,7 @@
                 <ref role="3cqZAo" node="3K_0akS$LOk" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="3K_0akS$WLA" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4U_yxogCdjW" resolve="tellUni" />
+                <ref role="37wK5l" node="6yEjedm623c" resolve="tellUni" />
                 <node concept="37vLTw" id="3K_0akS_ccT" role="37wK5m">
                   <ref role="3cqZAo" node="3K_0akS_bIv" resolve="p1" />
                 </node>
@@ -4838,11 +4864,11 @@
                     <ref role="3cqZAo" node="3K_0akS_bIv" resolve="p1" />
                   </node>
                   <node concept="liA8E" id="6HT7BWBPd0X" role="2OqNvi">
-                    <ref role="37wK5l" to="oy3s:dfChU1gcsX" resolve="findRoot" />
+                    <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
                   </node>
                 </node>
                 <node concept="liA8E" id="6HT7BWBPd0Y" role="2OqNvi">
-                  <ref role="37wK5l" to="95zw:3HJTsBmBZ0h" resolve="value" />
+                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
                 </node>
               </node>
             </node>
@@ -4982,7 +5008,7 @@
         </node>
       </node>
       <node concept="3s$Bmu" id="3K_0akS_pCv" role="3s_gse">
-        <property role="3s$Bm0" value="eq_the_uni" />
+        <property role="3s$Bm0" value="eq_then_uni" />
         <node concept="3cqZAl" id="3K_0akS_pCw" role="3clF45" />
         <node concept="3Tm1VV" id="3K_0akS_pCx" role="1B3o_S" />
         <node concept="3clFbS" id="3K_0akS_pCy" role="3clF47">
@@ -4990,29 +5016,35 @@
           <node concept="3cpWs8" id="3K_0akS_pC$" role="3cqZAp">
             <node concept="3cpWsn" id="3K_0akS_pC_" role="3cpWs9">
               <property role="TrG5h" value="x1" />
-              <node concept="3uibUv" id="3K_0akS_pCA" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
-              </node>
               <node concept="1rXfSq" id="3K_0akS_pCB" role="33vP2m">
                 <ref role="37wK5l" node="3K_0akS$NEa" resolve="logical" />
                 <node concept="Xl_RD" id="3K_0akS_pCC" role="37wK5m">
                   <property role="Xl_RC" value="X1" />
                 </node>
               </node>
+              <node concept="3uibUv" id="6yEjedm8o1P" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm8o1Q" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
+              </node>
             </node>
           </node>
           <node concept="3cpWs8" id="3K_0akS_pCD" role="3cqZAp">
             <node concept="3cpWsn" id="3K_0akS_pCE" role="3cpWs9">
               <property role="TrG5h" value="y1" />
-              <node concept="3uibUv" id="3K_0akS_pCF" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
-              </node>
               <node concept="1rXfSq" id="3K_0akS_pCG" role="33vP2m">
                 <ref role="37wK5l" node="3K_0akS$NEa" resolve="logical" />
                 <node concept="Xl_RD" id="3K_0akS_pCH" role="37wK5m">
                   <property role="Xl_RC" value="Y1" />
                 </node>
               </node>
+              <node concept="3uibUv" id="6yEjedm8oFj" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm8oFk" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
+              </node>
             </node>
           </node>
           <node concept="3clFbH" id="3K_0akS_pCI" role="3cqZAp" />
@@ -5040,7 +5072,7 @@
                 <ref role="3cqZAo" node="3K_0akS$LOk" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="3K_0akS_pCT" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4U_yxogCdjW" resolve="tellUni" />
+                <ref role="37wK5l" node="6yEjedm623c" resolve="tellUni" />
                 <node concept="37vLTw" id="3K_0akS_pCU" role="37wK5m">
                   <ref role="3cqZAo" node="3K_0akS_pCE" resolve="y1" />
                 </node>
@@ -5053,28 +5085,26 @@
           <node concept="3cpWs8" id="3K_0akS_pD4" role="3cqZAp">
             <node concept="3cpWsn" id="3K_0akS_pD5" role="3cpWs9">
               <property role="TrG5h" value="w1" />
-              <node concept="3uibUv" id="3K_0akS_pD6" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
-              </node>
-              <node concept="2OqwBi" id="3mz2_dYr7zp" role="33vP2m">
-                <node concept="1rXfSq" id="3K_0akS_pD7" role="2Oq$k0">
-                  <ref role="37wK5l" node="3K_0akS$NEa" resolve="logical" />
-                  <node concept="Xl_RD" id="3K_0akS_pD8" role="37wK5m">
-                    <property role="Xl_RC" value="W1" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="3mz2_dYr7Kp" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:3mz2_dYqEdN" resolve="withMeta" />
-                  <node concept="2ShNRf" id="3mz2_dYr7NZ" role="37wK5m">
-                    <node concept="1pGfFk" id="3mz2_dYr86A" role="2ShVmc">
-                      <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
-                      <node concept="3VsKOn" id="3mz2_dYr8bR" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
-                      </node>
+              <node concept="1rXfSq" id="3K_0akS_pD7" role="33vP2m">
+                <ref role="37wK5l" node="6yEjedm8Fwq" resolve="logical" />
+                <node concept="2ShNRf" id="6yEjedm8NC6" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm8NZD" role="2ShVmc">
+                    <ref role="37wK5l" to="45ys:7nPD14NON$C" resolve="MetaLogical" />
+                    <node concept="Xl_RD" id="6yEjedm9CL0" role="37wK5m">
+                      <property role="Xl_RC" value="w1" />
+                    </node>
+                    <node concept="3VsKOn" id="6yEjedm8Oi0" role="37wK5m">
+                      <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="3uibUv" id="6yEjedm8$6V" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm8$6W" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
+              </node>
             </node>
           </node>
           <node concept="3clFbH" id="3K_0akS_pD9" role="3cqZAp" />
@@ -5084,7 +5114,7 @@
                 <ref role="3cqZAo" node="3K_0akS$Mx8" resolve="eqSolver" />
               </node>
               <node concept="liA8E" id="3K_0akS_pDd" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBn4xBY" resolve="tellEq" />
+                <ref role="37wK5l" node="6yEjedm8tAi" resolve="tellEq" />
                 <node concept="37vLTw" id="3K_0akS_pDe" role="37wK5m">
                   <ref role="3cqZAo" node="3K_0akS_pD5" resolve="w1" />
                 </node>
@@ -5098,15 +5128,18 @@
           <node concept="3cpWs8" id="3K_0akS_pDh" role="3cqZAp">
             <node concept="3cpWsn" id="3K_0akS_pDi" role="3cpWs9">
               <property role="TrG5h" value="p1" />
-              <node concept="3uibUv" id="3K_0akS_pDj" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
-              </node>
               <node concept="1rXfSq" id="3K_0akS_pDk" role="33vP2m">
                 <ref role="37wK5l" node="3K_0akS$NEa" resolve="logical" />
                 <node concept="Xl_RD" id="3K_0akS_pDl" role="37wK5m">
                   <property role="Xl_RC" value="P1" />
                 </node>
               </node>
+              <node concept="3uibUv" id="6yEjedm8pey" role="1tU5fm">
+                <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
+                <node concept="3uibUv" id="6yEjedm8pez" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
+              </node>
             </node>
           </node>
           <node concept="3clFbH" id="3K_0akS_pDm" role="3cqZAp" />
@@ -5147,7 +5180,7 @@
                 <ref role="3cqZAo" node="3K_0akS$LOk" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="3K_0akS_pDB" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4U_yxogCdjW" resolve="tellUni" />
+                <ref role="37wK5l" node="6yEjedm623c" resolve="tellUni" />
                 <node concept="37vLTw" id="3K_0akS_pDC" role="37wK5m">
                   <ref role="3cqZAo" node="3K_0akS_pDi" resolve="p1" />
                 </node>
@@ -5164,7 +5197,7 @@
                 <ref role="3cqZAo" node="3K_0akS$LOk" resolve="unificationSolver" />
               </node>
               <node concept="liA8E" id="3K_0akS_pD0" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:4U_yxogCe_U" resolve="tellUni" />
+                <ref role="37wK5l" node="6yEjedm623c" resolve="tellUni" />
                 <node concept="37vLTw" id="3K_0akS_pD1" role="37wK5m">
                   <ref role="3cqZAo" node="3K_0akS_pC_" resolve="x1" />
                 </node>
@@ -5187,11 +5220,11 @@
                     <ref role="3cqZAo" node="3K_0akS_pDi" resolve="p1" />
                   </node>
                   <node concept="liA8E" id="6HT7BWBPhwQ" role="2OqNvi">
-                    <ref role="37wK5l" to="oy3s:dfChU1gcsX" resolve="findRoot" />
+                    <ref role="37wK5l" to="45ys:dfChU1eNVy" resolve="findRoot" />
                   </node>
                 </node>
                 <node concept="liA8E" id="6HT7BWBPhwR" role="2OqNvi">
-                  <ref role="37wK5l" to="95zw:3HJTsBmBZ0h" resolve="value" />
+                  <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
                 </node>
               </node>
             </node>
@@ -5333,51 +5366,29 @@
     </node>
     <node concept="1KhYhu" id="3K_0akS$LUq" role="1KhZu4">
       <node concept="3clFbS" id="3K_0akS$LUr" role="2VODD2">
-        <node concept="3clFbF" id="3K_0akS$LUs" role="3cqZAp">
-          <node concept="37vLTI" id="3K_0akS$LUt" role="3clFbG">
-            <node concept="37vLTw" id="3K_0akS$LUu" role="37vLTJ">
-              <ref role="3cqZAo" node="3K_0akS$LOh" resolve="constraintSystem" />
-            </node>
-            <node concept="2ShNRf" id="3K_0akS$LUv" role="37vLTx">
-              <node concept="1pGfFk" id="3K_0akS$LUw" role="2ShVmc">
-                <ref role="37wK5l" to="eifs:~ConstraintSystem.&lt;init&gt;()" resolve="ConstraintSystem" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3K_0akS$LUx" role="3cqZAp">
-          <node concept="2OqwBi" id="3K_0akS$LUy" role="3clFbG">
-            <node concept="37vLTw" id="3K_0akS$LUz" role="2Oq$k0">
-              <ref role="3cqZAo" node="3K_0akS$LOh" resolve="constraintSystem" />
-            </node>
-            <node concept="liA8E" id="3K_0akS$LU$" role="2OqNvi">
-              <ref role="37wK5l" to="eifs:~ConstraintSystem.setQueuing(boolean):void" resolve="setQueuing" />
-              <node concept="3clFbT" id="3K_0akS$LU_" role="37wK5m">
-                <property role="3clFbU" value="false" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2tcGHBEi$8m" role="3cqZAp">
-          <node concept="3cpWsn" id="2tcGHBEi$8n" role="3cpWs9">
+        <node concept="3cpWs8" id="6yEjedm8ekr" role="3cqZAp">
+          <node concept="3cpWsn" id="6yEjedm8eks" role="3cpWs9">
             <property role="TrG5h" value="symbols" />
-            <node concept="3uibUv" id="2tcGHBEi$8k" role="1tU5fm">
-              <ref role="3uigEE" to="95zw:7ISVfSIxNO" resolve="JchrSessionSolver" />
+            <node concept="3uibUv" id="6yEjedm8ekt" role="1tU5fm">
+              <ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
             </node>
-            <node concept="2ShNRf" id="2tcGHBEi$8o" role="33vP2m">
-              <node concept="1pGfFk" id="1ggxSI7$PyQ" role="2ShVmc">
-                <ref role="37wK5l" to="95zw:6MYr6Jwp62r" resolve="JchrSessionSolver" />
-                <node concept="37vLTw" id="6MYr6Jwovf7" role="37wK5m">
-                  <ref role="3cqZAo" node="3K_0akS$LOh" resolve="constraintSystem" />
-                </node>
+            <node concept="2ShNRf" id="6yEjedm8eku" role="33vP2m">
+              <node concept="1pGfFk" id="6yEjedm8ekv" role="2ShVmc">
+                <ref role="37wK5l" to="cxk7:3F6vMxqo1c$" resolve="DefaultSessionSolver" />
+                <node concept="10Nm6u" id="6yEjedm8ekw" role="37wK5m" />
               </node>
             </node>
           </node>
         </node>
+        <node concept="3SKdUt" id="2tcGHBEi$_e" role="3cqZAp">
+          <node concept="3SKdUq" id="2tcGHBEi$_g" role="3SKWNk">
+            <property role="3SKdUp" value="TODO: why create new solvers?" />
+          </node>
+        </node>
         <node concept="3clFbF" id="2tcGHBEi$gx" role="3cqZAp">
           <node concept="2OqwBi" id="2tcGHBEi$kw" role="3clFbG">
-            <node concept="37vLTw" id="2tcGHBEi$gv" role="2Oq$k0">
-              <ref role="3cqZAo" node="2tcGHBEi$8n" resolve="symbols" />
+            <node concept="37vLTw" id="6yEjedm8eMu" role="2Oq$k0">
+              <ref role="3cqZAo" node="6yEjedm8eks" resolve="symbols" />
             </node>
             <node concept="liA8E" id="2tcGHBEi$nn" role="2OqNvi">
               <ref role="37wK5l" to="qrld:2tcGHBEeol1" resolve="init" />
@@ -5392,34 +5403,37 @@
             </node>
           </node>
         </node>
-        <node concept="3SKdUt" id="2tcGHBEi$_e" role="3cqZAp">
-          <node concept="3SKdUq" id="2tcGHBEi$_g" role="3SKWNk">
-            <property role="3SKdUp" value="TODO: why create new solvers?" />
-          </node>
-        </node>
         <node concept="3clFbF" id="3K_0akS$LUA" role="3cqZAp">
           <node concept="37vLTI" id="3K_0akS$LUB" role="3clFbG">
-            <node concept="2ShNRf" id="3K_0akS$LUC" role="37vLTx">
-              <node concept="1pGfFk" id="3K_0akS$LUD" role="2ShVmc">
-                <ref role="37wK5l" to="95zw:6MYr6JwUN9q" resolve="JchrUnificationSolverImpl" />
-                <node concept="37vLTw" id="2tcGHBEi$vU" role="37wK5m">
-                  <ref role="3cqZAo" node="2tcGHBEi$8n" resolve="symbols" />
-                </node>
-                <node concept="10Nm6u" id="5uFPQ7CmmD4" role="37wK5m" />
-              </node>
-            </node>
             <node concept="37vLTw" id="3K_0akS$LUF" role="37vLTJ">
               <ref role="3cqZAo" node="3K_0akS$LOk" resolve="unificationSolver" />
             </node>
+            <node concept="2ShNRf" id="6yEjedm8fRI" role="37vLTx">
+              <node concept="1pGfFk" id="6yEjedm8fRJ" role="2ShVmc">
+                <ref role="37wK5l" node="6yEjedm5WI7" resolve="TestingUnificationSolver" />
+                <node concept="2ShNRf" id="6yEjedm8fRK" role="37wK5m">
+                  <node concept="HV5vD" id="6yEjedm8fRL" role="2ShVmc">
+                    <ref role="HV5vE" to="45ys:3F6vMxqplHq" resolve="LogicalUnification.Default" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="6yEjedm8fRM" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm8eks" resolve="symbols" />
+                </node>
+                <node concept="10M0yZ" id="6yEjedm8fRN" role="37wK5m">
+                  <ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                  <ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
+                </node>
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbF" id="3K_0akS$Mxh" role="3cqZAp">
           <node concept="37vLTI" id="3K_0akS$Mxi" role="3clFbG">
             <node concept="2ShNRf" id="3K_0akS$Mxm" role="37vLTx">
               <node concept="1pGfFk" id="3K_0akS$Mxn" role="2ShVmc">
-                <ref role="37wK5l" to="95zw:6MYr6JwUnSg" resolve="JchrEqualsSolverImpl" />
-                <node concept="37vLTw" id="2tcGHBEi$8q" role="37wK5m">
-                  <ref role="3cqZAo" node="2tcGHBEi$8n" resolve="symbols" />
+                <ref role="37wK5l" node="6yEjedm8sAV" resolve="TestingEqualsSolver" />
+                <node concept="37vLTw" id="6yEjedm8g4D" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm8eks" resolve="symbols" />
                 </node>
               </node>
             </node>
@@ -5720,16 +5734,13 @@
           <node concept="3cpWs8" id="2tcGHBEewJ$" role="3cqZAp">
             <node concept="3cpWsn" id="2tcGHBEewJ_" role="3cpWs9">
               <property role="TrG5h" value="csession" />
-              <node concept="3uibUv" id="2tcGHBEewJt" role="1tU5fm">
-                <ref role="3uigEE" to="95zw:7ISVfSIxNO" resolve="JchrSessionSolver" />
+              <node concept="3uibUv" id="6yEjedmgUqt" role="1tU5fm">
+                <ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
               </node>
               <node concept="2ShNRf" id="2tcGHBEewJA" role="33vP2m">
                 <node concept="1pGfFk" id="1ggxSI7$OLj" role="2ShVmc">
-                  <ref role="37wK5l" to="95zw:6MYr6Jwp62r" resolve="JchrSessionSolver" />
-                  <node concept="2YIFZM" id="6MYr6Jwourn" role="37wK5m">
-                    <ref role="37wK5l" to="eifs:~ConstraintSystem.get():runtime.ConstraintSystem" resolve="get" />
-                    <ref role="1Pybhc" to="eifs:~ConstraintSystem" resolve="ConstraintSystem" />
-                  </node>
+                  <ref role="37wK5l" to="cxk7:3F6vMxqo1c$" resolve="DefaultSessionSolver" />
+                  <node concept="10Nm6u" id="6yEjedmgUCa" role="37wK5m" />
                 </node>
               </node>
             </node>
@@ -5848,5 +5859,170 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="6yEjedm5WkE">
+    <property role="2bfB8j" value="false" />
+    <property role="TrG5h" value="TestingUnificationSolver" />
+    <node concept="2tJIrI" id="6yEjedm5WFP" role="jymVt" />
+    <node concept="3clFbW" id="6yEjedm5WI7" role="jymVt">
+      <node concept="37vLTG" id="3FIATxbQcKV" role="3clF46">
+        <property role="TrG5h" value="logicalUnification" />
+        <node concept="3uibUv" id="3FIATxbQcPk" role="1tU5fm">
+          <ref role="3uigEE" to="45ys:6MYr6JwANOa" resolve="LogicalUnification" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4xBopTzo15x" role="3clF46">
+        <property role="TrG5h" value="sessionSolver" />
+        <node concept="3uibUv" id="4xBopTzo1oi" role="1tU5fm">
+          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="24Vro6cS3w6" role="3clF46">
+        <property role="TrG5h" value="tracer" />
+        <node concept="3uibUv" id="24Vro6cS3NX" role="1tU5fm">
+          <ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="EvaluationTrace" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6yEjedm5WI9" role="3clF45" />
+      <node concept="3Tm1VV" id="6yEjedm5WIa" role="1B3o_S" />
+      <node concept="3clFbS" id="6yEjedm5WIb" role="3clF47">
+        <node concept="XkiVB" id="6yEjedm5WNa" role="3cqZAp">
+          <ref role="37wK5l" to="omn0:5p8T3QHGKJ7" resolve="UnificationSolver" />
+          <node concept="37vLTw" id="6yEjedm5WTt" role="37wK5m">
+            <ref role="3cqZAo" node="3FIATxbQcKV" resolve="logicalUnification" />
+          </node>
+          <node concept="37vLTw" id="6yEjedm5X1v" role="37wK5m">
+            <ref role="3cqZAo" node="4xBopTzo15x" resolve="sessionSolver" />
+          </node>
+          <node concept="37vLTw" id="6yEjedm5X9H" role="37wK5m">
+            <ref role="3cqZAo" node="24Vro6cS3w6" resolve="tracer" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6yEjedm5XCT" role="jymVt" />
+    <node concept="3clFb_" id="6yEjedm5XWy" role="jymVt">
+      <property role="TrG5h" value="askUni" />
+      <node concept="10P_77" id="6yEjedm5ZZz" role="3clF45" />
+      <node concept="3Tm1VV" id="6yEjedm5XW_" role="1B3o_S" />
+      <node concept="3clFbS" id="6yEjedm5XWA" role="3clF47">
+        <node concept="3clFbF" id="6yEjedm6hex" role="3cqZAp">
+          <node concept="1rXfSq" id="6yEjedm6hew" role="3clFbG">
+            <ref role="37wK5l" to="omn0:2UGjFq4lTDy" resolve="doAsk" />
+            <node concept="37vLTw" id="6yEjedm6hnq" role="37wK5m">
+              <ref role="3cqZAo" node="6yEjedm5Zmw" resolve="a" />
+            </node>
+            <node concept="37vLTw" id="6yEjedm6hE8" role="37wK5m">
+              <ref role="3cqZAo" node="6yEjedm5ZEw" resolve="b" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6yEjedm5Zmw" role="3clF46">
+        <property role="TrG5h" value="a" />
+        <node concept="3uibUv" id="6yEjedm5ZDk" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6yEjedm5ZEw" role="3clF46">
+        <property role="TrG5h" value="b" />
+        <node concept="3uibUv" id="6yEjedm5ZXm" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6yEjedm62ZU" role="jymVt" />
+    <node concept="3clFb_" id="6yEjedm623c" role="jymVt">
+      <property role="TrG5h" value="tellUni" />
+      <node concept="3cqZAl" id="6yEjedm63W$" role="3clF45" />
+      <node concept="3Tm1VV" id="6yEjedm623e" role="1B3o_S" />
+      <node concept="3clFbS" id="6yEjedm623f" role="3clF47">
+        <node concept="3clFbF" id="6yEjedm6hJS" role="3cqZAp">
+          <node concept="1rXfSq" id="6yEjedm6hJR" role="3clFbG">
+            <ref role="37wK5l" to="omn0:2UGjFq4mbmq" resolve="doTell" />
+            <node concept="37vLTw" id="6yEjedm6hPb" role="37wK5m">
+              <ref role="3cqZAo" node="6yEjedm623g" resolve="a" />
+            </node>
+            <node concept="37vLTw" id="6yEjedm6hWN" role="37wK5m">
+              <ref role="3cqZAo" node="6yEjedm623i" resolve="b" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6yEjedm623g" role="3clF46">
+        <property role="TrG5h" value="a" />
+        <node concept="3uibUv" id="6yEjedm623h" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6yEjedm623i" role="3clF46">
+        <property role="TrG5h" value="b" />
+        <node concept="3uibUv" id="6yEjedm623j" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="6yEjedm5WkF" role="1B3o_S" />
+    <node concept="3uibUv" id="6yEjedm5WEV" role="1zkMxy">
+      <ref role="3uigEE" to="omn0:6GYQG_Spvw5" resolve="UnificationSolver" />
+    </node>
+  </node>
+  <node concept="312cEu" id="6yEjedm8s$A">
+    <property role="TrG5h" value="TestingEqualsSolver" />
+    <node concept="2tJIrI" id="6yEjedm8s_O" role="jymVt" />
+    <node concept="3clFbW" id="6yEjedm8sAV" role="jymVt">
+      <node concept="37vLTG" id="5p8T3QHE69z" role="3clF46">
+        <property role="TrG5h" value="sessionSolver" />
+        <node concept="3uibUv" id="4xBopTzoL5d" role="1tU5fm">
+          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6yEjedm8sAX" role="3clF45" />
+      <node concept="3Tm1VV" id="6yEjedm8sAY" role="1B3o_S" />
+      <node concept="3clFbS" id="6yEjedm8sAZ" role="3clF47">
+        <node concept="XkiVB" id="6yEjedm8sQk" role="3cqZAp">
+          <ref role="37wK5l" to="omn0:5p8T3QHE69j" resolve="EqualsSolver" />
+          <node concept="37vLTw" id="6yEjedm8sX$" role="37wK5m">
+            <ref role="3cqZAo" node="5p8T3QHE69z" resolve="sessionSolver" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6yEjedm8s_T" role="jymVt" />
+    <node concept="3clFb_" id="6yEjedm8tAi" role="jymVt">
+      <property role="TrG5h" value="tellEq" />
+      <node concept="37vLTG" id="6yEjedm8tDF" role="3clF46">
+        <property role="TrG5h" value="a" />
+        <node concept="3uibUv" id="6yEjedm8tFi" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6yEjedm8tGg" role="3clF46">
+        <property role="TrG5h" value="b" />
+        <node concept="3uibUv" id="6yEjedm8tHT" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6yEjedm8tAk" role="3clF45" />
+      <node concept="3Tm1VV" id="6yEjedm8tAl" role="1B3o_S" />
+      <node concept="3clFbS" id="6yEjedm8tAm" role="3clF47">
+        <node concept="3clFbF" id="6yEjedm8tOR" role="3cqZAp">
+          <node concept="1rXfSq" id="6yEjedm8tOQ" role="3clFbG">
+            <ref role="37wK5l" to="omn0:2UGjFq4lGBW" resolve="_tell" />
+            <node concept="37vLTw" id="6yEjedm8tTM" role="37wK5m">
+              <ref role="3cqZAo" node="6yEjedm8tDF" resolve="a" />
+            </node>
+            <node concept="37vLTw" id="6yEjedm8u66" role="37wK5m">
+              <ref role="3cqZAo" node="6yEjedm8tGg" resolve="b" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6yEjedm8sYi" role="jymVt" />
+    <node concept="3Tm1VV" id="6yEjedm8s$B" role="1B3o_S" />
+    <node concept="3uibUv" id="6yEjedm8s_w" role="1zkMxy">
+      <ref role="3uigEE" to="omn0:3HJTsBn4ogZ" resolve="EqualsSolver" />
+    </node>
+  </node>
 </model>
 
diff --git a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl
index db036eb2..48714531 100644
--- a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl
+++ b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl
@@ -72,7 +72,6 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:894463aa-8754-49c0-bf4b-6a32af66b376:jetbrains.mps.jchr" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="2" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
@@ -97,7 +96,6 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
@@ -107,7 +105,6 @@
     <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
index f08fa329..7b3503c6 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
@@ -10,9 +10,7 @@
     <dependency reexport="false">3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.lang.typesystem2.sample)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)</dependency>
-    <dependency reexport="false">760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
-    <dependency reexport="false">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -46,7 +44,6 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
@@ -57,7 +54,6 @@
     <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
index 76ca25e6..ead2c35d 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
@@ -10,7 +10,6 @@
     <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
-    <dependency reexport="false">760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)</dependency>
   </dependencies>
@@ -18,18 +17,14 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <language slang="l:894463aa-8754-49c0-bf4b-6a32af66b376:jetbrains.mps.jchr" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
   </languageVersions>
   <dependencyVersions>
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="e4a4c488-aaf8-4c5b-bc98-e65c5dd9acb9(jetbrains.mps.lang.typesystem2.samplechecker.handler.test)" version="0" />
     <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
     <module reference="b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps
index ac4c6267..6dd28d8e 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps
@@ -7,16 +7,12 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
   <imports>
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="95zw" ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
-    <import index="stgg" ref="r:fcdb37a4-4602-4a05-8d91-e439430734b8(jetbrains.mps.logic.jchr.program)" />
     <import index="mqqo" ref="r:82cec6f7-ddec-440c-961c-1c598267be42(jetbrains.mps.logic.test.unification)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
+    <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -71,9 +67,12 @@
         <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="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
@@ -254,15 +253,21 @@
           <node concept="3cpWs8" id="7t5VLKGALTt" role="3cqZAp">
             <node concept="3cpWsn" id="7t5VLKGALTu" role="3cpWs9">
               <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="7t5VLKGALTv" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm7dtr" role="1tU5fm">
+                <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
+                <node concept="3uibUv" id="6yEjedm7jXZ" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
               <node concept="2ShNRf" id="7t5VLKGALTw" role="33vP2m">
-                <node concept="1pGfFk" id="7t5VLKGALTx" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="Xl_RD" id="7t5VLKGALTy" role="37wK5m">
+                <node concept="1pGfFk" id="6yEjedm7cy2" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+                  <node concept="Xl_RD" id="6yEjedm7cQw" role="37wK5m">
                     <property role="Xl_RC" value="var" />
                   </node>
+                  <node concept="3uibUv" id="6yEjedm7hYU" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -279,7 +284,7 @@
                 </node>
                 <node concept="2ShNRf" id="7t5VLKGALTC" role="37wK5m">
                   <node concept="1pGfFk" id="7t5VLKGALTD" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
                     <node concept="37vLTw" id="7t5VLKGALTE" role="37wK5m">
                       <ref role="3cqZAo" node="7t5VLKGALSU" resolve="left" />
                     </node>
@@ -287,7 +292,7 @@
                 </node>
                 <node concept="2ShNRf" id="7t5VLKGALTF" role="37wK5m">
                   <node concept="1pGfFk" id="7t5VLKGALTG" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
                     <node concept="37vLTw" id="7t5VLKGALTH" role="37wK5m">
                       <ref role="3cqZAo" node="7t5VLKGALTe" resolve="right" />
                     </node>
@@ -308,7 +313,7 @@
                 <ref role="3cqZAo" node="7t5VLKGALTu" resolve="var" />
               </node>
               <node concept="liA8E" id="4JRKVCv8a6c" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmC6RD" resolve="isBound" />
+                <ref role="37wK5l" to="zx3l:~MemLogical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -500,44 +505,50 @@
             </node>
           </node>
           <node concept="3clFbH" id="7t5VLKGALUx" role="3cqZAp" />
-          <node concept="3cpWs8" id="7t5VLKGALUy" role="3cqZAp">
-            <node concept="3cpWsn" id="7t5VLKGALUz" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7RDT" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7RDU" role="3cpWs9">
               <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="7t5VLKGALU$" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm7RDV" role="1tU5fm">
+                <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
+                <node concept="3uibUv" id="6yEjedm7RDW" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="7t5VLKGALU_" role="33vP2m">
-                <node concept="1pGfFk" id="7t5VLKGALUA" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="Xl_RD" id="7t5VLKGALUB" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm7RDX" role="33vP2m">
+                <node concept="1pGfFk" id="6yEjedm7RDY" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+                  <node concept="Xl_RD" id="6yEjedm7RDZ" role="37wK5m">
                     <property role="Xl_RC" value="var" />
                   </node>
+                  <node concept="3uibUv" id="6yEjedm7RE0" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="7t5VLKGALUC" role="3cqZAp">
-            <node concept="3cpWsn" id="7t5VLKGALUD" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7RE1" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7RE2" role="3cpWs9">
               <property role="TrG5h" value="success" />
-              <node concept="10P_77" id="7t5VLKGALUE" role="1tU5fm" />
-              <node concept="2YIFZM" id="7t5VLKGALUF" role="33vP2m">
+              <node concept="10P_77" id="6yEjedm7RE3" role="1tU5fm" />
+              <node concept="2YIFZM" id="6yEjedm7RE4" role="33vP2m">
                 <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
                 <ref role="37wK5l" to="4r4j:5H6hZahmloU" resolve="findLub" />
-                <node concept="37vLTw" id="7t5VLKGALUG" role="37wK5m">
-                  <ref role="3cqZAo" node="7t5VLKGALUz" resolve="var" />
+                <node concept="37vLTw" id="6yEjedm7RE5" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm7RDU" resolve="var" />
                 </node>
-                <node concept="2ShNRf" id="7t5VLKGALUH" role="37wK5m">
-                  <node concept="1pGfFk" id="7t5VLKGALUI" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="7t5VLKGALUJ" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7RE6" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7RE7" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7RE8" role="37wK5m">
                       <ref role="3cqZAo" node="7t5VLKGALTU" resolve="left" />
                     </node>
                   </node>
                 </node>
-                <node concept="2ShNRf" id="7t5VLKGALUK" role="37wK5m">
-                  <node concept="1pGfFk" id="7t5VLKGALUL" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="7t5VLKGALUM" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7RE9" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7REa" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7REb" role="37wK5m">
                       <ref role="3cqZAo" node="7t5VLKGALUe" resolve="right" />
                     </node>
                   </node>
@@ -548,16 +559,16 @@
           <node concept="3clFbH" id="7t5VLKGALUN" role="3cqZAp" />
           <node concept="3vwNmj" id="7t5VLKGALUO" role="3cqZAp">
             <node concept="37vLTw" id="7t5VLKGALUP" role="3vwVQn">
-              <ref role="3cqZAo" node="7t5VLKGALUD" resolve="success" />
+              <ref role="3cqZAo" node="6yEjedm7RE2" resolve="success" />
             </node>
           </node>
           <node concept="3vwNmj" id="7t5VLKGALUQ" role="3cqZAp">
             <node concept="2OqwBi" id="7t5VLKGALUR" role="3vwVQn">
               <node concept="37vLTw" id="7t5VLKGALUS" role="2Oq$k0">
-                <ref role="3cqZAo" node="7t5VLKGALUz" resolve="var" />
+                <ref role="3cqZAo" node="6yEjedm7RDU" resolve="var" />
               </node>
               <node concept="liA8E" id="7t5VLKGALUT" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmC6RD" resolve="isBound" />
+                <ref role="37wK5l" to="zx3l:~MemLogical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -612,7 +623,7 @@
                   <ref role="3cqZAo" node="7t5VLKGALUW" resolve="expect" />
                 </node>
                 <node concept="37vLTw" id="5jPBdK_vXp" role="37wK5m">
-                  <ref role="3cqZAo" node="7t5VLKGALUz" resolve="var" />
+                  <ref role="3cqZAo" node="6yEjedm7RDU" resolve="var" />
                 </node>
               </node>
             </node>
@@ -735,44 +746,50 @@
             </node>
           </node>
           <node concept="3clFbH" id="7t5VLKGALVO" role="3cqZAp" />
-          <node concept="3cpWs8" id="7t5VLKGALVP" role="3cqZAp">
-            <node concept="3cpWsn" id="7t5VLKGALVQ" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7ovE" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7ovF" role="3cpWs9">
               <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="7t5VLKGALVR" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm7ovG" role="1tU5fm">
+                <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
+                <node concept="3uibUv" id="6yEjedm7ovH" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="7t5VLKGALVS" role="33vP2m">
-                <node concept="1pGfFk" id="7t5VLKGALVT" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="Xl_RD" id="7t5VLKGALVU" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm7ovI" role="33vP2m">
+                <node concept="1pGfFk" id="6yEjedm7ovJ" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+                  <node concept="Xl_RD" id="6yEjedm7ovK" role="37wK5m">
                     <property role="Xl_RC" value="var" />
                   </node>
+                  <node concept="3uibUv" id="6yEjedm7ovL" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="7t5VLKGALVV" role="3cqZAp">
-            <node concept="3cpWsn" id="7t5VLKGALVW" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7ovM" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7ovN" role="3cpWs9">
               <property role="TrG5h" value="success" />
-              <node concept="10P_77" id="7t5VLKGALVX" role="1tU5fm" />
-              <node concept="2YIFZM" id="7t5VLKGALVY" role="33vP2m">
-                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+              <node concept="10P_77" id="6yEjedm7ovO" role="1tU5fm" />
+              <node concept="2YIFZM" id="6yEjedm7ovP" role="33vP2m">
                 <ref role="37wK5l" to="4r4j:5H6hZahmloU" resolve="findLub" />
-                <node concept="37vLTw" id="7t5VLKGALVZ" role="37wK5m">
-                  <ref role="3cqZAo" node="7t5VLKGALVQ" resolve="var" />
+                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+                <node concept="37vLTw" id="6yEjedm7ovQ" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm7ovF" resolve="var" />
                 </node>
-                <node concept="2ShNRf" id="7t5VLKGALW0" role="37wK5m">
-                  <node concept="1pGfFk" id="7t5VLKGALW1" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="7t5VLKGALW2" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7ovR" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7ovS" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7ovT" role="37wK5m">
                       <ref role="3cqZAo" node="7t5VLKGALVi" resolve="left" />
                     </node>
                   </node>
                 </node>
-                <node concept="2ShNRf" id="7t5VLKGALW3" role="37wK5m">
-                  <node concept="1pGfFk" id="7t5VLKGALW4" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="7t5VLKGALW5" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7ovU" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7ovV" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7ovW" role="37wK5m">
                       <ref role="3cqZAo" node="7t5VLKGALVA" resolve="right" />
                     </node>
                   </node>
@@ -783,16 +800,16 @@
           <node concept="3clFbH" id="7t5VLKGALW6" role="3cqZAp" />
           <node concept="3vwNmj" id="7t5VLKGALW7" role="3cqZAp">
             <node concept="37vLTw" id="7t5VLKGALW8" role="3vwVQn">
-              <ref role="3cqZAo" node="7t5VLKGALVW" resolve="success" />
+              <ref role="3cqZAo" node="6yEjedm7ovN" resolve="success" />
             </node>
           </node>
           <node concept="3vwNmj" id="7t5VLKGALW9" role="3cqZAp">
             <node concept="2OqwBi" id="7t5VLKGALWa" role="3vwVQn">
               <node concept="37vLTw" id="7t5VLKGALWb" role="2Oq$k0">
-                <ref role="3cqZAo" node="7t5VLKGALVQ" resolve="var" />
+                <ref role="3cqZAo" node="6yEjedm7ovF" resolve="var" />
               </node>
               <node concept="liA8E" id="7t5VLKGALWc" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmC6RD" resolve="isBound" />
+                <ref role="37wK5l" to="zx3l:~MemLogical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -847,7 +864,7 @@
                   <ref role="3cqZAo" node="7t5VLKGALWf" resolve="expect" />
                 </node>
                 <node concept="37vLTw" id="5jPBdK_wcg" role="37wK5m">
-                  <ref role="3cqZAo" node="7t5VLKGALVQ" resolve="var" />
+                  <ref role="3cqZAo" node="6yEjedm7ovF" resolve="var" />
                 </node>
               </node>
             </node>
@@ -998,44 +1015,50 @@
             </node>
           </node>
           <node concept="3clFbH" id="7t5VLKGALXh" role="3cqZAp" />
-          <node concept="3cpWs8" id="7t5VLKGALXi" role="3cqZAp">
-            <node concept="3cpWsn" id="7t5VLKGALXj" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7saE" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7saF" role="3cpWs9">
               <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="7t5VLKGALXk" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm7saG" role="1tU5fm">
+                <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
+                <node concept="3uibUv" id="6yEjedm7saH" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="7t5VLKGALXl" role="33vP2m">
-                <node concept="1pGfFk" id="7t5VLKGALXm" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="Xl_RD" id="7t5VLKGALXn" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm7saI" role="33vP2m">
+                <node concept="1pGfFk" id="6yEjedm7saJ" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+                  <node concept="Xl_RD" id="6yEjedm7saK" role="37wK5m">
                     <property role="Xl_RC" value="var" />
                   </node>
+                  <node concept="3uibUv" id="6yEjedm7saL" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="7t5VLKGALXo" role="3cqZAp">
-            <node concept="3cpWsn" id="7t5VLKGALXp" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7saM" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7saN" role="3cpWs9">
               <property role="TrG5h" value="success" />
-              <node concept="10P_77" id="7t5VLKGALXq" role="1tU5fm" />
-              <node concept="2YIFZM" id="7t5VLKGALXr" role="33vP2m">
-                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+              <node concept="10P_77" id="6yEjedm7saO" role="1tU5fm" />
+              <node concept="2YIFZM" id="6yEjedm7saP" role="33vP2m">
                 <ref role="37wK5l" to="4r4j:5H6hZahmloU" resolve="findLub" />
-                <node concept="37vLTw" id="7t5VLKGALXs" role="37wK5m">
-                  <ref role="3cqZAo" node="7t5VLKGALXj" resolve="var" />
+                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+                <node concept="37vLTw" id="6yEjedm7saQ" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm7saF" resolve="var" />
                 </node>
-                <node concept="2ShNRf" id="7t5VLKGALXt" role="37wK5m">
-                  <node concept="1pGfFk" id="7t5VLKGALXu" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="7t5VLKGALXv" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7saR" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7saS" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7saT" role="37wK5m">
                       <ref role="3cqZAo" node="7t5VLKGALW_" resolve="left" />
                     </node>
                   </node>
                 </node>
-                <node concept="2ShNRf" id="7t5VLKGALXw" role="37wK5m">
-                  <node concept="1pGfFk" id="7t5VLKGALXx" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="7t5VLKGALXy" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7saU" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7saV" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7saW" role="37wK5m">
                       <ref role="3cqZAo" node="7t5VLKGALWT" resolve="right" />
                     </node>
                   </node>
@@ -1046,16 +1069,16 @@
           <node concept="3clFbH" id="7t5VLKGALXz" role="3cqZAp" />
           <node concept="3vwNmj" id="7t5VLKGALX$" role="3cqZAp">
             <node concept="37vLTw" id="7t5VLKGALX_" role="3vwVQn">
-              <ref role="3cqZAo" node="7t5VLKGALXp" resolve="success" />
+              <ref role="3cqZAo" node="6yEjedm7saN" resolve="success" />
             </node>
           </node>
           <node concept="3vwNmj" id="7t5VLKGALXA" role="3cqZAp">
             <node concept="2OqwBi" id="7t5VLKGALXB" role="3vwVQn">
               <node concept="37vLTw" id="7t5VLKGALXC" role="2Oq$k0">
-                <ref role="3cqZAo" node="7t5VLKGALXj" resolve="var" />
+                <ref role="3cqZAo" node="6yEjedm7saF" resolve="var" />
               </node>
               <node concept="liA8E" id="7t5VLKGALXD" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmC6RD" resolve="isBound" />
+                <ref role="37wK5l" to="zx3l:~MemLogical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -1110,7 +1133,7 @@
                   <ref role="3cqZAo" node="7t5VLKGALXG" resolve="expect" />
                 </node>
                 <node concept="37vLTw" id="5jPBdK_w_m" role="37wK5m">
-                  <ref role="3cqZAo" node="7t5VLKGALXj" resolve="var" />
+                  <ref role="3cqZAo" node="6yEjedm7saF" resolve="var" />
                 </node>
               </node>
             </node>
@@ -1402,44 +1425,50 @@
             </node>
           </node>
           <node concept="3clFbH" id="7t5VLKGALZl" role="3cqZAp" />
-          <node concept="3cpWs8" id="7t5VLKGALZm" role="3cqZAp">
-            <node concept="3cpWsn" id="7t5VLKGALZn" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7vK3" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7vK4" role="3cpWs9">
               <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="7t5VLKGALZo" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm7vK5" role="1tU5fm">
+                <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
+                <node concept="3uibUv" id="6yEjedm7vK6" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="7t5VLKGALZp" role="33vP2m">
-                <node concept="1pGfFk" id="7t5VLKGALZq" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="Xl_RD" id="7t5VLKGALZr" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm7vK7" role="33vP2m">
+                <node concept="1pGfFk" id="6yEjedm7vK8" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+                  <node concept="Xl_RD" id="6yEjedm7vK9" role="37wK5m">
                     <property role="Xl_RC" value="var" />
                   </node>
+                  <node concept="3uibUv" id="6yEjedm7vKa" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="7t5VLKGALZs" role="3cqZAp">
-            <node concept="3cpWsn" id="7t5VLKGALZt" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7vKb" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7vKc" role="3cpWs9">
               <property role="TrG5h" value="success" />
-              <node concept="10P_77" id="7t5VLKGALZu" role="1tU5fm" />
-              <node concept="2YIFZM" id="7t5VLKGALZv" role="33vP2m">
-                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+              <node concept="10P_77" id="6yEjedm7vKd" role="1tU5fm" />
+              <node concept="2YIFZM" id="6yEjedm7vKe" role="33vP2m">
                 <ref role="37wK5l" to="4r4j:5H6hZahmloU" resolve="findLub" />
-                <node concept="37vLTw" id="7t5VLKGALZw" role="37wK5m">
-                  <ref role="3cqZAo" node="7t5VLKGALZn" resolve="var" />
+                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+                <node concept="37vLTw" id="6yEjedm7vKf" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm7vK4" resolve="var" />
                 </node>
-                <node concept="2ShNRf" id="7t5VLKGALZx" role="37wK5m">
-                  <node concept="1pGfFk" id="7t5VLKGALZy" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="7t5VLKGALZz" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7vKg" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7vKh" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7vKi" role="37wK5m">
                       <ref role="3cqZAo" node="7t5VLKGALY2" resolve="left" />
                     </node>
                   </node>
                 </node>
-                <node concept="2ShNRf" id="7t5VLKGALZ$" role="37wK5m">
-                  <node concept="1pGfFk" id="7t5VLKGALZ_" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="7t5VLKGALZA" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7vKj" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7vKk" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7vKl" role="37wK5m">
                       <ref role="3cqZAo" node="7t5VLKGALYz" resolve="right" />
                     </node>
                   </node>
@@ -1447,19 +1476,19 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="7t5VLKGALZB" role="3cqZAp" />
+          <node concept="3clFbH" id="6yEjedm7vHC" role="3cqZAp" />
           <node concept="3vwNmj" id="7t5VLKGALZC" role="3cqZAp">
             <node concept="37vLTw" id="7t5VLKGALZD" role="3vwVQn">
-              <ref role="3cqZAo" node="7t5VLKGALZt" resolve="success" />
+              <ref role="3cqZAo" node="6yEjedm7vKc" resolve="success" />
             </node>
           </node>
           <node concept="3vwNmj" id="7t5VLKGALZE" role="3cqZAp">
             <node concept="2OqwBi" id="7t5VLKGALZF" role="3vwVQn">
               <node concept="37vLTw" id="7t5VLKGALZG" role="2Oq$k0">
-                <ref role="3cqZAo" node="7t5VLKGALZn" resolve="var" />
+                <ref role="3cqZAo" node="6yEjedm7vK4" resolve="var" />
               </node>
               <node concept="liA8E" id="7t5VLKGALZH" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmC6RD" resolve="isBound" />
+                <ref role="37wK5l" to="zx3l:~MemLogical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -1528,7 +1557,7 @@
                   <ref role="3cqZAo" node="7t5VLKGALZK" resolve="expect" />
                 </node>
                 <node concept="37vLTw" id="5jPBdK_wPy" role="37wK5m">
-                  <ref role="3cqZAo" node="7t5VLKGALZn" resolve="var" />
+                  <ref role="3cqZAo" node="6yEjedm7vK4" resolve="var" />
                 </node>
               </node>
             </node>
@@ -1899,44 +1928,50 @@
             </node>
           </node>
           <node concept="3clFbH" id="3hfdu5cNgsb" role="3cqZAp" />
-          <node concept="3cpWs8" id="3hfdu5cNgsc" role="3cqZAp">
-            <node concept="3cpWsn" id="3hfdu5cNgsd" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7zh9" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7zha" role="3cpWs9">
               <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="3hfdu5cNgse" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm7zhb" role="1tU5fm">
+                <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
+                <node concept="3uibUv" id="6yEjedm7zhc" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="3hfdu5cNgsf" role="33vP2m">
-                <node concept="1pGfFk" id="3hfdu5cNgsg" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="Xl_RD" id="3hfdu5cNgsh" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm7zhd" role="33vP2m">
+                <node concept="1pGfFk" id="6yEjedm7zhe" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+                  <node concept="Xl_RD" id="6yEjedm7zhf" role="37wK5m">
                     <property role="Xl_RC" value="var" />
                   </node>
+                  <node concept="3uibUv" id="6yEjedm7zhg" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="3hfdu5cNgsi" role="3cqZAp">
-            <node concept="3cpWsn" id="3hfdu5cNgsj" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7zhh" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7zhi" role="3cpWs9">
               <property role="TrG5h" value="success" />
-              <node concept="10P_77" id="3hfdu5cNgsk" role="1tU5fm" />
-              <node concept="2YIFZM" id="3hfdu5cNgsl" role="33vP2m">
-                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+              <node concept="10P_77" id="6yEjedm7zhj" role="1tU5fm" />
+              <node concept="2YIFZM" id="6yEjedm7zhk" role="33vP2m">
                 <ref role="37wK5l" to="4r4j:5H6hZahmloU" resolve="findLub" />
-                <node concept="37vLTw" id="3hfdu5cNgsm" role="37wK5m">
-                  <ref role="3cqZAo" node="3hfdu5cNgsd" resolve="var" />
+                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+                <node concept="37vLTw" id="6yEjedm7zhl" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm7zha" resolve="var" />
                 </node>
-                <node concept="2ShNRf" id="3hfdu5cNgsn" role="37wK5m">
-                  <node concept="1pGfFk" id="3hfdu5cNgso" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3hfdu5cNgsp" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7zhm" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7zhn" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7zho" role="37wK5m">
                       <ref role="3cqZAo" node="3hfdu5cNgqA" resolve="left" />
                     </node>
                   </node>
                 </node>
-                <node concept="2ShNRf" id="3hfdu5cNgsq" role="37wK5m">
-                  <node concept="1pGfFk" id="3hfdu5cNgsr" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3hfdu5cNgss" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7zhp" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7zhq" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7zhr" role="37wK5m">
                       <ref role="3cqZAo" node="3hfdu5cNgre" resolve="right" />
                     </node>
                   </node>
@@ -1947,16 +1982,16 @@
           <node concept="3clFbH" id="3hfdu5cNgst" role="3cqZAp" />
           <node concept="3vwNmj" id="3hfdu5cNgsu" role="3cqZAp">
             <node concept="37vLTw" id="3hfdu5cNgsv" role="3vwVQn">
-              <ref role="3cqZAo" node="3hfdu5cNgsj" resolve="success" />
+              <ref role="3cqZAo" node="6yEjedm7zhi" resolve="success" />
             </node>
           </node>
           <node concept="3vwNmj" id="3hfdu5cNgsw" role="3cqZAp">
             <node concept="2OqwBi" id="3hfdu5cNgsx" role="3vwVQn">
               <node concept="37vLTw" id="3hfdu5cNgsy" role="2Oq$k0">
-                <ref role="3cqZAo" node="3hfdu5cNgsd" resolve="var" />
+                <ref role="3cqZAo" node="6yEjedm7zha" resolve="var" />
               </node>
               <node concept="liA8E" id="3hfdu5cNgsz" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmC6RD" resolve="isBound" />
+                <ref role="37wK5l" to="zx3l:~MemLogical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -2005,7 +2040,7 @@
                   <ref role="3cqZAo" node="3hfdu5cNgsA" resolve="expect" />
                 </node>
                 <node concept="37vLTw" id="5jPBdK_x7H" role="37wK5m">
-                  <ref role="3cqZAo" node="3hfdu5cNgsd" resolve="var" />
+                  <ref role="3cqZAo" node="6yEjedm7zha" resolve="var" />
                 </node>
               </node>
             </node>
@@ -2433,44 +2468,50 @@
             </node>
           </node>
           <node concept="3clFbH" id="3KV3FXk2oK1" role="3cqZAp" />
-          <node concept="3cpWs8" id="3KV3FXk2oK2" role="3cqZAp">
-            <node concept="3cpWsn" id="3KV3FXk2oK3" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7AXW" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7AXX" role="3cpWs9">
               <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="3KV3FXk2oK4" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm7AXY" role="1tU5fm">
+                <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
+                <node concept="3uibUv" id="6yEjedm7AXZ" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="3KV3FXk2oK5" role="33vP2m">
-                <node concept="1pGfFk" id="3KV3FXk2oK6" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="Xl_RD" id="3KV3FXk2oK7" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm7AY0" role="33vP2m">
+                <node concept="1pGfFk" id="6yEjedm7AY1" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+                  <node concept="Xl_RD" id="6yEjedm7AY2" role="37wK5m">
                     <property role="Xl_RC" value="var" />
                   </node>
+                  <node concept="3uibUv" id="6yEjedm7AY3" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="3KV3FXk2oK8" role="3cqZAp">
-            <node concept="3cpWsn" id="3KV3FXk2oK9" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7AY4" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7AY5" role="3cpWs9">
               <property role="TrG5h" value="success" />
-              <node concept="10P_77" id="3KV3FXk2oKa" role="1tU5fm" />
-              <node concept="2YIFZM" id="3KV3FXk2oKb" role="33vP2m">
-                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+              <node concept="10P_77" id="6yEjedm7AY6" role="1tU5fm" />
+              <node concept="2YIFZM" id="6yEjedm7AY7" role="33vP2m">
                 <ref role="37wK5l" to="4r4j:5H6hZahmloU" resolve="findLub" />
-                <node concept="37vLTw" id="3KV3FXk2oKc" role="37wK5m">
-                  <ref role="3cqZAo" node="3KV3FXk2oK3" resolve="var" />
+                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+                <node concept="37vLTw" id="6yEjedm7AY8" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm7AXX" resolve="var" />
                 </node>
-                <node concept="2ShNRf" id="3KV3FXk2oKd" role="37wK5m">
-                  <node concept="1pGfFk" id="3KV3FXk2oKe" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3KV3FXk2oKf" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7AY9" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7AYa" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7AYb" role="37wK5m">
                       <ref role="3cqZAo" node="3KV3FXk2oHN" resolve="left" />
                     </node>
                   </node>
                 </node>
-                <node concept="2ShNRf" id="3KV3FXk2oKg" role="37wK5m">
-                  <node concept="1pGfFk" id="3KV3FXk2oKh" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3KV3FXk2oKi" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7AYc" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7AYd" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7AYe" role="37wK5m">
                       <ref role="3cqZAo" node="3KV3FXk2oJ1" resolve="right" />
                     </node>
                   </node>
@@ -2481,16 +2522,16 @@
           <node concept="3clFbH" id="3KV3FXk2oKj" role="3cqZAp" />
           <node concept="3vwNmj" id="3KV3FXk2oKk" role="3cqZAp">
             <node concept="37vLTw" id="3KV3FXk2oKl" role="3vwVQn">
-              <ref role="3cqZAo" node="3KV3FXk2oK9" resolve="success" />
+              <ref role="3cqZAo" node="6yEjedm7AY5" resolve="success" />
             </node>
           </node>
           <node concept="3vwNmj" id="3KV3FXk2oKm" role="3cqZAp">
             <node concept="2OqwBi" id="3KV3FXk2oKn" role="3vwVQn">
               <node concept="37vLTw" id="3KV3FXk2oKo" role="2Oq$k0">
-                <ref role="3cqZAo" node="3KV3FXk2oK3" resolve="var" />
+                <ref role="3cqZAo" node="6yEjedm7AXX" resolve="var" />
               </node>
               <node concept="liA8E" id="3KV3FXk2oKp" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmC6RD" resolve="isBound" />
+                <ref role="37wK5l" to="zx3l:~MemLogical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -2539,7 +2580,7 @@
                   <ref role="3cqZAo" node="3KV3FXk2oKs" resolve="expect" />
                 </node>
                 <node concept="37vLTw" id="5jPBdK_xqX" role="37wK5m">
-                  <ref role="3cqZAo" node="3KV3FXk2oK3" resolve="var" />
+                  <ref role="3cqZAo" node="6yEjedm7AXX" resolve="var" />
                 </node>
               </node>
             </node>
@@ -2888,44 +2929,50 @@
             </node>
           </node>
           <node concept="3clFbH" id="3hfdu5cN_Mq" role="3cqZAp" />
-          <node concept="3cpWs8" id="3hfdu5cN_Mr" role="3cqZAp">
-            <node concept="3cpWsn" id="3hfdu5cN_Ms" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7Eju" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7Ejv" role="3cpWs9">
               <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="3hfdu5cN_Mt" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm7Ejw" role="1tU5fm">
+                <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
+                <node concept="3uibUv" id="6yEjedm7Ejx" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="3hfdu5cN_Mu" role="33vP2m">
-                <node concept="1pGfFk" id="3hfdu5cN_Mv" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="Xl_RD" id="3hfdu5cN_Mw" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm7Ejy" role="33vP2m">
+                <node concept="1pGfFk" id="6yEjedm7Ejz" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+                  <node concept="Xl_RD" id="6yEjedm7Ej$" role="37wK5m">
                     <property role="Xl_RC" value="var" />
                   </node>
+                  <node concept="3uibUv" id="6yEjedm7Ej_" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="3hfdu5cN_Mx" role="3cqZAp">
-            <node concept="3cpWsn" id="3hfdu5cN_My" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7EjA" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7EjB" role="3cpWs9">
               <property role="TrG5h" value="success" />
-              <node concept="10P_77" id="3hfdu5cN_Mz" role="1tU5fm" />
-              <node concept="2YIFZM" id="3hfdu5cN_M$" role="33vP2m">
-                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+              <node concept="10P_77" id="6yEjedm7EjC" role="1tU5fm" />
+              <node concept="2YIFZM" id="6yEjedm7EjD" role="33vP2m">
                 <ref role="37wK5l" to="4r4j:5H6hZahmloU" resolve="findLub" />
-                <node concept="37vLTw" id="3hfdu5cN_M_" role="37wK5m">
-                  <ref role="3cqZAo" node="3hfdu5cN_Ms" resolve="var" />
+                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+                <node concept="37vLTw" id="6yEjedm7EjE" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm7Ejv" resolve="var" />
                 </node>
-                <node concept="2ShNRf" id="3hfdu5cN_MA" role="37wK5m">
-                  <node concept="1pGfFk" id="3hfdu5cN_MB" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3hfdu5cN_MC" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7EjF" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7EjG" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7EjH" role="37wK5m">
                       <ref role="3cqZAo" node="3hfdu5cN_JW" resolve="left" />
                     </node>
                   </node>
                 </node>
-                <node concept="2ShNRf" id="3hfdu5cN_MD" role="37wK5m">
-                  <node concept="1pGfFk" id="3hfdu5cN_ME" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3hfdu5cN_MF" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7EjI" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7EjJ" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7EjK" role="37wK5m">
                       <ref role="3cqZAo" node="3hfdu5cN_KU" resolve="right" />
                     </node>
                   </node>
@@ -2936,16 +2983,16 @@
           <node concept="3clFbH" id="3hfdu5cN_MG" role="3cqZAp" />
           <node concept="3vwNmj" id="3hfdu5cN_MH" role="3cqZAp">
             <node concept="37vLTw" id="3hfdu5cN_MI" role="3vwVQn">
-              <ref role="3cqZAo" node="3hfdu5cN_My" resolve="success" />
+              <ref role="3cqZAo" node="6yEjedm7EjB" resolve="success" />
             </node>
           </node>
           <node concept="3vwNmj" id="3hfdu5cN_MJ" role="3cqZAp">
             <node concept="2OqwBi" id="3hfdu5cN_MK" role="3vwVQn">
               <node concept="37vLTw" id="3hfdu5cN_ML" role="2Oq$k0">
-                <ref role="3cqZAo" node="3hfdu5cN_Ms" resolve="var" />
+                <ref role="3cqZAo" node="6yEjedm7Ejv" resolve="var" />
               </node>
               <node concept="liA8E" id="3hfdu5cN_MM" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmC6RD" resolve="isBound" />
+                <ref role="37wK5l" to="zx3l:~MemLogical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -2994,7 +3041,7 @@
                   <ref role="3cqZAo" node="3hfdu5cN_MP" resolve="expect" />
                 </node>
                 <node concept="37vLTw" id="5jPBdK_xIq" role="37wK5m">
-                  <ref role="3cqZAo" node="3hfdu5cN_Ms" resolve="var" />
+                  <ref role="3cqZAo" node="6yEjedm7Ejv" resolve="var" />
                 </node>
               </node>
             </node>
@@ -3347,44 +3394,50 @@
             </node>
           </node>
           <node concept="3clFbH" id="3KV3FXjXcr1" role="3cqZAp" />
-          <node concept="3cpWs8" id="3KV3FXjXcr2" role="3cqZAp">
-            <node concept="3cpWsn" id="3KV3FXjXcr3" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7HxM" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7HxN" role="3cpWs9">
               <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="3KV3FXjXcr4" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm7HxO" role="1tU5fm">
+                <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
+                <node concept="3uibUv" id="6yEjedm7HxP" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="3KV3FXjXcr5" role="33vP2m">
-                <node concept="1pGfFk" id="3KV3FXjXcr6" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="Xl_RD" id="3KV3FXjXcr7" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm7HxQ" role="33vP2m">
+                <node concept="1pGfFk" id="6yEjedm7HxR" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+                  <node concept="Xl_RD" id="6yEjedm7HxS" role="37wK5m">
                     <property role="Xl_RC" value="var" />
                   </node>
+                  <node concept="3uibUv" id="6yEjedm7HxT" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="3KV3FXjXcr8" role="3cqZAp">
-            <node concept="3cpWsn" id="3KV3FXjXcr9" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7HxU" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7HxV" role="3cpWs9">
               <property role="TrG5h" value="success" />
-              <node concept="10P_77" id="3KV3FXjXcra" role="1tU5fm" />
-              <node concept="2YIFZM" id="3KV3FXjXcrb" role="33vP2m">
-                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+              <node concept="10P_77" id="6yEjedm7HxW" role="1tU5fm" />
+              <node concept="2YIFZM" id="6yEjedm7HxX" role="33vP2m">
                 <ref role="37wK5l" to="4r4j:5H6hZahmloU" resolve="findLub" />
-                <node concept="37vLTw" id="3KV3FXjXcrc" role="37wK5m">
-                  <ref role="3cqZAo" node="3KV3FXjXcr3" resolve="var" />
+                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+                <node concept="37vLTw" id="6yEjedm7HxY" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm7HxN" resolve="var" />
                 </node>
-                <node concept="2ShNRf" id="3KV3FXjXcrd" role="37wK5m">
-                  <node concept="1pGfFk" id="3KV3FXjXcre" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3KV3FXjXcrf" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7HxZ" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7Hy0" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7Hy1" role="37wK5m">
                       <ref role="3cqZAo" node="3KV3FXjXcpc" resolve="left" />
                     </node>
                   </node>
                 </node>
-                <node concept="2ShNRf" id="3KV3FXjXcrg" role="37wK5m">
-                  <node concept="1pGfFk" id="3KV3FXjXcrh" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3KV3FXjXcri" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7Hy2" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7Hy3" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7Hy4" role="37wK5m">
                       <ref role="3cqZAo" node="3KV3FXjXcq7" resolve="right" />
                     </node>
                   </node>
@@ -3395,16 +3448,16 @@
           <node concept="3clFbH" id="3KV3FXjXcrj" role="3cqZAp" />
           <node concept="3vwNmj" id="3KV3FXjXcrk" role="3cqZAp">
             <node concept="37vLTw" id="3KV3FXjXcrl" role="3vwVQn">
-              <ref role="3cqZAo" node="3KV3FXjXcr9" resolve="success" />
+              <ref role="3cqZAo" node="6yEjedm7HxV" resolve="success" />
             </node>
           </node>
           <node concept="3vwNmj" id="3KV3FXjXcrm" role="3cqZAp">
             <node concept="2OqwBi" id="3KV3FXjXcrn" role="3vwVQn">
               <node concept="37vLTw" id="3KV3FXjXcro" role="2Oq$k0">
-                <ref role="3cqZAo" node="3KV3FXjXcr3" resolve="var" />
+                <ref role="3cqZAo" node="6yEjedm7HxN" resolve="var" />
               </node>
               <node concept="liA8E" id="3KV3FXjXcrp" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmC6RD" resolve="isBound" />
+                <ref role="37wK5l" to="zx3l:~MemLogical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -3473,7 +3526,7 @@
                   <ref role="3cqZAo" node="3KV3FXjXcrs" resolve="expect" />
                 </node>
                 <node concept="37vLTw" id="5jPBdK_y14" role="37wK5m">
-                  <ref role="3cqZAo" node="3KV3FXjXcr3" resolve="var" />
+                  <ref role="3cqZAo" node="6yEjedm7HxN" resolve="var" />
                 </node>
               </node>
             </node>
@@ -3702,44 +3755,50 @@
             </node>
           </node>
           <node concept="3clFbH" id="3KV3FXk18P3" role="3cqZAp" />
-          <node concept="3cpWs8" id="3KV3FXk18P4" role="3cqZAp">
-            <node concept="3cpWsn" id="3KV3FXk18P5" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7KDB" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7KDC" role="3cpWs9">
               <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="3KV3FXk18P6" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm7KDD" role="1tU5fm">
+                <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
+                <node concept="3uibUv" id="6yEjedm7KDE" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="3KV3FXk18P7" role="33vP2m">
-                <node concept="1pGfFk" id="3KV3FXk18P8" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="Xl_RD" id="3KV3FXk18P9" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm7KDF" role="33vP2m">
+                <node concept="1pGfFk" id="6yEjedm7KDG" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+                  <node concept="Xl_RD" id="6yEjedm7KDH" role="37wK5m">
                     <property role="Xl_RC" value="var" />
                   </node>
+                  <node concept="3uibUv" id="6yEjedm7KDI" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="3KV3FXk18Pa" role="3cqZAp">
-            <node concept="3cpWsn" id="3KV3FXk18Pb" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7KDJ" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7KDK" role="3cpWs9">
               <property role="TrG5h" value="success" />
-              <node concept="10P_77" id="3KV3FXk18Pc" role="1tU5fm" />
-              <node concept="2YIFZM" id="3KV3FXk18Pd" role="33vP2m">
-                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+              <node concept="10P_77" id="6yEjedm7KDL" role="1tU5fm" />
+              <node concept="2YIFZM" id="6yEjedm7KDM" role="33vP2m">
                 <ref role="37wK5l" to="4r4j:5H6hZahmloU" resolve="findLub" />
-                <node concept="37vLTw" id="3KV3FXk18Pe" role="37wK5m">
-                  <ref role="3cqZAo" node="3KV3FXk18P5" resolve="var" />
+                <ref role="1Pybhc" to="4r4j:5H6hZahmlon" resolve="LubSolver" />
+                <node concept="37vLTw" id="6yEjedm7KDN" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm7KDC" resolve="var" />
                 </node>
-                <node concept="2ShNRf" id="3KV3FXk18Pf" role="37wK5m">
-                  <node concept="1pGfFk" id="3KV3FXk18Pg" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3KV3FXk18Ph" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7KDO" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7KDP" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7KDQ" role="37wK5m">
                       <ref role="3cqZAo" node="3KV3FXk18Nd" resolve="left" />
                     </node>
                   </node>
                 </node>
-                <node concept="2ShNRf" id="3KV3FXk18Pi" role="37wK5m">
-                  <node concept="1pGfFk" id="3KV3FXk18Pj" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3KV3FXk18Pk" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7KDR" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7KDS" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7KDT" role="37wK5m">
                       <ref role="3cqZAo" node="3KV3FXk18O5" resolve="right" />
                     </node>
                   </node>
@@ -3750,16 +3809,16 @@
           <node concept="3clFbH" id="3KV3FXk18Pl" role="3cqZAp" />
           <node concept="3vwNmj" id="3KV3FXk18Pm" role="3cqZAp">
             <node concept="37vLTw" id="3KV3FXk18Pn" role="3vwVQn">
-              <ref role="3cqZAo" node="3KV3FXk18Pb" resolve="success" />
+              <ref role="3cqZAo" node="6yEjedm7KDK" resolve="success" />
             </node>
           </node>
           <node concept="3vwNmj" id="3KV3FXk18Po" role="3cqZAp">
             <node concept="2OqwBi" id="3KV3FXk18Pp" role="3vwVQn">
               <node concept="37vLTw" id="3KV3FXk18Pq" role="2Oq$k0">
-                <ref role="3cqZAo" node="3KV3FXk18P5" resolve="var" />
+                <ref role="3cqZAo" node="6yEjedm7KDC" resolve="var" />
               </node>
               <node concept="liA8E" id="3KV3FXk18Pr" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmC6RD" resolve="isBound" />
+                <ref role="37wK5l" to="zx3l:~MemLogical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -3814,7 +3873,7 @@
                   <ref role="3cqZAo" node="3KV3FXk18Pu" resolve="expect" />
                 </node>
                 <node concept="37vLTw" id="5jPBdK_yjb" role="37wK5m">
-                  <ref role="3cqZAo" node="3KV3FXk18P5" resolve="var" />
+                  <ref role="3cqZAo" node="6yEjedm7KDC" resolve="var" />
                 </node>
               </node>
             </node>
@@ -4072,18 +4131,24 @@
             </node>
           </node>
           <node concept="3clFbH" id="3KV3FXk2bpW" role="3cqZAp" />
-          <node concept="3cpWs8" id="3KV3FXk2bpX" role="3cqZAp">
-            <node concept="3cpWsn" id="3KV3FXk2bpY" role="3cpWs9">
+          <node concept="3cpWs8" id="6yEjedm7VYv" role="3cqZAp">
+            <node concept="3cpWsn" id="6yEjedm7VYw" role="3cpWs9">
               <property role="TrG5h" value="var" />
-              <node concept="3uibUv" id="3KV3FXk2bpZ" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+              <node concept="3uibUv" id="6yEjedm7VYx" role="1tU5fm">
+                <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
+                <node concept="3uibUv" id="6yEjedm7VYy" role="11_B2D">
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                </node>
               </node>
-              <node concept="2ShNRf" id="3KV3FXk2bq0" role="33vP2m">
-                <node concept="1pGfFk" id="3KV3FXk2bq1" role="2ShVmc">
-                  <ref role="37wK5l" to="oy3s:6SkxsM$96Z2" resolve="AtomLogical" />
-                  <node concept="Xl_RD" id="3KV3FXk2bq2" role="37wK5m">
+              <node concept="2ShNRf" id="6yEjedm7VYz" role="33vP2m">
+                <node concept="1pGfFk" id="6yEjedm7VY$" role="2ShVmc">
+                  <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.String)" resolve="MemLogical" />
+                  <node concept="Xl_RD" id="6yEjedm7VY_" role="37wK5m">
                     <property role="Xl_RC" value="var" />
                   </node>
+                  <node concept="3uibUv" id="6yEjedm7VYA" role="1pMfVU">
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -4095,21 +4160,21 @@
               <node concept="2YIFZM" id="3KV3FXk2bPE" role="33vP2m">
                 <ref role="37wK5l" to="4r4j:3KV3FXk1fGe" resolve="findSubtypingPath" />
                 <ref role="1Pybhc" to="4r4j:3KV3FXk1fjd" resolve="SubtypePathSolver" />
-                <node concept="37vLTw" id="3KV3FXk2bPF" role="37wK5m">
-                  <ref role="3cqZAo" node="3KV3FXk2bpY" resolve="var" />
+                <node concept="37vLTw" id="6yEjedm7XtE" role="37wK5m">
+                  <ref role="3cqZAo" node="6yEjedm7VYw" resolve="var" />
                 </node>
-                <node concept="2ShNRf" id="3KV3FXk2bPG" role="37wK5m">
-                  <node concept="1pGfFk" id="3KV3FXk2bPH" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3KV3FXk2bPI" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7XtF" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7XtG" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7Xvm" role="37wK5m">
                       <ref role="3cqZAo" node="3KV3FXk2boN" resolve="fullPaths" />
                     </node>
                   </node>
                 </node>
-                <node concept="2ShNRf" id="3KV3FXk2bPJ" role="37wK5m">
-                  <node concept="1pGfFk" id="3KV3FXk2bPK" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:6SkxsM$2Uu7" resolve="AtomLogical" />
-                    <node concept="37vLTw" id="3KV3FXk2bPL" role="37wK5m">
+                <node concept="2ShNRf" id="6yEjedm7XtI" role="37wK5m">
+                  <node concept="1pGfFk" id="6yEjedm7XtJ" role="2ShVmc">
+                    <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
+                    <node concept="37vLTw" id="6yEjedm7XAR" role="37wK5m">
                       <ref role="3cqZAo" node="3KV3FXk2bpF" resolve="startFrom" />
                     </node>
                   </node>
@@ -4126,10 +4191,10 @@
           <node concept="3vwNmj" id="3KV3FXk2bqh" role="3cqZAp">
             <node concept="2OqwBi" id="3KV3FXk2bqi" role="3vwVQn">
               <node concept="37vLTw" id="3KV3FXk2bqj" role="2Oq$k0">
-                <ref role="3cqZAo" node="3KV3FXk2bpY" resolve="var" />
+                <ref role="3cqZAo" node="6yEjedm7VYw" resolve="var" />
               </node>
               <node concept="liA8E" id="3KV3FXk2bqk" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmC6RD" resolve="isBound" />
+                <ref role="37wK5l" to="zx3l:~MemLogical.isBound():boolean" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -4220,7 +4285,7 @@
                   <ref role="3cqZAo" node="3KV3FXk2bqn" resolve="expect" />
                 </node>
                 <node concept="37vLTw" id="5jPBdK_R$Z" role="37wK5m">
-                  <ref role="3cqZAo" node="3KV3FXk2bpY" resolve="var" />
+                  <ref role="3cqZAo" node="6yEjedm7VYw" resolve="var" />
                 </node>
               </node>
             </node>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
index 494c05e7..973b0e36 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
@@ -11,7 +11,6 @@
     <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
-    <dependency reexport="false">760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
@@ -28,7 +27,6 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:894463aa-8754-49c0-bf4b-6a32af66b376:jetbrains.mps.jchr" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
@@ -43,7 +41,6 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
@@ -52,7 +49,6 @@
     <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
index 22ef8aa8..9729db98 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
@@ -12,17 +12,12 @@
   </languages>
   <imports>
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
-    <import index="95zw" ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.template)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
index d6f53a52..b53f22bb 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
@@ -8,7 +8,6 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
-    <dependency reexport="false">121937e8-9efc-4551-81fc-50dc0319618e(jetbrains.mps.lang.typesystem2.samplechecker)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
@@ -46,17 +45,14 @@
     <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.lang.typesystem2.sampleLang)" version="0" />
-    <module reference="121937e8-9efc-4551-81fc-50dc0319618e(jetbrains.mps.lang.typesystem2.samplechecker)" version="0" />
     <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="fec0c515-766a-48ae-a50a-45de7ad21bd9(jetbrains.mps.lang.typesystem2.samplechecker.test)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd
deleted file mode 100644
index de20b3f3..00000000
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.lang.typesystem2.samplechecker" uuid="121937e8-9efc-4551-81fc-50dc0319618e" moduleVersion="0" compileInMPS="true">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <sourcePath />
-  <dependencies>
-    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
-    <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
-    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
-    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
-    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
-    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
-    <module reference="121937e8-9efc-4551-81fc-50dc0319618e(jetbrains.mps.lang.typesystem2.samplechecker)" version="0" />
-    <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
-    <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
-    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
-    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
-  </dependencyVersions>
-</solution>
-
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
index ce537527..e62f16e8 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
@@ -10,12 +10,10 @@
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
-    <dependency reexport="true">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
     <dependency reexport="false">df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)</dependency>
     <dependency reexport="true">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">121937e8-9efc-4551-81fc-50dc0319618e(jetbrains.mps.lang.typesystem2.samplechecker)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -24,8 +22,6 @@
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
     <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-    <dependency reexport="false">760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)</dependency>
-    <dependency reexport="false">c246f30f-e11c-4dc1-80c6-154d0aebc8b3(jetbrains.mps.lang.typesystem2.samplechecker.runner)</dependency>
     <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
     <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
   </dependencies>
@@ -41,36 +37,15 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-    <language slang="l:894463aa-8754-49c0-bf4b-6a32af66b376:jetbrains.mps.jchr" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="2" />
-    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
-    <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
-    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
-    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="1" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="0" />
-    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
-    <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -84,21 +59,16 @@
     <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)" version="0" />
-    <module reference="894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
-    <module reference="121937e8-9efc-4551-81fc-50dc0319618e(jetbrains.mps.lang.typesystem2.samplechecker)" version="0" />
     <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
-    <module reference="c246f30f-e11c-4dc1-80c6-154d0aebc8b3(jetbrains.mps.lang.typesystem2.samplechecker.runner)" version="0" />
     <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
     <module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index fc2b306b..a89ec82f 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -34,9 +34,7 @@
     <import index="i9so" ref="r:9e5578e0-37f0-4c9b-a301-771bcb453678(jetbrains.mps.make.script)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="j8aq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.module(MPS.Core/)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
-    <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
     <import index="ekwn" ref="r:9832fb5f-2578-4b58-8014-a5de79da988e(jetbrains.mps.ide.editor.actions)" />
@@ -47,7 +45,6 @@
     <import index="zavc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.messageTargets(MPS.Core/)" />
     <import index="k3nr" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.ide.editor(MPS.Editor/)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.template)" />
-    <import index="iawt" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime.debug(jetbrains.mps.jchr.runtime/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="57ty" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.messages(MPS.Platform/)" />
     <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
@@ -55,15 +52,10 @@
     <import index="z1c4" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="95zw" ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)" />
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
-    <import index="stgg" ref="r:fcdb37a4-4602-4a05-8d91-e439430734b8(jetbrains.mps.logic.jchr.program)" />
     <import index="7ub6" ref="r:b533b427-da69-49d8-9c93-4ea32433b66e(jetbrains.mps.lang.typesystem2.generation)" />
-    <import index="poio" ref="r:023e4571-f779-4131-9ae1-88b3dd330e93(jetbrains.mps.lang.typesystem2.samplechecker.util)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
-    <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="dlzn" ref="r:37f5cc5e-5928-4049-bb1c-5c7a5459b1fe(jetbrains.mps.typechecking.handler.producer)" />
     <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="rgfa" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.tree(JDK/)" />
     <import index="u30n" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.treeStructure.treetable(MPS.IDEA/)" />
@@ -73,32 +65,23 @@
     <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.builtin.program)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
     <import index="c8ee" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.table(JDK/)" />
-    <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
-    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="orxl" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.plaf(JDK/)" />
-    <import index="9z78" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.border(JDK/)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="3pb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.table(MPS.IDEA/)" />
     <import index="gsia" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.event(JDK/)" />
     <import index="kz9k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.navigation(MPS.Editor/)" />
-    <import index="rcv5" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.util.treeView(MPS.IDEA/)" />
     <import index="e8no" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.containers(MPS.IDEA/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="7bx7" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.workbench.action(MPS.Platform/)" />
     <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" />
     <import index="l7us" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.icons(MPS.Platform/)" />
-    <import index="mnlj" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.beans(JDK/)" />
     <import index="ewej" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.font(JDK/)" />
     <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
-    <import index="htnt" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.plaf.basic(JDK/)" />
     <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
     <import index="b8lf" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.selection(MPS.Editor/)" />
     <import index="eh3q" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.text(MPS.Editor/)" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
     <import index="e2ly" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui.tree(MPS.IDEA/)" />
-    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
     <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.typesystem2.type)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.typesystem2.aspect)" />
@@ -274,7 +257,9 @@
       <concept id="1083245097125" name="jetbrains.mps.baseLanguage.structure.EnumClass" flags="ig" index="Qs71p">
         <child id="1083245396908" name="enumConstant" index="Qtgdg" />
       </concept>
-      <concept id="1083245299891" name="jetbrains.mps.baseLanguage.structure.EnumConstantDeclaration" flags="ig" index="QsSxf" />
+      <concept id="1083245299891" name="jetbrains.mps.baseLanguage.structure.EnumConstantDeclaration" flags="ig" index="QsSxf">
+        <child id="492581319488141108" name="method" index="2HKRsH" />
+      </concept>
       <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
         <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
         <reference id="1144432896254" name="enumClass" index="1Px2BO" />
@@ -338,6 +323,7 @@
       </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <property id="1075300953594" name="abstractClass" index="1sVAO0" />
+        <property id="1221565133444" name="isFinal" index="1EXbeo" />
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
@@ -495,7 +481,6 @@
         <child id="1163670683720" name="body" index="3Kbo56" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
-      <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -714,14 +699,6 @@
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
-      <concept id="9042586985346099698" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachStatement" flags="nn" index="1_o_46">
-        <child id="9042586985346099734" name="forEach" index="1_o_by" />
-      </concept>
-      <concept id="9042586985346099733" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachPair" flags="ng" index="1_o_bx">
-        <child id="9042586985346099778" name="variable" index="1_o_aQ" />
-        <child id="9042586985346099735" name="input" index="1_o_bz" />
-      </concept>
-      <concept id="9042586985346099736" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariable" flags="ng" index="1_o_bG" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
         <child id="1197932525128" name="key" index="3ElVtu" />
@@ -734,9 +711,6 @@
         <child id="1206655844556" name="key" index="3MiK7k" />
         <child id="1206655853135" name="value" index="3MiMdn" />
       </concept>
-      <concept id="8293956702609956630" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariableReference" flags="nn" index="3M$PaV">
-        <reference id="8293956702609966325" name="variable" index="3M$S_o" />
-      </concept>
       <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
         <child id="5686963296372573084" name="elementType" index="3O5elw" />
       </concept>
@@ -1466,64 +1440,69 @@
               <ref role="3uigEE" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
             </node>
             <node concept="2ShNRf" id="1pPth$lNMX5" role="33vP2m">
-              <node concept="YeOm9" id="1pPth$lNMX6" role="2ShVmc">
-                <node concept="1Y3b0j" id="1pPth$lNMX7" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                  <ref role="37wK5l" node="1pPth$lK1ZL" resolve="TypecheckingHelper" />
-                  <node concept="2OqwBi" id="1pPth$lNMX8" role="37wK5m">
-                    <node concept="2WthIp" id="1pPth$lNMX9" role="2Oq$k0">
-                      <ref role="32nkFo" node="3Qp4N06byoz" resolve="MarkTypes" />
-                    </node>
-                    <node concept="1DTwFV" id="1pPth$lNMXa" role="2OqNvi">
-                      <ref role="2WH_rO" node="7iCFfvQBVbg" resolve="mpsProject" />
-                    </node>
+              <node concept="1pGfFk" id="3F6vMxqbC3F" role="2ShVmc">
+                <ref role="37wK5l" node="1pPth$lK1ZL" resolve="TypecheckingHelper" />
+                <node concept="2OqwBi" id="1pPth$lNMX8" role="37wK5m">
+                  <node concept="2WthIp" id="1pPth$lNMX9" role="2Oq$k0">
+                    <ref role="32nkFo" node="3Qp4N06byoz" resolve="MarkTypes" />
                   </node>
-                  <node concept="3Tm1VV" id="1pPth$lNMXb" role="1B3o_S" />
-                  <node concept="3clFb_" id="1pPth$lNMXc" role="jymVt">
-                    <property role="TrG5h" value="finished" />
-                    <property role="1EzhhJ" value="false" />
-                    <property role="IEkAT" value="false" />
-                    <node concept="37vLTG" id="1pPth$lNMXd" role="3clF46">
-                      <property role="TrG5h" value="message" />
-                      <node concept="17QB3L" id="1pPth$lNMXe" role="1tU5fm" />
-                    </node>
-                    <node concept="3cqZAl" id="1pPth$lNMXf" role="3clF45" />
-                    <node concept="3Tm1VV" id="1pPth$lNMXg" role="1B3o_S" />
-                    <node concept="3clFbS" id="1pPth$lNMXh" role="3clF47">
-                      <node concept="3clFbF" id="1pPth$lOa0n" role="3cqZAp">
-                        <node concept="2YIFZM" id="1pPth$lOa0o" role="3clFbG">
-                          <ref role="37wK5l" to="jkm4:~Messages.showInfoMessage(java.lang.String,java.lang.String):void" resolve="showInfoMessage" />
-                          <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
-                          <node concept="37vLTw" id="1pPth$lOad6" role="37wK5m">
-                            <ref role="3cqZAo" node="1pPth$lNMXd" resolve="message" />
-                          </node>
-                          <node concept="Xl_RD" id="1pPth$lOa0s" role="37wK5m">
-                            <property role="Xl_RC" value="Mark Types" />
+                  <node concept="1DTwFV" id="1pPth$lNMXa" role="2OqNvi">
+                    <ref role="2WH_rO" node="7iCFfvQBVbg" resolve="mpsProject" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="3F6vMxqb$AF" role="37wK5m">
+                  <node concept="YeOm9" id="3F6vMxqbBpQ" role="2ShVmc">
+                    <node concept="1Y3b0j" id="3F6vMxqbBpT" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <ref role="1Y3XeK" node="3F6vMxqaxpm" resolve="TypecheckingHelper.DoneCallback" />
+                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                      <node concept="3Tm1VV" id="3F6vMxqbBpU" role="1B3o_S" />
+                      <node concept="3clFb_" id="3F6vMxqbBpV" role="jymVt">
+                        <property role="TrG5h" value="finished" />
+                        <property role="1EzhhJ" value="false" />
+                        <property role="IEkAT" value="false" />
+                        <node concept="37vLTG" id="3F6vMxqbBpW" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="3F6vMxqbBpX" role="1tU5fm" />
+                        </node>
+                        <node concept="3cqZAl" id="3F6vMxqbBpY" role="3clF45" />
+                        <node concept="3Tm1VV" id="3F6vMxqbBpZ" role="1B3o_S" />
+                        <node concept="3clFbS" id="3F6vMxqbBq1" role="3clF47">
+                          <node concept="3clFbF" id="1pPth$lOa0n" role="3cqZAp">
+                            <node concept="2YIFZM" id="1pPth$lOa0o" role="3clFbG">
+                              <ref role="37wK5l" to="jkm4:~Messages.showInfoMessage(java.lang.String,java.lang.String):void" resolve="showInfoMessage" />
+                              <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                              <node concept="37vLTw" id="1pPth$lOad6" role="37wK5m">
+                                <ref role="3cqZAo" node="3F6vMxqbBpW" resolve="message" />
+                              </node>
+                              <node concept="Xl_RD" id="1pPth$lOa0s" role="37wK5m">
+                                <property role="Xl_RC" value="Mark Types" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                  <node concept="3clFb_" id="1pPth$lNMXi" role="jymVt">
-                    <property role="TrG5h" value="failed" />
-                    <property role="1EzhhJ" value="false" />
-                    <node concept="37vLTG" id="1pPth$lNMXj" role="3clF46">
-                      <property role="TrG5h" value="message" />
-                      <node concept="17QB3L" id="1pPth$lNMXk" role="1tU5fm" />
-                    </node>
-                    <node concept="3cqZAl" id="1pPth$lNMXl" role="3clF45" />
-                    <node concept="3Tm1VV" id="1pPth$lNMXm" role="1B3o_S" />
-                    <node concept="3clFbS" id="1pPth$lNMXn" role="3clF47">
-                      <node concept="3clFbF" id="1pPth$lO9Ku" role="3cqZAp">
-                        <node concept="2YIFZM" id="1pPth$lO9Kv" role="3clFbG">
-                          <ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
-                          <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
-                          <node concept="37vLTw" id="1pPth$lO9Xd" role="37wK5m">
-                            <ref role="3cqZAo" node="1pPth$lNMXj" resolve="message" />
-                          </node>
-                          <node concept="Xl_RD" id="1pPth$lO9Kz" role="37wK5m">
-                            <property role="Xl_RC" value="Mark Types" />
+                      <node concept="3clFb_" id="3F6vMxqbBq3" role="jymVt">
+                        <property role="TrG5h" value="failed" />
+                        <property role="1EzhhJ" value="false" />
+                        <node concept="37vLTG" id="3F6vMxqbBq4" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="3F6vMxqbBq5" role="1tU5fm" />
+                        </node>
+                        <node concept="3cqZAl" id="3F6vMxqbBq6" role="3clF45" />
+                        <node concept="3Tm1VV" id="3F6vMxqbBq7" role="1B3o_S" />
+                        <node concept="3clFbS" id="3F6vMxqbBq9" role="3clF47">
+                          <node concept="3clFbF" id="1pPth$lO9Ku" role="3cqZAp">
+                            <node concept="2YIFZM" id="1pPth$lO9Kv" role="3clFbG">
+                              <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                              <ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
+                              <node concept="37vLTw" id="1pPth$lO9Xd" role="37wK5m">
+                                <ref role="3cqZAo" node="3F6vMxqbBq4" resolve="message" />
+                              </node>
+                              <node concept="Xl_RD" id="1pPth$lO9Kz" role="37wK5m">
+                                <property role="Xl_RC" value="Mark Types" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -1576,9 +1555,6 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbT" id="6OUp3PsW9eS" role="37wK5m">
-                    <property role="3clFbU" value="false" />
-                  </node>
                   <node concept="3clFbT" id="1N_0WA5HTzS" role="37wK5m" />
                 </node>
               </node>
@@ -1698,9 +1674,6 @@
       <node concept="tCFHf" id="1isQzel_z7L" role="ftvYc">
         <ref role="tCJdB" node="3Qp4N06byoz" resolve="MarkTypes" />
       </node>
-      <node concept="tCFHf" id="6OUp3PsWpPD" role="ftvYc">
-        <ref role="tCJdB" node="6OUp3PsWo3r" resolve="MarkTypesJchr" />
-      </node>
       <node concept="10WQ6h" id="1isQzelDXbq" role="ftvYc">
         <property role="TrG5h" value="markTypes" />
       </node>
@@ -2257,51 +2230,15 @@
     </node>
     <node concept="2tJIrI" id="41ox5Vnk7ln" role="jymVt" />
     <node concept="3clFbW" id="HV6urVFjOl" role="jymVt">
-      <node concept="37vLTG" id="HV6urVFkci" role="3clF46">
-        <property role="TrG5h" value="program" />
-        <node concept="3uibUv" id="HV6urVFkcj" role="1tU5fm">
-          <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
-        </node>
-      </node>
       <node concept="37vLTG" id="2UGjFq4Led0" role="3clF46">
         <property role="TrG5h" value="sessionSolver" />
         <node concept="3uibUv" id="2UGjFq4Les6" role="1tU5fm">
           <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
         </node>
       </node>
-      <node concept="37vLTG" id="HV6urVFkcm" role="3clF46">
-        <property role="TrG5h" value="rulesModel" />
-        <node concept="H_c77" id="HV6urVFkcn" role="1tU5fm" />
-      </node>
       <node concept="3cqZAl" id="HV6urVFjOn" role="3clF45" />
       <node concept="3Tm1VV" id="HV6urVFjOo" role="1B3o_S" />
       <node concept="3clFbS" id="HV6urVFjOp" role="3clF47">
-        <node concept="3clFbF" id="HV6urVFnSo" role="3cqZAp">
-          <node concept="37vLTI" id="HV6urVFnSq" role="3clFbG">
-            <node concept="2OqwBi" id="HV6urVFnSu" role="37vLTJ">
-              <node concept="Xjq3P" id="HV6urVFnSx" role="2Oq$k0" />
-              <node concept="2OwXpG" id="HV6urVFnSt" role="2OqNvi">
-                <ref role="2Oxat5" node="HV6urVFnSk" resolve="program" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="HV6urVFnSy" role="37vLTx">
-              <ref role="3cqZAo" node="HV6urVFkci" resolve="program" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="HV6urVFoGi" role="3cqZAp">
-          <node concept="37vLTI" id="HV6urVFoGk" role="3clFbG">
-            <node concept="2OqwBi" id="HV6urVFoGo" role="37vLTJ">
-              <node concept="Xjq3P" id="HV6urVFoGr" role="2Oq$k0" />
-              <node concept="2OwXpG" id="HV6urVFoGn" role="2OqNvi">
-                <ref role="2Oxat5" node="HV6urVFoGe" resolve="rulesModel" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="HV6urVFoGs" role="37vLTx">
-              <ref role="3cqZAo" node="HV6urVFkcm" resolve="rulesModel" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="2UGjFq4Lesj" role="3cqZAp">
           <node concept="37vLTI" id="2UGjFq4Lesl" role="3clFbG">
             <node concept="2OqwBi" id="2UGjFq4Lesp" role="37vLTJ">
@@ -2337,11 +2274,20 @@
       <property role="TrG5h" value="runTypecheckingRules" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
-      <node concept="37vLTG" id="HV6urVFkck" role="3clF46">
-        <property role="TrG5h" value="root" />
-        <node concept="3Tqbb2" id="HV6urVFkcl" role="1tU5fm" />
+      <node concept="37vLTG" id="3F6vMxqrzZY" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="3F6vMxqrBcz" role="1tU5fm">
+          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="24Vro6cQKgF" role="3clF46">
+        <property role="TrG5h" value="cstracer" />
+        <node concept="3uibUv" id="qubcdtxFI2" role="1tU5fm">
+          <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+        </node>
       </node>
       <node concept="3clFbS" id="41ox5VnkgxM" role="3clF47">
+        <node concept="3clFbH" id="3F6vMxqrIaq" role="3cqZAp" />
         <node concept="3clFbF" id="41ox5VnkYST" role="3cqZAp">
           <node concept="2YIFZM" id="41ox5VnkZgE" role="3clFbG">
             <ref role="37wK5l" to="w1kc:~ModelAccess.assertLegalRead():void" resolve="assertLegalRead" />
@@ -2349,133 +2295,6 @@
           </node>
         </node>
         <node concept="3clFbH" id="41ox5VnkhIX" role="3cqZAp" />
-        <node concept="3cpWs8" id="41ox5VnkhLu" role="3cqZAp">
-          <node concept="3cpWsn" id="41ox5VnkhLv" role="3cpWs9">
-            <property role="TrG5h" value="handlerMdl" />
-            <node concept="H_c77" id="41ox5VnkhLw" role="1tU5fm" />
-            <node concept="37vLTw" id="4boqC9dOeXW" role="33vP2m">
-              <ref role="3cqZAo" node="HV6urVFoGe" resolve="rulesModel" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="41ox5VnkhLy" role="3cqZAp">
-          <node concept="3cpWsn" id="41ox5VnkhLz" role="3cpWs9">
-            <property role="TrG5h" value="handlerMod" />
-            <node concept="3uibUv" id="41ox5VnkhL$" role="1tU5fm">
-              <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-            </node>
-            <node concept="2OqwBi" id="41ox5VnkhL_" role="33vP2m">
-              <node concept="2JrnkZ" id="41ox5VnkhLA" role="2Oq$k0">
-                <node concept="37vLTw" id="41ox5VnkhLB" role="2JrQYb">
-                  <ref role="3cqZAo" node="41ox5VnkhLv" resolve="handlerMdl" />
-                </node>
-              </node>
-              <node concept="liA8E" id="41ox5VnkhLC" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SModel.getModule():org.jetbrains.mps.openapi.module.SModule" resolve="getModule" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="4boqC9dOcYg" role="3cqZAp">
-          <node concept="3cpWsn" id="4boqC9dOcYh" role="3cpWs9">
-            <property role="TrG5h" value="name" />
-            <node concept="17QB3L" id="4boqC9dOcYe" role="1tU5fm" />
-            <node concept="2OqwBi" id="4boqC9dOcYi" role="33vP2m">
-              <node concept="1PxgMI" id="4boqC9dOcYj" role="2Oq$k0">
-                <ref role="1m5ApE" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
-                <node concept="37vLTw" id="4boqC9dOcYk" role="1m5AlR">
-                  <ref role="3cqZAo" node="HV6urVFkck" resolve="root" />
-                </node>
-              </node>
-              <node concept="3TrcHB" id="4boqC9dOcYl" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="5mr7UHcbMCj" role="3cqZAp" />
-        <node concept="3cpWs8" id="4sSe4$oSnmk" role="3cqZAp">
-          <node concept="3cpWsn" id="4sSe4$oSnml" role="3cpWs9">
-            <property role="TrG5h" value="config" />
-            <node concept="3uibUv" id="4sSe4$oSnmm" role="1tU5fm">
-              <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
-            </node>
-            <node concept="2OqwBi" id="4sSe4$oSnmn" role="33vP2m">
-              <node concept="2YIFZM" id="4sSe4$oSnmo" role="2Oq$k0">
-                <ref role="37wK5l" to="qrld:7ISVfSIwfH" resolve="newSession" />
-                <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                <node concept="37vLTw" id="4sSe4$oSnmp" role="37wK5m">
-                  <ref role="3cqZAo" node="HV6urVFnSk" resolve="program" />
-                </node>
-              </node>
-              <node concept="liA8E" id="4sSe4$oSnmq" role="2OqNvi">
-                <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
-                <node concept="Xl_RD" id="4sSe4$oSnmr" role="37wK5m">
-                  <property role="Xl_RC" value="main" />
-                </node>
-                <node concept="2OqwBi" id="4sSe4$oSx1Y" role="37wK5m">
-                  <node concept="2ShNRf" id="4sSe4$oSnms" role="2Oq$k0">
-                    <node concept="1pGfFk" id="4sSe4$oSv6E" role="2ShVmc">
-                      <ref role="37wK5l" to="nz6g:4sSe4$oM2rk" resolve="ConstraintBuilder" />
-                      <node concept="2ShNRf" id="4sSe4$oSw3Z" role="37wK5m">
-                        <node concept="1pGfFk" id="4sSe4$oSw40" role="2ShVmc">
-                          <ref role="37wK5l" to="rchb:54i3FxcZMv0" resolve="ConstraintSymbol" />
-                          <node concept="Xl_RD" id="4sSe4$oSw41" role="37wK5m">
-                            <property role="Xl_RC" value="main" />
-                          </node>
-                          <node concept="3cmrfG" id="4sSe4$oSw42" role="37wK5m">
-                            <property role="3cmrfH" value="0" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="4sSe4$oSy2o" role="2OqNvi">
-                    <ref role="37wK5l" to="nz6g:4sSe4$oM2zI" resolve="toConstraint" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="6OUp3PsW4Eo" role="3cqZAp">
-          <node concept="3clFbS" id="6OUp3PsW4Eq" role="3clFbx">
-            <node concept="3clFbF" id="6OUp3PsW5HB" role="3cqZAp">
-              <node concept="37vLTI" id="6OUp3PsW5OP" role="3clFbG">
-                <node concept="37vLTw" id="6OUp3PsW5H_" role="37vLTJ">
-                  <ref role="3cqZAo" node="4sSe4$oSnml" resolve="config" />
-                </node>
-                <node concept="2OqwBi" id="6OUp3PsW5W4" role="37vLTx">
-                  <node concept="37vLTw" id="6OUp3PsW5W5" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sSe4$oSnml" resolve="config" />
-                  </node>
-                  <node concept="liA8E" id="6OUp3PsW5W6" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
-                    <node concept="Xl_RD" id="6OUp3PsW5W7" role="37wK5m">
-                      <property role="Xl_RC" value="jchr.handler.class" />
-                    </node>
-                    <node concept="1rXfSq" id="6OUp3PsW6jD" role="37wK5m">
-                      <ref role="37wK5l" node="5mr7UHcbKeS" resolve="findHandlerClass" />
-                      <node concept="37vLTw" id="6OUp3PsW6X$" role="37wK5m">
-                        <ref role="3cqZAo" node="41ox5VnkhLz" resolve="handlerMod" />
-                      </node>
-                      <node concept="37vLTw" id="6OUp3PsW7qp" role="37wK5m">
-                        <ref role="3cqZAo" node="41ox5VnkhLv" resolve="handlerMdl" />
-                      </node>
-                      <node concept="37vLTw" id="6OUp3PsW78m" role="37wK5m">
-                        <ref role="3cqZAo" node="4boqC9dOcYh" resolve="name" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="6OUp3PsW5d1" role="3clFbw">
-            <ref role="3cqZAo" node="6OUp3PsW09y" resolve="useJchr" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="1Ry9kf2v4oX" role="3cqZAp" />
         <node concept="3clFbF" id="1Ry9kf2v6eb" role="3cqZAp">
           <node concept="2YIFZM" id="1Ry9kf2v6ec" role="3clFbG">
             <ref role="1Pybhc" to="7ub6:2tjs8VC0K0m" resolve="Memoizer" />
@@ -2501,44 +2320,22 @@
             <node concept="3clFbF" id="1Ry9kf2vmS1" role="3cqZAp">
               <node concept="37vLTI" id="1Ry9kf2vmS3" role="3clFbG">
                 <node concept="2OqwBi" id="5mr7UHcbsDT" role="37vLTx">
-                  <node concept="2OqwBi" id="5mr7UHcbsDU" role="2Oq$k0">
-                    <node concept="2OqwBi" id="5mr7UHcbsDV" role="2Oq$k0">
-                      <node concept="2OqwBi" id="18cJbc1jcZI" role="2Oq$k0">
-                        <node concept="2OqwBi" id="5jPBdKSAEU" role="2Oq$k0">
-                          <node concept="37vLTw" id="6OUp3PsW3Em" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4sSe4$oSnml" resolve="config" />
-                          </node>
-                          <node concept="liA8E" id="5jPBdKSAMP" role="2OqNvi">
-                            <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
-                            <node concept="Xl_RD" id="5jPBdKSB5t" role="37wK5m">
-                              <property role="Xl_RC" value="jchr.tracer" />
-                            </node>
-                            <node concept="37vLTw" id="5jPBdKSC2n" role="37wK5m">
-                              <ref role="3cqZAo" node="4i4XGQZnvKs" resolve="tracer" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="18cJbc1jd8G" role="2OqNvi">
-                          <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
-                          <node concept="Xl_RD" id="18cJbc1jdle" role="37wK5m">
-                            <property role="Xl_RC" value="profiling.data" />
-                          </node>
-                          <node concept="37vLTw" id="18cJbc1jE1D" role="37wK5m">
-                            <ref role="3cqZAo" node="18cJbc1jDg0" resolve="profData" />
-                          </node>
-                        </node>
+                  <node concept="2OqwBi" id="5mr7UHcbsDV" role="2Oq$k0">
+                    <node concept="2OqwBi" id="3F6vMxqrizR" role="2Oq$k0">
+                      <node concept="37vLTw" id="3F6vMxqrFJm" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
                       </node>
-                      <node concept="liA8E" id="5mr7UHcbsE1" role="2OqNvi">
-                        <ref role="37wK5l" to="qrld:5uFPQ7Bwu9Q" resolve="withPredicates" />
-                        <node concept="37vLTw" id="5mr7UHcbsE2" role="37wK5m">
-                          <ref role="3cqZAo" node="5mr7UHcbnci" resolve="PREDICATE_SYMBOLS" />
+                      <node concept="liA8E" id="3F6vMxqriTU" role="2OqNvi">
+                        <ref role="37wK5l" to="qrld:5uFPQ7Bwvg_" resolve="withTrace" />
+                        <node concept="37vLTw" id="3F6vMxqrG2C" role="37wK5m">
+                          <ref role="3cqZAo" node="24Vro6cQKgF" resolve="cstracer" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="5mr7UHcbsE3" role="2OqNvi">
-                      <ref role="37wK5l" to="qrld:5uFPQ7Bwvg_" resolve="withTrace" />
-                      <node concept="37vLTw" id="5mr7UHcbsE4" role="37wK5m">
-                        <ref role="3cqZAo" node="24Vro6cQKgF" resolve="cstracer" />
+                    <node concept="liA8E" id="5mr7UHcbsE1" role="2OqNvi">
+                      <ref role="37wK5l" to="qrld:5uFPQ7Bwu9Q" resolve="withPredicates" />
+                      <node concept="37vLTw" id="5mr7UHcbsE2" role="37wK5m">
+                        <ref role="3cqZAo" node="5mr7UHcbnci" resolve="PREDICATE_SYMBOLS" />
                       </node>
                     </node>
                   </node>
@@ -2638,6 +2435,7 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="3F6vMxqrhDU" role="3cqZAp" />
         <node concept="1DcWWT" id="5mr7UHcc5Jm" role="3cqZAp">
           <node concept="3clFbS" id="5mr7UHcc5Jo" role="2LFqv$">
             <node concept="1DcWWT" id="5mr7UHccsMF" role="3cqZAp">
@@ -2796,52 +2594,12 @@
           </node>
         </node>
         <node concept="3clFbH" id="18cJbc1jG0D" role="3cqZAp" />
-        <node concept="3clFbJ" id="7vxJ_H4prer" role="3cqZAp">
-          <node concept="3clFbS" id="7vxJ_H4pret" role="3clFbx">
-            <node concept="3clFbF" id="7vxJ_H4ptek" role="3cqZAp">
-              <node concept="2OqwBi" id="7vxJ_H4ptok" role="3clFbG">
-                <node concept="37vLTw" id="7vxJ_H4ptei" role="2Oq$k0">
-                  <ref role="3cqZAo" node="24Vro6cQKgF" resolve="cstracer" />
-                </node>
-                <node concept="liA8E" id="7vxJ_H4ptqb" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:7vxJ_H4th$o" resolve="failure" />
-                  <node concept="2ShNRf" id="7vxJ_H4tETM" role="37wK5m">
-                    <node concept="1pGfFk" id="7vxJ_H4tIOk" role="2ShVmc">
-                      <ref role="37wK5l" to="qrld:7vxJ_H4qql2" resolve="EvaluationFailureException" />
-                      <node concept="Xl_RD" id="7vxJ_H4ptzV" role="37wK5m">
-                        <property role="Xl_RC" value="garbage constraints" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3fqX7Q" id="7vxJ_H4prOw" role="3clFbw">
-            <node concept="37vLTw" id="7vxJ_H4psB0" role="3fr31v">
-              <ref role="3cqZAo" node="7dgRGU4oLq3" resolve="remainingOk" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7vxJ_H4pq1W" role="3cqZAp" />
         <node concept="3cpWs6" id="7dgRGU4prm1" role="3cqZAp">
           <node concept="37vLTw" id="7dgRGU4psnb" role="3cqZAk">
             <ref role="3cqZAo" node="7dgRGU4oLq3" resolve="remainingOk" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="4i4XGQZnvKs" role="3clF46">
-        <property role="TrG5h" value="tracer" />
-        <node concept="3uibUv" id="4i4XGQZnw0C" role="1tU5fm">
-          <ref role="3uigEE" to="iawt:~Tracer" resolve="Tracer" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="24Vro6cQKgF" role="3clF46">
-        <property role="TrG5h" value="cstracer" />
-        <node concept="3uibUv" id="qubcdtxFI2" role="1tU5fm">
-          <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-        </node>
-      </node>
       <node concept="37vLTG" id="6HT7BWBUumb" role="3clF46">
         <property role="TrG5h" value="types" />
         <node concept="3uibUv" id="6HT7BWBUuyJ" role="1tU5fm">
@@ -2870,131 +2628,10 @@
           <node concept="17QB3L" id="18cJbc1k85D" role="11_B2D" />
         </node>
       </node>
-      <node concept="37vLTG" id="6OUp3PsW09y" role="3clF46">
-        <property role="TrG5h" value="useJchr" />
-        <node concept="10P_77" id="6OUp3PsW0zn" role="1tU5fm" />
-      </node>
       <node concept="10P_77" id="7dgRGU4pqKb" role="3clF45" />
       <node concept="3Tm1VV" id="41ox5VnkgxL" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="6OUp3PsW2D7" role="jymVt" />
-    <node concept="2YIFZL" id="5mr7UHcbKeS" role="jymVt">
-      <property role="TrG5h" value="findHandlerClass" />
-      <node concept="3Tm6S6" id="5mr7UHcbKeT" role="1B3o_S" />
-      <node concept="3uibUv" id="5mr7UHcbKeU" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-        <node concept="3uibUv" id="5mr7UHcbKeV" role="11_B2D">
-          <ref role="3uigEE" to="eifs:~Handler" resolve="Handler" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5mr7UHcbKeF" role="3clF46">
-        <property role="TrG5h" value="handlerMod" />
-        <node concept="3uibUv" id="5mr7UHcbKeG" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5mr7UHcbKeH" role="3clF46">
-        <property role="TrG5h" value="handlerMdl" />
-        <node concept="H_c77" id="5mr7UHcbKeI" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5mr7UHcbKeJ" role="3clF46">
-        <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="5mr7UHcbKeK" role="1tU5fm" />
-      </node>
-      <node concept="3clFbS" id="5mr7UHcbKe5" role="3clF47">
-        <node concept="3cpWs8" id="5mr7UHcbKe8" role="3cqZAp">
-          <node concept="3cpWsn" id="5mr7UHcbKe9" role="3cpWs9">
-            <property role="TrG5h" value="handlerCls" />
-            <node concept="3uibUv" id="5mr7UHcbKea" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-              <node concept="3uibUv" id="5mr7UHcbKeb" role="11_B2D">
-                <ref role="3uigEE" to="eifs:~Handler" resolve="Handler" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="SfApY" id="5mr7UHcbKec" role="3cqZAp">
-          <node concept="3clFbS" id="5mr7UHcbKed" role="SfCbr">
-            <node concept="3clFbF" id="5mr7UHcbKee" role="3cqZAp">
-              <node concept="37vLTI" id="5mr7UHcbKef" role="3clFbG">
-                <node concept="10QFUN" id="5mr7UHcbKeg" role="37vLTx">
-                  <node concept="3uibUv" id="5mr7UHcbKeh" role="10QFUM">
-                    <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-                    <node concept="3uibUv" id="5mr7UHcbKei" role="11_B2D">
-                      <ref role="3uigEE" to="eifs:~Handler" resolve="Handler" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="5mr7UHcbKej" role="10QFUP">
-                    <node concept="1eOMI4" id="5mr7UHcbKek" role="2Oq$k0">
-                      <node concept="10QFUN" id="5mr7UHcbKel" role="1eOMHV">
-                        <node concept="37vLTw" id="5mr7UHcbKeL" role="10QFUP">
-                          <ref role="3cqZAo" node="5mr7UHcbKeF" resolve="handlerMod" />
-                        </node>
-                        <node concept="3uibUv" id="5mr7UHcbKen" role="10QFUM">
-                          <ref role="3uigEE" to="j8aq:~ReloadableModuleBase" resolve="ReloadableModuleBase" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="5mr7UHcbKeo" role="2OqNvi">
-                      <ref role="37wK5l" to="j8aq:~ReloadableModuleBase.getClass(java.lang.String):java.lang.Class" resolve="getClass" />
-                      <node concept="2YIFZM" id="5mr7UHcbKep" role="37wK5m">
-                        <ref role="37wK5l" to="18ew:~JavaNameUtil.fqClassName(org.jetbrains.mps.openapi.model.SModel,java.lang.String):java.lang.String" resolve="fqClassName" />
-                        <ref role="1Pybhc" to="18ew:~JavaNameUtil" resolve="JavaNameUtil" />
-                        <node concept="37vLTw" id="5mr7UHcbKeN" role="37wK5m">
-                          <ref role="3cqZAo" node="5mr7UHcbKeH" resolve="handlerMdl" />
-                        </node>
-                        <node concept="3cpWs3" id="5mr7UHcbKer" role="37wK5m">
-                          <node concept="Xl_RD" id="5mr7UHcbKes" role="3uHU7w">
-                            <property role="Xl_RC" value="Handler" />
-                          </node>
-                          <node concept="3cpWs3" id="5mr7UHcbKet" role="3uHU7B">
-                            <node concept="Xl_RD" id="5mr7UHcbKeu" role="3uHU7B">
-                              <property role="Xl_RC" value="Types" />
-                            </node>
-                            <node concept="37vLTw" id="5mr7UHcbKeM" role="3uHU7w">
-                              <ref role="3cqZAo" node="5mr7UHcbKeJ" resolve="name" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="5mr7UHcbKew" role="37vLTJ">
-                  <ref role="3cqZAo" node="5mr7UHcbKe9" resolve="handlerCls" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="TDmWw" id="5mr7UHcbKex" role="TEbGg">
-            <node concept="3clFbS" id="5mr7UHcbKey" role="TDEfX">
-              <node concept="YS8fn" id="5mr7UHcbKez" role="3cqZAp">
-                <node concept="2ShNRf" id="5mr7UHcbKe$" role="YScLw">
-                  <node concept="1pGfFk" id="5mr7UHcbKe_" role="2ShVmc">
-                    <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.Throwable)" resolve="RuntimeException" />
-                    <node concept="37vLTw" id="5mr7UHcbKeA" role="37wK5m">
-                      <ref role="3cqZAo" node="5mr7UHcbKeB" resolve="e" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWsn" id="5mr7UHcbKeB" role="TDEfY">
-              <property role="TrG5h" value="e" />
-              <node concept="3uibUv" id="5mr7UHcbKeC" role="1tU5fm">
-                <ref role="3uigEE" to="wyt6:~ClassNotFoundException" resolve="ClassNotFoundException" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="5mr7UHcbKeD" role="3cqZAp">
-          <node concept="37vLTw" id="5mr7UHcbKeE" role="3cqZAk">
-            <ref role="3cqZAo" node="5mr7UHcbKe9" resolve="handlerCls" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4pWvZ2nEh6y" role="jymVt" />
     <node concept="312cEu" id="6HT7BWBSFOV" role="jymVt">
       <property role="2bfB8j" value="false" />
       <property role="TrG5h" value="TypeFormatter" />
@@ -3573,18 +3210,6 @@
     </node>
     <node concept="2tJIrI" id="6HT7BWBT8vT" role="jymVt" />
     <node concept="3Tm1VV" id="41ox5Vnk76b" role="1B3o_S" />
-    <node concept="312cEg" id="HV6urVFnSk" role="jymVt">
-      <property role="TrG5h" value="program" />
-      <node concept="3Tm6S6" id="HV6urVFnSl" role="1B3o_S" />
-      <node concept="3uibUv" id="HV6urVFnSn" role="1tU5fm">
-        <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
-      </node>
-    </node>
-    <node concept="312cEg" id="HV6urVFoGe" role="jymVt">
-      <property role="TrG5h" value="rulesModel" />
-      <node concept="3Tm6S6" id="HV6urVFoGf" role="1B3o_S" />
-      <node concept="H_c77" id="HV6urVFoGh" role="1tU5fm" />
-    </node>
     <node concept="312cEg" id="HV6urVFuJL" role="jymVt">
       <property role="TrG5h" value="formatter" />
       <node concept="3Tm6S6" id="HV6urVFuJJ" role="1B3o_S" />
@@ -3604,6 +3229,7 @@
         <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
       </node>
     </node>
+    <node concept="2tJIrI" id="3F6vMxqgcMq" role="jymVt" />
   </node>
   <node concept="312cEu" id="41ox5VnpFrR">
     <property role="TrG5h" value="MarkPlugin" />
@@ -4661,6 +4287,76 @@
   </node>
   <node concept="312cEu" id="4i4XGQZlbGA">
     <property role="TrG5h" value="MessageViewTracer" />
+    <node concept="2tJIrI" id="5mDiJnRXT3S" role="jymVt" />
+    <node concept="Qs71p" id="61vfVfp5tJN" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Event" />
+      <node concept="QsSxf" id="61vfVfp5uey" role="Qtgdg">
+        <property role="TrG5h" value="ACTIVATED" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="61vfVfp5uls" role="Qtgdg">
+        <property role="TrG5h" value="REACTIVATED" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="61vfVfp5usz" role="Qtgdg">
+        <property role="TrG5h" value="STORED" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="61vfVfp5uz_" role="Qtgdg">
+        <property role="TrG5h" value="SUSPENDED" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="61vfVfp5uEI" role="Qtgdg">
+        <property role="TrG5h" value="REMOVED" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="61vfVfp5uLV" role="Qtgdg">
+        <property role="TrG5h" value="TERMINATED" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="61vfVfp5uMw" role="Qtgdg">
+        <property role="TrG5h" value="TRIGGERED" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="61vfVfp5uU4" role="Qtgdg">
+        <property role="TrG5h" value="FIRED" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="24Vro6cQUo9" role="Qtgdg">
+        <property role="TrG5h" value="ASK_SUCCESS" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="24Vro6cQUIt" role="Qtgdg">
+        <property role="TrG5h" value="ASK_FAILURE" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="6ps95k_Hk8b" role="Qtgdg">
+        <property role="TrG5h" value="ASK" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="6ps95k_GOS3" role="Qtgdg">
+        <property role="TrG5h" value="TELL" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="7FtwPOZH$aW" role="Qtgdg">
+        <property role="TrG5h" value="RESULT" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="7nkyKX7gTui" role="Qtgdg">
+        <property role="TrG5h" value="GARBAGE" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="7feMCq_cKM_" role="Qtgdg">
+        <property role="TrG5h" value="FAILURE" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="QsSxf" id="18cJbc1jXpK" role="Qtgdg">
+        <property role="TrG5h" value="INFO" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+      </node>
+      <node concept="3Tm1VV" id="61vfVfp5tJO" role="1B3o_S" />
+    </node>
     <node concept="Wx3nA" id="5mDiJnRYW2w" role="jymVt">
       <property role="TrG5h" value="EMPTY" />
       <node concept="3Tm6S6" id="5mDiJnRYW2y" role="1B3o_S" />
@@ -5007,59 +4703,9 @@
     </node>
     <node concept="2tJIrI" id="623frvFC1kb" role="jymVt" />
     <node concept="3Tm1VV" id="4i4XGQZlbGB" role="1B3o_S" />
-    <node concept="3uibUv" id="4i4XGQZlmNA" role="EKbjA">
-      <ref role="3uigEE" to="iawt:~Tracer" resolve="Tracer" />
-    </node>
     <node concept="3uibUv" id="qubcdtxCp8" role="EKbjA">
       <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
     </node>
-    <node concept="3clFb_" id="4i4XGQZlmRQ" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="activated" />
-      <property role="DiZV1" value="false" />
-      <property role="IEkAT" value="false" />
-      <node concept="3Tm1VV" id="4i4XGQZlmRR" role="1B3o_S" />
-      <node concept="3cqZAl" id="4i4XGQZlmRT" role="3clF45" />
-      <node concept="37vLTG" id="4i4XGQZlmRU" role="3clF46">
-        <property role="TrG5h" value="constraint" />
-        <node concept="3uibUv" id="4i4XGQZlmRV" role="1tU5fm">
-          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="4i4XGQZlmRW" role="3clF47">
-        <node concept="3clFbF" id="4i4XGQZmfrX" role="3cqZAp">
-          <node concept="1rXfSq" id="4i4XGQZmfrW" role="3clFbG">
-            <ref role="37wK5l" node="4i4XGQZmbIk" resolve="displayInfo" />
-            <node concept="Rm8GO" id="61vfVfp5Kv8" role="37wK5m">
-              <ref role="Rm8GQ" node="61vfVfp5uey" resolve="ACTIVATED" />
-              <ref role="1Px2BO" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
-            </node>
-            <node concept="1bVj0M" id="5mDiJnS1s45" role="37wK5m">
-              <node concept="3clFbS" id="5mDiJnS1s46" role="1bW5cS">
-                <node concept="3clFbF" id="5mDiJnS1s47" role="3cqZAp">
-                  <node concept="1Ls8ON" id="5mDiJnS1s48" role="3clFbG">
-                    <node concept="Xl_RD" id="5mDiJnS1tQm" role="1Lso8e">
-                      <property role="Xl_RC" value="[+++] &lt;activated&gt; " />
-                    </node>
-                    <node concept="2ShNRf" id="5mDiJnS1s4a" role="1Lso8e">
-                      <node concept="3g6Rrh" id="5mDiJnS1s4b" role="2ShVmc">
-                        <node concept="3uibUv" id="5mDiJnS1s4c" role="3g7fb8">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                        <node concept="37vLTw" id="5mDiJnS1vWR" role="3g7hyw">
-                          <ref role="3cqZAo" node="4i4XGQZlmRU" resolve="constraint" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4i4XGQZmEXo" role="jymVt" />
     <node concept="3clFb_" id="1n2ZgJ3Lehb" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="activate" />
@@ -5103,52 +4749,8 @@
           </node>
         </node>
       </node>
-    </node>
-    <node concept="2tJIrI" id="1n2ZgJ3Lfeu" role="jymVt" />
-    <node concept="3clFb_" id="4i4XGQZlmRX" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="reactivated" />
-      <property role="DiZV1" value="false" />
-      <property role="IEkAT" value="false" />
-      <node concept="3Tm1VV" id="4i4XGQZlmRY" role="1B3o_S" />
-      <node concept="3cqZAl" id="4i4XGQZlmS0" role="3clF45" />
-      <node concept="37vLTG" id="4i4XGQZlmS1" role="3clF46">
-        <property role="TrG5h" value="constraint" />
-        <node concept="3uibUv" id="4i4XGQZlmS2" role="1tU5fm">
-          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="4i4XGQZlmS3" role="3clF47">
-        <node concept="3clFbF" id="4i4XGQZmhlp" role="3cqZAp">
-          <node concept="1rXfSq" id="4i4XGQZmhlq" role="3clFbG">
-            <ref role="37wK5l" node="4i4XGQZmbIk" resolve="displayInfo" />
-            <node concept="Rm8GO" id="61vfVfp5Ly$" role="37wK5m">
-              <ref role="Rm8GQ" node="61vfVfp5uls" resolve="REACTIVATED" />
-              <ref role="1Px2BO" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
-            </node>
-            <node concept="1bVj0M" id="5mDiJnS14yN" role="37wK5m">
-              <node concept="3clFbS" id="5mDiJnS14yO" role="1bW5cS">
-                <node concept="3clFbF" id="5mDiJnS14yP" role="3cqZAp">
-                  <node concept="1Ls8ON" id="5mDiJnS14yQ" role="3clFbG">
-                    <node concept="Xl_RD" id="5mDiJnS16f6" role="1Lso8e">
-                      <property role="Xl_RC" value="[###] &lt;re-activated&gt; " />
-                    </node>
-                    <node concept="2ShNRf" id="5mDiJnS14yS" role="1Lso8e">
-                      <node concept="3g6Rrh" id="5mDiJnS14yT" role="2ShVmc">
-                        <node concept="3uibUv" id="5mDiJnS14yU" role="3g7fb8">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                        <node concept="37vLTw" id="5mDiJnS17Ud" role="3g7hyw">
-                          <ref role="3cqZAo" node="4i4XGQZlmS1" resolve="constraint" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
+      <node concept="2AHcQZ" id="3F6vMxqu0xX" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="4i4XGQZmFdp" role="jymVt" />
@@ -5195,102 +4797,11 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="3F6vMxqu6Rc" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
     </node>
     <node concept="2tJIrI" id="1n2ZgJ3LPvp" role="jymVt" />
-    <node concept="3clFb_" id="4i4XGQZlmS4" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="stored" />
-      <property role="DiZV1" value="false" />
-      <property role="IEkAT" value="false" />
-      <node concept="3Tm1VV" id="4i4XGQZlmS5" role="1B3o_S" />
-      <node concept="3cqZAl" id="4i4XGQZlmS7" role="3clF45" />
-      <node concept="37vLTG" id="4i4XGQZlmS8" role="3clF46">
-        <property role="TrG5h" value="constraint" />
-        <node concept="3uibUv" id="4i4XGQZlmS9" role="1tU5fm">
-          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="4i4XGQZlmSa" role="3clF47">
-        <node concept="3clFbF" id="4i4XGQZmhOO" role="3cqZAp">
-          <node concept="1rXfSq" id="4i4XGQZmhOP" role="3clFbG">
-            <ref role="37wK5l" node="4i4XGQZmbIk" resolve="displayInfo" />
-            <node concept="Rm8GO" id="61vfVfp5LH1" role="37wK5m">
-              <ref role="Rm8GQ" node="61vfVfp5usz" resolve="STORED" />
-              <ref role="1Px2BO" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
-            </node>
-            <node concept="1bVj0M" id="5mDiJnS0QAQ" role="37wK5m">
-              <node concept="3clFbS" id="5mDiJnS0QAR" role="1bW5cS">
-                <node concept="3clFbF" id="5mDiJnS0QAS" role="3cqZAp">
-                  <node concept="1Ls8ON" id="5mDiJnS0QAT" role="3clFbG">
-                    <node concept="Xl_RD" id="5mDiJnS0Sdk" role="1Lso8e">
-                      <property role="Xl_RC" value="[~~~] &lt;stored&gt; " />
-                    </node>
-                    <node concept="2ShNRf" id="5mDiJnS0QAV" role="1Lso8e">
-                      <node concept="3g6Rrh" id="5mDiJnS0QAW" role="2ShVmc">
-                        <node concept="3uibUv" id="5mDiJnS0QAX" role="3g7fb8">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                        <node concept="37vLTw" id="5mDiJnS0QAY" role="3g7hyw">
-                          <ref role="3cqZAo" node="4i4XGQZlmS8" resolve="constraint" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4i4XGQZmFtr" role="jymVt" />
-    <node concept="3clFb_" id="4i4XGQZlmSb" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="suspended" />
-      <property role="DiZV1" value="false" />
-      <property role="IEkAT" value="false" />
-      <node concept="3Tm1VV" id="4i4XGQZlmSc" role="1B3o_S" />
-      <node concept="3cqZAl" id="4i4XGQZlmSe" role="3clF45" />
-      <node concept="37vLTG" id="4i4XGQZlmSf" role="3clF46">
-        <property role="TrG5h" value="constraint" />
-        <node concept="3uibUv" id="4i4XGQZlmSg" role="1tU5fm">
-          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="4i4XGQZlmSh" role="3clF47">
-        <node concept="3clFbF" id="4i4XGQZmi0i" role="3cqZAp">
-          <node concept="1rXfSq" id="4i4XGQZmi0j" role="3clFbG">
-            <ref role="37wK5l" node="4i4XGQZmbIk" resolve="displayInfo" />
-            <node concept="Rm8GO" id="61vfVfp5LSa" role="37wK5m">
-              <ref role="Rm8GQ" node="61vfVfp5uz_" resolve="SUSPENDED" />
-              <ref role="1Px2BO" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
-            </node>
-            <node concept="1bVj0M" id="5mDiJnS0I_f" role="37wK5m">
-              <node concept="3clFbS" id="5mDiJnS0I_g" role="1bW5cS">
-                <node concept="3clFbF" id="5mDiJnS0I_h" role="3cqZAp">
-                  <node concept="1Ls8ON" id="5mDiJnS0I_i" role="3clFbG">
-                    <node concept="Xl_RD" id="4i4XGQZmi0k" role="1Lso8e">
-                      <property role="Xl_RC" value="[===] &lt;suspended&gt; " />
-                    </node>
-                    <node concept="2ShNRf" id="5mDiJnS0I_k" role="1Lso8e">
-                      <node concept="3g6Rrh" id="5mDiJnS0I_l" role="2ShVmc">
-                        <node concept="3uibUv" id="5mDiJnS0I_m" role="3g7fb8">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                        <node concept="37vLTw" id="5mDiJnS0Ncf" role="3g7hyw">
-                          <ref role="3cqZAo" node="4i4XGQZlmSf" resolve="constraint" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1n2ZgJ3LT4v" role="jymVt" />
     <node concept="3clFb_" id="1n2ZgJ3LUaC" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="suspend" />
@@ -5334,102 +4845,11 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="3F6vMxqugyf" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
     </node>
     <node concept="2tJIrI" id="1n2ZgJ3LXA5" role="jymVt" />
-    <node concept="3clFb_" id="4i4XGQZlmSi" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="removed" />
-      <property role="DiZV1" value="false" />
-      <property role="IEkAT" value="false" />
-      <node concept="3Tm1VV" id="4i4XGQZlmSj" role="1B3o_S" />
-      <node concept="3cqZAl" id="4i4XGQZlmSl" role="3clF45" />
-      <node concept="37vLTG" id="4i4XGQZlmSm" role="3clF46">
-        <property role="TrG5h" value="constraint" />
-        <node concept="3uibUv" id="4i4XGQZlmSn" role="1tU5fm">
-          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="4i4XGQZlmSo" role="3clF47">
-        <node concept="3clFbF" id="4i4XGQZmibm" role="3cqZAp">
-          <node concept="1rXfSq" id="4i4XGQZmibn" role="3clFbG">
-            <ref role="37wK5l" node="4i4XGQZmbIk" resolve="displayInfo" />
-            <node concept="Rm8GO" id="61vfVfp5M4O" role="37wK5m">
-              <ref role="Rm8GQ" node="61vfVfp5uEI" resolve="REMOVED" />
-              <ref role="1Px2BO" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
-            </node>
-            <node concept="1bVj0M" id="5mDiJnS0wTe" role="37wK5m">
-              <node concept="3clFbS" id="5mDiJnS0wTf" role="1bW5cS">
-                <node concept="3clFbF" id="5mDiJnS0wTg" role="3cqZAp">
-                  <node concept="1Ls8ON" id="5mDiJnS0wTh" role="3clFbG">
-                    <node concept="Xl_RD" id="4i4XGQZmibo" role="1Lso8e">
-                      <property role="Xl_RC" value="[^^^] &lt;removed&gt; " />
-                    </node>
-                    <node concept="2ShNRf" id="5mDiJnS0wTj" role="1Lso8e">
-                      <node concept="3g6Rrh" id="5mDiJnS0wTk" role="2ShVmc">
-                        <node concept="3uibUv" id="5mDiJnS0wTl" role="3g7fb8">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                        <node concept="37vLTw" id="5mDiJnS0wTm" role="3g7hyw">
-                          <ref role="3cqZAo" node="4i4XGQZlmSm" resolve="constraint" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4i4XGQZmFXy" role="jymVt" />
-    <node concept="3clFb_" id="4i4XGQZlmSp" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="terminated" />
-      <property role="DiZV1" value="false" />
-      <property role="IEkAT" value="false" />
-      <node concept="3Tm1VV" id="4i4XGQZlmSq" role="1B3o_S" />
-      <node concept="3cqZAl" id="4i4XGQZlmSs" role="3clF45" />
-      <node concept="37vLTG" id="4i4XGQZlmSt" role="3clF46">
-        <property role="TrG5h" value="constraint" />
-        <node concept="3uibUv" id="4i4XGQZlmSu" role="1tU5fm">
-          <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="4i4XGQZlmSv" role="3clF47">
-        <node concept="3clFbF" id="4i4XGQZmils" role="3cqZAp">
-          <node concept="1rXfSq" id="4i4XGQZmilt" role="3clFbG">
-            <ref role="37wK5l" node="4i4XGQZmbIk" resolve="displayInfo" />
-            <node concept="Rm8GO" id="61vfVfp5Mi7" role="37wK5m">
-              <ref role="Rm8GQ" node="61vfVfp5uLV" resolve="TERMINATED" />
-              <ref role="1Px2BO" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
-            </node>
-            <node concept="1bVj0M" id="5mDiJnS0pBg" role="37wK5m">
-              <node concept="3clFbS" id="5mDiJnS0pBh" role="1bW5cS">
-                <node concept="3clFbF" id="5mDiJnS0pBi" role="3cqZAp">
-                  <node concept="1Ls8ON" id="5mDiJnS0pBj" role="3clFbG">
-                    <node concept="Xl_RD" id="4i4XGQZmilu" role="1Lso8e">
-                      <property role="Xl_RC" value="[---] &lt;terminated&gt; " />
-                    </node>
-                    <node concept="2ShNRf" id="5mDiJnS0pBl" role="1Lso8e">
-                      <node concept="3g6Rrh" id="5mDiJnS0pBm" role="2ShVmc">
-                        <node concept="3uibUv" id="5mDiJnS0pBn" role="3g7fb8">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                        <node concept="37vLTw" id="5mDiJnS0tKj" role="3g7hyw">
-                          <ref role="3cqZAo" node="4i4XGQZlmSt" resolve="constraint" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4i4XGQZmGdB" role="jymVt" />
     <node concept="3clFb_" id="1n2ZgJ3LYH$" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="discard" />
@@ -5473,100 +4893,11 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="3F6vMxquwCi" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
     </node>
     <node concept="2tJIrI" id="1n2ZgJ3LZNJ" role="jymVt" />
-    <node concept="3clFb_" id="4i4XGQZlmSw" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="fires" />
-      <property role="DiZV1" value="false" />
-      <property role="IEkAT" value="false" />
-      <node concept="3Tm1VV" id="4i4XGQZlmSx" role="1B3o_S" />
-      <node concept="3cqZAl" id="4i4XGQZlmSz" role="3clF45" />
-      <node concept="37vLTG" id="4i4XGQZlmS$" role="3clF46">
-        <property role="TrG5h" value="rule" />
-        <node concept="3uibUv" id="4i4XGQZlmS_" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4i4XGQZlmSA" role="3clF46">
-        <property role="TrG5h" value="activeIdx" />
-        <node concept="10Oyi0" id="4i4XGQZlmSB" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="4i4XGQZlmSC" role="3clF46">
-        <property role="TrG5h" value="constraints" />
-        <node concept="8X2XB" id="4i4XGQZlmSD" role="1tU5fm">
-          <node concept="3uibUv" id="4i4XGQZlmSE" role="8Xvag">
-            <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="4i4XGQZlmSF" role="3clF47">
-        <node concept="3clFbF" id="1n2ZgJ3Mo7O" role="3cqZAp">
-          <node concept="3uNrnE" id="1n2ZgJ3Mo7P" role="3clFbG">
-            <node concept="37vLTw" id="1n2ZgJ3Mo7Q" role="2$L3a6">
-              <ref role="3cqZAo" node="61vfVfp2SU5" resolve="lastRuleTriggered" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1n2ZgJ3Mo7B" role="3cqZAp">
-          <node concept="1rXfSq" id="1n2ZgJ3Mo7C" role="3clFbG">
-            <ref role="37wK5l" node="4i4XGQZmbIk" resolve="displayInfo" />
-            <node concept="Rm8GO" id="1n2ZgJ3Mo7D" role="37wK5m">
-              <ref role="Rm8GQ" node="61vfVfp5uMw" resolve="TRIGGERED" />
-              <ref role="1Px2BO" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
-            </node>
-            <node concept="1bVj0M" id="5mDiJnRZXwf" role="37wK5m">
-              <node concept="3clFbS" id="5mDiJnRZXwg" role="1bW5cS">
-                <node concept="3clFbF" id="5mDiJnRZXwh" role="3cqZAp">
-                  <node concept="1Ls8ON" id="5mDiJnRZXwi" role="3clFbG">
-                    <node concept="3cpWs3" id="1n2ZgJ3Mo7E" role="1Lso8e">
-                      <node concept="Xl_RD" id="1n2ZgJ3Mo7F" role="3uHU7w">
-                        <property role="Xl_RC" value=") " />
-                      </node>
-                      <node concept="3cpWs3" id="1n2ZgJ3Mo7G" role="3uHU7B">
-                        <node concept="37vLTw" id="1n2ZgJ3Mo7H" role="3uHU7w">
-                          <ref role="3cqZAo" node="4i4XGQZlmSA" resolve="activeIdx" />
-                        </node>
-                        <node concept="3cpWs3" id="1n2ZgJ3Mo7I" role="3uHU7B">
-                          <node concept="3cpWs3" id="1n2ZgJ3Mo7J" role="3uHU7B">
-                            <node concept="Xl_RD" id="1n2ZgJ3Mo7K" role="3uHU7B">
-                              <property role="Xl_RC" value="[&gt;&gt;&gt;] &lt;triggered&gt; " />
-                            </node>
-                            <node concept="37vLTw" id="1n2ZgJ3Mo7L" role="3uHU7w">
-                              <ref role="3cqZAo" node="4i4XGQZlmS$" resolve="rule" />
-                            </node>
-                          </node>
-                          <node concept="Xl_RD" id="1n2ZgJ3Mo7M" role="3uHU7w">
-                            <property role="Xl_RC" value=" (" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2YIFZM" id="2nEyJybKHL_" role="1Lso8e">
-                      <ref role="37wK5l" to="33ny:~Arrays.copyOf(java.lang.Object[],int):java.lang.Object[]" resolve="copyOf" />
-                      <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-                      <node concept="37vLTw" id="2nEyJybKJTd" role="37wK5m">
-                        <ref role="3cqZAo" node="4i4XGQZlmSC" resolve="constraints" />
-                      </node>
-                      <node concept="2OqwBi" id="2nEyJybKWD5" role="37wK5m">
-                        <node concept="37vLTw" id="2nEyJybKUVt" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4i4XGQZlmSC" resolve="constraints" />
-                        </node>
-                        <node concept="1Rwk04" id="2nEyJybKYlT" role="2OqNvi" />
-                      </node>
-                      <node concept="3uibUv" id="2nEyJybKN1W" role="3PaCim">
-                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4i4XGQZmGA6" role="jymVt" />
     <node concept="3clFb_" id="1n2ZgJ3Mk5D" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="trigger" />
@@ -5579,11 +4910,9 @@
       <node concept="3cqZAl" id="1n2ZgJ3Mk5G" role="3clF45" />
       <node concept="3Tm1VV" id="1n2ZgJ3Mk5H" role="1B3o_S" />
       <node concept="3clFbS" id="1n2ZgJ3Mk5K" role="3clF47">
-        <node concept="3clFbF" id="1n2ZgJ3MwHy" role="3cqZAp">
-          <node concept="3uNrnE" id="1n2ZgJ3MwHz" role="3clFbG">
-            <node concept="37vLTw" id="1n2ZgJ3MwH$" role="2$L3a6">
-              <ref role="3cqZAo" node="61vfVfp2SU5" resolve="lastRuleTriggered" />
-            </node>
+        <node concept="3clFbF" id="3F6vMxquGhn" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxquGhl" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqsvUz" resolve="incLastRuleTriggered" />
           </node>
         </node>
         <node concept="3cpWs8" id="63ioh_TXaV5" role="3cqZAp">
@@ -5754,6 +5083,9 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="3F6vMxquJHv" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
     </node>
     <node concept="2tJIrI" id="2_NfR5whJHV" role="jymVt" />
     <node concept="3clFb_" id="2_NfR5whSFX" role="jymVt">
@@ -5785,98 +5117,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="2_NfR5whXeg" role="jymVt" />
-    <node concept="3clFb_" id="4i4XGQZlmSG" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="fired" />
-      <property role="DiZV1" value="false" />
-      <property role="IEkAT" value="false" />
-      <node concept="3Tm1VV" id="4i4XGQZlmSH" role="1B3o_S" />
-      <node concept="3cqZAl" id="4i4XGQZlmSJ" role="3clF45" />
-      <node concept="37vLTG" id="4i4XGQZlmSK" role="3clF46">
-        <property role="TrG5h" value="rule" />
-        <node concept="3uibUv" id="4i4XGQZlmSL" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4i4XGQZlmSM" role="3clF46">
-        <property role="TrG5h" value="activeIdx" />
-        <node concept="10Oyi0" id="4i4XGQZlmSN" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="4i4XGQZlmSO" role="3clF46">
-        <property role="TrG5h" value="constraints" />
-        <node concept="8X2XB" id="4i4XGQZlmSP" role="1tU5fm">
-          <node concept="3uibUv" id="4i4XGQZlmSQ" role="8Xvag">
-            <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="4i4XGQZlmSR" role="3clF47">
-        <node concept="3clFbF" id="4i4XGQZmqzZ" role="3cqZAp">
-          <node concept="1rXfSq" id="4i4XGQZmq$0" role="3clFbG">
-            <ref role="37wK5l" node="4i4XGQZmbIk" resolve="displayInfo" />
-            <node concept="Rm8GO" id="61vfVfp5O1N" role="37wK5m">
-              <ref role="Rm8GQ" node="61vfVfp5uU4" resolve="FIRED" />
-              <ref role="1Px2BO" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
-            </node>
-            <node concept="1bVj0M" id="5mDiJnRZHdK" role="37wK5m">
-              <node concept="3clFbS" id="5mDiJnRZHdL" role="1bW5cS">
-                <node concept="3clFbF" id="5mDiJnRZHdM" role="3cqZAp">
-                  <node concept="1Ls8ON" id="5mDiJnRZHdN" role="3clFbG">
-                    <node concept="3cpWs3" id="4i4XGQZmq$1" role="1Lso8e">
-                      <node concept="Xl_RD" id="4i4XGQZmq$2" role="3uHU7w">
-                        <property role="Xl_RC" value=" " />
-                      </node>
-                      <node concept="3cpWs3" id="4i4XGQZmq$3" role="3uHU7B">
-                        <node concept="37vLTw" id="4i4XGQZmq$4" role="3uHU7w">
-                          <ref role="3cqZAo" node="4i4XGQZlmSM" resolve="activeIdx" />
-                        </node>
-                        <node concept="3cpWs3" id="4i4XGQZmq$5" role="3uHU7B">
-                          <node concept="3cpWs3" id="4i4XGQZmq$6" role="3uHU7B">
-                            <node concept="Xl_RD" id="4i4XGQZmq$7" role="3uHU7B">
-                              <property role="Xl_RC" value="[&lt;&lt;&lt;] &lt;exited&gt; " />
-                            </node>
-                            <node concept="37vLTw" id="4i4XGQZmq$8" role="3uHU7w">
-                              <ref role="3cqZAo" node="4i4XGQZlmSK" resolve="rule" />
-                            </node>
-                          </node>
-                          <node concept="Xl_RD" id="4i4XGQZmq$9" role="3uHU7w">
-                            <property role="Xl_RC" value="#" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2YIFZM" id="2nEyJybKZO9" role="1Lso8e">
-                      <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-                      <ref role="37wK5l" to="33ny:~Arrays.copyOf(java.lang.Object[],int):java.lang.Object[]" resolve="copyOf" />
-                      <node concept="37vLTw" id="2nEyJybKZOa" role="37wK5m">
-                        <ref role="3cqZAo" node="4i4XGQZlmSO" resolve="constraints" />
-                      </node>
-                      <node concept="2OqwBi" id="2nEyJybKZOb" role="37wK5m">
-                        <node concept="37vLTw" id="2nEyJybKZOc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4i4XGQZlmSO" resolve="constraints" />
-                        </node>
-                        <node concept="1Rwk04" id="2nEyJybKZOd" role="2OqNvi" />
-                      </node>
-                      <node concept="3uibUv" id="2nEyJybKZOe" role="3PaCim">
-                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7feMCq_v8KI" role="3cqZAp">
-          <node concept="3uO5VW" id="7feMCq_v9B0" role="3clFbG">
-            <node concept="37vLTw" id="7feMCq_v9B2" role="2$L3a6">
-              <ref role="3cqZAo" node="61vfVfp2SU5" resolve="lastRuleTriggered" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="24Vro6cQTbM" role="jymVt" />
     <node concept="3clFb_" id="2UGjFq4b$XW" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="trying" />
@@ -5889,6 +5129,9 @@
       <node concept="3cqZAl" id="2UGjFq4b$XZ" role="3clF45" />
       <node concept="3Tm1VV" id="2UGjFq4b$Y0" role="1B3o_S" />
       <node concept="3clFbS" id="2UGjFq4b$Y3" role="3clF47" />
+      <node concept="2AHcQZ" id="3F6vMxquPyV" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
     </node>
     <node concept="2tJIrI" id="2UGjFq4bB5g" role="jymVt" />
     <node concept="3clFb_" id="2T1p0CFMQxa" role="jymVt">
@@ -5903,6 +5146,9 @@
       <node concept="3cqZAl" id="2T1p0CFMQxd" role="3clF45" />
       <node concept="3Tm1VV" id="2T1p0CFMQxe" role="1B3o_S" />
       <node concept="3clFbS" id="2T1p0CFMQxh" role="3clF47" />
+      <node concept="2AHcQZ" id="3F6vMxquRDr" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
     </node>
     <node concept="2tJIrI" id="2T1p0CFMSJT" role="jymVt" />
     <node concept="3clFb_" id="2UGjFq4b$Y4" role="jymVt">
@@ -5917,11 +5163,9 @@
       <node concept="3cqZAl" id="2UGjFq4b$Y7" role="3clF45" />
       <node concept="3Tm1VV" id="2UGjFq4b$Y8" role="1B3o_S" />
       <node concept="3clFbS" id="2UGjFq4b$Yb" role="3clF47">
-        <node concept="3clFbF" id="61vfVfp2Vd_" role="3cqZAp">
-          <node concept="3uO5VW" id="1n2ZgJ3MEFW" role="3clFbG">
-            <node concept="37vLTw" id="1n2ZgJ3MEFY" role="2$L3a6">
-              <ref role="3cqZAo" node="61vfVfp2SU5" resolve="lastRuleTriggered" />
-            </node>
+        <node concept="3clFbF" id="3F6vMxquXOj" role="3cqZAp">
+          <node concept="1rXfSq" id="3F6vMxquXOh" role="3clFbG">
+            <ref role="37wK5l" node="3F6vMxqsUIG" resolve="decLastRuleTriggered" />
           </node>
         </node>
         <node concept="3clFbF" id="4i4XGQZmm4T" role="3cqZAp">
@@ -5963,6 +5207,9 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="3F6vMxquTK3" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
     </node>
     <node concept="2tJIrI" id="2UGjFq4bD9F" role="jymVt" />
     <node concept="3clFb_" id="2UGjFq4bK4i" role="jymVt">
@@ -6378,90 +5625,37 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7dgRGU4oRFL" role="jymVt" />
-    <node concept="3clFb_" id="4i4XGQZmbIk" role="jymVt">
-      <property role="TrG5h" value="displayInfo" />
-      <node concept="3cqZAl" id="4i4XGQZmbIn" role="3clF45" />
-      <node concept="3Tm6S6" id="4i4XGQZmbT2" role="1B3o_S" />
-      <node concept="3clFbS" id="4i4XGQZmbIp" role="3clF47">
-        <node concept="3clFbF" id="7dgRGU4p1eI" role="3cqZAp">
-          <node concept="1rXfSq" id="7dgRGU4p1eH" role="3clFbG">
-            <ref role="37wK5l" node="7dgRGU4oSTZ" resolve="displayMessage" />
-            <node concept="37vLTw" id="7dgRGU4p1xx" role="37wK5m">
-              <ref role="3cqZAo" node="61vfVfp5G_l" resolve="evt" />
-            </node>
-            <node concept="Rm8GO" id="7dgRGU4p1K8" role="37wK5m">
-              <ref role="Rm8GQ" to="et5u:~MessageKind.INFORMATION" resolve="INFORMATION" />
-              <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
-            </node>
-            <node concept="37vLTw" id="5mDiJnRY_4B" role="37wK5m">
-              <ref role="3cqZAo" node="5mDiJnRYuy8" resolve="msg" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="61vfVfp5G_l" role="3clF46">
-        <property role="TrG5h" value="evt" />
-        <node concept="3uibUv" id="61vfVfp5La7" role="1tU5fm">
-          <ref role="3uigEE" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5mDiJnRYuy8" role="3clF46">
-        <property role="TrG5h" value="msg" />
-        <node concept="1ajhzC" id="5mDiJnRYuy9" role="1tU5fm">
-          <node concept="1LlUBW" id="5mDiJnRYuya" role="1ajl9A">
-            <node concept="17QB3L" id="5mDiJnRYuyb" role="1Lm7xW" />
-            <node concept="10Q1$e" id="5mDiJnRYuyc" role="1Lm7xW">
-              <node concept="3uibUv" id="5mDiJnRYuyd" role="10Q1$1">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7nkyKX7h2YI" role="jymVt" />
-    <node concept="3clFb_" id="7nkyKX7h0Lx" role="jymVt">
-      <property role="TrG5h" value="displayWarning" />
-      <node concept="3cqZAl" id="7nkyKX7h0Ly" role="3clF45" />
-      <node concept="3Tm6S6" id="7nkyKX7h0Lz" role="1B3o_S" />
-      <node concept="3clFbS" id="7nkyKX7h0L$" role="3clF47">
-        <node concept="3clFbF" id="7nkyKX7h0L_" role="3cqZAp">
-          <node concept="1rXfSq" id="7nkyKX7h0LA" role="3clFbG">
-            <ref role="37wK5l" node="7dgRGU4oSTZ" resolve="displayMessage" />
-            <node concept="37vLTw" id="7nkyKX7h0LB" role="37wK5m">
-              <ref role="3cqZAo" node="7nkyKX7h0LF" resolve="evt" />
-            </node>
-            <node concept="Rm8GO" id="7nkyKX7h6Sy" role="37wK5m">
-              <ref role="Rm8GQ" to="et5u:~MessageKind.WARNING" resolve="WARNING" />
-              <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
-            </node>
-            <node concept="37vLTw" id="5mDiJnRY$Cs" role="37wK5m">
-              <ref role="3cqZAo" node="5mDiJnRYwZJ" resolve="msg" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7nkyKX7h0LF" role="3clF46">
-        <property role="TrG5h" value="evt" />
-        <node concept="3uibUv" id="7nkyKX7h0LG" role="1tU5fm">
-          <ref role="3uigEE" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5mDiJnRYwZJ" role="3clF46">
-        <property role="TrG5h" value="msg" />
-        <node concept="1ajhzC" id="5mDiJnRYwZK" role="1tU5fm">
-          <node concept="1LlUBW" id="5mDiJnRYwZL" role="1ajl9A">
-            <node concept="17QB3L" id="5mDiJnRYwZM" role="1Lm7xW" />
-            <node concept="10Q1$e" id="5mDiJnRYwZN" role="1Lm7xW">
-              <node concept="3uibUv" id="5mDiJnRYwZO" role="10Q1$1">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="4i4XGQZmb7o" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqsvUz" role="jymVt">
+      <property role="TrG5h" value="incLastRuleTriggered" />
+      <node concept="3cqZAl" id="3F6vMxqsvU_" role="3clF45" />
+      <node concept="3Tm1VV" id="3F6vMxqsvUA" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqsvUB" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqt6jd" role="3cqZAp">
+          <node concept="3uNrnE" id="3F6vMxqt96N" role="3clFbG">
+            <node concept="37vLTw" id="3F6vMxqt96P" role="2$L3a6">
+              <ref role="3cqZAo" node="61vfVfp2SU5" resolve="lastRuleTriggered" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqsYUM" role="jymVt" />
+    <node concept="3clFb_" id="3F6vMxqsUIG" role="jymVt">
+      <property role="TrG5h" value="decLastRuleTriggered" />
+      <node concept="3cqZAl" id="3F6vMxqsUIH" role="3clF45" />
+      <node concept="3Tm1VV" id="3F6vMxqsUII" role="1B3o_S" />
+      <node concept="3clFbS" id="3F6vMxqsUIJ" role="3clF47">
+        <node concept="3clFbF" id="3F6vMxqt5jv" role="3cqZAp">
+          <node concept="3uO5VW" id="3F6vMxqt5jw" role="3clFbG">
+            <node concept="37vLTw" id="3F6vMxqt5jx" role="2$L3a6">
+              <ref role="3cqZAo" node="61vfVfp2SU5" resolve="lastRuleTriggered" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqsrnG" role="jymVt" />
     <node concept="3clFb_" id="7dgRGU4oSTZ" role="jymVt">
       <property role="TrG5h" value="displayMessage" />
       <node concept="37vLTG" id="7dgRGU4oWrI" role="3clF46">
@@ -6490,7 +5684,7 @@
         </node>
       </node>
       <node concept="3cqZAl" id="7dgRGU4oSU1" role="3clF45" />
-      <node concept="3Tm6S6" id="7dgRGU4p2yF" role="1B3o_S" />
+      <node concept="3Tm1VV" id="3F6vMxqs6JG" role="1B3o_S" />
       <node concept="3clFbS" id="7dgRGU4oSU3" role="3clF47">
         <node concept="3clFbJ" id="61vfVfp5I5n" role="3cqZAp">
           <node concept="3clFbS" id="61vfVfp5I5p" role="3clFbx">
@@ -6727,6 +5921,90 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4i4XGQZmt1o" role="jymVt" />
+    <node concept="3clFb_" id="4i4XGQZmbIk" role="jymVt">
+      <property role="TrG5h" value="displayInfo" />
+      <node concept="3cqZAl" id="4i4XGQZmbIn" role="3clF45" />
+      <node concept="3Tm6S6" id="4i4XGQZmbT2" role="1B3o_S" />
+      <node concept="3clFbS" id="4i4XGQZmbIp" role="3clF47">
+        <node concept="3clFbF" id="7dgRGU4p1eI" role="3cqZAp">
+          <node concept="1rXfSq" id="7dgRGU4p1eH" role="3clFbG">
+            <ref role="37wK5l" node="7dgRGU4oSTZ" resolve="displayMessage" />
+            <node concept="37vLTw" id="7dgRGU4p1xx" role="37wK5m">
+              <ref role="3cqZAo" node="61vfVfp5G_l" resolve="evt" />
+            </node>
+            <node concept="Rm8GO" id="7dgRGU4p1K8" role="37wK5m">
+              <ref role="Rm8GQ" to="et5u:~MessageKind.INFORMATION" resolve="INFORMATION" />
+              <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+            </node>
+            <node concept="37vLTw" id="5mDiJnRY_4B" role="37wK5m">
+              <ref role="3cqZAo" node="5mDiJnRYuy8" resolve="msg" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="61vfVfp5G_l" role="3clF46">
+        <property role="TrG5h" value="evt" />
+        <node concept="3uibUv" id="61vfVfp5La7" role="1tU5fm">
+          <ref role="3uigEE" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5mDiJnRYuy8" role="3clF46">
+        <property role="TrG5h" value="msg" />
+        <node concept="1ajhzC" id="5mDiJnRYuy9" role="1tU5fm">
+          <node concept="1LlUBW" id="5mDiJnRYuya" role="1ajl9A">
+            <node concept="17QB3L" id="5mDiJnRYuyb" role="1Lm7xW" />
+            <node concept="10Q1$e" id="5mDiJnRYuyc" role="1Lm7xW">
+              <node concept="3uibUv" id="5mDiJnRYuyd" role="10Q1$1">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7nkyKX7h2YI" role="jymVt" />
+    <node concept="3clFb_" id="7nkyKX7h0Lx" role="jymVt">
+      <property role="TrG5h" value="displayWarning" />
+      <node concept="3cqZAl" id="7nkyKX7h0Ly" role="3clF45" />
+      <node concept="3Tm6S6" id="7nkyKX7h0Lz" role="1B3o_S" />
+      <node concept="3clFbS" id="7nkyKX7h0L$" role="3clF47">
+        <node concept="3clFbF" id="7nkyKX7h0L_" role="3cqZAp">
+          <node concept="1rXfSq" id="7nkyKX7h0LA" role="3clFbG">
+            <ref role="37wK5l" node="7dgRGU4oSTZ" resolve="displayMessage" />
+            <node concept="37vLTw" id="7nkyKX7h0LB" role="37wK5m">
+              <ref role="3cqZAo" node="7nkyKX7h0LF" resolve="evt" />
+            </node>
+            <node concept="Rm8GO" id="7nkyKX7h6Sy" role="37wK5m">
+              <ref role="Rm8GQ" to="et5u:~MessageKind.WARNING" resolve="WARNING" />
+              <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+            </node>
+            <node concept="37vLTw" id="5mDiJnRY$Cs" role="37wK5m">
+              <ref role="3cqZAo" node="5mDiJnRYwZJ" resolve="msg" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7nkyKX7h0LF" role="3clF46">
+        <property role="TrG5h" value="evt" />
+        <node concept="3uibUv" id="7nkyKX7h0LG" role="1tU5fm">
+          <ref role="3uigEE" node="61vfVfp5tJN" resolve="MessageViewTracer.Event" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5mDiJnRYwZJ" role="3clF46">
+        <property role="TrG5h" value="msg" />
+        <node concept="1ajhzC" id="5mDiJnRYwZK" role="1tU5fm">
+          <node concept="1LlUBW" id="5mDiJnRYwZL" role="1ajl9A">
+            <node concept="17QB3L" id="5mDiJnRYwZM" role="1Lm7xW" />
+            <node concept="10Q1$e" id="5mDiJnRYwZN" role="1Lm7xW">
+              <node concept="3uibUv" id="5mDiJnRYwZO" role="10Q1$1">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqv2N$" role="jymVt" />
     <node concept="3clFb_" id="1n2ZgJ3LkPO" role="jymVt">
       <property role="TrG5h" value="debugString" />
       <node concept="37vLTG" id="1n2ZgJ3Lsnv" role="3clF46">
@@ -6739,56 +6017,6 @@
       <node concept="3Tm6S6" id="1n2ZgJ3LlNw" role="1B3o_S" />
       <node concept="3clFbS" id="1n2ZgJ3LkPS" role="3clF47">
         <node concept="3clFbJ" id="1n2ZgJ3LtJ2" role="3cqZAp">
-          <node concept="3clFbS" id="1n2ZgJ3LtJ3" role="3clFbx">
-            <node concept="3cpWs6" id="1n2ZgJ3LvgD" role="3cqZAp">
-              <node concept="2OqwBi" id="1n2ZgJ3Lxnv" role="3cqZAk">
-                <node concept="1eOMI4" id="1n2ZgJ3LwDx" role="2Oq$k0">
-                  <node concept="10QFUN" id="1n2ZgJ3LwDu" role="1eOMHV">
-                    <node concept="3uibUv" id="1n2ZgJ3LytC" role="10QFUM">
-                      <ref role="3uigEE" to="eifs:~Constraint" resolve="Constraint" />
-                    </node>
-                    <node concept="37vLTw" id="1n2ZgJ3LwD$" role="10QFUP">
-                      <ref role="3cqZAo" node="1n2ZgJ3Lsnv" resolve="o" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="1n2ZgJ3Lze_" role="2OqNvi">
-                  <ref role="37wK5l" to="eifs:~Constraint.toDebugString():java.lang.String" resolve="toDebugString" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="1n2ZgJ3LHdW" role="3cqZAp" />
-          </node>
-          <node concept="2ZW3vV" id="1n2ZgJ3LtYZ" role="3clFbw">
-            <node concept="3uibUv" id="1n2ZgJ3Lujo" role="2ZW6by">
-              <ref role="3uigEE" to="rchb:6Kcfpq7BfEn" resolve="Constraint" />
-            </node>
-            <node concept="37vLTw" id="1n2ZgJ3LtXH" role="2ZW6bz">
-              <ref role="3cqZAo" node="1n2ZgJ3Lsnv" resolve="o" />
-            </node>
-          </node>
-          <node concept="3eNFk2" id="1n2ZgJ3LzW9" role="3eNLev">
-            <node concept="2ZW3vV" id="1n2ZgJ3L$U6" role="3eO9$A">
-              <node concept="3uibUv" id="1n2ZgJ3L_eY" role="2ZW6by">
-                <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
-              </node>
-              <node concept="37vLTw" id="1n2ZgJ3L$Sn" role="2ZW6bz">
-                <ref role="3cqZAo" node="1n2ZgJ3Lsnv" resolve="o" />
-              </node>
-            </node>
-            <node concept="3clFbS" id="1n2ZgJ3LzWb" role="3eOfB_">
-              <node concept="3cpWs6" id="1n2ZgJ3L_Q7" role="3cqZAp">
-                <node concept="2YIFZM" id="1n2ZgJ3LMl7" role="3cqZAk">
-                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                  <node concept="37vLTw" id="1n2ZgJ3LMl8" role="37wK5m">
-                    <ref role="3cqZAo" node="1n2ZgJ3Lsnv" resolve="o" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="1n2ZgJ3LLKD" role="3cqZAp" />
-            </node>
-          </node>
           <node concept="9aQIb" id="1n2ZgJ3LD4a" role="9aQIa">
             <node concept="3clFbS" id="1n2ZgJ3LD4b" role="9aQI4">
               <node concept="3cpWs6" id="1n2ZgJ3LIqx" role="3cqZAp">
@@ -6802,79 +6030,29 @@
               </node>
             </node>
           </node>
+          <node concept="2ZW3vV" id="1n2ZgJ3L$U6" role="3clFbw">
+            <node concept="3uibUv" id="1n2ZgJ3L_eY" role="2ZW6by">
+              <ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
+            </node>
+            <node concept="37vLTw" id="1n2ZgJ3L$Sn" role="2ZW6bz">
+              <ref role="3cqZAo" node="1n2ZgJ3Lsnv" resolve="o" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="1n2ZgJ3LzWb" role="3clFbx">
+            <node concept="3cpWs6" id="1n2ZgJ3L_Q7" role="3cqZAp">
+              <node concept="2YIFZM" id="1n2ZgJ3LMl7" role="3cqZAk">
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <node concept="37vLTw" id="1n2ZgJ3LMl8" role="37wK5m">
+                  <ref role="3cqZAo" node="1n2ZgJ3Lsnv" resolve="o" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="1n2ZgJ3LLKD" role="3cqZAp" />
+          </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="5mDiJnRXT3S" role="jymVt" />
-    <node concept="Qs71p" id="61vfVfp5tJN" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Event" />
-      <node concept="QsSxf" id="61vfVfp5uey" role="Qtgdg">
-        <property role="TrG5h" value="ACTIVATED" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="61vfVfp5uls" role="Qtgdg">
-        <property role="TrG5h" value="REACTIVATED" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="61vfVfp5usz" role="Qtgdg">
-        <property role="TrG5h" value="STORED" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="61vfVfp5uz_" role="Qtgdg">
-        <property role="TrG5h" value="SUSPENDED" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="61vfVfp5uEI" role="Qtgdg">
-        <property role="TrG5h" value="REMOVED" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="61vfVfp5uLV" role="Qtgdg">
-        <property role="TrG5h" value="TERMINATED" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="61vfVfp5uMw" role="Qtgdg">
-        <property role="TrG5h" value="TRIGGERED" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="61vfVfp5uU4" role="Qtgdg">
-        <property role="TrG5h" value="FIRED" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="24Vro6cQUo9" role="Qtgdg">
-        <property role="TrG5h" value="ASK_SUCCESS" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="24Vro6cQUIt" role="Qtgdg">
-        <property role="TrG5h" value="ASK_FAILURE" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="6ps95k_Hk8b" role="Qtgdg">
-        <property role="TrG5h" value="ASK" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="6ps95k_GOS3" role="Qtgdg">
-        <property role="TrG5h" value="TELL" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="7FtwPOZH$aW" role="Qtgdg">
-        <property role="TrG5h" value="RESULT" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="7nkyKX7gTui" role="Qtgdg">
-        <property role="TrG5h" value="GARBAGE" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="7feMCq_cKM_" role="Qtgdg">
-        <property role="TrG5h" value="FAILURE" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="QsSxf" id="18cJbc1jXpK" role="Qtgdg">
-        <property role="TrG5h" value="INFO" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-      </node>
-      <node concept="3Tm1VV" id="61vfVfp5tJO" role="1B3o_S" />
-    </node>
     <node concept="2tJIrI" id="61vfVfp5tdr" role="jymVt" />
     <node concept="312cEg" id="4i4XGQZmMzg" role="jymVt">
       <property role="TrG5h" value="messagesViewTool" />
@@ -6930,9 +6108,83 @@
   </node>
   <node concept="312cEu" id="1pPth$l_TFV">
     <property role="TrG5h" value="TypecheckingHelper" />
-    <property role="1sVAO0" value="true" />
+    <property role="1sVAO0" value="false" />
     <property role="3GE5qa" value="typechecking" />
     <node concept="2tJIrI" id="1pPth$l_Yy_" role="jymVt" />
+    <node concept="3HP615" id="3F6vMxqaxpm" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="DoneCallback" />
+      <node concept="3clFb_" id="3F6vMxqaA32" role="jymVt">
+        <property role="TrG5h" value="finished" />
+        <property role="1EzhhJ" value="true" />
+        <property role="IEkAT" value="false" />
+        <node concept="37vLTG" id="3F6vMxqaA33" role="3clF46">
+          <property role="TrG5h" value="message" />
+          <node concept="17QB3L" id="3F6vMxqaA34" role="1tU5fm" />
+        </node>
+        <node concept="3cqZAl" id="3F6vMxqaA35" role="3clF45" />
+        <node concept="3Tm1VV" id="3F6vMxqaA36" role="1B3o_S" />
+        <node concept="3clFbS" id="3F6vMxqaA37" role="3clF47" />
+      </node>
+      <node concept="3clFb_" id="3F6vMxqaA38" role="jymVt">
+        <property role="TrG5h" value="failed" />
+        <property role="1EzhhJ" value="true" />
+        <node concept="37vLTG" id="3F6vMxqaA39" role="3clF46">
+          <property role="TrG5h" value="message" />
+          <node concept="17QB3L" id="3F6vMxqaA3a" role="1tU5fm" />
+        </node>
+        <node concept="3cqZAl" id="3F6vMxqaA3b" role="3clF45" />
+        <node concept="3Tm1VV" id="3F6vMxqaA3c" role="1B3o_S" />
+        <node concept="3clFbS" id="3F6vMxqaA3d" role="3clF47" />
+      </node>
+      <node concept="3Tm1VV" id="3F6vMxqaxpn" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="3F6vMxqas_j" role="jymVt" />
+    <node concept="3clFbW" id="1pPth$lK1ZL" role="jymVt">
+      <node concept="3cqZAl" id="1pPth$lK1ZN" role="3clF45" />
+      <node concept="3Tm1VV" id="1pPth$lKoEj" role="1B3o_S" />
+      <node concept="3clFbS" id="1pPth$lK1ZP" role="3clF47">
+        <node concept="3clFbF" id="1pPth$lK4UE" role="3cqZAp">
+          <node concept="37vLTI" id="1pPth$lK5cu" role="3clFbG">
+            <node concept="37vLTw" id="1pPth$lK5sZ" role="37vLTx">
+              <ref role="3cqZAo" node="1pPth$lK4DR" resolve="mpsProject" />
+            </node>
+            <node concept="2OqwBi" id="1pPth$lK4V4" role="37vLTJ">
+              <node concept="Xjq3P" id="1pPth$lK4UD" role="2Oq$k0" />
+              <node concept="2OwXpG" id="1pPth$lK4Zw" role="2OqNvi">
+                <ref role="2Oxat5" node="1pPth$lA2Na" resolve="mpsProject" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3F6vMxqaA$_" role="3cqZAp">
+          <node concept="37vLTI" id="3F6vMxqaA$B" role="3clFbG">
+            <node concept="2OqwBi" id="3F6vMxqaFpb" role="37vLTJ">
+              <node concept="Xjq3P" id="3F6vMxqaF$M" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3F6vMxqaFpe" role="2OqNvi">
+                <ref role="2Oxat5" node="3F6vMxqaA$x" resolve="myCallback" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="3F6vMxqaA$F" role="37vLTx">
+              <ref role="3cqZAo" node="3F6vMxqaA9K" resolve="callback" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="1pPth$lK4DR" role="3clF46">
+        <property role="TrG5h" value="mpsProject" />
+        <node concept="3uibUv" id="1pPth$lK4DQ" role="1tU5fm">
+          <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3F6vMxqaA9K" role="3clF46">
+        <property role="TrG5h" value="callback" />
+        <node concept="3uibUv" id="3F6vMxqb93n" role="1tU5fm">
+          <ref role="3uigEE" node="3F6vMxqaxpm" resolve="TypecheckingHelper.DoneCallback" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1pPth$lNpyq" role="jymVt" />
     <node concept="3clFb_" id="1pPth$lBvOo" role="jymVt">
       <property role="TrG5h" value="collectRules" />
       <property role="IEkAT" value="false" />
@@ -6959,58 +6211,6 @@
       </node>
       <node concept="3Tm1VV" id="1pPth$lBsf4" role="1B3o_S" />
     </node>
-    <node concept="3clFb_" id="1pPth$lBwLp" role="jymVt">
-      <property role="TrG5h" value="produceHandler" />
-      <property role="IEkAT" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="37vLTG" id="6OUp3PsVw9C" role="3clF46">
-        <property role="TrG5h" value="include" />
-        <node concept="10P_77" id="6OUp3PsVxC2" role="1tU5fm" />
-      </node>
-      <node concept="3clFbS" id="1pPth$lBwLq" role="3clF47">
-        <node concept="3clFbF" id="1pPth$lBwLr" role="3cqZAp">
-          <node concept="2ShNRf" id="1pPth$lBwLs" role="3clFbG">
-            <node concept="1pGfFk" id="6OUp3PsVzI7" role="2ShVmc">
-              <ref role="37wK5l" node="6OUp3PsVz2A" resolve="TypecheckingHelper.ProduceHandler" />
-              <node concept="37vLTw" id="6OUp3PsV$EB" role="37wK5m">
-                <ref role="3cqZAo" node="6OUp3PsVw9C" resolve="include" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="1pPth$lBwLu" role="3clF45">
-        <ref role="3uigEE" node="1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
-      </node>
-      <node concept="3Tm1VV" id="1pPth$lBwLv" role="1B3o_S" />
-    </node>
-    <node concept="3clFb_" id="1pPth$lD9_s" role="jymVt">
-      <property role="TrG5h" value="makeHandler" />
-      <property role="IEkAT" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="37vLTG" id="6OUp3PsV$Ok" role="3clF46">
-        <property role="TrG5h" value="include" />
-        <node concept="10P_77" id="6OUp3PsVAHA" role="1tU5fm" />
-      </node>
-      <node concept="3clFbS" id="1pPth$lD9_t" role="3clF47">
-        <node concept="3clFbF" id="1pPth$lD9_u" role="3cqZAp">
-          <node concept="2ShNRf" id="1pPth$lD9_v" role="3clFbG">
-            <node concept="1pGfFk" id="6OUp3PsVCub" role="2ShVmc">
-              <ref role="37wK5l" node="6OUp3PsVBJU" resolve="TypecheckingHelper.MakeHandler" />
-              <node concept="37vLTw" id="6OUp3PsVDGw" role="37wK5m">
-                <ref role="3cqZAo" node="6OUp3PsV$Ok" resolve="include" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="1pPth$lD9_x" role="3clF45">
-        <ref role="3uigEE" node="1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
-      </node>
-      <node concept="3Tm1VV" id="1pPth$lD9_y" role="1B3o_S" />
-    </node>
     <node concept="3clFb_" id="1pPth$lDhou" role="jymVt">
       <property role="TrG5h" value="runTypechecking" />
       <property role="IEkAT" value="false" />
@@ -7020,10 +6220,6 @@
         <property role="TrG5h" value="nodes" />
         <node concept="2I9FWS" id="1pPth$lHmlI" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="6OUp3PsVDL8" role="3clF46">
-        <property role="TrG5h" value="useJchr" />
-        <node concept="10P_77" id="6OUp3PsVF$y" role="1tU5fm" />
-      </node>
       <node concept="37vLTG" id="1N_0WA5HGOA" role="3clF46">
         <property role="TrG5h" value="showTrace" />
         <node concept="10P_77" id="1N_0WA5HI$m" role="1tU5fm" />
@@ -7036,9 +6232,6 @@
               <node concept="37vLTw" id="1pPth$lHwyn" role="37wK5m">
                 <ref role="3cqZAo" node="1pPth$lHmlH" resolve="nodes" />
               </node>
-              <node concept="37vLTw" id="6OUp3PsVFRk" role="37wK5m">
-                <ref role="3cqZAo" node="6OUp3PsVDL8" resolve="useJchr" />
-              </node>
               <node concept="37vLTw" id="1N_0WA5HJfv" role="37wK5m">
                 <ref role="3cqZAo" node="1N_0WA5HGOA" resolve="showTrace" />
               </node>
@@ -7080,32 +6273,6 @@
       <node concept="3Tm1VV" id="1pPth$lDplV" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="1pPth$lJVeH" role="jymVt" />
-    <node concept="3clFbW" id="1pPth$lK1ZL" role="jymVt">
-      <node concept="3cqZAl" id="1pPth$lK1ZN" role="3clF45" />
-      <node concept="3Tm1VV" id="1pPth$lKoEj" role="1B3o_S" />
-      <node concept="3clFbS" id="1pPth$lK1ZP" role="3clF47">
-        <node concept="3clFbF" id="1pPth$lK4UE" role="3cqZAp">
-          <node concept="37vLTI" id="1pPth$lK5cu" role="3clFbG">
-            <node concept="37vLTw" id="1pPth$lK5sZ" role="37vLTx">
-              <ref role="3cqZAo" node="1pPth$lK4DR" resolve="mpsProject" />
-            </node>
-            <node concept="2OqwBi" id="1pPth$lK4V4" role="37vLTJ">
-              <node concept="Xjq3P" id="1pPth$lK4UD" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1pPth$lK4Zw" role="2OqNvi">
-                <ref role="2Oxat5" node="1pPth$lA2Na" resolve="mpsProject" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="1pPth$lK4DR" role="3clF46">
-        <property role="TrG5h" value="mpsProject" />
-        <node concept="3uibUv" id="1pPth$lK4DQ" role="1tU5fm">
-          <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1pPth$lNpyq" role="jymVt" />
     <node concept="3clFb_" id="1pPth$lNtBJ" role="jymVt">
       <property role="TrG5h" value="withSteps" />
       <node concept="37vLTG" id="1pPth$lKvJ8" role="3clF46">
@@ -7222,33 +6389,9 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1pPth$lNTte" role="jymVt" />
-    <node concept="3clFb_" id="1pPth$lIk6$" role="jymVt">
-      <property role="TrG5h" value="finished" />
-      <property role="1EzhhJ" value="true" />
-      <property role="IEkAT" value="false" />
-      <node concept="37vLTG" id="1pPth$lIwm_" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="1pPth$lIMF3" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="1pPth$lIk6A" role="3clF45" />
-      <node concept="3Tm1VV" id="1pPth$lIk6B" role="1B3o_S" />
-      <node concept="3clFbS" id="1pPth$lIk6C" role="3clF47" />
-    </node>
-    <node concept="3clFb_" id="1pPth$lIE2N" role="jymVt">
-      <property role="TrG5h" value="failed" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="1pPth$lIKys" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="1pPth$lIMxd" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="1pPth$lIE2P" role="3clF45" />
-      <node concept="3Tm1VV" id="1pPth$lIE2Q" role="1B3o_S" />
-      <node concept="3clFbS" id="1pPth$lIE2R" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="1pPth$lIPgu" role="jymVt" />
     <node concept="312cEg" id="1pPth$lA2Na" role="jymVt">
       <property role="TrG5h" value="mpsProject" />
-      <node concept="3Tm6S6" id="1pPth$lA2Nb" role="1B3o_S" />
+      <node concept="3Tmbuc" id="3F6vMxqcYz0" role="1B3o_S" />
       <node concept="3uibUv" id="1pPth$lA3PO" role="1tU5fm">
         <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
       </node>
@@ -7272,6 +6415,13 @@
         <ref role="3uigEE" node="1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
       </node>
     </node>
+    <node concept="312cEg" id="3F6vMxqaA$x" role="jymVt">
+      <property role="TrG5h" value="myCallback" />
+      <node concept="3Tm6S6" id="3F6vMxqaA$y" role="1B3o_S" />
+      <node concept="3uibUv" id="3F6vMxqb9ot" role="1tU5fm">
+        <ref role="3uigEE" node="3F6vMxqaxpm" resolve="TypecheckingHelper.DoneCallback" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="1pPth$lKDgn" role="jymVt" />
     <node concept="3clFb_" id="1pPth$lA589" role="jymVt">
       <property role="TrG5h" value="rulesModel" />
@@ -7580,15 +6730,20 @@
             </node>
             <node concept="9aQIb" id="7dgRGU4MD8i" role="9aQIa">
               <node concept="3clFbS" id="7dgRGU4MD8j" role="9aQI4">
-                <node concept="3clFbF" id="1N_0WA5K93k" role="3cqZAp">
-                  <node concept="1rXfSq" id="1N_0WA5K93j" role="3clFbG">
-                    <ref role="37wK5l" node="1pPth$lIE2N" resolve="failed" />
-                    <node concept="2OqwBi" id="1N_0WA5Karu" role="37wK5m">
-                      <node concept="37vLTw" id="1N_0WA5K9GS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
-                      </node>
-                      <node concept="liA8E" id="1N_0WA5Ka$t" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+                <node concept="3clFbF" id="3F6vMxqbRah" role="3cqZAp">
+                  <node concept="2OqwBi" id="3F6vMxqbRVQ" role="3clFbG">
+                    <node concept="37vLTw" id="3F6vMxqbRaf" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3F6vMxqaA$x" resolve="myCallback" />
+                    </node>
+                    <node concept="liA8E" id="3F6vMxqbS43" role="2OqNvi">
+                      <ref role="37wK5l" node="3F6vMxqaA38" resolve="failed" />
+                      <node concept="2OqwBi" id="1N_0WA5Karu" role="37wK5m">
+                        <node concept="37vLTw" id="1N_0WA5K9GS" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
+                        </node>
+                        <node concept="liA8E" id="1N_0WA5Ka$t" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -7600,15 +6755,20 @@
                 <ref role="3cqZAo" node="7dgRGU4MD8p" resolve="success" />
               </node>
               <node concept="3clFbS" id="1N_0WA5K7fZ" role="3eOfB_">
-                <node concept="3clFbF" id="7dgRGU4MD8k" role="3cqZAp">
-                  <node concept="1rXfSq" id="7dgRGU4MD8l" role="3clFbG">
-                    <ref role="37wK5l" node="1pPth$lIk6$" resolve="finished" />
-                    <node concept="2OqwBi" id="7dgRGU4MD8m" role="37wK5m">
-                      <node concept="37vLTw" id="7dgRGU4MD8n" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
-                      </node>
-                      <node concept="liA8E" id="7dgRGU4MD8o" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+                <node concept="3clFbF" id="3F6vMxqbOPD" role="3cqZAp">
+                  <node concept="2OqwBi" id="3F6vMxqbPok" role="3clFbG">
+                    <node concept="37vLTw" id="3F6vMxqbOPB" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3F6vMxqaA$x" resolve="myCallback" />
+                    </node>
+                    <node concept="liA8E" id="3F6vMxqbPB0" role="2OqNvi">
+                      <ref role="37wK5l" node="3F6vMxqaA32" resolve="finished" />
+                      <node concept="2OqwBi" id="7dgRGU4MD8m" role="37wK5m">
+                        <node concept="37vLTw" id="7dgRGU4MD8n" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
+                        </node>
+                        <node concept="liA8E" id="7dgRGU4MD8o" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -7685,10 +6845,10 @@
     <node concept="312cEu" id="1pPth$lAwc0" role="jymVt">
       <property role="2bfB8j" value="true" />
       <property role="TrG5h" value="CollectRules" />
-      <node concept="3Tm1VV" id="1isQzel_W3O" role="1B3o_S" />
+      <node concept="3Tm1VV" id="3F6vMxq$KGN" role="1B3o_S" />
       <node concept="3clFbW" id="1pPth$lDzTR" role="jymVt">
         <node concept="3cqZAl" id="1pPth$lDzTT" role="3clF45" />
-        <node concept="3Tm1VV" id="1pPth$lDzTU" role="1B3o_S" />
+        <node concept="3Tmbuc" id="3F6vMxq$Oun" role="1B3o_S" />
         <node concept="3clFbS" id="1pPth$lDzTV" role="3clF47">
           <node concept="3clFbF" id="1pPth$lD$Fx" role="3cqZAp">
             <node concept="37vLTI" id="1pPth$lD$Fz" role="3clFbG">
@@ -7877,35 +7037,21 @@
                           </node>
                         </node>
                         <node concept="3clFbH" id="4JJCDIn5exj" role="3cqZAp" />
-                        <node concept="3SKdUt" id="6X5F0Ngi2Wb" role="3cqZAp">
-                          <node concept="3SKdUq" id="6X5F0Ngi2Wd" role="3SKWNk">
-                            <property role="3SKdUp" value="FIXME: extract to implementation-dependent component?" />
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="2UGjFq4LlNw" role="3cqZAp">
-                          <node concept="2OqwBi" id="2UGjFq4LEn_" role="3clFbG">
-                            <node concept="2OqwBi" id="2UGjFq4Lmv8" role="2Oq$k0">
-                              <node concept="Xjq3P" id="2UGjFq4LlNu" role="2Oq$k0" />
-                              <node concept="2OwXpG" id="2UGjFq4LmZz" role="2OqNvi">
-                                <ref role="2Oxat5" node="2UGjFq4Lj$X" resolve="sessionSolver" />
+                        <node concept="3clFbF" id="3F6vMxqm2AB" role="3cqZAp">
+                          <node concept="2OqwBi" id="3F6vMxqm9QE" role="3clFbG">
+                            <node concept="2OqwBi" id="3F6vMxqm4Iw" role="2Oq$k0">
+                              <node concept="Xjq3P" id="3F6vMxqm2A_" role="2Oq$k0" />
+                              <node concept="2OwXpG" id="3F6vMxqm754" role="2OqNvi">
+                                <ref role="2Oxat5" node="3F6vMxqlTiX" resolve="expressionSolvers" />
                               </node>
                             </node>
-                            <node concept="TSZUe" id="2UGjFq4LF9z" role="2OqNvi">
-                              <node concept="2ShNRf" id="2UGjFq4LoMV" role="25WWJ7">
-                                <node concept="1pGfFk" id="2UGjFq4LoMW" role="2ShVmc">
-                                  <ref role="37wK5l" to="95zw:6MYr6Jwp7cE" resolve="JchrSessionSolver" />
-                                  <node concept="2OqwBi" id="2UGjFq4LoMX" role="37wK5m">
-                                    <node concept="37vLTw" id="2UGjFq4LoMY" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3Qp4N06byjA" resolve="ruleManifest" />
-                                    </node>
-                                    <node concept="liA8E" id="2UGjFq4LoMZ" role="2OqNvi">
-                                      <ref role="37wK5l" to="i348:1ggxSI7z1S5" resolve="javaExpressionSolver" />
-                                    </node>
-                                  </node>
-                                  <node concept="2YIFZM" id="2UGjFq4LoN0" role="37wK5m">
-                                    <ref role="37wK5l" to="eifs:~ConstraintSystem.get():runtime.ConstraintSystem" resolve="get" />
-                                    <ref role="1Pybhc" to="eifs:~ConstraintSystem" resolve="ConstraintSystem" />
-                                  </node>
+                            <node concept="TSZUe" id="3F6vMxqmcFJ" role="2OqNvi">
+                              <node concept="2OqwBi" id="3F6vMxqmeIj" role="25WWJ7">
+                                <node concept="37vLTw" id="3F6vMxqmeIk" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="3Qp4N06byjA" resolve="ruleManifest" />
+                                </node>
+                                <node concept="liA8E" id="3F6vMxqmeIl" role="2OqNvi">
+                                  <ref role="37wK5l" to="i348:1ggxSI7z1S5" resolve="javaExpressionSolver" />
                                 </node>
                               </node>
                             </node>
@@ -7977,8 +7123,11 @@
                         <node concept="3clFbH" id="506k$zeTAV$" role="3cqZAp" />
                         <node concept="3clFbF" id="1pPth$lGzsJ" role="3cqZAp">
                           <node concept="2OqwBi" id="1pPth$lG$rZ" role="3clFbG">
-                            <node concept="37vLTw" id="1pPth$lGzsH" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1pPth$lE8Xs" resolve="programs" />
+                            <node concept="2OqwBi" id="3F6vMxqnFll" role="2Oq$k0">
+                              <node concept="Xjq3P" id="3F6vMxqnHek" role="2Oq$k0" />
+                              <node concept="2OwXpG" id="3F6vMxqnFlo" role="2OqNvi">
+                                <ref role="2Oxat5" node="1pPth$lE8Xs" resolve="programs" />
+                              </node>
                             </node>
                             <node concept="TSZUe" id="1pPth$lGArx" role="2OqNvi">
                               <node concept="37vLTw" id="1pPth$lGBka" role="25WWJ7">
@@ -8082,7 +7231,7 @@
         <property role="eg7rD" value="false" />
         <property role="TrG5h" value="programs" />
         <property role="3TUv4t" value="false" />
-        <node concept="3Tmbuc" id="1pPth$lE7PF" role="1B3o_S" />
+        <node concept="3Tm1VV" id="3F6vMxq$OGQ" role="1B3o_S" />
         <node concept="_YKpA" id="1pPth$lE8zt" role="1tU5fm">
           <node concept="3uibUv" id="78CwJJcTw4D" role="_ZDj9">
             <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
@@ -8096,393 +7245,30 @@
           </node>
         </node>
       </node>
-      <node concept="312cEg" id="2UGjFq4Lj$X" role="jymVt">
-        <property role="TrG5h" value="sessionSolver" />
-        <node concept="3Tmbuc" id="2UGjFq4LkZ1" role="1B3o_S" />
-        <node concept="_YKpA" id="2UGjFq4LyK2" role="1tU5fm">
-          <node concept="3uibUv" id="2UGjFq4L$2U" role="_ZDj9">
-            <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+      <node concept="312cEg" id="3F6vMxqlTiX" role="jymVt">
+        <property role="TrG5h" value="expressionSolvers" />
+        <node concept="3Tm1VV" id="3F6vMxq$S9w" role="1B3o_S" />
+        <node concept="_YKpA" id="3F6vMxqlY2Z" role="1tU5fm">
+          <node concept="3uibUv" id="3F6vMxqlZdi" role="_ZDj9">
+            <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
           </node>
         </node>
-        <node concept="2ShNRf" id="2UGjFq4LAw9" role="33vP2m">
-          <node concept="Tc6Ow" id="2UGjFq4LAt4" role="2ShVmc">
-            <node concept="3uibUv" id="2UGjFq4LAt5" role="HW$YZ">
-              <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        <node concept="2ShNRf" id="3F6vMxqm03O" role="33vP2m">
+          <node concept="Tc6Ow" id="3F6vMxqlZFJ" role="2ShVmc">
+            <node concept="3uibUv" id="3F6vMxqlZFK" role="HW$YZ">
+              <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1pPth$lA1x2" role="jymVt" />
-    <node concept="312cEu" id="1pPth$lB0Q2" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="ProduceHandler" />
-      <node concept="3clFbW" id="6OUp3PsVz2A" role="jymVt">
-        <node concept="3cqZAl" id="6OUp3PsVz2C" role="3clF45" />
-        <node concept="3Tm6S6" id="6OUp3PsVz2D" role="1B3o_S" />
-        <node concept="3clFbS" id="6OUp3PsVz2E" role="3clF47">
-          <node concept="3clFbF" id="6OUp3PsVzZA" role="3cqZAp">
-            <node concept="37vLTI" id="6OUp3PsVzZC" role="3clFbG">
-              <node concept="2OqwBi" id="6OUp3PsVzZG" role="37vLTJ">
-                <node concept="Xjq3P" id="6OUp3PsVzZJ" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6OUp3PsVzZF" role="2OqNvi">
-                  <ref role="2Oxat5" node="6OUp3PsVzZy" resolve="include" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="6OUp3PsWasS" role="37vLTx">
-                <ref role="3cqZAo" node="6OUp3PsVzTO" resolve="include" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="6OUp3PsVzTO" role="3clF46">
-          <property role="TrG5h" value="include" />
-          <node concept="10P_77" id="6OUp3PsVzTN" role="1tU5fm" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="1pPth$lMJaQ" role="jymVt">
-        <property role="TrG5h" value="info" />
-        <property role="1EzhhJ" value="false" />
-        <node concept="17QB3L" id="1pPth$lMJaR" role="3clF45" />
-        <node concept="3Tmbuc" id="1pPth$lMJaS" role="1B3o_S" />
-        <node concept="3clFbS" id="1pPth$lMJaU" role="3clF47">
-          <node concept="3clFbF" id="1pPth$lMK0U" role="3cqZAp">
-            <node concept="Xl_RD" id="1pPth$lMK0T" role="3clFbG">
-              <property role="Xl_RC" value="producing rules handler" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="1pPth$lB26u" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <property role="1EzhhJ" value="false" />
-        <node concept="37vLTG" id="1pPth$lEaxh" role="3clF46">
-          <property role="TrG5h" value="prev" />
-          <node concept="3uibUv" id="1pPth$lEbiS" role="1tU5fm">
-            <ref role="3uigEE" node="1pPth$lAwc0" resolve="TypecheckingHelper.CollectRules" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1pPth$lB26x" role="3clF45" />
-        <node concept="3Tm1VV" id="1pPth$lB26y" role="1B3o_S" />
-        <node concept="3clFbS" id="1pPth$lB26$" role="3clF47">
-          <node concept="3clFbH" id="1pPth$lCaeF" role="3cqZAp" />
-          <node concept="3cpWs8" id="1pPth$l_Zgt" role="3cqZAp">
-            <node concept="3cpWsn" id="1pPth$l_Zgu" role="3cpWs9">
-              <property role="TrG5h" value="errors" />
-              <node concept="10Oyi0" id="1pPth$l_Zgv" role="1tU5fm" />
-              <node concept="3cmrfG" id="1pPth$l_Zgw" role="33vP2m">
-                <property role="3cmrfH" value="0" />
-              </node>
-            </node>
-          </node>
-          <node concept="1QHqEO" id="1pPth$l_Zgx" role="3cqZAp">
-            <node concept="1QHqEC" id="1pPth$l_Zgy" role="1QHqEI">
-              <node concept="3clFbS" id="1pPth$l_Zgz" role="1bW5cS">
-                <node concept="SfApY" id="1pPth$l_ZgB" role="3cqZAp">
-                  <node concept="3clFbS" id="1pPth$l_ZgC" role="SfCbr">
-                    <node concept="1_o_46" id="2UGjFq4P9ov" role="3cqZAp">
-                      <node concept="3clFbS" id="2UGjFq4P9ox" role="2LFqv$">
-                        <node concept="3clFbJ" id="6OUp3PsVHo4" role="3cqZAp">
-                          <node concept="3clFbS" id="6OUp3PsVHo6" role="3clFbx">
-                            <node concept="3clFbF" id="pIEwD9IsyX" role="3cqZAp">
-                              <node concept="2OqwBi" id="pIEwD9IsyY" role="3clFbG">
-                                <node concept="2ShNRf" id="pIEwD9IsyZ" role="2Oq$k0">
-                                  <node concept="1pGfFk" id="pIEwD9Isz0" role="2ShVmc">
-                                    <ref role="37wK5l" to="dlzn:ZqZbw4Qjv7" resolve="ChrHandlerProducer" />
-                                    <node concept="3M$PaV" id="2UGjFq4PbSr" role="37wK5m">
-                                      <ref role="3M$S_o" node="2UGjFq4P9oB" resolve="program" />
-                                    </node>
-                                    <node concept="3M$PaV" id="2UGjFq4Pcta" role="37wK5m">
-                                      <ref role="3M$S_o" node="2UGjFq4P9qu" resolve="sessionSolver" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="pIEwD9Isz1" role="2OqNvi">
-                                  <ref role="37wK5l" to="dlzn:ZqZbw4Qjwa" resolve="produce" />
-                                  <node concept="2OqwBi" id="pIEwD9Isz2" role="37wK5m">
-                                    <node concept="Xjq3P" id="pIEwD9Isz3" role="2Oq$k0">
-                                      <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                                    </node>
-                                    <node concept="liA8E" id="pIEwD9Isz4" role="2OqNvi">
-                                      <ref role="37wK5l" node="1pPth$lA589" resolve="rulesModel" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="37vLTw" id="6OUp3PsVHJS" role="3clFbw">
-                            <ref role="3cqZAo" node="6OUp3PsVzZy" resolve="include" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1_o_bx" id="2UGjFq4P9oz" role="1_o_by">
-                        <node concept="2OqwBi" id="2UGjFq4Pa$1" role="1_o_bz">
-                          <node concept="37vLTw" id="2UGjFq4PahD" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1pPth$lEaxh" resolve="prev" />
-                          </node>
-                          <node concept="2OwXpG" id="2UGjFq4PaGl" role="2OqNvi">
-                            <ref role="2Oxat5" node="1pPth$lE8Xs" resolve="programs" />
-                          </node>
-                        </node>
-                        <node concept="1_o_bG" id="2UGjFq4P9oB" role="1_o_aQ">
-                          <property role="TrG5h" value="program" />
-                        </node>
-                      </node>
-                      <node concept="1_o_bx" id="2UGjFq4P9qs" role="1_o_by">
-                        <node concept="2OqwBi" id="2UGjFq4Pbnu" role="1_o_bz">
-                          <node concept="37vLTw" id="2UGjFq4Pb56" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1pPth$lEaxh" resolve="prev" />
-                          </node>
-                          <node concept="2OwXpG" id="2UGjFq4PbvM" role="2OqNvi">
-                            <ref role="2Oxat5" node="2UGjFq4Lj$X" resolve="sessionSolver" />
-                          </node>
-                        </node>
-                        <node concept="1_o_bG" id="2UGjFq4P9qu" role="1_o_aQ">
-                          <property role="TrG5h" value="sessionSolver" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="TDmWw" id="1pPth$l_ZgL" role="TEbGg">
-                    <node concept="3cpWsn" id="1pPth$l_ZgM" role="TDEfY">
-                      <property role="TrG5h" value="ex" />
-                      <node concept="3uibUv" id="1pPth$l_ZgN" role="1tU5fm">
-                        <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
-                      </node>
-                    </node>
-                    <node concept="3clFbS" id="1pPth$l_ZgO" role="TDEfX">
-                      <node concept="34ab3g" id="1pPth$l_ZgP" role="3cqZAp">
-                        <property role="35gtTG" value="error" />
-                        <property role="34fQS0" value="true" />
-                        <node concept="Xl_RD" id="1pPth$l_ZgQ" role="34bqiv">
-                          <property role="Xl_RC" value="exception during rules generating" />
-                        </node>
-                        <node concept="37vLTw" id="1pPth$l_ZgR" role="34bMjA">
-                          <ref role="3cqZAo" node="1pPth$l_ZgM" resolve="ex" />
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="1pPth$l_ZgS" role="3cqZAp">
-                        <node concept="d57v9" id="1pPth$l_ZgT" role="3clFbG">
-                          <node concept="3cmrfG" id="1pPth$l_ZgU" role="37vLTx">
-                            <property role="3cmrfH" value="1" />
-                          </node>
-                          <node concept="37vLTw" id="1pPth$l_ZgV" role="37vLTJ">
-                            <ref role="3cqZAo" node="1pPth$l_Zgu" resolve="errors" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1pPth$l_Zh0" role="ukAjM">
-              <node concept="2OqwBi" id="1pPth$l_Zh1" role="2Oq$k0">
-                <node concept="Xjq3P" id="1pPth$l_Zgj" role="2Oq$k0">
-                  <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                </node>
-                <node concept="2OwXpG" id="1pPth$lA8Tj" role="2OqNvi">
-                  <ref role="2Oxat5" node="1pPth$lA2Na" resolve="mpsProject" />
-                </node>
-              </node>
-              <node concept="liA8E" id="1pPth$l_Zh3" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="1pPth$l_Zh4" role="3cqZAp" />
-          <node concept="3clFbF" id="7dgRGU4Nv9m" role="3cqZAp">
-            <node concept="1rXfSq" id="7dgRGU4Nv9k" role="3clFbG">
-              <ref role="37wK5l" node="7dgRGU4Nmfr" resolve="done" />
-              <node concept="3clFbC" id="7dgRGU4NzTI" role="37wK5m">
-                <node concept="37vLTw" id="7dgRGU4NvqZ" role="3uHU7B">
-                  <ref role="3cqZAo" node="1pPth$l_Zgu" resolve="errors" />
-                </node>
-                <node concept="3cmrfG" id="7dgRGU4NweX" role="3uHU7w">
-                  <property role="3cmrfH" value="0" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6X5F0NghV_l" role="jymVt" />
-      <node concept="3Tm6S6" id="1pPth$lNeRB" role="1B3o_S" />
-      <node concept="3uibUv" id="1pPth$lB20z" role="1zkMxy">
-        <ref role="3uigEE" node="1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
-        <node concept="3uibUv" id="1pPth$lE9Yx" role="11_B2D">
-          <ref role="3uigEE" node="1pPth$lAwc0" resolve="TypecheckingHelper.CollectRules" />
-        </node>
-      </node>
-      <node concept="312cEg" id="6OUp3PsVzZy" role="jymVt">
-        <property role="TrG5h" value="include" />
-        <node concept="3Tm6S6" id="6OUp3PsVzZz" role="1B3o_S" />
-        <node concept="10P_77" id="6OUp3PsVzZ_" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4pWvZ2nh3LO" role="jymVt" />
-    <node concept="312cEu" id="1pPth$lBDcr" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="MakeHandler" />
-      <node concept="3clFbW" id="6OUp3PsVBJU" role="jymVt">
-        <node concept="3cqZAl" id="6OUp3PsVBJW" role="3clF45" />
-        <node concept="3Tm6S6" id="6OUp3PsVBJX" role="1B3o_S" />
-        <node concept="3clFbS" id="6OUp3PsVBJY" role="3clF47">
-          <node concept="3clFbF" id="6OUp3PsVCUm" role="3cqZAp">
-            <node concept="37vLTI" id="6OUp3PsVCUo" role="3clFbG">
-              <node concept="2OqwBi" id="6OUp3PsVCUs" role="37vLTJ">
-                <node concept="Xjq3P" id="6OUp3PsVCUv" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6OUp3PsVCUr" role="2OqNvi">
-                  <ref role="2Oxat5" node="6OUp3PsVCUi" resolve="include" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="6OUp3PsVCUw" role="37vLTx">
-                <ref role="3cqZAo" node="6OUp3PsVCNx" resolve="include" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="6OUp3PsVCNx" role="3clF46">
-          <property role="TrG5h" value="include" />
-          <node concept="10P_77" id="6OUp3PsVCNw" role="1tU5fm" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="1pPth$lMMWH" role="jymVt">
-        <property role="TrG5h" value="info" />
-        <property role="1EzhhJ" value="false" />
-        <node concept="17QB3L" id="1pPth$lMMWI" role="3clF45" />
-        <node concept="3Tmbuc" id="1pPth$lMMWJ" role="1B3o_S" />
-        <node concept="3clFbS" id="1pPth$lMMWL" role="3clF47">
-          <node concept="3clFbF" id="1pPth$lMOpY" role="3cqZAp">
-            <node concept="Xl_RD" id="1pPth$lMOpX" role="3clFbG">
-              <property role="Xl_RC" value="making rules handler" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="1pPth$lBEhE" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <property role="1EzhhJ" value="false" />
-        <node concept="37vLTG" id="1pPth$lEuZa" role="3clF46">
-          <property role="TrG5h" value="prev" />
-          <node concept="3uibUv" id="1pPth$lEx0N" role="1tU5fm">
-            <ref role="3uigEE" node="1pPth$lB0Q2" resolve="TypecheckingHelper.ProduceHandler" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1pPth$lBEhH" role="3clF45" />
-        <node concept="3Tm1VV" id="1pPth$lBEhI" role="1B3o_S" />
-        <node concept="3clFbS" id="1pPth$lBEhK" role="3clF47">
-          <node concept="3clFbH" id="6X5F0NghVwe" role="3cqZAp" />
-          <node concept="3clFbJ" id="1pPth$l_ZhV" role="3cqZAp">
-            <node concept="1Wc70l" id="63dufnFESNo" role="3clFbw">
-              <node concept="37vLTw" id="6OUp3PsVLim" role="3uHU7B">
-                <ref role="3cqZAo" node="6OUp3PsVCUi" resolve="include" />
-              </node>
-              <node concept="3fqX7Q" id="1pPth$l_Zia" role="3uHU7w">
-                <node concept="2YIFZM" id="1pPth$l_Zib" role="3fr31v">
-                  <ref role="37wK5l" node="7RDCjSXjQEP" resolve="make" />
-                  <ref role="1Pybhc" node="7RDCjSXgvZa" resolve="MakeCollectedRules" />
-                  <node concept="2OqwBi" id="1pPth$l_Zic" role="37wK5m">
-                    <node concept="Xjq3P" id="1pPth$l_ZhL" role="2Oq$k0">
-                      <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                    </node>
-                    <node concept="liA8E" id="1pPth$lA8aE" role="2OqNvi">
-                      <ref role="37wK5l" node="1pPth$lA589" resolve="rulesModel" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="1pPth$l_Zie" role="37wK5m">
-                    <node concept="Xjq3P" id="1pPth$l_ZhM" role="2Oq$k0">
-                      <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                    </node>
-                    <node concept="2OwXpG" id="1pPth$lA81x" role="2OqNvi">
-                      <ref role="2Oxat5" node="1pPth$lA2Na" resolve="mpsProject" />
-                    </node>
-                  </node>
-                  <node concept="1bVj0M" id="1pPth$l_Zig" role="37wK5m">
-                    <node concept="3clFbS" id="1pPth$l_Zih" role="1bW5cS">
-                      <node concept="3clFbF" id="7dgRGU4Nj9E" role="3cqZAp">
-                        <node concept="1rXfSq" id="7dgRGU4Nj9C" role="3clFbG">
-                          <ref role="37wK5l" node="7dgRGU4Nmfr" resolve="done" />
-                          <node concept="2OqwBi" id="7dgRGU4Nkqq" role="37wK5m">
-                            <node concept="37vLTw" id="7dgRGU4Nkqr" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1pPth$l_ZiX" resolve="res" />
-                            </node>
-                            <node concept="liA8E" id="7dgRGU4Nkqs" role="2OqNvi">
-                              <ref role="37wK5l" to="i9so:17I1R__cQ6v" resolve="isSucessful" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3SKdUt" id="6OUp3PsYWZc" role="3cqZAp">
-                        <node concept="3SKdUq" id="6OUp3PsYWZe" role="3SKWNk">
-                          <property role="3SKdUp" value="done() is called in a continuation" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="37vLTG" id="1pPth$l_ZiX" role="1bW2Oz">
-                      <property role="TrG5h" value="res" />
-                      <node concept="3uibUv" id="1pPth$l_ZiY" role="1tU5fm">
-                        <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbS" id="1pPth$l_ZhW" role="3clFbx">
-              <node concept="3clFbF" id="1N_0WA5KFO4" role="3cqZAp">
-                <node concept="1rXfSq" id="1N_0WA5KFO2" role="3clFbG">
-                  <ref role="37wK5l" node="7dgRGU4Nmfr" resolve="done" />
-                  <node concept="3clFbT" id="1N_0WA5KG4v" role="37wK5m">
-                    <property role="3clFbU" value="false" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="1N_0WA5KG4S" role="3cqZAp" />
-            </node>
-            <node concept="3eNFk2" id="6OUp3PsYXIj" role="3eNLev">
-              <node concept="3clFbS" id="6OUp3PsYXIk" role="3eOfB_">
-                <node concept="3clFbF" id="6OUp3PsYXIl" role="3cqZAp">
-                  <node concept="1rXfSq" id="6OUp3PsYXIm" role="3clFbG">
-                    <ref role="37wK5l" node="7dgRGU4Nmfr" resolve="done" />
-                    <node concept="3clFbT" id="6OUp3PsYXIn" role="37wK5m">
-                      <property role="3clFbU" value="true" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3fqX7Q" id="6OUp3PsYY4r" role="3eO9$A">
-                <node concept="37vLTw" id="6OUp3PsYYfe" role="3fr31v">
-                  <ref role="3cqZAo" node="6OUp3PsVCUi" resolve="include" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="65McoJv1q7E" role="3cqZAp" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6X5F0NghI3j" role="jymVt" />
-      <node concept="3Tm6S6" id="1pPth$lNf1$" role="1B3o_S" />
-      <node concept="3uibUv" id="1pPth$lBEfy" role="1zkMxy">
-        <ref role="3uigEE" node="1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
-        <node concept="3uibUv" id="1pPth$lErhx" role="11_B2D">
-          <ref role="3uigEE" node="1pPth$lB0Q2" resolve="TypecheckingHelper.ProduceHandler" />
-        </node>
-      </node>
-      <node concept="312cEg" id="6OUp3PsVCUi" role="jymVt">
-        <property role="TrG5h" value="include" />
-        <node concept="3Tm6S6" id="6OUp3PsVCUj" role="1B3o_S" />
-        <node concept="10P_77" id="6OUp3PsVCUl" role="1tU5fm" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="1pPth$lBGJs" role="jymVt" />
     <node concept="312cEu" id="1pPth$lBNWG" role="jymVt">
       <property role="2bfB8j" value="true" />
       <property role="TrG5h" value="RunTypechecking" />
       <node concept="3clFbW" id="1pPth$lHpLU" role="jymVt">
         <node concept="3cqZAl" id="1pPth$lHpLW" role="3clF45" />
-        <node concept="3Tm1VV" id="1pPth$lHpLX" role="1B3o_S" />
+        <node concept="3Tmbuc" id="3F6vMxq$XSD" role="1B3o_S" />
         <node concept="3clFbS" id="1pPth$lHpLY" role="3clF47">
           <node concept="3clFbF" id="1pPth$lHqTn" role="3cqZAp">
             <node concept="37vLTI" id="1pPth$lHqTp" role="3clFbG">
@@ -8497,19 +7283,6 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="6OUp3PsVGiW" role="3cqZAp">
-            <node concept="37vLTI" id="6OUp3PsVGiY" role="3clFbG">
-              <node concept="2OqwBi" id="6OUp3PsVGj2" role="37vLTJ">
-                <node concept="Xjq3P" id="6OUp3PsVGj5" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6OUp3PsVGj1" role="2OqNvi">
-                  <ref role="2Oxat5" node="6OUp3PsVGiS" resolve="useJchr" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="6OUp3PsVGj6" role="37vLTx">
-                <ref role="3cqZAo" node="6OUp3PsVFS$" resolve="useJchr" />
-              </node>
-            </node>
-          </node>
           <node concept="3clFbF" id="1N_0WA5HPCD" role="3cqZAp">
             <node concept="37vLTI" id="1N_0WA5HPCF" role="3clFbG">
               <node concept="2OqwBi" id="1N_0WA5HPCJ" role="37vLTJ">
@@ -8528,15 +7301,12 @@
           <property role="TrG5h" value="nodes" />
           <node concept="2I9FWS" id="1pPth$lHqNY" role="1tU5fm" />
         </node>
-        <node concept="37vLTG" id="6OUp3PsVFS$" role="3clF46">
-          <property role="TrG5h" value="useJchr" />
-          <node concept="10P_77" id="6OUp3PsVGb4" role="1tU5fm" />
-        </node>
         <node concept="37vLTG" id="1N_0WA5HFTD" role="3clF46">
           <property role="TrG5h" value="showTrace" />
           <node concept="10P_77" id="1N_0WA5HGaE" role="1tU5fm" />
         </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" />
@@ -8550,6 +7320,7 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="3F6vMxq_0xa" role="jymVt" />
       <node concept="3clFb_" id="1pPth$lBP4o" role="jymVt">
         <property role="TrG5h" value="execute" />
         <property role="1EzhhJ" value="false" />
@@ -8591,35 +7362,10 @@
           <node concept="1QHqEK" id="1pPth$l_ZjB" role="3cqZAp">
             <node concept="1QHqEC" id="1pPth$l_ZjC" role="1QHqEI">
               <node concept="3clFbS" id="1pPth$l_ZjD" role="1bW5cS">
-                <node concept="3cpWs8" id="1pPth$l_ZjE" role="3cqZAp">
-                  <node concept="3cpWsn" id="1pPth$l_ZjF" role="3cpWs9">
-                    <property role="TrG5h" value="msgtrace" />
-                    <node concept="3uibUv" id="1pPth$l_ZjG" role="1tU5fm">
-                      <ref role="3uigEE" node="4i4XGQZlbGA" resolve="MessageViewTracer" />
-                    </node>
-                    <node concept="2YIFZM" id="1pPth$l_ZjH" role="33vP2m">
-                      <ref role="1Pybhc" node="4i4XGQZlbGA" resolve="MessageViewTracer" />
-                      <ref role="37wK5l" node="4i4XGQZmHHg" resolve="get" />
-                      <node concept="2OqwBi" id="1pPth$l_ZjI" role="37wK5m">
-                        <node concept="2OqwBi" id="1pPth$l_ZjJ" role="2Oq$k0">
-                          <node concept="Xjq3P" id="1pPth$l_Zj1" role="2Oq$k0">
-                            <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                          </node>
-                          <node concept="2OwXpG" id="1pPth$lA7_I" role="2OqNvi">
-                            <ref role="2Oxat5" node="1pPth$lA2Na" resolve="mpsProject" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="1pPth$l_ZjL" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c4:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
                 <node concept="3clFbF" id="1pPth$l_ZjM" role="3cqZAp">
                   <node concept="2OqwBi" id="1pPth$l_ZjN" role="3clFbG">
-                    <node concept="37vLTw" id="1pPth$l_ZjO" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1pPth$l_ZjF" resolve="msgtrace" />
+                    <node concept="37vLTw" id="3F6vMxqw5qA" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
                     </node>
                     <node concept="liA8E" id="1pPth$l_ZjP" role="2OqNvi">
                       <ref role="37wK5l" node="61vfVfp5zwA" resolve="showEvents" />
@@ -8631,8 +7377,6 @@
                   </node>
                 </node>
                 <node concept="3clFbH" id="1pPth$l_ZjR" role="3cqZAp" />
-                <node concept="3clFbH" id="4JJCDIn4G7$" role="3cqZAp" />
-                <node concept="3clFbH" id="4JJCDIn4Gbq" role="3cqZAp" />
                 <node concept="3cpWs8" id="HV6urVFQur" role="3cqZAp">
                   <node concept="3cpWsn" id="HV6urVFQus" role="3cpWs9">
                     <property role="TrG5h" value="rrules" />
@@ -8642,41 +7386,24 @@
                     <node concept="2ShNRf" id="HV6urVFQut" role="33vP2m">
                       <node concept="1pGfFk" id="HV6urVFQuu" role="2ShVmc">
                         <ref role="37wK5l" node="HV6urVFjOl" resolve="RunTypecheckingRules" />
-                        <node concept="2OqwBi" id="1N_0WA5H5sw" role="37wK5m">
-                          <node concept="2OqwBi" id="HV6urVFQuv" role="2Oq$k0">
-                            <node concept="37vLTw" id="HV6urVFQuw" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1pPth$lEDHT" resolve="prev" />
+                        <node concept="1rXfSq" id="3F6vMxqmw$o" role="37wK5m">
+                          <ref role="37wK5l" node="3F6vMxql$1A" resolve="createSessionSolver" />
+                          <node concept="2OqwBi" id="2UGjFq4LGcE" role="37wK5m">
+                            <node concept="2OqwBi" id="2UGjFq4Lxla" role="2Oq$k0">
+                              <node concept="37vLTw" id="2UGjFq4LwvE" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1pPth$lEDHT" resolve="prev" />
+                              </node>
+                              <node concept="2OwXpG" id="3F6vMxqm$TT" role="2OqNvi">
+                                <ref role="2Oxat5" node="3F6vMxqlTiX" resolve="expressionSolvers" />
+                              </node>
                             </node>
-                            <node concept="2OwXpG" id="1N_0WA5H4GQ" role="2OqNvi">
-                              <ref role="2Oxat5" node="1pPth$lE8Xs" resolve="programs" />
-                            </node>
-                          </node>
-                          <node concept="1uHKPH" id="1N_0WA5H6lr" role="2OqNvi" />
-                        </node>
-                        <node concept="2OqwBi" id="2UGjFq4LGcE" role="37wK5m">
-                          <node concept="2OqwBi" id="2UGjFq4Lxla" role="2Oq$k0">
-                            <node concept="37vLTw" id="2UGjFq4LwvE" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1pPth$lEDHT" resolve="prev" />
-                            </node>
-                            <node concept="2OwXpG" id="2UGjFq4Ly0E" role="2OqNvi">
-                              <ref role="2Oxat5" node="2UGjFq4Lj$X" resolve="sessionSolver" />
-                            </node>
-                          </node>
-                          <node concept="1uHKPH" id="2UGjFq4LH90" role="2OqNvi" />
-                        </node>
-                        <node concept="2OqwBi" id="HV6urVFQu_" role="37wK5m">
-                          <node concept="Xjq3P" id="HV6urVFQuA" role="2Oq$k0">
-                            <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                          </node>
-                          <node concept="liA8E" id="HV6urVFQuB" role="2OqNvi">
-                            <ref role="37wK5l" node="1pPth$lA589" resolve="rulesModel" />
+                            <node concept="1uHKPH" id="2UGjFq4LH90" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="HV6urVG248" role="3cqZAp" />
                 <node concept="3clFbJ" id="HV6urVGjZ2" role="3cqZAp">
                   <node concept="3clFbS" id="HV6urVGjZ4" role="3clFbx">
                     <node concept="3cpWs8" id="7nPD14Nd$I0" role="3cqZAp">
@@ -8790,16 +7517,16 @@
                               <ref role="37wK5l" node="YGS68MEx_L" resolve="trace" />
                             </node>
                           </node>
-                          <node concept="37vLTw" id="3jXBvmTK67d" role="37wK5m">
-                            <ref role="3cqZAo" node="1pPth$l_ZjF" resolve="msgtrace" />
+                          <node concept="37vLTw" id="3F6vMxqwdkP" role="37wK5m">
+                            <ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
                           </node>
                         </node>
                       </node>
                       <node concept="2ShNRf" id="3jXBvmTK6ZG" role="3K4GZi">
                         <node concept="1pGfFk" id="3jXBvmTK6ZH" role="2ShVmc">
                           <ref role="37wK5l" node="7nPD14NbIzp" resolve="MultiTrace" />
-                          <node concept="37vLTw" id="3jXBvmTK7Fo" role="37wK5m">
-                            <ref role="3cqZAo" node="1pPth$l_ZjF" resolve="msgtrace" />
+                          <node concept="37vLTw" id="3F6vMxqwfvo" role="37wK5m">
+                            <ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
                           </node>
                         </node>
                       </node>
@@ -8839,8 +7566,8 @@
                                           <property role="Xl_RC" value="{" />
                                         </node>
                                         <node concept="2YIFZM" id="1pPth$l_Zk$" role="3uHU7w">
-                                          <ref role="37wK5l" to="poio:4peSo3CHBfF" resolve="print" />
-                                          <ref role="1Pybhc" to="poio:4peSo3CHy8D" resolve="NodePrinter" />
+                                          <ref role="1Pybhc" node="4peSo3CHy8D" resolve="NodePrinter" />
+                                          <ref role="37wK5l" node="4peSo3CHBfF" resolve="print" />
                                           <node concept="37vLTw" id="1pPth$l_Zk_" role="37wK5m">
                                             <ref role="3cqZAo" node="1pPth$l_Zkr" resolve="atom" />
                                           </node>
@@ -8862,40 +7589,129 @@
                       </node>
                     </node>
                     <node concept="3clFbH" id="1pPth$lRU_j" role="3cqZAp" />
+                    <node concept="3cpWs8" id="3F6vMxqehe$" role="3cqZAp">
+                      <node concept="3cpWsn" id="3F6vMxqehe_" role="3cpWs9">
+                        <property role="TrG5h" value="program" />
+                        <node concept="3uibUv" id="3F6vMxqehez" role="1tU5fm">
+                          <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+                        </node>
+                        <node concept="2OqwBi" id="3F6vMxqeheA" role="33vP2m">
+                          <node concept="2OqwBi" id="3F6vMxqeheB" role="2Oq$k0">
+                            <node concept="37vLTw" id="3F6vMxqeheC" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1pPth$lEDHT" resolve="prev" />
+                            </node>
+                            <node concept="2OwXpG" id="3F6vMxqeheD" role="2OqNvi">
+                              <ref role="2Oxat5" node="1pPth$lE8Xs" resolve="programs" />
+                            </node>
+                          </node>
+                          <node concept="1uHKPH" id="3F6vMxqeheE" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="3F6vMxqeOqF" role="3cqZAp">
+                      <node concept="3cpWsn" id="3F6vMxqeOqG" role="3cpWs9">
+                        <property role="TrG5h" value="rulesModel" />
+                        <node concept="H_c77" id="3F6vMxqeOqC" role="1tU5fm" />
+                        <node concept="2OqwBi" id="3F6vMxqeOqH" role="33vP2m">
+                          <node concept="Xjq3P" id="3F6vMxqeOqI" role="2Oq$k0">
+                            <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
+                          </node>
+                          <node concept="liA8E" id="3F6vMxqeOqJ" role="2OqNvi">
+                            <ref role="37wK5l" node="1pPth$lA589" resolve="rulesModel" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="3F6vMxqfqkV" role="3cqZAp" />
                     <node concept="1DcWWT" id="1pPth$lHseb" role="3cqZAp">
                       <node concept="3clFbS" id="1pPth$lHsed" role="2LFqv$">
+                        <node concept="3cpWs8" id="3F6vMxqgZ8_" role="3cqZAp">
+                          <node concept="3cpWsn" id="3F6vMxqgZ8A" role="3cpWs9">
+                            <property role="TrG5h" value="containingRoot" />
+                            <node concept="3uibUv" id="3F6vMxqgZ8z" role="1tU5fm">
+                              <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                            </node>
+                            <node concept="2OqwBi" id="3F6vMxqgZ8B" role="33vP2m">
+                              <node concept="37vLTw" id="3F6vMxqgZ8C" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1pPth$lHsef" resolve="node" />
+                              </node>
+                              <node concept="liA8E" id="3F6vMxqgZ8D" role="2OqNvi">
+                                <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="3F6vMxqi_Py" role="3cqZAp" />
                         <node concept="2GUZhq" id="5jPBdKCf3W" role="3cqZAp">
                           <node concept="3clFbS" id="1pPth$lS0sg" role="2GV8ay">
-                            <node concept="3clFbJ" id="6OUp3PsVM9_" role="3cqZAp">
-                              <node concept="3clFbS" id="6OUp3PsVM9B" role="3clFbx">
-                                <node concept="3clFbF" id="5jPBdKCiIT" role="3cqZAp">
-                                  <node concept="2YIFZM" id="5jPBdKCktT" role="3clFbG">
-                                    <ref role="37wK5l" to="stgg:7ISVfSIf0j" resolve="init" />
-                                    <ref role="1Pybhc" to="stgg:7ISVfSIedQ" resolve="JchrEvaluationSession" />
-                                  </node>
+                            <node concept="3clFbF" id="3F6vMxqjuTa" role="3cqZAp">
+                              <node concept="1rXfSq" id="3F6vMxqjuT9" role="3clFbG">
+                                <ref role="37wK5l" node="3F6vMxqjuT6" resolve="initSession" />
+                              </node>
+                            </node>
+                            <node concept="3clFbH" id="3F6vMxqiw19" role="3cqZAp" />
+                            <node concept="3cpWs8" id="3F6vMxqe8jJ" role="3cqZAp">
+                              <node concept="3cpWsn" id="3F6vMxqe8jK" role="3cpWs9">
+                                <property role="TrG5h" value="config" />
+                                <node concept="3uibUv" id="3F6vMxqe8jL" role="1tU5fm">
+                                  <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
                                 </node>
-                              </node>
-                              <node concept="37vLTw" id="6OUp3PsVN1q" role="3clFbw">
-                                <ref role="3cqZAo" node="6OUp3PsVGiS" resolve="useJchr" />
-                              </node>
-                              <node concept="9aQIb" id="6OUp3PsVP87" role="9aQIa">
-                                <node concept="3clFbS" id="6OUp3PsVP88" role="9aQI4">
-                                  <node concept="3clFbF" id="63dufnFDvam" role="3cqZAp">
-                                    <node concept="2OqwBi" id="63dufnFDxk9" role="3clFbG">
-                                      <node concept="10M0yZ" id="63dufnFDwgZ" role="2Oq$k0">
-                                        <ref role="1PxDUh" to="zx3l:~MemEvaluationSession" resolve="MemEvaluationSession" />
-                                        <ref role="3cqZAo" to="zx3l:~MemEvaluationSession.Companion" resolve="Companion" />
+                                <node concept="2OqwBi" id="3F6vMxqqDsF" role="33vP2m">
+                                  <node concept="2OqwBi" id="3F6vMxqqtDz" role="2Oq$k0">
+                                    <node concept="1rXfSq" id="3F6vMxqjkfc" role="2Oq$k0">
+                                      <ref role="37wK5l" node="3F6vMxqjkf6" resolve="createConfig" />
+                                      <node concept="37vLTw" id="3F6vMxqjkf9" role="37wK5m">
+                                        <ref role="3cqZAo" node="3F6vMxqehe_" resolve="program" />
                                       </node>
-                                      <node concept="liA8E" id="63dufnFDxPR" role="2OqNvi">
-                                        <ref role="37wK5l" to="zx3l:~MemEvaluationSession$Companion.init():void" resolve="init" />
+                                      <node concept="37vLTw" id="3F6vMxqjkfa" role="37wK5m">
+                                        <ref role="3cqZAo" node="3F6vMxqeOqG" resolve="rulesModel" />
                                       </node>
+                                      <node concept="37vLTw" id="3F6vMxqjkfb" role="37wK5m">
+                                        <ref role="3cqZAo" node="3F6vMxqgZ8A" resolve="containingRoot" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="3F6vMxqqwSs" role="2OqNvi">
+                                      <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
+                                      <node concept="Xl_RD" id="3F6vMxqqzhz" role="37wK5m">
+                                        <property role="Xl_RC" value="profiling.data" />
+                                      </node>
+                                      <node concept="37vLTw" id="3F6vMxqqAtS" role="37wK5m">
+                                        <ref role="3cqZAo" node="18cJbc1jAyv" resolve="profilingData" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="3F6vMxqqHCb" role="2OqNvi">
+                                    <ref role="37wK5l" to="qrld:5uFPQ7Bwvg_" resolve="withTrace" />
+                                    <node concept="37vLTw" id="3F6vMxqqN1j" role="37wK5m">
+                                      <ref role="3cqZAo" node="3jXBvmTK0xQ" resolve="multitrace" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
+                            <node concept="3clFbH" id="3F6vMxqqi7V" role="3cqZAp" />
                             <node concept="3clFbJ" id="7dgRGU4HYuA" role="3cqZAp">
                               <node concept="3clFbS" id="7dgRGU4HYuC" role="3clFbx">
+                                <node concept="3clFbH" id="3F6vMxqr3Bh" role="3cqZAp" />
+                                <node concept="3clFbF" id="3F6vMxqr7rt" role="3cqZAp">
+                                  <node concept="2OqwBi" id="3F6vMxqr7ru" role="3clFbG">
+                                    <node concept="37vLTw" id="3F6vMxqr9NH" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="3jXBvmTK0xQ" resolve="multitrace" />
+                                    </node>
+                                    <node concept="liA8E" id="3F6vMxqr7rw" role="2OqNvi">
+                                      <ref role="37wK5l" node="7vxJ_H4tBm6" resolve="failure" />
+                                      <node concept="2ShNRf" id="3F6vMxqr7rx" role="37wK5m">
+                                        <node concept="1pGfFk" id="3F6vMxqr7ry" role="2ShVmc">
+                                          <ref role="37wK5l" to="qrld:7vxJ_H4qql2" resolve="EvaluationFailureException" />
+                                          <node concept="Xl_RD" id="3F6vMxqr7rz" role="37wK5m">
+                                            <property role="Xl_RC" value="garbage constraints" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbH" id="3F6vMxqr5zC" role="3cqZAp" />
                                 <node concept="3clFbF" id="7dgRGU4I2Bi" role="3cqZAp">
                                   <node concept="37vLTI" id="7dgRGU4I46i" role="3clFbG">
                                     <node concept="37vLTw" id="7dgRGU4I2Bh" role="37vLTJ">
@@ -8924,18 +7740,10 @@
                                   </node>
                                   <node concept="liA8E" id="HV6urVFVLU" role="2OqNvi">
                                     <ref role="37wK5l" node="HV6urVFrQ9" resolve="runTypecheckingRules" />
-                                    <node concept="2OqwBi" id="3cX_ruc2aMF" role="37wK5m">
-                                      <node concept="37vLTw" id="HV6urVG3HK" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1pPth$lHsef" resolve="node" />
-                                      </node>
-                                      <node concept="liA8E" id="3cX_ruc2btO" role="2OqNvi">
-                                        <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
-                                      </node>
+                                    <node concept="37vLTw" id="3F6vMxqgG4w" role="37wK5m">
+                                      <ref role="3cqZAo" node="3F6vMxqe8jK" resolve="config" />
                                     </node>
-                                    <node concept="37vLTw" id="7dgRGU4KU2d" role="37wK5m">
-                                      <ref role="3cqZAo" node="1pPth$l_ZjF" resolve="msgtrace" />
-                                    </node>
-                                    <node concept="37vLTw" id="7nPD14NdL5C" role="37wK5m">
+                                    <node concept="37vLTw" id="3F6vMxqrXaf" role="37wK5m">
                                       <ref role="3cqZAo" node="3jXBvmTK0xQ" resolve="multitrace" />
                                     </node>
                                     <node concept="37vLTw" id="7dgRGU4KU2f" role="37wK5m">
@@ -8944,12 +7752,9 @@
                                     <node concept="37vLTw" id="7dgRGU4KU2g" role="37wK5m">
                                       <ref role="3cqZAo" node="1pPth$lEGxt" resolve="errors" />
                                     </node>
-                                    <node concept="37vLTw" id="18cJbc1jC9i" role="37wK5m">
+                                    <node concept="37vLTw" id="3F6vMxqrNUz" role="37wK5m">
                                       <ref role="3cqZAo" node="18cJbc1jAyv" resolve="profilingData" />
                                     </node>
-                                    <node concept="37vLTw" id="6OUp3PsVXwf" role="37wK5m">
-                                      <ref role="3cqZAo" node="6OUp3PsVGiS" resolve="useJchr" />
-                                    </node>
                                   </node>
                                 </node>
                               </node>
@@ -9014,8 +7819,8 @@
                               </node>
                               <node concept="3clFbF" id="7vxJ_H4sDdJ" role="3cqZAp">
                                 <node concept="2OqwBi" id="7vxJ_H4sDdK" role="3clFbG">
-                                  <node concept="37vLTw" id="7vxJ_H4sDdL" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1pPth$l_ZjF" resolve="msgtrace" />
+                                  <node concept="37vLTw" id="3F6vMxqwlY6" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
                                   </node>
                                   <node concept="liA8E" id="7vxJ_H4sDdM" role="2OqNvi">
                                     <ref role="37wK5l" node="623frvFBcwl" resolve="warning" />
@@ -9105,8 +7910,8 @@
                               </node>
                               <node concept="3clFbF" id="1pPth$l_ZkX" role="3cqZAp">
                                 <node concept="2OqwBi" id="1pPth$l_ZkY" role="3clFbG">
-                                  <node concept="37vLTw" id="1pPth$l_ZkZ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1pPth$l_ZjF" resolve="msgtrace" />
+                                  <node concept="37vLTw" id="3F6vMxqwomf" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
                                   </node>
                                   <node concept="liA8E" id="1pPth$l_Zl0" role="2OqNvi">
                                     <ref role="37wK5l" node="623frvFBcwl" resolve="warning" />
@@ -9143,32 +7948,9 @@
                             </node>
                           </node>
                           <node concept="3clFbS" id="5jPBdKCf3Z" role="2GVbov">
-                            <node concept="3clFbJ" id="6OUp3PsVRCY" role="3cqZAp">
-                              <node concept="3clFbS" id="6OUp3PsVRD0" role="3clFbx">
-                                <node concept="3clFbF" id="5jPBdKCoDG" role="3cqZAp">
-                                  <node concept="2YIFZM" id="5jPBdKCp9e" role="3clFbG">
-                                    <ref role="37wK5l" to="stgg:5jPBdKCn3Z" resolve="deinit" />
-                                    <ref role="1Pybhc" to="stgg:7ISVfSIedQ" resolve="JchrEvaluationSession" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="37vLTw" id="6OUp3PsVSwR" role="3clFbw">
-                                <ref role="3cqZAo" node="6OUp3PsVGiS" resolve="useJchr" />
-                              </node>
-                              <node concept="9aQIb" id="6OUp3PsVV65" role="9aQIa">
-                                <node concept="3clFbS" id="6OUp3PsVV66" role="9aQI4">
-                                  <node concept="3clFbF" id="63dufnFDzac" role="3cqZAp">
-                                    <node concept="2OqwBi" id="63dufnFDzad" role="3clFbG">
-                                      <node concept="10M0yZ" id="63dufnFDzae" role="2Oq$k0">
-                                        <ref role="1PxDUh" to="zx3l:~MemEvaluationSession" resolve="MemEvaluationSession" />
-                                        <ref role="3cqZAo" to="zx3l:~MemEvaluationSession.Companion" resolve="Companion" />
-                                      </node>
-                                      <node concept="liA8E" id="63dufnFDzaf" role="2OqNvi">
-                                        <ref role="37wK5l" to="zx3l:~MemEvaluationSession$Companion.deinit():void" resolve="deinit" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
+                            <node concept="3clFbF" id="3F6vMxqj$oQ" role="3cqZAp">
+                              <node concept="1rXfSq" id="3F6vMxqj$oP" role="3clFbG">
+                                <ref role="37wK5l" node="3F6vMxqj$oM" resolve="deinitSession" />
                               </node>
                             </node>
                           </node>
@@ -9228,8 +8010,160 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="3F6vMxqjAY0" role="jymVt" />
+      <node concept="3clFb_" id="3F6vMxqj$oM" role="jymVt">
+        <property role="TrG5h" value="deinitSession" />
+        <node concept="3Tmbuc" id="3F6vMxqjDuA" role="1B3o_S" />
+        <node concept="3cqZAl" id="3F6vMxqj$oO" role="3clF45" />
+        <node concept="3clFbS" id="3F6vMxqj$o$" role="3clF47">
+          <node concept="3clFbF" id="3F6vMxqj$oG" role="3cqZAp">
+            <node concept="2OqwBi" id="3F6vMxqj$oH" role="3clFbG">
+              <node concept="10M0yZ" id="3F6vMxqj$oI" role="2Oq$k0">
+                <ref role="1PxDUh" to="zx3l:~MemEvaluationSession" resolve="MemEvaluationSession" />
+                <ref role="3cqZAo" to="zx3l:~MemEvaluationSession.Companion" resolve="Companion" />
+              </node>
+              <node concept="liA8E" id="3F6vMxqj$oJ" role="2OqNvi">
+                <ref role="37wK5l" to="zx3l:~MemEvaluationSession$Companion.deinit():void" resolve="deinit" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3F6vMxqjxuu" role="jymVt" />
+      <node concept="3clFb_" id="3F6vMxqjuT6" role="jymVt">
+        <property role="TrG5h" value="initSession" />
+        <node concept="3Tmbuc" id="3F6vMxqjxXi" role="1B3o_S" />
+        <node concept="3cqZAl" id="3F6vMxqjuT8" role="3clF45" />
+        <node concept="3clFbS" id="3F6vMxqjuSR" role="3clF47">
+          <node concept="3clFbF" id="3F6vMxqjuT0" role="3cqZAp">
+            <node concept="2OqwBi" id="3F6vMxqjuT1" role="3clFbG">
+              <node concept="10M0yZ" id="3F6vMxqjuT2" role="2Oq$k0">
+                <ref role="1PxDUh" to="zx3l:~MemEvaluationSession" resolve="MemEvaluationSession" />
+                <ref role="3cqZAo" to="zx3l:~MemEvaluationSession.Companion" resolve="Companion" />
+              </node>
+              <node concept="liA8E" id="3F6vMxqjuT3" role="2OqNvi">
+                <ref role="37wK5l" to="zx3l:~MemEvaluationSession$Companion.init():void" resolve="init" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3F6vMxqjnci" role="jymVt" />
+      <node concept="3clFb_" id="3F6vMxql$1A" role="jymVt">
+        <property role="TrG5h" value="createSessionSolver" />
+        <node concept="37vLTG" id="3F6vMxqmh0e" role="3clF46">
+          <property role="TrG5h" value="expressionSolver" />
+          <node concept="3uibUv" id="3F6vMxqmoOj" role="1tU5fm">
+            <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="3F6vMxqlLKq" role="3clF45">
+          <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+        </node>
+        <node concept="3Tmbuc" id="3F6vMxql$1D" role="1B3o_S" />
+        <node concept="3clFbS" id="3F6vMxql$1E" role="3clF47">
+          <node concept="3clFbF" id="3F6vMxqlO4j" role="3cqZAp">
+            <node concept="2ShNRf" id="3F6vMxqlO4l" role="3clFbG">
+              <node concept="1pGfFk" id="3F6vMxqlO4m" role="2ShVmc">
+                <ref role="37wK5l" to="cxk7:3F6vMxqo1c$" resolve="DefaultSessionSolver" />
+                <node concept="37vLTw" id="3F6vMxqms0$" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqmh0e" resolve="expressionSolver" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3F6vMxqlx2p" role="jymVt" />
+      <node concept="3clFb_" id="3F6vMxqjkf6" role="jymVt">
+        <property role="TrG5h" value="createConfig" />
+        <node concept="3Tmbuc" id="3F6vMxqjqea" role="1B3o_S" />
+        <node concept="3uibUv" id="3F6vMxqjkf8" role="3clF45">
+          <ref role="3uigEE" to="qrld:5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
+        </node>
+        <node concept="37vLTG" id="3F6vMxqjkeU" role="3clF46">
+          <property role="TrG5h" value="program" />
+          <node concept="3uibUv" id="3F6vMxqjkeV" role="1tU5fm">
+            <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="3F6vMxqjkeW" role="3clF46">
+          <property role="TrG5h" value="rulesModel" />
+          <node concept="H_c77" id="3F6vMxqjkeX" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="3F6vMxqjkeY" role="3clF46">
+          <property role="TrG5h" value="containingRoot" />
+          <node concept="3uibUv" id="3F6vMxqjkeZ" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="3F6vMxqjkeg" role="3clF47">
+          <node concept="3cpWs6" id="3F6vMxqjkeS" role="3cqZAp">
+            <node concept="2OqwBi" id="3F6vMxqk2yx" role="3cqZAk">
+              <node concept="2YIFZM" id="3F6vMxqk2yy" role="2Oq$k0">
+                <ref role="37wK5l" to="qrld:7ISVfSIwfH" resolve="newSession" />
+                <ref role="1Pybhc" to="qrld:5uFPQ7BvN_d" resolve="EvaluationSession" />
+                <node concept="37vLTw" id="3F6vMxqk2yz" role="37wK5m">
+                  <ref role="3cqZAo" node="3F6vMxqjkeU" resolve="program" />
+                </node>
+              </node>
+              <node concept="liA8E" id="3F6vMxqk2y$" role="2OqNvi">
+                <ref role="37wK5l" to="qrld:5mr7UHcbbR2" resolve="withParam" />
+                <node concept="Xl_RD" id="3F6vMxqk2y_" role="37wK5m">
+                  <property role="Xl_RC" value="main" />
+                </node>
+                <node concept="2OqwBi" id="3F6vMxqk2yA" role="37wK5m">
+                  <node concept="2ShNRf" id="3F6vMxqk2yB" role="2Oq$k0">
+                    <node concept="1pGfFk" id="3F6vMxqk2yC" role="2ShVmc">
+                      <ref role="37wK5l" to="nz6g:4sSe4$oM2rk" resolve="ConstraintBuilder" />
+                      <node concept="2ShNRf" id="3F6vMxqk2yD" role="37wK5m">
+                        <node concept="1pGfFk" id="3F6vMxqk2yE" role="2ShVmc">
+                          <ref role="37wK5l" to="rchb:54i3FxcZMv0" resolve="ConstraintSymbol" />
+                          <node concept="Xl_RD" id="3F6vMxqk2yF" role="37wK5m">
+                            <property role="Xl_RC" value="main" />
+                          </node>
+                          <node concept="3cmrfG" id="3F6vMxqk2yG" role="37wK5m">
+                            <property role="3cmrfH" value="0" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3F6vMxqk2yH" role="2OqNvi">
+                    <ref role="37wK5l" to="nz6g:4sSe4$oM2zI" resolve="toConstraint" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="4pWvZ2nkSRh" role="jymVt" />
       <node concept="2tJIrI" id="18cJbc1j$AE" role="jymVt" />
+      <node concept="312cEg" id="3F6vMxqv_px" role="jymVt">
+        <property role="TrG5h" value="msgtrace" />
+        <node concept="3Tmbuc" id="3F6vMxqv_pp" role="1B3o_S" />
+        <node concept="3uibUv" id="3F6vMxqv_pq" role="1tU5fm">
+          <ref role="3uigEE" node="4i4XGQZlbGA" resolve="MessageViewTracer" />
+        </node>
+        <node concept="2YIFZM" id="3F6vMxqv_pr" role="33vP2m">
+          <ref role="1Pybhc" node="4i4XGQZlbGA" resolve="MessageViewTracer" />
+          <ref role="37wK5l" node="4i4XGQZmHHg" resolve="get" />
+          <node concept="2OqwBi" id="3F6vMxqv_ps" role="37wK5m">
+            <node concept="2OqwBi" id="3F6vMxqv_pt" role="2Oq$k0">
+              <node concept="Xjq3P" id="3F6vMxqv_pu" role="2Oq$k0">
+                <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
+              </node>
+              <node concept="2OwXpG" id="3F6vMxqv_pv" role="2OqNvi">
+                <ref role="2Oxat5" node="1pPth$lA2Na" resolve="mpsProject" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3F6vMxqv_pw" role="2OqNvi">
+              <ref role="37wK5l" to="z1c4:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="312cEg" id="1pPth$lEGxq" role="jymVt">
         <property role="TrG5h" value="types" />
         <property role="3TUv4t" value="false" />
@@ -9283,7 +8217,7 @@
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="1pPth$lNgE8" role="1B3o_S" />
+      <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="TypecheckingHelper.Step" />
         <node concept="3uibUv" id="1N_0WA5GiE0" role="11_B2D">
@@ -9297,22 +8231,16 @@
           <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
         </node>
       </node>
-      <node concept="2tJIrI" id="HV6urVGtl4" role="jymVt" />
-      <node concept="312cEg" id="1pPth$lHqTj" role="jymVt">
-        <property role="TrG5h" value="nodes" />
-        <node concept="3Tm6S6" id="1pPth$lHqTk" role="1B3o_S" />
-        <node concept="2I9FWS" id="1pPth$lHqTm" role="1tU5fm" />
-      </node>
-      <node concept="312cEg" id="6OUp3PsVGiS" role="jymVt">
-        <property role="TrG5h" value="useJchr" />
-        <node concept="3Tm6S6" id="6OUp3PsVGiT" role="1B3o_S" />
-        <node concept="10P_77" id="6OUp3PsVGiV" role="1tU5fm" />
-      </node>
       <node concept="312cEg" id="1N_0WA5HPC_" role="jymVt">
         <property role="TrG5h" value="showTrace" />
         <node concept="3Tm6S6" id="1N_0WA5HPCA" role="1B3o_S" />
         <node concept="10P_77" id="1N_0WA5HPCC" role="1tU5fm" />
       </node>
+      <node concept="312cEg" id="1pPth$lHqTj" role="jymVt">
+        <property role="TrG5h" value="nodes" />
+        <node concept="3Tm6S6" id="1pPth$lHqTk" role="1B3o_S" />
+        <node concept="2I9FWS" id="1pPth$lHqTm" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="1pPth$lBWTD" role="jymVt" />
     <node concept="312cEu" id="1pPth$lC1vN" role="jymVt">
@@ -9326,7 +8254,7 @@
           </node>
         </node>
         <node concept="3cqZAl" id="1pPth$lGTro" role="3clF45" />
-        <node concept="3Tm1VV" id="1pPth$lGTrp" role="1B3o_S" />
+        <node concept="3Tmbuc" id="3F6vMxq_3kJ" role="1B3o_S" />
         <node concept="3clFbS" id="1pPth$lGTrq" role="3clF47">
           <node concept="3clFbF" id="1pPth$lGU8j" role="3cqZAp">
             <node concept="37vLTI" id="1pPth$lGU8l" role="3clFbG">
@@ -9343,6 +8271,7 @@
           </node>
         </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" />
@@ -9356,6 +8285,7 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="3F6vMxq_3Wa" role="jymVt" />
       <node concept="3clFb_" id="1pPth$lC2U5" role="jymVt">
         <property role="TrG5h" value="execute" />
         <property role="1EzhhJ" value="false" />
@@ -9521,7 +8451,7 @@
         </node>
       </node>
       <node concept="2tJIrI" id="1pPth$lN3QC" role="jymVt" />
-      <node concept="3Tm6S6" id="1pPth$lNhhP" role="1B3o_S" />
+      <node concept="3Tm1VV" id="3F6vMxq_2US" role="1B3o_S" />
       <node concept="3uibUv" id="1pPth$lC2Ed" role="1zkMxy">
         <ref role="3uigEE" node="1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
         <node concept="3uibUv" id="YgAcJaVl1F" role="11_B2D">
@@ -9806,64 +8736,69 @@
               <ref role="3uigEE" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
             </node>
             <node concept="2ShNRf" id="1pPth$lQ3rV" role="33vP2m">
-              <node concept="YeOm9" id="1pPth$lQ3rW" role="2ShVmc">
-                <node concept="1Y3b0j" id="1pPth$lQ3rX" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                  <ref role="37wK5l" node="1pPth$lK1ZL" resolve="TypecheckingHelper" />
-                  <node concept="2OqwBi" id="1pPth$lQ3Tg" role="37wK5m">
-                    <node concept="2WthIp" id="1pPth$lQ3Tj" role="2Oq$k0">
-                      <ref role="32nkFo" node="1pPth$lPGVY" resolve="CheckTypes" />
-                    </node>
-                    <node concept="1DTwFV" id="1pPth$lQ3Tl" role="2OqNvi">
-                      <ref role="2WH_rO" node="1pPth$lPK8J" resolve="mpsProject" />
-                    </node>
+              <node concept="1pGfFk" id="3F6vMxqb6Th" role="2ShVmc">
+                <ref role="37wK5l" node="1pPth$lK1ZL" resolve="TypecheckingHelper" />
+                <node concept="2OqwBi" id="1pPth$lQ3Tg" role="37wK5m">
+                  <node concept="2WthIp" id="1pPth$lQ3Tj" role="2Oq$k0">
+                    <ref role="32nkFo" node="1pPth$lPGVY" resolve="CheckTypes" />
                   </node>
-                  <node concept="3Tm1VV" id="1pPth$lQ3s1" role="1B3o_S" />
-                  <node concept="3clFb_" id="1pPth$lQ3s2" role="jymVt">
-                    <property role="TrG5h" value="finished" />
-                    <property role="1EzhhJ" value="false" />
-                    <property role="IEkAT" value="false" />
-                    <node concept="37vLTG" id="1pPth$lQ3s3" role="3clF46">
-                      <property role="TrG5h" value="message" />
-                      <node concept="17QB3L" id="1pPth$lQ3s4" role="1tU5fm" />
-                    </node>
-                    <node concept="3cqZAl" id="1pPth$lQ3s5" role="3clF45" />
-                    <node concept="3Tm1VV" id="1pPth$lQ3s6" role="1B3o_S" />
-                    <node concept="3clFbS" id="1pPth$lQ3s7" role="3clF47">
-                      <node concept="3clFbF" id="1pPth$lQ3s8" role="3cqZAp">
-                        <node concept="2YIFZM" id="1pPth$lQ3s9" role="3clFbG">
-                          <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
-                          <ref role="37wK5l" to="jkm4:~Messages.showInfoMessage(java.lang.String,java.lang.String):void" resolve="showInfoMessage" />
-                          <node concept="37vLTw" id="1pPth$lQ3sa" role="37wK5m">
-                            <ref role="3cqZAo" node="1pPth$lQ3s3" resolve="message" />
-                          </node>
-                          <node concept="Xl_RD" id="1pPth$lQ3sb" role="37wK5m">
-                            <property role="Xl_RC" value="Check Types" />
+                  <node concept="1DTwFV" id="1pPth$lQ3Tl" role="2OqNvi">
+                    <ref role="2WH_rO" node="1pPth$lPK8J" resolve="mpsProject" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="3F6vMxqb3vY" role="37wK5m">
+                  <node concept="YeOm9" id="3F6vMxqb633" role="2ShVmc">
+                    <node concept="1Y3b0j" id="3F6vMxqb636" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <ref role="1Y3XeK" node="3F6vMxqaxpm" resolve="TypecheckingHelper.DoneCallback" />
+                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                      <node concept="3Tm1VV" id="3F6vMxqb637" role="1B3o_S" />
+                      <node concept="3clFb_" id="3F6vMxqb638" role="jymVt">
+                        <property role="TrG5h" value="finished" />
+                        <property role="1EzhhJ" value="false" />
+                        <property role="IEkAT" value="false" />
+                        <node concept="37vLTG" id="3F6vMxqb639" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="3F6vMxqb63a" role="1tU5fm" />
+                        </node>
+                        <node concept="3cqZAl" id="3F6vMxqb63b" role="3clF45" />
+                        <node concept="3Tm1VV" id="3F6vMxqb63c" role="1B3o_S" />
+                        <node concept="3clFbS" id="3F6vMxqb63e" role="3clF47">
+                          <node concept="3clFbF" id="1pPth$lQ3s8" role="3cqZAp">
+                            <node concept="2YIFZM" id="1pPth$lQ3s9" role="3clFbG">
+                              <ref role="37wK5l" to="jkm4:~Messages.showInfoMessage(java.lang.String,java.lang.String):void" resolve="showInfoMessage" />
+                              <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                              <node concept="37vLTw" id="1pPth$lQ3sa" role="37wK5m">
+                                <ref role="3cqZAo" node="3F6vMxqb639" resolve="message" />
+                              </node>
+                              <node concept="Xl_RD" id="1pPth$lQ3sb" role="37wK5m">
+                                <property role="Xl_RC" value="Check Types" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                  <node concept="3clFb_" id="1pPth$lQ3sc" role="jymVt">
-                    <property role="TrG5h" value="failed" />
-                    <property role="1EzhhJ" value="false" />
-                    <node concept="37vLTG" id="1pPth$lQ3sd" role="3clF46">
-                      <property role="TrG5h" value="message" />
-                      <node concept="17QB3L" id="1pPth$lQ3se" role="1tU5fm" />
-                    </node>
-                    <node concept="3cqZAl" id="1pPth$lQ3sf" role="3clF45" />
-                    <node concept="3Tm1VV" id="1pPth$lQ3sg" role="1B3o_S" />
-                    <node concept="3clFbS" id="1pPth$lQ3sh" role="3clF47">
-                      <node concept="3clFbF" id="1pPth$lQ3si" role="3cqZAp">
-                        <node concept="2YIFZM" id="1pPth$lQ3sj" role="3clFbG">
-                          <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
-                          <ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
-                          <node concept="37vLTw" id="1pPth$lQ3sk" role="37wK5m">
-                            <ref role="3cqZAo" node="1pPth$lQ3sd" resolve="message" />
-                          </node>
-                          <node concept="Xl_RD" id="1pPth$lQ3sl" role="37wK5m">
-                            <property role="Xl_RC" value="Check Types" />
+                      <node concept="3clFb_" id="3F6vMxqb63g" role="jymVt">
+                        <property role="TrG5h" value="failed" />
+                        <property role="1EzhhJ" value="false" />
+                        <node concept="37vLTG" id="3F6vMxqb63h" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="3F6vMxqb63i" role="1tU5fm" />
+                        </node>
+                        <node concept="3cqZAl" id="3F6vMxqb63j" role="3clF45" />
+                        <node concept="3Tm1VV" id="3F6vMxqb63k" role="1B3o_S" />
+                        <node concept="3clFbS" id="3F6vMxqb63m" role="3clF47">
+                          <node concept="3clFbF" id="1pPth$lQ3si" role="3cqZAp">
+                            <node concept="2YIFZM" id="1pPth$lQ3sj" role="3clFbG">
+                              <ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
+                              <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                              <node concept="37vLTw" id="1pPth$lQ3sk" role="37wK5m">
+                                <ref role="3cqZAo" node="3F6vMxqb63h" resolve="message" />
+                              </node>
+                              <node concept="Xl_RD" id="1pPth$lQ3sl" role="37wK5m">
+                                <property role="Xl_RC" value="Check Types" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -9908,9 +8843,6 @@
                       <ref role="2WH_rO" node="1pPth$lSW5Z" resolve="roots" />
                     </node>
                   </node>
-                  <node concept="3clFbT" id="6OUp3PsWj9l" role="37wK5m">
-                    <property role="3clFbU" value="false" />
-                  </node>
                   <node concept="3clFbT" id="1N_0WA5HS94" role="37wK5m">
                     <property role="3clFbU" value="false" />
                   </node>
@@ -10017,281 +8949,6 @@
       <ref role="2f8Tey" to="tprs:14z8V6nEs7K" resolve="debug" />
     </node>
   </node>
-  <node concept="sE7Ow" id="6OUp3PsWo3r">
-    <property role="TrG5h" value="MarkTypesJchr" />
-    <property role="2uzpH1" value="Mark Types Using JCHR" />
-    <property role="72QZ$" value="true" />
-    <node concept="tnohg" id="6OUp3PsWo3s" role="tncku">
-      <node concept="3clFbS" id="6OUp3PsWo3t" role="2VODD2">
-        <node concept="3clFbF" id="6OUp3PsWo3u" role="3cqZAp">
-          <node concept="2YIFZM" id="33j_O21qPuz" role="3clFbG">
-            <ref role="37wK5l" node="3WU9yfAbTWe" resolve="clearAll" />
-            <ref role="1Pybhc" node="41ox5VnpFrR" resolve="MarkPlugin" />
-            <node concept="2OqwBi" id="33j_O21qPu$" role="37wK5m">
-              <node concept="2WthIp" id="33j_O21qPu_" role="2Oq$k0" />
-              <node concept="1DTwFV" id="33j_O21qPuA" role="2OqNvi">
-                <ref role="2WH_rO" node="6OUp3PsWo4C" resolve="mpsProject" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6OUp3PsWo3z" role="3cqZAp" />
-        <node concept="3cpWs8" id="6OUp3PsWo3$" role="3cqZAp">
-          <node concept="3cpWsn" id="6OUp3PsWo3_" role="3cpWs9">
-            <property role="TrG5h" value="helper" />
-            <node concept="3uibUv" id="6OUp3PsWo3A" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-            </node>
-            <node concept="2ShNRf" id="6OUp3PsWo3B" role="33vP2m">
-              <node concept="YeOm9" id="6OUp3PsWo3C" role="2ShVmc">
-                <node concept="1Y3b0j" id="6OUp3PsWo3D" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                  <ref role="37wK5l" node="1pPth$lK1ZL" resolve="TypecheckingHelper" />
-                  <node concept="2OqwBi" id="6OUp3PsWo3E" role="37wK5m">
-                    <node concept="2WthIp" id="6OUp3PsWo3F" role="2Oq$k0">
-                      <ref role="32nkFo" node="6OUp3PsWo3r" resolve="MarkTypesJchr" />
-                    </node>
-                    <node concept="1DTwFV" id="6OUp3PsWo3G" role="2OqNvi">
-                      <ref role="2WH_rO" node="6OUp3PsWo4C" resolve="mpsProject" />
-                    </node>
-                  </node>
-                  <node concept="3Tm1VV" id="6OUp3PsWo3H" role="1B3o_S" />
-                  <node concept="3clFb_" id="6OUp3PsWo3I" role="jymVt">
-                    <property role="TrG5h" value="finished" />
-                    <property role="1EzhhJ" value="false" />
-                    <property role="IEkAT" value="false" />
-                    <node concept="37vLTG" id="6OUp3PsWo3J" role="3clF46">
-                      <property role="TrG5h" value="message" />
-                      <node concept="17QB3L" id="6OUp3PsWo3K" role="1tU5fm" />
-                    </node>
-                    <node concept="3cqZAl" id="6OUp3PsWo3L" role="3clF45" />
-                    <node concept="3Tm1VV" id="6OUp3PsWo3M" role="1B3o_S" />
-                    <node concept="3clFbS" id="6OUp3PsWo3N" role="3clF47">
-                      <node concept="3clFbF" id="6OUp3PsWo3O" role="3cqZAp">
-                        <node concept="2YIFZM" id="6OUp3PsWo3P" role="3clFbG">
-                          <ref role="37wK5l" to="jkm4:~Messages.showInfoMessage(java.lang.String,java.lang.String):void" resolve="showInfoMessage" />
-                          <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
-                          <node concept="37vLTw" id="6OUp3PsWo3Q" role="37wK5m">
-                            <ref role="3cqZAo" node="6OUp3PsWo3J" resolve="message" />
-                          </node>
-                          <node concept="Xl_RD" id="6OUp3PsWo3R" role="37wK5m">
-                            <property role="Xl_RC" value="Mark Types" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFb_" id="6OUp3PsWo3S" role="jymVt">
-                    <property role="TrG5h" value="failed" />
-                    <property role="1EzhhJ" value="false" />
-                    <node concept="37vLTG" id="6OUp3PsWo3T" role="3clF46">
-                      <property role="TrG5h" value="message" />
-                      <node concept="17QB3L" id="6OUp3PsWo3U" role="1tU5fm" />
-                    </node>
-                    <node concept="3cqZAl" id="6OUp3PsWo3V" role="3clF45" />
-                    <node concept="3Tm1VV" id="6OUp3PsWo3W" role="1B3o_S" />
-                    <node concept="3clFbS" id="6OUp3PsWo3X" role="3clF47">
-                      <node concept="3clFbF" id="6OUp3PsWo3Y" role="3cqZAp">
-                        <node concept="2YIFZM" id="6OUp3PsWo3Z" role="3clFbG">
-                          <ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
-                          <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
-                          <node concept="37vLTw" id="6OUp3PsWo40" role="37wK5m">
-                            <ref role="3cqZAo" node="6OUp3PsWo3T" resolve="message" />
-                          </node>
-                          <node concept="Xl_RD" id="6OUp3PsWo41" role="37wK5m">
-                            <property role="Xl_RC" value="Mark Types" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6OUp3PsWo42" role="3cqZAp">
-          <node concept="2OqwBi" id="6OUp3PsWo43" role="3clFbG">
-            <node concept="37vLTw" id="6OUp3PsWo44" role="2Oq$k0">
-              <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
-            </node>
-            <node concept="liA8E" id="6OUp3PsWo45" role="2OqNvi">
-              <ref role="37wK5l" node="1pPth$lNtBJ" resolve="withSteps" />
-              <node concept="2OqwBi" id="6OUp3PsWo46" role="37wK5m">
-                <node concept="37vLTw" id="6OUp3PsWo47" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
-                </node>
-                <node concept="liA8E" id="6OUp3PsWo48" role="2OqNvi">
-                  <ref role="37wK5l" node="1pPth$lBvOo" resolve="collectRules" />
-                  <node concept="2YIFZM" id="6OUp3PsWo49" role="37wK5m">
-                    <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
-                    <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-                    <node concept="2OqwBi" id="6OUp3PsWo4a" role="37wK5m">
-                      <node concept="2WthIp" id="6OUp3PsWo4b" role="2Oq$k0" />
-                      <node concept="1DTwFV" id="6OUp3PsWo4c" role="2OqNvi">
-                        <ref role="2WH_rO" node="6OUp3PsWo4E" resolve="node" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="6OUp3PsWo4d" role="37wK5m">
-                <node concept="37vLTw" id="6OUp3PsWo4e" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
-                </node>
-                <node concept="liA8E" id="6OUp3PsWo4f" role="2OqNvi">
-                  <ref role="37wK5l" node="1pPth$lBwLp" resolve="produceHandler" />
-                  <node concept="3clFbT" id="6OUp3PsWpqJ" role="37wK5m">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="6OUp3PsWo4h" role="37wK5m">
-                <node concept="37vLTw" id="6OUp3PsWo4i" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
-                </node>
-                <node concept="liA8E" id="6OUp3PsWo4j" role="2OqNvi">
-                  <ref role="37wK5l" node="1pPth$lD9_s" resolve="makeHandler" />
-                  <node concept="3clFbT" id="6OUp3PsWpzG" role="37wK5m">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="6OUp3PsWo4l" role="37wK5m">
-                <node concept="37vLTw" id="6OUp3PsWo4m" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
-                </node>
-                <node concept="liA8E" id="6OUp3PsWo4n" role="2OqNvi">
-                  <ref role="37wK5l" node="1pPth$lDhou" resolve="runTypechecking" />
-                  <node concept="2YIFZM" id="6OUp3PsWo4o" role="37wK5m">
-                    <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
-                    <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-                    <node concept="2OqwBi" id="6OUp3PsWo4p" role="37wK5m">
-                      <node concept="2WthIp" id="6OUp3PsWo4q" role="2Oq$k0" />
-                      <node concept="1DTwFV" id="6OUp3PsWo4r" role="2OqNvi">
-                        <ref role="2WH_rO" node="6OUp3PsWo4E" resolve="node" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbT" id="6OUp3PsWpGD" role="37wK5m">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                  <node concept="3clFbT" id="1N_0WA5Ii8F" role="37wK5m">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="6OUp3PsWo4t" role="37wK5m">
-                <node concept="37vLTw" id="6OUp3PsWo4u" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
-                </node>
-                <node concept="liA8E" id="6OUp3PsWo4v" role="2OqNvi">
-                  <ref role="37wK5l" node="1pPth$lDplP" resolve="highlightTypesAndErrors" />
-                  <node concept="2OqwBi" id="6OUp3PsWo4w" role="37wK5m">
-                    <node concept="2WthIp" id="6OUp3PsWo4x" role="2Oq$k0" />
-                    <node concept="1DTwFV" id="6OUp3PsWo4y" role="2OqNvi">
-                      <ref role="2WH_rO" node="6OUp3PsWo4G" resolve="editorComponent" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6OUp3PsWo4z" role="3cqZAp" />
-        <node concept="3clFbF" id="6OUp3PsWo4$" role="3cqZAp">
-          <node concept="2OqwBi" id="6OUp3PsWo4_" role="3clFbG">
-            <node concept="37vLTw" id="6OUp3PsWo4A" role="2Oq$k0">
-              <ref role="3cqZAo" node="6OUp3PsWo3_" resolve="helper" />
-            </node>
-            <node concept="liA8E" id="6OUp3PsWo4B" role="2OqNvi">
-              <ref role="37wK5l" node="1pPth$lNVW2" resolve="execute" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1DS2jV" id="6OUp3PsWo4C" role="1NuT2Z">
-      <property role="TrG5h" value="mpsProject" />
-      <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
-      <node concept="1oajcY" id="6OUp3PsWo4D" role="1oa70y" />
-    </node>
-    <node concept="1DS2jV" id="6OUp3PsWo4E" role="1NuT2Z">
-      <property role="TrG5h" value="node" />
-      <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.NODE" resolve="NODE" />
-      <node concept="1oajcY" id="6OUp3PsWo4F" role="1oa70y" />
-    </node>
-    <node concept="1DS2jV" id="6OUp3PsWo4G" role="1NuT2Z">
-      <property role="TrG5h" value="editorComponent" />
-      <ref role="1DUlNI" to="k3nr:~MPSEditorDataKeys.EDITOR_COMPONENT" resolve="EDITOR_COMPONENT" />
-      <node concept="1oajcY" id="6OUp3PsWo4H" role="1oa70y" />
-    </node>
-    <node concept="2ScWuX" id="6OUp3PsWo4I" role="tmbBb">
-      <node concept="3clFbS" id="6OUp3PsWo4J" role="2VODD2">
-        <node concept="3cpWs8" id="6OUp3PsWo4K" role="3cqZAp">
-          <node concept="3cpWsn" id="6OUp3PsWo4L" role="3cpWs9">
-            <property role="TrG5h" value="containingRoot" />
-            <node concept="3Tqbb2" id="6OUp3PsWo4M" role="1tU5fm" />
-            <node concept="2OqwBi" id="6OUp3PsWo4N" role="33vP2m">
-              <node concept="2OqwBi" id="6OUp3PsWo4O" role="2Oq$k0">
-                <node concept="2WthIp" id="6OUp3PsWo4P" role="2Oq$k0" />
-                <node concept="1DTwFV" id="6OUp3PsWo4Q" role="2OqNvi">
-                  <ref role="2WH_rO" node="6OUp3PsWo4E" resolve="node" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6OUp3PsWo4R" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6OUp3PsWo4S" role="3cqZAp">
-          <node concept="1Wc70l" id="6OUp3PsWo4T" role="3clFbG">
-            <node concept="1Wc70l" id="6OUp3PsWo4U" role="3uHU7B">
-              <node concept="3clFbC" id="6OUp3PsWo4V" role="3uHU7w">
-                <node concept="37vLTw" id="6OUp3PsWo4W" role="3uHU7B">
-                  <ref role="3cqZAo" node="6OUp3PsWo4L" resolve="containingRoot" />
-                </node>
-                <node concept="2OqwBi" id="6OUp3PsWo4X" role="3uHU7w">
-                  <node concept="2OqwBi" id="6OUp3PsWo4Y" role="2Oq$k0">
-                    <node concept="2WthIp" id="6OUp3PsWo4Z" role="2Oq$k0" />
-                    <node concept="1DTwFV" id="6OUp3PsWo50" role="2OqNvi">
-                      <ref role="2WH_rO" node="6OUp3PsWo4G" resolve="editorComponent" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="6OUp3PsWo51" role="2OqNvi">
-                    <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="6OUp3PsWo52" role="3uHU7B">
-                <node concept="37vLTw" id="6OUp3PsWo53" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6OUp3PsWo4L" resolve="containingRoot" />
-                </node>
-                <node concept="1mIQ4w" id="6OUp3PsWo54" role="2OqNvi">
-                  <node concept="chp4Y" id="6OUp3PsWo55" role="cj9EA">
-                    <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3fqX7Q" id="6OUp3PsWo56" role="3uHU7w">
-              <node concept="2OqwBi" id="6OUp3PsWo57" role="3fr31v">
-                <node concept="2YIFZM" id="6OUp3PsWo58" role="2Oq$k0">
-                  <ref role="37wK5l" to="hfuk:7yGn3z4MRr2" resolve="get" />
-                  <ref role="1Pybhc" to="hfuk:7yGn3z4MRqM" resolve="IMakeService.INSTANCE" />
-                </node>
-                <node concept="liA8E" id="6OUp3PsWo59" role="2OqNvi">
-                  <ref role="37wK5l" to="hfuk:7yGn3z4N64o" resolve="isSessionActive" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="312cEu" id="7nPD14Nbbbe">
     <property role="TrG5h" value="TraceComponent" />
     <property role="3GE5qa" value="trace" />
@@ -10470,8 +9127,8 @@
                               <property role="Xl_RC" value="{" />
                             </node>
                             <node concept="2YIFZM" id="7nPD14Nhk6T" role="3uHU7w">
-                              <ref role="1Pybhc" to="poio:4peSo3CHy8D" resolve="NodePrinter" />
-                              <ref role="37wK5l" to="poio:4peSo3CHBfF" resolve="print" />
+                              <ref role="1Pybhc" node="4peSo3CHy8D" resolve="NodePrinter" />
+                              <ref role="37wK5l" node="4peSo3CHBfF" resolve="print" />
                               <node concept="37vLTw" id="7nPD14Nhk6U" role="37wK5m">
                                 <ref role="3cqZAo" node="7nPD14Nhk6K" resolve="atom" />
                               </node>
@@ -19772,8 +18429,8 @@
                 <node concept="liA8E" id="4pWvZ2njipK" role="2OqNvi">
                   <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
                   <node concept="2YIFZM" id="4pWvZ2njipL" role="37wK5m">
-                    <ref role="37wK5l" to="poio:4peSo3D04j7" resolve="print" />
-                    <ref role="1Pybhc" to="poio:4peSo3CHy8D" resolve="NodePrinter" />
+                    <ref role="1Pybhc" node="4peSo3CHy8D" resolve="NodePrinter" />
+                    <ref role="37wK5l" node="4peSo3D04j7" resolve="print" />
                     <node concept="2YIFZM" id="4pWvZ2njipM" role="37wK5m">
                       <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
                       <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
@@ -20250,7 +18907,7 @@
       </node>
       <node concept="3Tm6S6" id="5kEUewdD8xu" role="1B3o_S" />
       <node concept="3uibUv" id="4peSo3D1gxU" role="1zkMxy">
-        <ref role="3uigEE" to="poio:3gJBs5s$bxr" resolve="NodePrinter.DefaultVariableSymbol" />
+        <ref role="3uigEE" node="3gJBs5s$bxr" resolve="NodePrinter.DefaultVariableSymbol" />
       </node>
     </node>
     <node concept="2tJIrI" id="4pWvZ2nEaSo" role="jymVt" />
@@ -20325,8 +18982,8 @@
                 <node concept="liA8E" id="4TCblo6gv51" role="2OqNvi">
                   <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
                   <node concept="2YIFZM" id="4TCblo6gv52" role="37wK5m">
-                    <ref role="37wK5l" to="poio:4peSo3D04j7" resolve="print" />
-                    <ref role="1Pybhc" to="poio:4peSo3CHy8D" resolve="NodePrinter" />
+                    <ref role="1Pybhc" node="4peSo3CHy8D" resolve="NodePrinter" />
+                    <ref role="37wK5l" node="4peSo3D04j7" resolve="print" />
                     <node concept="2YIFZM" id="4TCblo6gv53" role="37wK5m">
                       <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
                       <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
@@ -31802,64 +30459,69 @@
               <ref role="3uigEE" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
             </node>
             <node concept="2ShNRf" id="7f1nCjLFveY" role="33vP2m">
-              <node concept="YeOm9" id="7f1nCjLFveZ" role="2ShVmc">
-                <node concept="1Y3b0j" id="7f1nCjLFvf0" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                  <ref role="37wK5l" node="1pPth$lK1ZL" resolve="TypecheckingHelper" />
-                  <node concept="2OqwBi" id="7f1nCjLFvf1" role="37wK5m">
-                    <node concept="2WthIp" id="7f1nCjLFvf2" role="2Oq$k0">
-                      <ref role="32nkFo" node="7f1nCjLFveK" resolve="MarkTypesTrace" />
-                    </node>
-                    <node concept="1DTwFV" id="7f1nCjLFvf3" role="2OqNvi">
-                      <ref role="2WH_rO" node="7f1nCjLFvfT" resolve="mpsProject" />
-                    </node>
+              <node concept="1pGfFk" id="3F6vMxqbM$Q" role="2ShVmc">
+                <ref role="37wK5l" node="1pPth$lK1ZL" resolve="TypecheckingHelper" />
+                <node concept="2OqwBi" id="7f1nCjLFvf1" role="37wK5m">
+                  <node concept="2WthIp" id="7f1nCjLFvf2" role="2Oq$k0">
+                    <ref role="32nkFo" node="7f1nCjLFveK" resolve="MarkTypesTrace" />
                   </node>
-                  <node concept="3Tm1VV" id="7f1nCjLFvf4" role="1B3o_S" />
-                  <node concept="3clFb_" id="7f1nCjLFvf5" role="jymVt">
-                    <property role="TrG5h" value="finished" />
-                    <property role="1EzhhJ" value="false" />
-                    <property role="IEkAT" value="false" />
-                    <node concept="37vLTG" id="7f1nCjLFvf6" role="3clF46">
-                      <property role="TrG5h" value="message" />
-                      <node concept="17QB3L" id="7f1nCjLFvf7" role="1tU5fm" />
-                    </node>
-                    <node concept="3cqZAl" id="7f1nCjLFvf8" role="3clF45" />
-                    <node concept="3Tm1VV" id="7f1nCjLFvf9" role="1B3o_S" />
-                    <node concept="3clFbS" id="7f1nCjLFvfa" role="3clF47">
-                      <node concept="3clFbF" id="7f1nCjLFvfb" role="3cqZAp">
-                        <node concept="2YIFZM" id="7f1nCjLFvfc" role="3clFbG">
-                          <ref role="37wK5l" to="jkm4:~Messages.showInfoMessage(java.lang.String,java.lang.String):void" resolve="showInfoMessage" />
-                          <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
-                          <node concept="37vLTw" id="7f1nCjLFvfd" role="37wK5m">
-                            <ref role="3cqZAo" node="7f1nCjLFvf6" resolve="message" />
-                          </node>
-                          <node concept="Xl_RD" id="7f1nCjLFvfe" role="37wK5m">
-                            <property role="Xl_RC" value="Mark Types" />
+                  <node concept="1DTwFV" id="7f1nCjLFvf3" role="2OqNvi">
+                    <ref role="2WH_rO" node="7f1nCjLFvfT" resolve="mpsProject" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="3F6vMxqbJ8G" role="37wK5m">
+                  <node concept="YeOm9" id="3F6vMxqbLVR" role="2ShVmc">
+                    <node concept="1Y3b0j" id="3F6vMxqbLVU" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <ref role="1Y3XeK" node="3F6vMxqaxpm" resolve="TypecheckingHelper.DoneCallback" />
+                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                      <node concept="3Tm1VV" id="3F6vMxqbLVV" role="1B3o_S" />
+                      <node concept="3clFb_" id="3F6vMxqbLVW" role="jymVt">
+                        <property role="TrG5h" value="finished" />
+                        <property role="1EzhhJ" value="false" />
+                        <property role="IEkAT" value="false" />
+                        <node concept="37vLTG" id="3F6vMxqbLVX" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="3F6vMxqbLVY" role="1tU5fm" />
+                        </node>
+                        <node concept="3cqZAl" id="3F6vMxqbLVZ" role="3clF45" />
+                        <node concept="3Tm1VV" id="3F6vMxqbLW0" role="1B3o_S" />
+                        <node concept="3clFbS" id="3F6vMxqbLW2" role="3clF47">
+                          <node concept="3clFbF" id="7f1nCjLFvfb" role="3cqZAp">
+                            <node concept="2YIFZM" id="7f1nCjLFvfc" role="3clFbG">
+                              <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                              <ref role="37wK5l" to="jkm4:~Messages.showInfoMessage(java.lang.String,java.lang.String):void" resolve="showInfoMessage" />
+                              <node concept="37vLTw" id="7f1nCjLFvfd" role="37wK5m">
+                                <ref role="3cqZAo" node="3F6vMxqbLVX" resolve="message" />
+                              </node>
+                              <node concept="Xl_RD" id="7f1nCjLFvfe" role="37wK5m">
+                                <property role="Xl_RC" value="Mark Types" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                  <node concept="3clFb_" id="7f1nCjLFvff" role="jymVt">
-                    <property role="TrG5h" value="failed" />
-                    <property role="1EzhhJ" value="false" />
-                    <node concept="37vLTG" id="7f1nCjLFvfg" role="3clF46">
-                      <property role="TrG5h" value="message" />
-                      <node concept="17QB3L" id="7f1nCjLFvfh" role="1tU5fm" />
-                    </node>
-                    <node concept="3cqZAl" id="7f1nCjLFvfi" role="3clF45" />
-                    <node concept="3Tm1VV" id="7f1nCjLFvfj" role="1B3o_S" />
-                    <node concept="3clFbS" id="7f1nCjLFvfk" role="3clF47">
-                      <node concept="3clFbF" id="7f1nCjLFvfl" role="3cqZAp">
-                        <node concept="2YIFZM" id="7f1nCjLFvfm" role="3clFbG">
-                          <ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
-                          <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
-                          <node concept="37vLTw" id="7f1nCjLFvfn" role="37wK5m">
-                            <ref role="3cqZAo" node="7f1nCjLFvfg" resolve="message" />
-                          </node>
-                          <node concept="Xl_RD" id="7f1nCjLFvfo" role="37wK5m">
-                            <property role="Xl_RC" value="Mark Types" />
+                      <node concept="3clFb_" id="3F6vMxqbLW4" role="jymVt">
+                        <property role="TrG5h" value="failed" />
+                        <property role="1EzhhJ" value="false" />
+                        <node concept="37vLTG" id="3F6vMxqbLW5" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="3F6vMxqbLW6" role="1tU5fm" />
+                        </node>
+                        <node concept="3cqZAl" id="3F6vMxqbLW7" role="3clF45" />
+                        <node concept="3Tm1VV" id="3F6vMxqbLW8" role="1B3o_S" />
+                        <node concept="3clFbS" id="3F6vMxqbLWa" role="3clF47">
+                          <node concept="3clFbF" id="7f1nCjLFvfl" role="3cqZAp">
+                            <node concept="2YIFZM" id="7f1nCjLFvfm" role="3clFbG">
+                              <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                              <ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
+                              <node concept="37vLTw" id="7f1nCjLFvfn" role="37wK5m">
+                                <ref role="3cqZAo" node="3F6vMxqbLW5" resolve="message" />
+                              </node>
+                              <node concept="Xl_RD" id="7f1nCjLFvfo" role="37wK5m">
+                                <property role="Xl_RC" value="Mark Types" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -31912,9 +30574,6 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbT" id="7f1nCjLFvfG" role="37wK5m">
-                    <property role="3clFbU" value="false" />
-                  </node>
                   <node concept="3clFbT" id="7f1nCjLFvfH" role="37wK5m">
                     <property role="3clFbU" value="true" />
                   </node>
@@ -32068,59 +30727,64 @@
               <ref role="3uigEE" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
             </node>
             <node concept="2ShNRf" id="4hh0cTRdibC" role="33vP2m">
-              <node concept="YeOm9" id="4hh0cTRdibD" role="2ShVmc">
-                <node concept="1Y3b0j" id="4hh0cTRdibE" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                  <ref role="37wK5l" node="1pPth$lK1ZL" resolve="TypecheckingHelper" />
-                  <node concept="3Tm1VV" id="4hh0cTRdibF" role="1B3o_S" />
-                  <node concept="3clFb_" id="4hh0cTRdibG" role="jymVt">
-                    <property role="TrG5h" value="finished" />
-                    <property role="1EzhhJ" value="false" />
-                    <property role="IEkAT" value="false" />
-                    <node concept="37vLTG" id="4hh0cTRdibH" role="3clF46">
-                      <property role="TrG5h" value="message" />
-                      <node concept="17QB3L" id="4hh0cTRdibI" role="1tU5fm" />
-                    </node>
-                    <node concept="3cqZAl" id="4hh0cTRdibJ" role="3clF45" />
-                    <node concept="3Tm1VV" id="4hh0cTRdibK" role="1B3o_S" />
-                    <node concept="3clFbS" id="4hh0cTRdibL" role="3clF47" />
+              <node concept="1pGfFk" id="3F6vMxqbyT7" role="2ShVmc">
+                <ref role="37wK5l" node="1pPth$lK1ZL" resolve="TypecheckingHelper" />
+                <node concept="10QFUN" id="1N_0WA5JrWv" role="37wK5m">
+                  <node concept="37vLTw" id="1N_0WA5Jsmm" role="10QFUP">
+                    <ref role="3cqZAo" node="1N_0WA5Jqq8" resolve="prj" />
                   </node>
-                  <node concept="3clFb_" id="4hh0cTRdibM" role="jymVt">
-                    <property role="TrG5h" value="failed" />
-                    <property role="1EzhhJ" value="false" />
-                    <node concept="37vLTG" id="4hh0cTRdibN" role="3clF46">
-                      <property role="TrG5h" value="message" />
-                      <node concept="17QB3L" id="4hh0cTRdibO" role="1tU5fm" />
-                    </node>
-                    <node concept="3cqZAl" id="4hh0cTRdibP" role="3clF45" />
-                    <node concept="3Tm1VV" id="4hh0cTRdibQ" role="1B3o_S" />
-                    <node concept="3clFbS" id="4hh0cTRdibR" role="3clF47">
-                      <node concept="3clFbF" id="1N_0WA5IIXc" role="3cqZAp">
-                        <node concept="37vLTI" id="1N_0WA5IJ4p" role="3clFbG">
-                          <node concept="37vLTw" id="1N_0WA5IJwr" role="37vLTx">
-                            <ref role="3cqZAo" node="4hh0cTRdibN" resolve="message" />
-                          </node>
-                          <node concept="AH0OO" id="1N_0WA5IJlP" role="37vLTJ">
-                            <node concept="3cmrfG" id="1N_0WA5IJoA" role="AHEQo">
-                              <property role="3cmrfH" value="0" />
-                            </node>
-                            <node concept="37vLTw" id="1N_0WA5IIXa" role="AHHXb">
-                              <ref role="3cqZAo" node="1N_0WA5IICk" resolve="errors" />
+                  <node concept="3uibUv" id="1N_0WA5Jsc8" role="10QFUM">
+                    <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="3F6vMxqbvuh" role="37wK5m">
+                  <node concept="YeOm9" id="3F6vMxqbypH" role="2ShVmc">
+                    <node concept="1Y3b0j" id="3F6vMxqbypK" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <ref role="1Y3XeK" node="3F6vMxqaxpm" resolve="TypecheckingHelper.DoneCallback" />
+                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                      <node concept="3Tm1VV" id="3F6vMxqbypL" role="1B3o_S" />
+                      <node concept="3clFb_" id="3F6vMxqbypM" role="jymVt">
+                        <property role="TrG5h" value="finished" />
+                        <property role="1EzhhJ" value="false" />
+                        <property role="IEkAT" value="false" />
+                        <node concept="37vLTG" id="3F6vMxqbypN" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="3F6vMxqbypO" role="1tU5fm" />
+                        </node>
+                        <node concept="3cqZAl" id="3F6vMxqbypP" role="3clF45" />
+                        <node concept="3Tm1VV" id="3F6vMxqbypQ" role="1B3o_S" />
+                        <node concept="3clFbS" id="3F6vMxqbypS" role="3clF47" />
+                      </node>
+                      <node concept="3clFb_" id="3F6vMxqbypU" role="jymVt">
+                        <property role="TrG5h" value="failed" />
+                        <property role="1EzhhJ" value="false" />
+                        <node concept="37vLTG" id="3F6vMxqbypV" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="3F6vMxqbypW" role="1tU5fm" />
+                        </node>
+                        <node concept="3cqZAl" id="3F6vMxqbypX" role="3clF45" />
+                        <node concept="3Tm1VV" id="3F6vMxqbypY" role="1B3o_S" />
+                        <node concept="3clFbS" id="3F6vMxqbyq0" role="3clF47">
+                          <node concept="3clFbF" id="1N_0WA5IIXc" role="3cqZAp">
+                            <node concept="37vLTI" id="1N_0WA5IJ4p" role="3clFbG">
+                              <node concept="37vLTw" id="1N_0WA5IJwr" role="37vLTx">
+                                <ref role="3cqZAo" node="3F6vMxqbypV" resolve="message" />
+                              </node>
+                              <node concept="AH0OO" id="1N_0WA5IJlP" role="37vLTJ">
+                                <node concept="3cmrfG" id="1N_0WA5IJoA" role="AHEQo">
+                                  <property role="3cmrfH" value="0" />
+                                </node>
+                                <node concept="37vLTw" id="1N_0WA5IIXa" role="AHHXb">
+                                  <ref role="3cqZAo" node="1N_0WA5IICk" resolve="errors" />
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="10QFUN" id="1N_0WA5JrWv" role="37wK5m">
-                    <node concept="37vLTw" id="1N_0WA5Jsmm" role="10QFUP">
-                      <ref role="3cqZAo" node="1N_0WA5Jqq8" resolve="prj" />
-                    </node>
-                    <node concept="3uibUv" id="1N_0WA5Jsc8" role="10QFUM">
-                      <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-                    </node>
-                  </node>
                 </node>
               </node>
             </node>
@@ -32162,9 +30826,6 @@
                       <ref role="3cqZAo" node="1N_0WA5IKi9" resolve="root" />
                     </node>
                   </node>
-                  <node concept="3clFbT" id="4hh0cTRdic4" role="37wK5m">
-                    <property role="3clFbU" value="false" />
-                  </node>
                   <node concept="3clFbT" id="4hh0cTRdic5" role="37wK5m" />
                 </node>
               </node>
@@ -32198,5 +30859,2145 @@
     <node concept="2tJIrI" id="1N_0WA5Jy0_" role="jymVt" />
     <node concept="3Tm1VV" id="1N_0WA5JxZP" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="4peSo3CHy8D">
+    <property role="TrG5h" value="NodePrinter" />
+    <node concept="Wx3nA" id="6XxJ1FLXd5E" role="jymVt">
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="CLASS_PARAMS" />
+      <node concept="3Tm6S6" id="6XxJ1FLXd5z" role="1B3o_S" />
+      <node concept="10Q1$e" id="6XxJ1FLXd5$" role="1tU5fm">
+        <node concept="17QB3L" id="6XxJ1FLXd5_" role="10Q1$1" />
+      </node>
+      <node concept="2BsdOp" id="6XxJ1FLXd5A" role="33vP2m">
+        <node concept="Xl_RD" id="6XxJ1FLXd5B" role="2BsfMF">
+          <property role="Xl_RC" value="&lt;" />
+        </node>
+        <node concept="Xl_RD" id="6XxJ1FLXd5C" role="2BsfMF">
+          <property role="Xl_RC" value=", " />
+        </node>
+        <node concept="Xl_RD" id="6XxJ1FLXd5D" role="2BsfMF">
+          <property role="Xl_RC" value="&gt;" />
+        </node>
+      </node>
+    </node>
+    <node concept="Wx3nA" id="6XxJ1FLXefa" role="jymVt">
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="ARRAY_PARAMS" />
+      <node concept="3Tm6S6" id="6XxJ1FLXefb" role="1B3o_S" />
+      <node concept="10Q1$e" id="6XxJ1FLXefc" role="1tU5fm">
+        <node concept="17QB3L" id="6XxJ1FLXefd" role="10Q1$1" />
+      </node>
+      <node concept="2BsdOp" id="6XxJ1FLXefe" role="33vP2m">
+        <node concept="Xl_RD" id="6XxJ1FLXeff" role="2BsfMF">
+          <property role="Xl_RC" value="[" />
+        </node>
+        <node concept="Xl_RD" id="6XxJ1FLXefg" role="2BsfMF">
+          <property role="Xl_RC" value=", " />
+        </node>
+        <node concept="Xl_RD" id="6XxJ1FLXefh" role="2BsfMF">
+          <property role="Xl_RC" value="]" />
+        </node>
+      </node>
+    </node>
+    <node concept="Wx3nA" id="6XxJ1FLYfHw" role="jymVt">
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="NO_PARAMS" />
+      <node concept="3Tm6S6" id="6XxJ1FLYfHx" role="1B3o_S" />
+      <node concept="10Q1$e" id="6XxJ1FLYfHy" role="1tU5fm">
+        <node concept="17QB3L" id="6XxJ1FLYfHz" role="10Q1$1" />
+      </node>
+      <node concept="2BsdOp" id="6XxJ1FLYfH$" role="33vP2m">
+        <node concept="Xl_RD" id="6XxJ1FLYfH_" role="2BsfMF" />
+        <node concept="Xl_RD" id="6XxJ1FLYfHA" role="2BsfMF" />
+        <node concept="Xl_RD" id="6XxJ1FLYfHB" role="2BsfMF" />
+      </node>
+    </node>
+    <node concept="Wx3nA" id="3yhgKRJgb2m" role="jymVt">
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="EXTENDS_PARAMS" />
+      <node concept="3Tm6S6" id="3yhgKRJgb2n" role="1B3o_S" />
+      <node concept="10Q1$e" id="3yhgKRJgb2o" role="1tU5fm">
+        <node concept="17QB3L" id="3yhgKRJgb2p" role="10Q1$1" />
+      </node>
+      <node concept="2BsdOp" id="3yhgKRJgb2q" role="33vP2m">
+        <node concept="Xl_RD" id="3yhgKRJgb2r" role="2BsfMF">
+          <property role="Xl_RC" value=" extends " />
+        </node>
+        <node concept="Xl_RD" id="3yhgKRJgb2s" role="2BsfMF">
+          <property role="Xl_RC" value=", " />
+        </node>
+        <node concept="Xl_RD" id="3yhgKRJgb2t" role="2BsfMF" />
+      </node>
+    </node>
+    <node concept="Wx3nA" id="3yhgKRJgl0S" role="jymVt">
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="SUPER_PARAMS" />
+      <node concept="3Tm6S6" id="3yhgKRJgl0T" role="1B3o_S" />
+      <node concept="10Q1$e" id="3yhgKRJgl0U" role="1tU5fm">
+        <node concept="17QB3L" id="3yhgKRJgl0V" role="10Q1$1" />
+      </node>
+      <node concept="2BsdOp" id="3yhgKRJgl0W" role="33vP2m">
+        <node concept="Xl_RD" id="3yhgKRJgl0X" role="2BsfMF">
+          <property role="Xl_RC" value=" super " />
+        </node>
+        <node concept="Xl_RD" id="3yhgKRJgl0Y" role="2BsfMF">
+          <property role="Xl_RC" value=", " />
+        </node>
+        <node concept="Xl_RD" id="3yhgKRJgl0Z" role="2BsfMF" />
+      </node>
+    </node>
+    <node concept="Wx3nA" id="3jXBvmTp2IM" role="jymVt">
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="DEFAULT" />
+      <node concept="3Tm6S6" id="3jXBvmTp2IN" role="1B3o_S" />
+      <node concept="10Q1$e" id="3jXBvmTp2IO" role="1tU5fm">
+        <node concept="17QB3L" id="3jXBvmTp2IP" role="10Q1$1" />
+      </node>
+      <node concept="2BsdOp" id="3jXBvmTp2IQ" role="33vP2m">
+        <node concept="Xl_RD" id="3jXBvmTp2IR" role="2BsfMF">
+          <property role="Xl_RC" value="{" />
+        </node>
+        <node concept="Xl_RD" id="3jXBvmTp2IS" role="2BsfMF">
+          <property role="Xl_RC" value=", " />
+        </node>
+        <node concept="Xl_RD" id="3jXBvmTp2IT" role="2BsfMF">
+          <property role="Xl_RC" value="}" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4peSo3CHzMd" role="jymVt" />
+    <node concept="2YIFZL" id="4peSo3CHBfF" role="jymVt">
+      <property role="IEkAT" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <property role="TrG5h" value="print" />
+      <node concept="37vLTG" id="4peSo3CHB$z" role="3clF46">
+        <property role="TrG5h" value="atom" />
+        <node concept="3uibUv" id="4peSo3CHBGl" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="4peSo3CHB5z" role="3clF47">
+        <node concept="3cpWs8" id="4peSo3CILeK" role="3cqZAp">
+          <node concept="3cpWsn" id="4peSo3CILeL" role="3cpWs9">
+            <property role="TrG5h" value="builder" />
+            <node concept="3uibUv" id="4peSo3CILeI" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+            </node>
+            <node concept="2ShNRf" id="4peSo3CILeM" role="33vP2m">
+              <node concept="1pGfFk" id="4peSo3CILeN" role="2ShVmc">
+                <ref role="37wK5l" to="wyt6:~StringBuilder.&lt;init&gt;()" resolve="StringBuilder" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4peSo3CILp_" role="3cqZAp">
+          <node concept="1rXfSq" id="4peSo3CILpz" role="3clFbG">
+            <ref role="37wK5l" node="4peSo3CIJRO" resolve="doPrint" />
+            <node concept="37vLTw" id="6HT7BWBRhCT" role="37wK5m">
+              <ref role="3cqZAo" node="4peSo3CHB$z" resolve="atom" />
+            </node>
+            <node concept="2ShNRf" id="4peSo3D1xgT" role="37wK5m">
+              <node concept="HV5vD" id="4peSo3D1x$v" role="2ShVmc">
+                <ref role="HV5vE" node="3gJBs5s$bxr" resolve="NodePrinter.DefaultVariableSymbol" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4peSo3CILG0" role="37wK5m">
+              <ref role="3cqZAo" node="4peSo3CILeL" resolve="builder" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="4peSo3CILQg" role="3cqZAp">
+          <node concept="2OqwBi" id="4peSo3CIMct" role="3cqZAk">
+            <node concept="37vLTw" id="4peSo3CIM42" role="2Oq$k0">
+              <ref role="3cqZAo" node="4peSo3CILeL" resolve="builder" />
+            </node>
+            <node concept="liA8E" id="4peSo3CIMLV" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="4peSo3CIKv4" role="3clF45" />
+      <node concept="3Tm1VV" id="4peSo3CHB5y" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="4peSo3CIKfj" role="jymVt" />
+    <node concept="2YIFZL" id="4peSo3D04j7" role="jymVt">
+      <property role="IEkAT" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <property role="TrG5h" value="print" />
+      <node concept="37vLTG" id="4peSo3D04j8" role="3clF46">
+        <property role="TrG5h" value="atom" />
+        <node concept="3uibUv" id="4peSo3D04j9" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4peSo3D075N" role="3clF46">
+        <property role="TrG5h" value="variableSymbol" />
+        <node concept="3uibUv" id="4peSo3D18yQ" role="1tU5fm">
+          <ref role="3uigEE" node="3gJBs5s$bxr" resolve="NodePrinter.DefaultVariableSymbol" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="4peSo3D04jd" role="3clF47">
+        <node concept="3cpWs8" id="4peSo3D1wNi" role="3cqZAp">
+          <node concept="3cpWsn" id="4peSo3D1wNj" role="3cpWs9">
+            <property role="TrG5h" value="builder" />
+            <node concept="3uibUv" id="4peSo3D1wNk" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+            </node>
+            <node concept="2ShNRf" id="4peSo3D1wNl" role="33vP2m">
+              <node concept="1pGfFk" id="4peSo3D1wNm" role="2ShVmc">
+                <ref role="37wK5l" to="wyt6:~StringBuilder.&lt;init&gt;()" resolve="StringBuilder" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4peSo3D1wNn" role="3cqZAp">
+          <node concept="1rXfSq" id="4peSo3D1wNo" role="3clFbG">
+            <ref role="37wK5l" node="4peSo3CIJRO" resolve="doPrint" />
+            <node concept="37vLTw" id="6HT7BWBRh_w" role="37wK5m">
+              <ref role="3cqZAo" node="4peSo3D04j8" resolve="atom" />
+            </node>
+            <node concept="37vLTw" id="4peSo3D1xXE" role="37wK5m">
+              <ref role="3cqZAo" node="4peSo3D075N" resolve="variableSymbol" />
+            </node>
+            <node concept="37vLTw" id="4peSo3D1wNq" role="37wK5m">
+              <ref role="3cqZAo" node="4peSo3D1wNj" resolve="builder" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="4peSo3D1wNr" role="3cqZAp">
+          <node concept="2OqwBi" id="4peSo3D1wNs" role="3cqZAk">
+            <node concept="37vLTw" id="4peSo3D1wNt" role="2Oq$k0">
+              <ref role="3cqZAo" node="4peSo3D1wNj" resolve="builder" />
+            </node>
+            <node concept="liA8E" id="4peSo3D1wNu" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="4peSo3D1yj6" role="3clF45" />
+      <node concept="3Tm1VV" id="4peSo3D04jB" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="4peSo3D1uDA" role="jymVt" />
+    <node concept="2YIFZL" id="4peSo3CIJRO" role="jymVt">
+      <property role="IEkAT" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <property role="TrG5h" value="doPrint" />
+      <node concept="37vLTG" id="4peSo3CIJRP" role="3clF46">
+        <property role="TrG5h" value="atom" />
+        <node concept="3uibUv" id="4peSo3CIJRQ" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4peSo3D1wUl" role="3clF46">
+        <property role="TrG5h" value="variableSymbol" />
+        <node concept="3uibUv" id="4peSo3D1wUm" role="1tU5fm">
+          <ref role="3uigEE" node="3gJBs5s$bxr" resolve="NodePrinter.DefaultVariableSymbol" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4peSo3CIJRS" role="3clF46">
+        <property role="TrG5h" value="sb" />
+        <node concept="3uibUv" id="4peSo3CIJRT" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="4peSo3CIJRU" role="3clF47">
+        <node concept="3clFbJ" id="4peSo3CIJRV" role="3cqZAp">
+          <node concept="3clFbS" id="4peSo3CIJRW" role="3clFbx">
+            <node concept="3clFbF" id="4peSo3CIJRX" role="3cqZAp">
+              <node concept="2OqwBi" id="4peSo3CIJRY" role="3clFbG">
+                <node concept="37vLTw" id="4peSo3CIJRZ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4peSo3CIJRS" resolve="sb" />
+                </node>
+                <node concept="liA8E" id="4peSo3CIJS0" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <node concept="2YIFZM" id="4peSo3CIJS1" role="37wK5m">
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                    <node concept="37vLTw" id="4peSo3CIJS2" role="37wK5m">
+                      <ref role="3cqZAo" node="4peSo3CIJRP" resolve="atom" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="4peSo3CIJS3" role="3cqZAp" />
+          </node>
+          <node concept="2OqwBi" id="4peSo3CIJS4" role="3clFbw">
+            <node concept="liA8E" id="4peSo3CIJS5" role="2OqNvi">
+              <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind):boolean" resolve="is" />
+              <node concept="Rm8GO" id="4peSo3CIJS6" role="37wK5m">
+                <ref role="1Px2BO" to="yt73:~Term$Kind" resolve="Term.Kind" />
+                <ref role="Rm8GQ" to="yt73:~Term$Kind.VAR" resolve="VAR" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4peSo3CIJS7" role="2Oq$k0">
+              <ref role="3cqZAo" node="4peSo3CIJRP" resolve="atom" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="4peSo3CIJS8" role="9aQIa">
+            <node concept="3clFbS" id="4peSo3CIJS9" role="9aQI4">
+              <node concept="3clFbF" id="4peSo3CIJSa" role="3cqZAp">
+                <node concept="2OqwBi" id="4peSo3CIJSb" role="3clFbG">
+                  <node concept="2ShNRf" id="4peSo3CIJSc" role="2Oq$k0">
+                    <node concept="1pGfFk" id="4peSo3CIJSd" role="2ShVmc">
+                      <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                      <node concept="2ShNRf" id="4peSo3CINyv" role="37wK5m">
+                        <node concept="1pGfFk" id="4peSo3CINPP" role="2ShVmc">
+                          <ref role="37wK5l" node="4peSo3CIw3p" resolve="NodePrinter" />
+                          <node concept="37vLTw" id="4peSo3CINVt" role="37wK5m">
+                            <ref role="3cqZAo" node="4peSo3CIJRS" resolve="sb" />
+                          </node>
+                          <node concept="37vLTw" id="5_6ImQYJS0a" role="37wK5m">
+                            <ref role="3cqZAo" node="4peSo3D1wUl" resolve="variableSymbol" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="4peSo3CIJSf" role="2OqNvi">
+                    <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+                    <node concept="2YIFZM" id="6HT7BWBRh6I" role="37wK5m">
+                      <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
+                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+                      <node concept="37vLTw" id="6HT7BWBRhg3" role="37wK5m">
+                        <ref role="3cqZAo" node="4peSo3CIJRP" resolve="atom" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="4peSo3CIJSh" role="3clF45" />
+      <node concept="3Tm6S6" id="5TpjAH626oL" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="4peSo3CIHWU" role="jymVt" />
+    <node concept="3clFbW" id="4peSo3CIw3p" role="jymVt">
+      <node concept="37vLTG" id="4peSo3CIwrc" role="3clF46">
+        <property role="TrG5h" value="stringBuilder" />
+        <node concept="3uibUv" id="4peSo3CIwye" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4peSo3D0GSX" role="3clF46">
+        <property role="TrG5h" value="variableSymbol" />
+        <node concept="3uibUv" id="4peSo3D17ux" role="1tU5fm">
+          <ref role="3uigEE" node="3gJBs5s$bxr" resolve="NodePrinter.DefaultVariableSymbol" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="4peSo3CIw3r" role="3clF45" />
+      <node concept="3Tm6S6" id="4peSo3CIwnr" role="1B3o_S" />
+      <node concept="3clFbS" id="4peSo3CIw3t" role="3clF47">
+        <node concept="3clFbF" id="4peSo3CIw_D" role="3cqZAp">
+          <node concept="37vLTI" id="4peSo3CIw_F" role="3clFbG">
+            <node concept="2OqwBi" id="4peSo3CIw_J" role="37vLTJ">
+              <node concept="Xjq3P" id="4peSo3CIw_M" role="2Oq$k0" />
+              <node concept="2OwXpG" id="4peSo3CIw_I" role="2OqNvi">
+                <ref role="2Oxat5" node="4peSo3CIw__" resolve="stringBuilder" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4peSo3CIw_N" role="37vLTx">
+              <ref role="3cqZAo" node="4peSo3CIwrc" resolve="stringBuilder" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4peSo3D0HuR" role="3cqZAp">
+          <node concept="37vLTI" id="4peSo3D0HuT" role="3clFbG">
+            <node concept="2OqwBi" id="4peSo3D0HuX" role="37vLTJ">
+              <node concept="Xjq3P" id="4peSo3D0Hv0" role="2Oq$k0" />
+              <node concept="2OwXpG" id="4peSo3D0HuW" role="2OqNvi">
+                <ref role="2Oxat5" node="4peSo3D0HuN" resolve="variableSymbol" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4peSo3D0Hv1" role="37vLTx">
+              <ref role="3cqZAo" node="4peSo3D0GSX" resolve="variableSymbol" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3jXBvmTpfO_" role="3cqZAp">
+          <node concept="2OqwBi" id="3jXBvmTpfWQ" role="3clFbG">
+            <node concept="37vLTw" id="3jXBvmTpfOz" role="2Oq$k0">
+              <ref role="3cqZAo" node="4peSo3CIVXA" resolve="formatStack" />
+            </node>
+            <node concept="liA8E" id="3jXBvmTpgso" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+              <node concept="2ShNRf" id="3jXBvmTpgFa" role="37wK5m">
+                <node concept="1pGfFk" id="3jXBvmTpgXz" role="2ShVmc">
+                  <ref role="37wK5l" node="6XxJ1FLXDlP" resolve="NodePrinter.NodeFormatter" />
+                  <node concept="37vLTw" id="3F6vMxq2h2n" role="37wK5m">
+                    <ref role="3cqZAo" node="3jXBvmTp2IM" resolve="DEFAULT" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4peSo3CIBGi" role="jymVt" />
+    <node concept="3Tm1VV" id="4peSo3CHy8E" role="1B3o_S" />
+    <node concept="3uibUv" id="4peSo3CHzrM" role="EKbjA">
+      <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+    </node>
+    <node concept="3clFb_" id="4peSo3CHzzR" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="walkTerms" />
+      <node concept="3uibUv" id="4peSo3CHzzS" role="3clF45">
+        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+      </node>
+      <node concept="3Tm1VV" id="4peSo3CHzzT" role="1B3o_S" />
+      <node concept="37vLTG" id="4peSo3CHzzV" role="3clF46">
+        <property role="TrG5h" value="cb" />
+        <node concept="3uibUv" id="4peSo3CHzzW" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="4peSo3CHz$5" role="3clF47">
+        <node concept="3clFbH" id="6infEALsoez" role="3cqZAp" />
+        <node concept="3SKdUt" id="4peSo3CJDAn" role="3cqZAp">
+          <node concept="3SKdUq" id="4peSo3CJDKb" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME: the constants must be extracted" />
+          </node>
+        </node>
+        <node concept="3clFbJ" id="4peSo3CJCAw" role="3cqZAp">
+          <node concept="3clFbS" id="4peSo3CJCAy" role="3clFbx">
+            <node concept="3SKdUt" id="5_6ImQYCh12" role="3cqZAp">
+              <node concept="3SKdUq" id="5_6ImQYChcI" role="3SKWNk">
+                <property role="3SKdUp" value="TODO: no-formatter" />
+              </node>
+            </node>
+            <node concept="3clFbJ" id="4peSo3CKstE" role="3cqZAp">
+              <node concept="3clFbS" id="4peSo3CKstG" role="3clFbx">
+                <node concept="3clFbF" id="4peSo3CKycV" role="3cqZAp">
+                  <node concept="2OqwBi" id="4peSo3CKBwI" role="3clFbG">
+                    <node concept="2OqwBi" id="4peSo3CKyM6" role="2Oq$k0">
+                      <node concept="37vLTw" id="4peSo3CKycT" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4peSo3CIVXA" resolve="formatStack" />
+                      </node>
+                      <node concept="liA8E" id="4peSo3CKBj_" role="2OqNvi">
+                        <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="4peSo3CKCbF" role="2OqNvi">
+                      <ref role="37wK5l" node="6infEALrBJ1" resolve="listNext" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3fqX7Q" id="4peSo3CKsD_" role="3clFbw">
+                <node concept="2OqwBi" id="4peSo3CKty1" role="3fr31v">
+                  <node concept="37vLTw" id="4peSo3CKsLa" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4peSo3CIVXA" resolve="formatStack" />
+                  </node>
+                  <node concept="liA8E" id="4peSo3CKxPU" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty():boolean" resolve="isEmpty" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="6XxJ1FLY2M$" role="3cqZAp" />
+            <node concept="3clFbF" id="4peSo3CJy0U" role="3cqZAp">
+              <node concept="2OqwBi" id="4peSo3CJyA7" role="3clFbG">
+                <node concept="37vLTw" id="4peSo3CJy0S" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4peSo3CIVXA" resolve="formatStack" />
+                </node>
+                <node concept="liA8E" id="4peSo3CJATL" role="2OqNvi">
+                  <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+                  <node concept="2ShNRf" id="4peSo3CJBr$" role="37wK5m">
+                    <node concept="1pGfFk" id="6XxJ1FLXDxt" role="2ShVmc">
+                      <ref role="37wK5l" node="6XxJ1FLXDlP" resolve="NodePrinter.NodeFormatter" />
+                      <node concept="37vLTw" id="3F6vMxq2h2r" role="37wK5m">
+                        <ref role="3cqZAo" node="6XxJ1FLXd5E" resolve="CLASS_PARAMS" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="4peSo3CJHeA" role="3cqZAp" />
+          </node>
+          <node concept="2OqwBi" id="29_L5zQVjlV" role="3clFbw">
+            <node concept="2YIFZM" id="29_L5zQVcOM" role="2Oq$k0">
+              <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <node concept="2OqwBi" id="29_L5zQVerA" role="37wK5m">
+                <node concept="37vLTw" id="29_L5zQVerB" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4peSo3CHzzV" resolve="cb" />
+                </node>
+                <node concept="liA8E" id="29_L5zQVerC" role="2OqNvi">
+                  <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="29_L5zQVl1Z" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String):boolean" resolve="startsWith" />
+              <node concept="Xl_RD" id="29_L5zQVmIe" role="37wK5m">
+                <property role="Xl_RC" value="node" />
+              </node>
+            </node>
+          </node>
+          <node concept="3eNFk2" id="5_6ImQY3GdE" role="3eNLev">
+            <node concept="2OqwBi" id="5_6ImQY3GdG" role="3eO9$A">
+              <node concept="Xl_RD" id="5_6ImQY3GdH" role="2Oq$k0">
+                <property role="Xl_RC" value="parameter" />
+              </node>
+              <node concept="liA8E" id="5_6ImQY3GdI" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                <node concept="2OqwBi" id="5_6ImQY3GdJ" role="37wK5m">
+                  <node concept="37vLTw" id="5_6ImQY3GdK" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4peSo3CHzzV" resolve="cb" />
+                  </node>
+                  <node concept="liA8E" id="5_6ImQY3GdL" role="2OqNvi">
+                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="5_6ImQY3GdM" role="3eOfB_">
+              <node concept="3cpWs8" id="63ioh_TT1_9" role="3cqZAp">
+                <node concept="3cpWsn" id="63ioh_TT1_a" role="3cpWs9">
+                  <property role="TrG5h" value="peek" />
+                  <node concept="3uibUv" id="63ioh_TT1_3" role="1tU5fm">
+                    <ref role="3uigEE" node="6infEALqzXA" resolve="NodePrinter.Formatter" />
+                  </node>
+                  <node concept="2OqwBi" id="63ioh_TT1_b" role="33vP2m">
+                    <node concept="37vLTw" id="63ioh_TT1_c" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4peSo3CIVXA" resolve="formatStack" />
+                    </node>
+                    <node concept="liA8E" id="63ioh_TT1_d" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="6XxJ1FLXNhS" role="3cqZAp">
+                <node concept="2OqwBi" id="6XxJ1FLXNhT" role="3clFbG">
+                  <node concept="37vLTw" id="6XxJ1FLXNhU" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4peSo3CIVXA" resolve="formatStack" />
+                  </node>
+                  <node concept="liA8E" id="6XxJ1FLXNhV" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+                    <node concept="2ShNRf" id="6XxJ1FLYIVq" role="37wK5m">
+                      <node concept="1pGfFk" id="6XxJ1FLYJmt" role="2ShVmc">
+                        <ref role="37wK5l" node="6XxJ1FLXDlP" resolve="NodePrinter.NodeFormatter" />
+                        <node concept="3K4zz7" id="63ioh_TT2cr" role="37wK5m">
+                          <node concept="37vLTw" id="3F6vMxq2h2v" role="3K4GZi">
+                            <ref role="3cqZAo" node="6XxJ1FLYfHw" resolve="NO_PARAMS" />
+                          </node>
+                          <node concept="3y3z36" id="63ioh_TT21N" role="3K4Cdx">
+                            <node concept="10Nm6u" id="63ioh_TT27b" role="3uHU7w" />
+                            <node concept="37vLTw" id="63ioh_TT1Wz" role="3uHU7B">
+                              <ref role="3cqZAo" node="63ioh_TT1_a" resolve="peek" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="6XxJ1FLYIjo" role="3K4E3e">
+                            <node concept="37vLTw" id="63ioh_TT1_e" role="2Oq$k0">
+                              <ref role="3cqZAo" node="63ioh_TT1_a" resolve="peek" />
+                            </node>
+                            <node concept="liA8E" id="6XxJ1FLYN8c" role="2OqNvi">
+                              <ref role="37wK5l" node="6XxJ1FLYJFR" resolve="getSeparators" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="5_6ImQYAkSP" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="3eNFk2" id="6infEALqiR1" role="3eNLev">
+            <node concept="2OqwBi" id="3t7_2FgUSos" role="3eO9$A">
+              <node concept="Xl_RD" id="3t7_2FgUSot" role="2Oq$k0">
+                <property role="Xl_RC" value="list" />
+              </node>
+              <node concept="liA8E" id="3t7_2FgUSou" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                <node concept="2OqwBi" id="3t7_2FgUSov" role="37wK5m">
+                  <node concept="37vLTw" id="3t7_2FgUSow" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4peSo3CHzzV" resolve="cb" />
+                  </node>
+                  <node concept="liA8E" id="3t7_2FgUSox" role="2OqNvi">
+                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="6infEALqiR3" role="3eOfB_">
+              <node concept="3clFbF" id="6XxJ1FLXLE4" role="3cqZAp">
+                <node concept="2OqwBi" id="6XxJ1FLXLE5" role="3clFbG">
+                  <node concept="37vLTw" id="6XxJ1FLXLE6" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4peSo3CIVXA" resolve="formatStack" />
+                  </node>
+                  <node concept="liA8E" id="6XxJ1FLXLE7" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+                    <node concept="2ShNRf" id="6XxJ1FLXLE8" role="37wK5m">
+                      <node concept="1pGfFk" id="6XxJ1FLXLE9" role="2ShVmc">
+                        <ref role="37wK5l" node="6XxJ1FLXDlP" resolve="NodePrinter.NodeFormatter" />
+                        <node concept="37vLTw" id="3F6vMxq2h2z" role="37wK5m">
+                          <ref role="3cqZAo" node="6XxJ1FLXefa" resolve="ARRAY_PARAMS" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="5_6ImQY3Gzl" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="5_6ImQYAla0" role="9aQIa">
+            <node concept="3clFbS" id="5_6ImQYAla1" role="9aQI4">
+              <node concept="3SKdUt" id="5_6ImQY3GdN" role="3cqZAp">
+                <node concept="3SKdUq" id="5_6ImQY3GdO" role="3SKWNk">
+                  <property role="3SKdUp" value="FIXME: implement" />
+                </node>
+              </node>
+              <node concept="YS8fn" id="5_6ImQY3GdP" role="3cqZAp">
+                <node concept="2ShNRf" id="5_6ImQY3GdQ" role="YScLw">
+                  <node concept="1pGfFk" id="5_6ImQY3GdR" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4peSo3CNtem" role="3cqZAp" />
+        <node concept="3clFbF" id="4peSo3CNsGJ" role="3cqZAp">
+          <node concept="2OqwBi" id="4peSo3CNsGK" role="3clFbG">
+            <node concept="37vLTw" id="4peSo3CNsGL" role="2Oq$k0">
+              <ref role="3cqZAo" node="4peSo3CK9Ka" resolve="endStack" />
+            </node>
+            <node concept="liA8E" id="4peSo3CNsGM" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+              <node concept="Rm8GO" id="4peSo3CNu8z" role="37wK5m">
+                <ref role="1Px2BO" node="5s497Vr8LPr" resolve="NodePrinter.EndWalk" />
+                <ref role="Rm8GQ" node="5s497Vr9kSP" resolve="END_TERMS" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4peSo3CJxFt" role="3cqZAp">
+          <node concept="Rm8GO" id="4peSo3CJxLa" role="3clFbG">
+            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4peSo3CJHIx" role="jymVt" />
+    <node concept="3clFb_" id="4peSo3CHz$y" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="walkList" />
+      <node concept="3uibUv" id="4peSo3CHz$z" role="3clF45">
+        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+      </node>
+      <node concept="3Tm1VV" id="4peSo3CHz$$" role="1B3o_S" />
+      <node concept="3clFbS" id="4peSo3CHz$L" role="3clF47">
+        <node concept="3clFbF" id="4peSo3CPC4k" role="3cqZAp">
+          <node concept="2OqwBi" id="4peSo3CPHs4" role="3clFbG">
+            <node concept="2OqwBi" id="4peSo3CPCDw" role="2Oq$k0">
+              <node concept="37vLTw" id="4peSo3CPC4i" role="2Oq$k0">
+                <ref role="3cqZAo" node="4peSo3CIVXA" resolve="formatStack" />
+              </node>
+              <node concept="liA8E" id="4peSo3CPHaS" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+              </node>
+            </node>
+            <node concept="liA8E" id="4peSo3CQr9o" role="2OqNvi">
+              <ref role="37wK5l" node="6infEALrJVZ" resolve="listStart" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5_6ImQYC1nT" role="3cqZAp">
+          <node concept="2OqwBi" id="5_6ImQYC1nU" role="3clFbG">
+            <node concept="37vLTw" id="5_6ImQYC1nV" role="2Oq$k0">
+              <ref role="3cqZAo" node="4peSo3CK9Ka" resolve="endStack" />
+            </node>
+            <node concept="liA8E" id="5_6ImQYC1nW" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+              <node concept="Rm8GO" id="5_6ImQYC1Cy" role="37wK5m">
+                <ref role="Rm8GQ" node="5s497Vr8Sxa" resolve="END_LIST" />
+                <ref role="1Px2BO" node="5s497Vr8LPr" resolve="NodePrinter.EndWalk" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4peSo3CK1PR" role="3cqZAp">
+          <node concept="Rm8GO" id="4peSo3CK1Y2" role="3clFbG">
+            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4peSo3CHz$A" role="3clF46">
+        <property role="TrG5h" value="listb" />
+        <node concept="3uibUv" id="5YIOneOU7$j" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4peSo3CJMqa" role="jymVt" />
+    <node concept="3clFb_" id="4peSo3CHz$8" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="walkValues" />
+      <node concept="3uibUv" id="4peSo3CHz$9" role="3clF45">
+        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+      </node>
+      <node concept="3Tm1VV" id="4peSo3CHz$a" role="1B3o_S" />
+      <node concept="16euLQ" id="4peSo3CHz$i" role="16eVyc">
+        <property role="TrG5h" value="V" />
+      </node>
+      <node concept="3clFbS" id="4peSo3CHz$j" role="3clF47">
+        <node concept="3cpWs8" id="4peSo3CL10f" role="3cqZAp">
+          <node concept="3cpWsn" id="4peSo3CL10g" role="3cpWs9">
+            <property role="TrG5h" value="value" />
+            <node concept="17QB3L" id="4peSo3CL3cC" role="1tU5fm" />
+            <node concept="2YIFZM" id="4peSo3CL10h" role="33vP2m">
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+              <node concept="2OqwBi" id="5YIOneON9dE" role="37wK5m">
+                <node concept="2OqwBi" id="5YIOneON8CN" role="2Oq$k0">
+                  <node concept="2OqwBi" id="5YIOneON8es" role="2Oq$k0">
+                    <node concept="37vLTw" id="5YIOneON85J" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4peSo3CHz$c" resolve="valb" />
+                    </node>
+                    <node concept="liA8E" id="5YIOneON8ue" role="2OqNvi">
+                      <ref role="37wK5l" to="ie8e:5YIOneOMEJi" resolve="values" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="5YIOneON95r" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="5YIOneON9xb" role="2OqNvi">
+                  <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6infEALrTkZ" role="3cqZAp">
+          <node concept="3cpWsn" id="6infEALrTl0" role="3cpWs9">
+            <property role="TrG5h" value="name" />
+            <node concept="17QB3L" id="6infEALrTJi" role="1tU5fm" />
+            <node concept="2YIFZM" id="6infEALrUcU" role="33vP2m">
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+              <node concept="2OqwBi" id="6infEALrTl1" role="37wK5m">
+                <node concept="37vLTw" id="6infEALrTl2" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4peSo3CHz$c" resolve="valb" />
+                </node>
+                <node concept="liA8E" id="6infEALrTl3" role="2OqNvi">
+                  <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6infEALrX8F" role="3cqZAp" />
+        <node concept="3clFbF" id="6infEALrQyb" role="3cqZAp">
+          <node concept="2OqwBi" id="6infEALrQIX" role="3clFbG">
+            <node concept="2OqwBi" id="6infEALrVJi" role="2Oq$k0">
+              <node concept="37vLTw" id="6infEALrVJj" role="2Oq$k0">
+                <ref role="3cqZAo" node="4peSo3CIVXA" resolve="formatStack" />
+              </node>
+              <node concept="liA8E" id="6infEALrVJk" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+              </node>
+            </node>
+            <node concept="liA8E" id="6infEALrQYE" role="2OqNvi">
+              <ref role="37wK5l" node="6infEALqKZg" resolve="formatValue" />
+              <node concept="37vLTw" id="6infEALrTl4" role="37wK5m">
+                <ref role="3cqZAo" node="6infEALrTl0" resolve="name" />
+              </node>
+              <node concept="37vLTw" id="6infEALrSME" role="37wK5m">
+                <ref role="3cqZAo" node="4peSo3CL10g" resolve="value" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4peSo3CK097" role="3cqZAp">
+          <node concept="Rm8GO" id="4peSo3CK0nk" role="3clFbG">
+            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4peSo3CHz$c" role="3clF46">
+        <property role="TrG5h" value="valb" />
+        <node concept="3uibUv" id="5YIOneONkSZ" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueFunc" />
+          <node concept="16syzq" id="5YIOneONkT0" role="11_B2D">
+            <ref role="16sUi3" node="4peSo3CHz$i" resolve="V" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4peSo3CJJ6l" role="jymVt" />
+    <node concept="3clFb_" id="4peSo3CHz$O" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="walkValue" />
+      <node concept="3uibUv" id="4peSo3CHz$P" role="3clF45">
+        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+      </node>
+      <node concept="3Tm1VV" id="4peSo3CHz$Q" role="1B3o_S" />
+      <node concept="37vLTG" id="4peSo3CHz$S" role="3clF46">
+        <property role="TrG5h" value="value" />
+        <node concept="3uibUv" id="4peSo3CHz$T" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+          <node concept="3qTvmN" id="4peSo3CHz$U" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="4peSo3CHz$V" role="3clF47">
+        <node concept="3clFbF" id="3mz2_dYmgOv" role="3cqZAp">
+          <node concept="2OqwBi" id="3mz2_dYmh_P" role="3clFbG">
+            <node concept="2OqwBi" id="3mz2_dYmgVH" role="2Oq$k0">
+              <node concept="37vLTw" id="3mz2_dYmgOu" role="2Oq$k0">
+                <ref role="3cqZAo" node="4peSo3CIVXA" resolve="formatStack" />
+              </node>
+              <node concept="liA8E" id="3mz2_dYmhrf" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3mz2_dYmhLX" role="2OqNvi">
+              <ref role="37wK5l" node="3mz2_dYmhS3" resolve="formatValue" />
+              <node concept="2YIFZM" id="3mz2_dYml7v" role="37wK5m">
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <node concept="2OqwBi" id="3mz2_dYmlnT" role="37wK5m">
+                  <node concept="37vLTw" id="3mz2_dYmlgS" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4peSo3CHz$S" resolve="value" />
+                  </node>
+                  <node concept="liA8E" id="3mz2_dYmlx$" role="2OqNvi">
+                    <ref role="37wK5l" to="ie8e:1msb0mq8QTt" resolve="symbol" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3mz2_dYmvJJ" role="3cqZAp">
+          <node concept="Rm8GO" id="3mz2_dYmvJK" role="3clFbG">
+            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4peSo3CJMXP" role="jymVt" />
+    <node concept="3clFb_" id="4peSo3CHz$m" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="walkVariables" />
+      <node concept="3uibUv" id="4peSo3CHz$n" role="3clF45">
+        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+      </node>
+      <node concept="3Tm1VV" id="4peSo3CHz$o" role="1B3o_S" />
+      <node concept="3clFbS" id="4peSo3CHz$v" role="3clF47">
+        <node concept="3SKdUt" id="4peSo3CJJEz" role="3cqZAp">
+          <node concept="3SKdUq" id="4peSo3CJJE$" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME implement me" />
+          </node>
+        </node>
+        <node concept="YS8fn" id="4peSo3CJJE_" role="3cqZAp">
+          <node concept="2ShNRf" id="4peSo3CJJEA" role="YScLw">
+            <node concept="1pGfFk" id="4peSo3CJJEB" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4peSo3CHz$q" role="3clF46">
+        <property role="TrG5h" value="varb" />
+        <node concept="3uibUv" id="5YIOneOSlWm" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableFunc" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4peSo3CJNnW" role="jymVt" />
+    <node concept="3clFb_" id="4peSo3CHz$Y" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="walkVariable" />
+      <node concept="3uibUv" id="4peSo3CHz$Z" role="3clF45">
+        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+      </node>
+      <node concept="3Tm1VV" id="4peSo3CHz_0" role="1B3o_S" />
+      <node concept="37vLTG" id="4peSo3CHz_2" role="3clF46">
+        <property role="TrG5h" value="variable" />
+        <node concept="3uibUv" id="4peSo3CHz_3" role="1tU5fm">
+          <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="4peSo3CHz_4" role="3clF47">
+        <node concept="3clFbF" id="4peSo3CNNmX" role="3cqZAp">
+          <node concept="2OqwBi" id="4peSo3CNSB1" role="3clFbG">
+            <node concept="2OqwBi" id="4peSo3CNNSw" role="2Oq$k0">
+              <node concept="37vLTw" id="4peSo3CNNmW" role="2Oq$k0">
+                <ref role="3cqZAo" node="4peSo3CIVXA" resolve="formatStack" />
+              </node>
+              <node concept="liA8E" id="4peSo3CNSpS" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+              </node>
+            </node>
+            <node concept="liA8E" id="4peSo3CNTik" role="2OqNvi">
+              <ref role="37wK5l" node="6infEALrBJ1" resolve="listNext" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4peSo3CNTGL" role="3cqZAp">
+          <node concept="2OqwBi" id="4peSo3CNTQn" role="3clFbG">
+            <node concept="37vLTw" id="4peSo3CNTGJ" role="2Oq$k0">
+              <ref role="3cqZAo" node="4peSo3CIw__" resolve="stringBuilder" />
+            </node>
+            <node concept="liA8E" id="4peSo3CNUgl" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+              <node concept="2OqwBi" id="4peSo3D0Vo_" role="37wK5m">
+                <node concept="37vLTw" id="4peSo3D0VkF" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4peSo3D0HuN" resolve="variableSymbol" />
+                </node>
+                <node concept="liA8E" id="4peSo3D0VPs" role="2OqNvi">
+                  <ref role="37wK5l" node="3gJBs5s$cVK" resolve="variableSymbol" />
+                  <node concept="37vLTw" id="4peSo3D0VSw" role="37wK5m">
+                    <ref role="3cqZAo" node="4peSo3CHz_2" resolve="variable" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4peSo3CNUWB" role="3cqZAp">
+          <node concept="Rm8GO" id="4peSo3CNVh5" role="3clFbG">
+            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4peSo3CJNM4" role="jymVt" />
+    <node concept="3clFb_" id="4peSo3CHz_7" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="endWalk" />
+      <node concept="3cqZAl" id="4peSo3CHz_8" role="3clF45" />
+      <node concept="3Tm1VV" id="4peSo3CHz_9" role="1B3o_S" />
+      <node concept="3clFbS" id="4peSo3CHz_b" role="3clF47">
+        <node concept="3clFbF" id="4peSo3CKhiq" role="3cqZAp">
+          <node concept="2OqwBi" id="4peSo3CKkmF" role="3clFbG">
+            <node concept="2OqwBi" id="4peSo3CKhNN" role="2Oq$k0">
+              <node concept="37vLTw" id="4peSo3CKhip" role="2Oq$k0">
+                <ref role="3cqZAo" node="4peSo3CK9Ka" resolve="endStack" />
+              </node>
+              <node concept="liA8E" id="4peSo3CKk3r" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+              </node>
+            </node>
+            <node concept="liA8E" id="4peSo3CKldW" role="2OqNvi">
+              <ref role="37wK5l" node="5s497Vr8NSN" resolve="endAction" />
+              <node concept="Xjq3P" id="4peSo3CKlmC" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4peSo3CIChO" role="jymVt" />
+    <node concept="3clFb_" id="4peSo3CICTQ" role="jymVt">
+      <property role="TrG5h" value="reset" />
+      <node concept="3cqZAl" id="4peSo3CICTS" role="3clF45" />
+      <node concept="3Tm6S6" id="4peSo3CIDl$" role="1B3o_S" />
+      <node concept="3clFbS" id="4peSo3CICTU" role="3clF47">
+        <node concept="3clFbF" id="4peSo3CIDQc" role="3cqZAp">
+          <node concept="2OqwBi" id="4peSo3CIE1E" role="3clFbG">
+            <node concept="37vLTw" id="4peSo3CIDQb" role="2Oq$k0">
+              <ref role="3cqZAo" node="4peSo3CIw__" resolve="stringBuilder" />
+            </node>
+            <node concept="liA8E" id="4peSo3CIHLR" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~AbstractStringBuilder.setLength(int):void" resolve="setLength" />
+              <node concept="3cmrfG" id="4peSo3CIHNw" role="37wK5m">
+                <property role="3cmrfH" value="0" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4peSo3CID9F" role="jymVt" />
+    <node concept="2tJIrI" id="6XxJ1FLX5sV" role="jymVt" />
+    <node concept="312cEu" id="6infEALqzXA" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Formatter" />
+      <property role="1sVAO0" value="true" />
+      <node concept="3clFbW" id="6XxJ1FLX$2H" role="jymVt">
+        <node concept="3cqZAl" id="6XxJ1FLX$2J" role="3clF45" />
+        <node concept="3Tmbuc" id="6XxJ1FLYome" role="1B3o_S" />
+        <node concept="3clFbS" id="6XxJ1FLX$2L" role="3clF47">
+          <node concept="3clFbF" id="6XxJ1FLX$Wu" role="3cqZAp">
+            <node concept="37vLTI" id="6XxJ1FLX_kR" role="3clFbG">
+              <node concept="37vLTw" id="6XxJ1FLX_CZ" role="37vLTx">
+                <ref role="3cqZAo" node="6XxJ1FLX$I4" resolve="listSeparators" />
+              </node>
+              <node concept="2OqwBi" id="6XxJ1FLX$WU" role="37vLTJ">
+                <node concept="Xjq3P" id="6XxJ1FLX$Wt" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6XxJ1FLX_6S" role="2OqNvi">
+                  <ref role="2Oxat5" node="6XxJ1FLXvac" resolve="listSep" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6XxJ1FLX$I4" role="3clF46">
+          <property role="TrG5h" value="listSeparators" />
+          <node concept="10Q1$e" id="6XxJ1FLX$NH" role="1tU5fm">
+            <node concept="17QB3L" id="6XxJ1FLX$I3" role="10Q1$1" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFb_" id="6XxJ1FLYizn" role="jymVt">
+        <property role="TrG5h" value="setSeparators" />
+        <node concept="37vLTG" id="6XxJ1FLYkZs" role="3clF46">
+          <property role="TrG5h" value="listSeparators" />
+          <node concept="10Q1$e" id="6XxJ1FLYl$l" role="1tU5fm">
+            <node concept="17QB3L" id="6XxJ1FLYly2" role="10Q1$1" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="6XxJ1FLYizp" role="3clF45" />
+        <node concept="3Tmbuc" id="6XxJ1FLYnPa" role="1B3o_S" />
+        <node concept="3clFbS" id="6XxJ1FLYizr" role="3clF47">
+          <node concept="3clFbF" id="6XxJ1FLYlAx" role="3cqZAp">
+            <node concept="37vLTI" id="6XxJ1FLYlAy" role="3clFbG">
+              <node concept="37vLTw" id="6XxJ1FLYnMK" role="37vLTx">
+                <ref role="3cqZAo" node="6XxJ1FLYkZs" resolve="listSeparators" />
+              </node>
+              <node concept="2OqwBi" id="6XxJ1FLYlA$" role="37vLTJ">
+                <node concept="Xjq3P" id="6XxJ1FLYlA_" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6XxJ1FLYlAA" role="2OqNvi">
+                  <ref role="2Oxat5" node="6XxJ1FLXvac" resolve="listSep" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFb_" id="6XxJ1FLYJFR" role="jymVt">
+        <property role="TrG5h" value="getSeparators" />
+        <node concept="10Q1$e" id="6XxJ1FLYL1n" role="3clF45">
+          <node concept="17QB3L" id="6XxJ1FLYKo8" role="10Q1$1" />
+        </node>
+        <node concept="3Tmbuc" id="6XxJ1FLYJFW" role="1B3o_S" />
+        <node concept="3clFbS" id="6XxJ1FLYJFX" role="3clF47">
+          <node concept="3clFbF" id="6XxJ1FLYN3Z" role="3cqZAp">
+            <node concept="37vLTw" id="6XxJ1FLYN3Y" role="3clFbG">
+              <ref role="3cqZAo" node="6XxJ1FLXvac" resolve="listSep" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFb_" id="6XxJ1FLYoWY" role="jymVt">
+        <property role="TrG5h" value="append" />
+        <node concept="3cqZAl" id="6XxJ1FLYoX0" role="3clF45" />
+        <node concept="3Tmbuc" id="6XxJ1FLYpxo" role="1B3o_S" />
+        <node concept="3clFbS" id="6XxJ1FLYoX2" role="3clF47">
+          <node concept="3clFbF" id="6XxJ1FLYseT" role="3cqZAp">
+            <node concept="2OqwBi" id="6XxJ1FLYsls" role="3clFbG">
+              <node concept="37vLTw" id="6XxJ1FLYseS" role="2Oq$k0">
+                <ref role="3cqZAo" node="4peSo3CIw__" resolve="stringBuilder" />
+              </node>
+              <node concept="liA8E" id="6XxJ1FLYsBR" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <node concept="37vLTw" id="6XxJ1FLYsEf" role="37wK5m">
+                  <ref role="3cqZAo" node="6XxJ1FLYrv$" resolve="str" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6XxJ1FLYrv$" role="3clF46">
+          <property role="TrG5h" value="str" />
+          <node concept="17QB3L" id="6XxJ1FLYrvz" role="1tU5fm" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="6infEALqKZg" role="jymVt">
+        <property role="TrG5h" value="formatValue" />
+        <property role="1EzhhJ" value="true" />
+        <node concept="37vLTG" id="6infEALqKZu" role="3clF46">
+          <property role="TrG5h" value="name" />
+          <node concept="17QB3L" id="6infEALqKZC" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="6infEALqKZF" role="3clF46">
+          <property role="TrG5h" value="value" />
+          <node concept="17QB3L" id="6infEALqKZR" role="1tU5fm" />
+        </node>
+        <node concept="3cqZAl" id="6infEALqKZi" role="3clF45" />
+        <node concept="3Tmbuc" id="6infEALqKZr" role="1B3o_S" />
+        <node concept="3clFbS" id="6infEALqKZk" role="3clF47" />
+      </node>
+      <node concept="3clFb_" id="3mz2_dYmhS3" role="jymVt">
+        <property role="TrG5h" value="formatValue" />
+        <property role="1EzhhJ" value="true" />
+        <node concept="37vLTG" id="3mz2_dYmhS6" role="3clF46">
+          <property role="TrG5h" value="value" />
+          <node concept="17QB3L" id="3mz2_dYmhS7" role="1tU5fm" />
+        </node>
+        <node concept="3cqZAl" id="3mz2_dYmhS8" role="3clF45" />
+        <node concept="3Tmbuc" id="3mz2_dYmhS9" role="1B3o_S" />
+        <node concept="3clFbS" id="3mz2_dYmhSa" role="3clF47" />
+      </node>
+      <node concept="3clFb_" id="6XxJ1FLY4K6" role="jymVt">
+        <property role="TrG5h" value="end" />
+        <node concept="3cqZAl" id="6XxJ1FLY4K8" role="3clF45" />
+        <node concept="3Tmbuc" id="6XxJ1FLY5gs" role="1B3o_S" />
+        <node concept="3clFbS" id="6XxJ1FLY4Ka" role="3clF47">
+          <node concept="YS8fn" id="6XxJ1FLY6BG" role="3cqZAp">
+            <node concept="2ShNRf" id="6XxJ1FLY6Dn" role="YScLw">
+              <node concept="1pGfFk" id="6XxJ1FLY7XZ" role="2ShVmc">
+                <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;(java.lang.String)" resolve="UnsupportedOperationException" />
+                <node concept="Xl_RD" id="6XxJ1FLY7ZR" role="37wK5m">
+                  <property role="Xl_RC" value="not implemented" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFb_" id="6infEALrJVZ" role="jymVt">
+        <property role="TrG5h" value="listStart" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="3cqZAl" id="6infEALrJW0" role="3clF45" />
+        <node concept="3Tmbuc" id="6infEALrJW1" role="1B3o_S" />
+        <node concept="3clFbS" id="6infEALrJW2" role="3clF47">
+          <node concept="3clFbF" id="6XxJ1FLXlfH" role="3cqZAp">
+            <node concept="37vLTI" id="6XxJ1FLXlvC" role="3clFbG">
+              <node concept="3cmrfG" id="6XxJ1FLXlyb" role="37vLTx">
+                <property role="3cmrfH" value="0" />
+              </node>
+              <node concept="37vLTw" id="6XxJ1FLXlfG" role="37vLTJ">
+                <ref role="3cqZAo" node="6XxJ1FLXfBM" resolve="sepIdx" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFb_" id="6infEALrBJ1" role="jymVt">
+        <property role="TrG5h" value="listNext" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="3cqZAl" id="6infEALrBJ4" role="3clF45" />
+        <node concept="3Tmbuc" id="6infEALrCaP" role="1B3o_S" />
+        <node concept="3clFbS" id="6infEALrBJ6" role="3clF47">
+          <node concept="3clFbJ" id="3jXBvmTpj5x" role="3cqZAp">
+            <node concept="3clFbS" id="3jXBvmTpj5z" role="3clFbx">
+              <node concept="3clFbF" id="6XxJ1FLXgP8" role="3cqZAp">
+                <node concept="2OqwBi" id="6XxJ1FLXgP9" role="3clFbG">
+                  <node concept="37vLTw" id="6XxJ1FLXgPa" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4peSo3CIw__" resolve="stringBuilder" />
+                  </node>
+                  <node concept="liA8E" id="6XxJ1FLXgPb" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <node concept="AH0OO" id="6XxJ1FLXkkK" role="37wK5m">
+                      <node concept="37vLTw" id="6XxJ1FLXkW4" role="AHEQo">
+                        <ref role="3cqZAo" node="6XxJ1FLXfBM" resolve="sepIdx" />
+                      </node>
+                      <node concept="37vLTw" id="6XxJ1FLXjWH" role="AHHXb">
+                        <ref role="3cqZAo" node="6XxJ1FLXvac" resolve="listSep" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2d3UOw" id="3jXBvmTplnj" role="3clFbw">
+              <node concept="37vLTw" id="3jXBvmTpja7" role="3uHU7B">
+                <ref role="3cqZAo" node="6XxJ1FLXfBM" resolve="sepIdx" />
+              </node>
+              <node concept="3cmrfG" id="3jXBvmTpjo4" role="3uHU7w">
+                <property role="3cmrfH" value="0" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6XxJ1FLXm2o" role="3cqZAp">
+            <node concept="37vLTI" id="6XxJ1FLXmjG" role="3clFbG">
+              <node concept="3cmrfG" id="6XxJ1FLXmoe" role="37vLTx">
+                <property role="3cmrfH" value="1" />
+              </node>
+              <node concept="37vLTw" id="6XxJ1FLXm2m" role="37vLTJ">
+                <ref role="3cqZAo" node="6XxJ1FLXfBM" resolve="sepIdx" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFb_" id="6infEALrKRp" role="jymVt">
+        <property role="TrG5h" value="listEnd" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="3cqZAl" id="6infEALrKRq" role="3clF45" />
+        <node concept="3Tmbuc" id="6infEALrKRr" role="1B3o_S" />
+        <node concept="3clFbS" id="6infEALrKRs" role="3clF47">
+          <node concept="3clFbJ" id="6XxJ1FLXmEU" role="3cqZAp">
+            <node concept="3clFbS" id="6XxJ1FLXmEV" role="3clFbx">
+              <node concept="3clFbF" id="6XxJ1FLXnn6" role="3cqZAp">
+                <node concept="2OqwBi" id="6XxJ1FLXnn8" role="3clFbG">
+                  <node concept="37vLTw" id="6XxJ1FLXnn9" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4peSo3CIw__" resolve="stringBuilder" />
+                  </node>
+                  <node concept="liA8E" id="6XxJ1FLXnna" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <node concept="AH0OO" id="6XxJ1FLXnnb" role="37wK5m">
+                      <node concept="3cmrfG" id="6XxJ1FLXnHB" role="AHEQo">
+                        <property role="3cmrfH" value="2" />
+                      </node>
+                      <node concept="37vLTw" id="6XxJ1FLXnnd" role="AHHXb">
+                        <ref role="3cqZAo" node="6XxJ1FLXvac" resolve="listSep" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3eOSWO" id="6XxJ1FLXXWV" role="3clFbw">
+              <node concept="37vLTw" id="6XxJ1FLXmM1" role="3uHU7B">
+                <ref role="3cqZAo" node="6XxJ1FLXfBM" resolve="sepIdx" />
+              </node>
+              <node concept="3cmrfG" id="6XxJ1FLXnf9" role="3uHU7w">
+                <property role="3cmrfH" value="0" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6XxJ1FLXo94" role="3cqZAp">
+            <node concept="37vLTI" id="6XxJ1FLXojM" role="3clFbG">
+              <node concept="37vLTw" id="6XxJ1FLXo92" role="37vLTJ">
+                <ref role="3cqZAo" node="6XxJ1FLXfBM" resolve="sepIdx" />
+              </node>
+              <node concept="3cmrfG" id="6XxJ1FLXoBB" role="37vLTx">
+                <property role="3cmrfH" value="-1" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="312cEg" id="6XxJ1FLXfBM" role="jymVt">
+        <property role="TrG5h" value="sepIdx" />
+        <node concept="3Tm6S6" id="6XxJ1FLXfBN" role="1B3o_S" />
+        <node concept="10Oyi0" id="6XxJ1FLXg97" role="1tU5fm" />
+        <node concept="3cmrfG" id="6XxJ1FLXgpG" role="33vP2m">
+          <property role="3cmrfH" value="-1" />
+        </node>
+      </node>
+      <node concept="312cEg" id="6XxJ1FLXvac" role="jymVt">
+        <property role="TrG5h" value="listSep" />
+        <node concept="3Tm6S6" id="6XxJ1FLXvad" role="1B3o_S" />
+        <node concept="10Q1$e" id="6XxJ1FLXvOE" role="1tU5fm">
+          <node concept="17QB3L" id="6XxJ1FLXvO0" role="10Q1$1" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6infEALqKVT" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="6XxJ1FLX47M" role="jymVt" />
+    <node concept="Qs71p" id="5s497Vr8LPr" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="EndWalk" />
+      <node concept="QsSxf" id="5s497Vr8Sxa" role="Qtgdg">
+        <property role="TrG5h" value="END_LIST" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+        <node concept="3clFb_" id="5s497Vr8SLw" role="2HKRsH">
+          <property role="TrG5h" value="endAction" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="37vLTG" id="5s497Vr8V8B" role="3clF46">
+            <property role="TrG5h" value="printer" />
+            <node concept="3uibUv" id="4peSo3CK7M2" role="1tU5fm">
+              <ref role="3uigEE" node="4peSo3CHy8D" resolve="NodePrinter" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="5s497Vr8SLx" role="3clF45" />
+          <node concept="3Tmbuc" id="5s497Vr8SLy" role="1B3o_S" />
+          <node concept="3clFbS" id="5s497Vr8SL$" role="3clF47">
+            <node concept="3SKdUt" id="6XxJ1FLY1ww" role="3cqZAp">
+              <node concept="3SKdUq" id="6XxJ1FLY1_4" role="3SKWNk">
+                <property role="3SKdUp" value="don't pop here, &quot;visitTerms&quot; is responsible for that" />
+              </node>
+            </node>
+            <node concept="3clFbF" id="4peSo3CPN64" role="3cqZAp">
+              <node concept="2OqwBi" id="4peSo3CPWIF" role="3clFbG">
+                <node concept="2OqwBi" id="4peSo3CPNG9" role="2Oq$k0">
+                  <node concept="liA8E" id="4peSo3CPWxc" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                  </node>
+                  <node concept="2OqwBi" id="4peSo3CQ$MB" role="2Oq$k0">
+                    <node concept="37vLTw" id="4peSo3CQ$He" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5s497Vr8V8B" resolve="printer" />
+                    </node>
+                    <node concept="2OwXpG" id="4peSo3CQ_0G" role="2OqNvi">
+                      <ref role="2Oxat5" node="4peSo3CIVXA" resolve="formatStack" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="4peSo3CPXDM" role="2OqNvi">
+                  <ref role="37wK5l" node="6infEALrKRp" resolve="listEnd" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2AHcQZ" id="5s497VrcvXU" role="2AJF6D">
+            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+          </node>
+        </node>
+      </node>
+      <node concept="QsSxf" id="5s497Vr9kSP" role="Qtgdg">
+        <property role="TrG5h" value="END_TERMS" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+        <node concept="3clFb_" id="5s497Vr9lBv" role="2HKRsH">
+          <property role="TrG5h" value="endAction" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="3cqZAl" id="5s497Vr9lBy" role="3clF45" />
+          <node concept="3Tmbuc" id="5s497Vr9lBz" role="1B3o_S" />
+          <node concept="3clFbS" id="5s497Vr9lB_" role="3clF47">
+            <node concept="3clFbF" id="5_6ImQYBG$T" role="3cqZAp">
+              <node concept="2OqwBi" id="6XxJ1FLYCPr" role="3clFbG">
+                <node concept="2OqwBi" id="5_6ImQYBG$V" role="2Oq$k0">
+                  <node concept="liA8E" id="5_6ImQYBG$W" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+                  </node>
+                  <node concept="2OqwBi" id="5_6ImQYBG$X" role="2Oq$k0">
+                    <node concept="37vLTw" id="5_6ImQYBG$Y" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4peSo3CK90i" resolve="printer" />
+                    </node>
+                    <node concept="2OwXpG" id="5_6ImQYBG$Z" role="2OqNvi">
+                      <ref role="2Oxat5" node="4peSo3CIVXA" resolve="formatStack" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="6XxJ1FLYD2J" role="2OqNvi">
+                  <ref role="37wK5l" node="6XxJ1FLY4K6" resolve="end" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2AHcQZ" id="5s497VrcwfQ" role="2AJF6D">
+            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+          </node>
+          <node concept="37vLTG" id="4peSo3CK90i" role="3clF46">
+            <property role="TrG5h" value="printer" />
+            <node concept="3uibUv" id="4peSo3CK90h" role="1tU5fm">
+              <ref role="3uigEE" node="4peSo3CHy8D" resolve="NodePrinter" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="5s497Vr8NgH" role="1B3o_S" />
+      <node concept="3clFb_" id="5s497Vr8NSN" role="jymVt">
+        <property role="TrG5h" value="endAction" />
+        <property role="1EzhhJ" value="true" />
+        <node concept="3cqZAl" id="5s497Vr8NSO" role="3clF45" />
+        <node concept="3Tmbuc" id="5s497Vr8Ob3" role="1B3o_S" />
+        <node concept="3clFbS" id="5s497Vr8NSQ" role="3clF47" />
+        <node concept="37vLTG" id="4peSo3CK8$T" role="3clF46">
+          <property role="TrG5h" value="printer" />
+          <node concept="3uibUv" id="4peSo3CK8$S" role="1tU5fm">
+            <ref role="3uigEE" node="4peSo3CHy8D" resolve="NodePrinter" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6infEALqzsn" role="jymVt" />
+    <node concept="312cEu" id="4peSo3CIWKi" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="1sVAO0" value="false" />
+      <property role="1EXbeo" value="false" />
+      <property role="TrG5h" value="NodeFormatter" />
+      <node concept="312cEg" id="6XxJ1FLY6dx" role="jymVt">
+        <property role="TrG5h" value="typeConcept" />
+        <node concept="3Tm6S6" id="6XxJ1FLY6dv" role="1B3o_S" />
+        <node concept="3uibUv" id="6XxJ1FLY6dw" role="1tU5fm">
+          <ref role="3uigEE" node="4peSo3CQ4MO" resolve="NodePrinter.TypeConcept" />
+        </node>
+      </node>
+      <node concept="3clFbW" id="6XxJ1FLXDlP" role="jymVt">
+        <node concept="3cqZAl" id="6XxJ1FLXDlR" role="3clF45" />
+        <node concept="3Tm6S6" id="6XxJ1FLXDlS" role="1B3o_S" />
+        <node concept="3clFbS" id="6XxJ1FLXDlT" role="3clF47">
+          <node concept="XkiVB" id="6XxJ1FLXDLY" role="3cqZAp">
+            <ref role="37wK5l" node="6XxJ1FLX$2H" resolve="NodePrinter.Formatter" />
+            <node concept="37vLTw" id="6XxJ1FLXEFL" role="37wK5m">
+              <ref role="3cqZAo" node="6XxJ1FLXDU0" resolve="listSep" />
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6XxJ1FLXDU0" role="3clF46">
+          <property role="TrG5h" value="listSep" />
+          <node concept="10Q1$e" id="6XxJ1FLXE55" role="1tU5fm">
+            <node concept="17QB3L" id="6XxJ1FLXDTZ" role="10Q1$1" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6XxJ1FLXEGe" role="jymVt" />
+      <node concept="3clFb_" id="6infEALq$_r" role="jymVt">
+        <property role="TrG5h" value="formatValue" />
+        <node concept="37vLTG" id="6infEALqA5W" role="3clF46">
+          <property role="TrG5h" value="name" />
+          <node concept="17QB3L" id="6infEALqA68" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="6infEALq$Bx" role="3clF46">
+          <property role="TrG5h" value="value" />
+          <node concept="17QB3L" id="6infEALq$BF" role="1tU5fm" />
+        </node>
+        <node concept="3cqZAl" id="6infEALq$_t" role="3clF45" />
+        <node concept="3Tmbuc" id="6infEALqKZ1" role="1B3o_S" />
+        <node concept="3clFbS" id="6infEALq$_v" role="3clF47">
+          <node concept="3clFbJ" id="6infEALqDY_" role="3cqZAp">
+            <node concept="3clFbS" id="6infEALqDYA" role="3clFbx">
+              <node concept="1DcWWT" id="6infEALqUJn" role="3cqZAp">
+                <node concept="3clFbS" id="6infEALqUJo" role="2LFqv$">
+                  <node concept="3clFbJ" id="6infEALqUJp" role="3cqZAp">
+                    <node concept="3clFbS" id="6infEALqUJq" role="3clFbx">
+                      <node concept="3clFbF" id="6XxJ1FLY6dC" role="3cqZAp">
+                        <node concept="37vLTI" id="6XxJ1FLY6dD" role="3clFbG">
+                          <node concept="2OqwBi" id="6XxJ1FLY6dE" role="37vLTJ">
+                            <node concept="Xjq3P" id="6XxJ1FLY6dF" role="2Oq$k0" />
+                            <node concept="2OwXpG" id="6XxJ1FLY6dG" role="2OqNvi">
+                              <ref role="2Oxat5" node="6XxJ1FLY6dx" resolve="typeConcept" />
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="6XxJ1FLY6dH" role="37vLTx">
+                            <ref role="3cqZAo" node="6infEALqUJB" resolve="cpt" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="6infEALqUJr" role="3cqZAp">
+                        <node concept="2OqwBi" id="6infEALqUJs" role="3clFbG">
+                          <node concept="2OqwBi" id="6XxJ1FLY6dI" role="2Oq$k0">
+                            <node concept="Xjq3P" id="6XxJ1FLY6dJ" role="2Oq$k0" />
+                            <node concept="2OwXpG" id="6XxJ1FLY6dK" role="2OqNvi">
+                              <ref role="2Oxat5" node="6XxJ1FLY6dx" resolve="typeConcept" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="6infEALqUJu" role="2OqNvi">
+                            <ref role="37wK5l" node="4peSo3CQgRP" resolve="doAction" />
+                            <node concept="Xjq3P" id="6XxJ1FLYykg" role="37wK5m" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs6" id="6infEALqUJw" role="3cqZAp" />
+                    </node>
+                    <node concept="2OqwBi" id="6infEALqUJx" role="3clFbw">
+                      <node concept="2OqwBi" id="6infEALqUJy" role="2Oq$k0">
+                        <node concept="37vLTw" id="6infEALqUJz" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6infEALqUJB" resolve="cpt" />
+                        </node>
+                        <node concept="liA8E" id="6infEALqUJ$" role="2OqNvi">
+                          <ref role="37wK5l" node="4peSo3CQeqc" resolve="conceptName" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="6infEALqUJ_" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                        <node concept="37vLTw" id="6infEALqXqy" role="37wK5m">
+                          <ref role="3cqZAo" node="6infEALq$Bx" resolve="value" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWsn" id="6infEALqUJB" role="1Duv9x">
+                  <property role="TrG5h" value="cpt" />
+                  <node concept="3uibUv" id="6infEALqUJC" role="1tU5fm">
+                    <ref role="3uigEE" node="4peSo3CQ4MO" resolve="NodePrinter.TypeConcept" />
+                  </node>
+                </node>
+                <node concept="uiWXb" id="6infEALqUJD" role="1DdaDG">
+                  <ref role="uiZuM" node="4peSo3CQ4MO" resolve="NodePrinter.TypeConcept" />
+                </node>
+              </node>
+              <node concept="3SKdUt" id="1jo82tq5ogp" role="3cqZAp">
+                <node concept="3SKdUq" id="1jo82tq5ojq" role="3SKWNk">
+                  <property role="3SKdUp" value="default: print the concept name" />
+                </node>
+              </node>
+              <node concept="3clFbF" id="6infEALqUJE" role="3cqZAp">
+                <node concept="2OqwBi" id="1jo82tq5nKw" role="3clFbG">
+                  <node concept="2OqwBi" id="6infEALqUJF" role="2Oq$k0">
+                    <node concept="37vLTw" id="6infEALqUJG" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4peSo3CIw__" resolve="stringBuilder" />
+                    </node>
+                    <node concept="liA8E" id="6infEALqUJH" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                      <node concept="37vLTw" id="6infEALqXq_" role="37wK5m">
+                        <ref role="3cqZAo" node="6infEALq$Bx" resolve="value" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="1jo82tq5o1I" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <node concept="Xl_RD" id="1jo82tq5o4i" role="37wK5m">
+                      <property role="Xl_RC" value=" " />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3SKdUt" id="6infEALqUJJ" role="3cqZAp">
+                <node concept="3SKdUq" id="6infEALqUJK" role="3SKWNk">
+                  <property role="3SKdUp" value="expect name" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="6infEALqDYG" role="3cqZAp" />
+            </node>
+            <node concept="2OqwBi" id="6infEALqDYH" role="3clFbw">
+              <node concept="Xl_RD" id="6infEALqDYI" role="2Oq$k0">
+                <property role="Xl_RC" value="concept" />
+              </node>
+              <node concept="liA8E" id="6infEALqDYJ" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                <node concept="37vLTw" id="6infEALqK7y" role="37wK5m">
+                  <ref role="3cqZAo" node="6infEALqA5W" resolve="name" />
+                </node>
+              </node>
+            </node>
+            <node concept="9aQIb" id="6infEALqDYN" role="9aQIa">
+              <node concept="3clFbS" id="6infEALqDYO" role="9aQI4">
+                <node concept="YS8fn" id="6infEALsc7v" role="3cqZAp">
+                  <node concept="2ShNRf" id="6infEALsc8q" role="YScLw">
+                    <node concept="1pGfFk" id="6infEALscpK" role="2ShVmc">
+                      <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;(java.lang.String)" resolve="UnsupportedOperationException" />
+                      <node concept="Xl_RD" id="6infEALscsF" role="37wK5m">
+                        <property role="Xl_RC" value="not implemented" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3eNFk2" id="6infEALqDYV" role="3eNLev">
+              <node concept="3clFbS" id="6infEALqDYW" role="3eOfB_">
+                <node concept="3clFbF" id="6infEALqKp7" role="3cqZAp">
+                  <node concept="2OqwBi" id="6infEALqKp8" role="3clFbG">
+                    <node concept="37vLTw" id="6infEALqKpa" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4peSo3CIw__" resolve="stringBuilder" />
+                    </node>
+                    <node concept="liA8E" id="6infEALqKpd" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                      <node concept="37vLTw" id="6infEALqKuI" role="37wK5m">
+                        <ref role="3cqZAo" node="6infEALq$Bx" resolve="value" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6infEALqDZ2" role="3cqZAp" />
+              </node>
+              <node concept="2OqwBi" id="6infEALqDZ3" role="3eO9$A">
+                <node concept="Xl_RD" id="6infEALqDZ4" role="2Oq$k0">
+                  <property role="Xl_RC" value="name" />
+                </node>
+                <node concept="liA8E" id="6infEALqK7G" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                  <node concept="37vLTw" id="6infEALqK7H" role="37wK5m">
+                    <ref role="3cqZAo" node="6infEALqA5W" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3eNFk2" id="6infEALqDZ9" role="3eNLev">
+              <node concept="3clFbS" id="6infEALqDZa" role="3eOfB_">
+                <node concept="3clFbF" id="6infEALqKAx" role="3cqZAp">
+                  <node concept="2OqwBi" id="6infEALqKAy" role="3clFbG">
+                    <node concept="37vLTw" id="6infEALqKAz" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4peSo3CIw__" resolve="stringBuilder" />
+                    </node>
+                    <node concept="liA8E" id="6infEALqKA$" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                      <node concept="37vLTw" id="6infEALqKD9" role="37wK5m">
+                        <ref role="3cqZAo" node="6infEALq$Bx" resolve="value" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6infEALqDZg" role="3cqZAp" />
+              </node>
+              <node concept="2OqwBi" id="6infEALqDZh" role="3eO9$A">
+                <node concept="Xl_RD" id="6infEALqDZi" role="2Oq$k0">
+                  <property role="Xl_RC" value="classifier" />
+                </node>
+                <node concept="liA8E" id="6infEALqK7Q" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                  <node concept="37vLTw" id="6infEALqK7R" role="37wK5m">
+                    <ref role="3cqZAo" node="6infEALqA5W" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3eNFk2" id="6infEALqDZn" role="3eNLev">
+              <node concept="3clFbS" id="6infEALqDZo" role="3eOfB_">
+                <node concept="3SKdUt" id="6infEALqKFm" role="3cqZAp">
+                  <node concept="3SKdUq" id="6infEALqKFn" role="3SKWNk">
+                    <property role="3SKdUp" value="do nothing" />
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6infEALqDZu" role="3cqZAp" />
+              </node>
+              <node concept="2OqwBi" id="6infEALqDZv" role="3eO9$A">
+                <node concept="Xl_RD" id="6infEALqDZw" role="2Oq$k0">
+                  <property role="Xl_RC" value="cid" />
+                </node>
+                <node concept="liA8E" id="6infEALqK80" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                  <node concept="37vLTw" id="6infEALqK81" role="37wK5m">
+                    <ref role="3cqZAo" node="6infEALqA5W" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3eNFk2" id="6infEALqDZ_" role="3eNLev">
+              <node concept="3clFbS" id="6infEALqDZA" role="3eOfB_">
+                <node concept="3SKdUt" id="6infEALqKFz" role="3cqZAp">
+                  <node concept="3SKdUq" id="6infEALqKF$" role="3SKWNk">
+                    <property role="3SKdUp" value="do nothing" />
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6infEALqDZG" role="3cqZAp" />
+              </node>
+              <node concept="2OqwBi" id="6infEALqDZH" role="3eO9$A">
+                <node concept="Xl_RD" id="6infEALqDZI" role="2Oq$k0">
+                  <property role="Xl_RC" value="id" />
+                </node>
+                <node concept="liA8E" id="6infEALqK8a" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                  <node concept="37vLTw" id="6infEALqK8b" role="37wK5m">
+                    <ref role="3cqZAo" node="6infEALqA5W" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6XxJ1FLYcyM" role="jymVt" />
+      <node concept="3clFb_" id="3mz2_dYmjYp" role="jymVt">
+        <property role="TrG5h" value="formatValue" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="37vLTG" id="3mz2_dYmjYq" role="3clF46">
+          <property role="TrG5h" value="value" />
+          <node concept="17QB3L" id="3mz2_dYmjYr" role="1tU5fm" />
+        </node>
+        <node concept="3cqZAl" id="3mz2_dYmjYs" role="3clF45" />
+        <node concept="3Tmbuc" id="3mz2_dYmjYt" role="1B3o_S" />
+        <node concept="3clFbS" id="3mz2_dYmjYv" role="3clF47">
+          <node concept="3clFbF" id="3mz2_dYmkTh" role="3cqZAp">
+            <node concept="2OqwBi" id="3mz2_dYmkTj" role="3clFbG">
+              <node concept="37vLTw" id="3mz2_dYmkTk" role="2Oq$k0">
+                <ref role="3cqZAo" node="4peSo3CIw__" resolve="stringBuilder" />
+              </node>
+              <node concept="liA8E" id="3mz2_dYmkTl" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <node concept="37vLTw" id="3mz2_dYmkTm" role="37wK5m">
+                  <ref role="3cqZAo" node="3mz2_dYmjYq" resolve="value" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3mz2_dYmksG" role="jymVt" />
+      <node concept="3clFb_" id="6XxJ1FLYcN8" role="jymVt">
+        <property role="TrG5h" value="end" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="3cqZAl" id="6XxJ1FLYcN9" role="3clF45" />
+        <node concept="3Tmbuc" id="6XxJ1FLYcNa" role="1B3o_S" />
+        <node concept="3clFbS" id="6XxJ1FLYcNg" role="3clF47">
+          <node concept="3clFbJ" id="6XxJ1FLYdeb" role="3cqZAp">
+            <node concept="3clFbS" id="6XxJ1FLYdec" role="3clFbx">
+              <node concept="3clFbF" id="6XxJ1FLYhBW" role="3cqZAp">
+                <node concept="2OqwBi" id="6XxJ1FLYhGE" role="3clFbG">
+                  <node concept="37vLTw" id="6XxJ1FLYhBV" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6XxJ1FLY6dx" resolve="typeConcept" />
+                  </node>
+                  <node concept="liA8E" id="6XxJ1FLYhPs" role="2OqNvi">
+                    <ref role="37wK5l" node="6XxJ1FLYeRG" resolve="endAction" />
+                    <node concept="Xjq3P" id="6XxJ1FLYy7b" role="37wK5m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3y3z36" id="6XxJ1FLYdoi" role="3clFbw">
+              <node concept="10Nm6u" id="6XxJ1FLYdqs" role="3uHU7w" />
+              <node concept="37vLTw" id="6XxJ1FLYdiT" role="3uHU7B">
+                <ref role="3cqZAo" node="6XxJ1FLY6dx" resolve="typeConcept" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="6XxJ1FLYcNh" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="4peSo3CIWCa" role="1B3o_S" />
+      <node concept="3uibUv" id="6infEALqDFH" role="1zkMxy">
+        <ref role="3uigEE" node="6infEALqzXA" resolve="NodePrinter.Formatter" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6XxJ1FLY8hR" role="jymVt" />
+    <node concept="Qs71p" id="4peSo3CQ4MO" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="TypeConcept" />
+      <node concept="QsSxf" id="4peSo3CQ66U" role="Qtgdg">
+        <property role="TrG5h" value="CLASSIFIER_TYPE" />
+        <ref role="37wK5l" node="4peSo3CQ5Wp" resolve="NodePrinter.TypeConcept" />
+        <node concept="Xl_RD" id="4peSo3CQ6dt" role="37wK5m">
+          <property role="Xl_RC" value="ClassifierType" />
+        </node>
+        <node concept="3clFb_" id="4peSo3CQi4z" role="2HKRsH">
+          <property role="TrG5h" value="doAction" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="37vLTG" id="4peSo3CQi4$" role="3clF46">
+            <property role="TrG5h" value="formatter" />
+            <node concept="3uibUv" id="6XxJ1FLYuP2" role="1tU5fm">
+              <ref role="3uigEE" node="4peSo3CIWKi" resolve="NodePrinter.NodeFormatter" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="4peSo3CQi4A" role="3clF45" />
+          <node concept="3Tm1VV" id="4peSo3CQi4B" role="1B3o_S" />
+          <node concept="3clFbS" id="4peSo3CQi4D" role="3clF47" />
+        </node>
+      </node>
+      <node concept="QsSxf" id="7DXHbsZBcQM" role="Qtgdg">
+        <property role="TrG5h" value="ARRAY_TYPE" />
+        <ref role="37wK5l" node="4peSo3CQ5Wp" resolve="NodePrinter.TypeConcept" />
+        <node concept="Xl_RD" id="7DXHbsZBcQN" role="37wK5m">
+          <property role="Xl_RC" value="ArrayType" />
+        </node>
+        <node concept="3clFb_" id="7DXHbsZBcQO" role="2HKRsH">
+          <property role="TrG5h" value="doAction" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="37vLTG" id="7DXHbsZBcQP" role="3clF46">
+            <property role="TrG5h" value="formatter" />
+            <node concept="3uibUv" id="6XxJ1FLYuBa" role="1tU5fm">
+              <ref role="3uigEE" node="4peSo3CIWKi" resolve="NodePrinter.NodeFormatter" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="7DXHbsZBcQR" role="3clF45" />
+          <node concept="3Tm1VV" id="7DXHbsZBcQS" role="1B3o_S" />
+          <node concept="3clFbS" id="7DXHbsZBcQT" role="3clF47">
+            <node concept="3clFbF" id="6XxJ1FLYyLI" role="3cqZAp">
+              <node concept="2OqwBi" id="6XxJ1FLYyQW" role="3clFbG">
+                <node concept="37vLTw" id="3yhgKRJgfKv" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7DXHbsZBcQP" resolve="formatter" />
+                </node>
+                <node concept="liA8E" id="6XxJ1FLYyWy" role="2OqNvi">
+                  <ref role="37wK5l" node="6XxJ1FLYizn" resolve="setSeparators" />
+                  <node concept="37vLTw" id="3F6vMxq2h3z" role="37wK5m">
+                    <ref role="3cqZAo" node="6XxJ1FLYfHw" resolve="NO_PARAMS" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFb_" id="6XxJ1FLYh8B" role="2HKRsH">
+          <property role="TrG5h" value="endAction" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="37vLTG" id="6XxJ1FLYh8C" role="3clF46">
+            <property role="TrG5h" value="formatter" />
+            <node concept="3uibUv" id="6XxJ1FLYuou" role="1tU5fm">
+              <ref role="3uigEE" node="4peSo3CIWKi" resolve="NodePrinter.NodeFormatter" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="6XxJ1FLYh8E" role="3clF45" />
+          <node concept="3Tmbuc" id="6XxJ1FLYh8F" role="1B3o_S" />
+          <node concept="3clFbS" id="6XxJ1FLYh8H" role="3clF47">
+            <node concept="3clFbF" id="6XxJ1FLYhpn" role="3cqZAp">
+              <node concept="2OqwBi" id="6XxJ1FLYhpo" role="3clFbG">
+                <node concept="37vLTw" id="6XxJ1FLYhpq" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6XxJ1FLYh8C" resolve="formatter" />
+                </node>
+                <node concept="liA8E" id="6XxJ1FLYhps" role="2OqNvi">
+                  <ref role="37wK5l" node="6XxJ1FLYoWY" resolve="append" />
+                  <node concept="Xl_RD" id="6XxJ1FLYhpt" role="37wK5m">
+                    <property role="Xl_RC" value="[]" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="QsSxf" id="4peSo3CQ8US" role="Qtgdg">
+        <property role="TrG5h" value="TYPE_VARIABLE_REFERENCE" />
+        <ref role="37wK5l" node="4peSo3CQ5Wp" resolve="NodePrinter.TypeConcept" />
+        <node concept="Xl_RD" id="4peSo3CQ8UT" role="37wK5m">
+          <property role="Xl_RC" value="TypeVariableReference" />
+        </node>
+        <node concept="3clFb_" id="4peSo3CQicN" role="2HKRsH">
+          <property role="TrG5h" value="doAction" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="37vLTG" id="4peSo3CQicO" role="3clF46">
+            <property role="TrG5h" value="formatter" />
+            <node concept="3uibUv" id="6XxJ1FLYuaM" role="1tU5fm">
+              <ref role="3uigEE" node="4peSo3CIWKi" resolve="NodePrinter.NodeFormatter" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="4peSo3CQicQ" role="3clF45" />
+          <node concept="3Tm1VV" id="4peSo3CQicR" role="1B3o_S" />
+          <node concept="3clFbS" id="4peSo3CQicS" role="3clF47">
+            <node concept="3clFbF" id="3yhgKRJgfNK" role="3cqZAp">
+              <node concept="2OqwBi" id="3yhgKRJgfNL" role="3clFbG">
+                <node concept="37vLTw" id="3yhgKRJgfNM" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4peSo3CQicO" resolve="formatter" />
+                </node>
+                <node concept="liA8E" id="3yhgKRJgfNN" role="2OqNvi">
+                  <ref role="37wK5l" node="6XxJ1FLYizn" resolve="setSeparators" />
+                  <node concept="37vLTw" id="3F6vMxq2h3H" role="37wK5m">
+                    <ref role="3cqZAo" node="3yhgKRJgb2m" resolve="EXTENDS_PARAMS" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="QsSxf" id="4peSo3CQ8ZD" role="Qtgdg">
+        <property role="TrG5h" value="WILDCARD_TYPE" />
+        <ref role="37wK5l" node="4peSo3CQ5Wp" resolve="NodePrinter.TypeConcept" />
+        <node concept="3clFb_" id="4peSo3CQiyg" role="2HKRsH">
+          <property role="TrG5h" value="doAction" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="37vLTG" id="4peSo3CQiyh" role="3clF46">
+            <property role="TrG5h" value="formatter" />
+            <node concept="3uibUv" id="6XxJ1FLYtWs" role="1tU5fm">
+              <ref role="3uigEE" node="4peSo3CIWKi" resolve="NodePrinter.NodeFormatter" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="4peSo3CQiyj" role="3clF45" />
+          <node concept="3Tm1VV" id="4peSo3CQiyk" role="1B3o_S" />
+          <node concept="3clFbS" id="4peSo3CQiyl" role="3clF47">
+            <node concept="3clFbF" id="4peSo3CQjoy" role="3cqZAp">
+              <node concept="2OqwBi" id="4peSo3CQjoz" role="3clFbG">
+                <node concept="37vLTw" id="4peSo3CQuiu" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4peSo3CQiyh" resolve="formatter" />
+                </node>
+                <node concept="liA8E" id="4peSo3CQjo_" role="2OqNvi">
+                  <ref role="37wK5l" node="6XxJ1FLYoWY" resolve="append" />
+                  <node concept="Xl_RD" id="4peSo3CQjoA" role="37wK5m">
+                    <property role="Xl_RC" value="?" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="Xl_RD" id="4peSo3CQ8ZE" role="37wK5m">
+          <property role="Xl_RC" value="WildCardType" />
+        </node>
+      </node>
+      <node concept="QsSxf" id="4peSo3CQ94y" role="Qtgdg">
+        <property role="TrG5h" value="UPPER_BOUND_TYPE" />
+        <ref role="37wK5l" node="4peSo3CQ5Wp" resolve="NodePrinter.TypeConcept" />
+        <node concept="3clFb_" id="4peSo3CQiFE" role="2HKRsH">
+          <property role="TrG5h" value="doAction" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="37vLTG" id="4peSo3CQiFF" role="3clF46">
+            <property role="TrG5h" value="formatter" />
+            <node concept="3uibUv" id="6XxJ1FLYtIc" role="1tU5fm">
+              <ref role="3uigEE" node="4peSo3CIWKi" resolve="NodePrinter.NodeFormatter" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="4peSo3CQiFH" role="3clF45" />
+          <node concept="3Tm1VV" id="4peSo3CQiFI" role="1B3o_S" />
+          <node concept="3clFbS" id="4peSo3CQiFJ" role="3clF47">
+            <node concept="3clFbF" id="3yhgKRJgnu6" role="3cqZAp">
+              <node concept="2OqwBi" id="3yhgKRJgnu7" role="3clFbG">
+                <node concept="liA8E" id="3yhgKRJgnu8" role="2OqNvi">
+                  <ref role="37wK5l" node="6XxJ1FLYoWY" resolve="append" />
+                  <node concept="Xl_RD" id="3yhgKRJgnu9" role="37wK5m">
+                    <property role="Xl_RC" value="?" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="3yhgKRJgnua" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4peSo3CQiFF" resolve="formatter" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3yhgKRJgnu1" role="3cqZAp">
+              <node concept="2OqwBi" id="3yhgKRJgnu2" role="3clFbG">
+                <node concept="37vLTw" id="3yhgKRJgnu3" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4peSo3CQiFF" resolve="formatter" />
+                </node>
+                <node concept="liA8E" id="3yhgKRJgnu4" role="2OqNvi">
+                  <ref role="37wK5l" node="6XxJ1FLYizn" resolve="setSeparators" />
+                  <node concept="37vLTw" id="3F6vMxq2h3R" role="37wK5m">
+                    <ref role="3cqZAo" node="3yhgKRJgb2m" resolve="EXTENDS_PARAMS" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="Xl_RD" id="4peSo3CQ94z" role="37wK5m">
+          <property role="Xl_RC" value="UpperBoundType" />
+        </node>
+      </node>
+      <node concept="QsSxf" id="4peSo3CQ99t" role="Qtgdg">
+        <property role="TrG5h" value="LOWER_BOUND_TYPE" />
+        <ref role="37wK5l" node="4peSo3CQ5Wp" resolve="NodePrinter.TypeConcept" />
+        <node concept="3clFb_" id="4peSo3CQiPz" role="2HKRsH">
+          <property role="TrG5h" value="doAction" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="37vLTG" id="4peSo3CQiP$" role="3clF46">
+            <property role="TrG5h" value="formatter" />
+            <node concept="3uibUv" id="6XxJ1FLYtw2" role="1tU5fm">
+              <ref role="3uigEE" node="4peSo3CIWKi" resolve="NodePrinter.NodeFormatter" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="4peSo3CQiPA" role="3clF45" />
+          <node concept="3Tm1VV" id="4peSo3CQiPB" role="1B3o_S" />
+          <node concept="3clFbS" id="4peSo3CQiPC" role="3clF47">
+            <node concept="3clFbF" id="4peSo3CQjyw" role="3cqZAp">
+              <node concept="2OqwBi" id="4peSo3CQjyx" role="3clFbG">
+                <node concept="liA8E" id="4peSo3CQjyz" role="2OqNvi">
+                  <ref role="37wK5l" node="6XxJ1FLYoWY" resolve="append" />
+                  <node concept="Xl_RD" id="4peSo3CQjy$" role="37wK5m">
+                    <property role="Xl_RC" value="?" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="4peSo3CQuAs" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4peSo3CQiP$" resolve="formatter" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3yhgKRJgkxk" role="3cqZAp">
+              <node concept="2OqwBi" id="3yhgKRJgkxl" role="3clFbG">
+                <node concept="37vLTw" id="3yhgKRJgkxm" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4peSo3CQiP$" resolve="formatter" />
+                </node>
+                <node concept="liA8E" id="3yhgKRJgkxn" role="2OqNvi">
+                  <ref role="37wK5l" node="6XxJ1FLYizn" resolve="setSeparators" />
+                  <node concept="37vLTw" id="3F6vMxq2h41" role="37wK5m">
+                    <ref role="3cqZAo" node="3yhgKRJgl0S" resolve="SUPER_PARAMS" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="Xl_RD" id="4peSo3CQ99u" role="37wK5m">
+          <property role="Xl_RC" value="LowerBoundType" />
+        </node>
+      </node>
+      <node concept="QsSxf" id="1jo82tq6raN" role="Qtgdg">
+        <property role="TrG5h" value="NULL_TYPE" />
+        <ref role="37wK5l" node="4peSo3CQ5Wp" resolve="NodePrinter.TypeConcept" />
+        <node concept="3clFb_" id="1jo82tq6raO" role="2HKRsH">
+          <property role="TrG5h" value="doAction" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="37vLTG" id="1jo82tq6raP" role="3clF46">
+            <property role="TrG5h" value="formatter" />
+            <node concept="3uibUv" id="6XxJ1FLYthY" role="1tU5fm">
+              <ref role="3uigEE" node="4peSo3CIWKi" resolve="NodePrinter.NodeFormatter" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="1jo82tq6raR" role="3clF45" />
+          <node concept="3Tm1VV" id="1jo82tq6raS" role="1B3o_S" />
+          <node concept="3clFbS" id="1jo82tq6raT" role="3clF47">
+            <node concept="3clFbF" id="1jo82tq6raU" role="3cqZAp">
+              <node concept="2OqwBi" id="1jo82tq6raV" role="3clFbG">
+                <node concept="liA8E" id="1jo82tq6raW" role="2OqNvi">
+                  <ref role="37wK5l" node="6XxJ1FLYoWY" resolve="append" />
+                  <node concept="Xl_RD" id="1jo82tq6raX" role="37wK5m">
+                    <property role="Xl_RC" value="nulltype" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="1jo82tq6raZ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1jo82tq6raP" resolve="formatter" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="Xl_RD" id="1jo82tq6rb1" role="37wK5m">
+          <property role="Xl_RC" value="NullType" />
+        </node>
+      </node>
+      <node concept="QsSxf" id="6XxJ1FLYEiw" role="Qtgdg">
+        <property role="TrG5h" value="BOOLEAN_TYPE" />
+        <ref role="37wK5l" node="4peSo3CQ5Wp" resolve="NodePrinter.TypeConcept" />
+        <node concept="3clFb_" id="6XxJ1FLYEix" role="2HKRsH">
+          <property role="TrG5h" value="doAction" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="37vLTG" id="6XxJ1FLYEiy" role="3clF46">
+            <property role="TrG5h" value="formatter" />
+            <node concept="3uibUv" id="6XxJ1FLYEiz" role="1tU5fm">
+              <ref role="3uigEE" node="4peSo3CIWKi" resolve="NodePrinter.NodeFormatter" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="6XxJ1FLYEi$" role="3clF45" />
+          <node concept="3Tm1VV" id="6XxJ1FLYEi_" role="1B3o_S" />
+          <node concept="3clFbS" id="6XxJ1FLYEiA" role="3clF47">
+            <node concept="3clFbF" id="6XxJ1FLYEiB" role="3cqZAp">
+              <node concept="2OqwBi" id="6XxJ1FLYEiC" role="3clFbG">
+                <node concept="liA8E" id="6XxJ1FLYEiD" role="2OqNvi">
+                  <ref role="37wK5l" node="6XxJ1FLYoWY" resolve="append" />
+                  <node concept="Xl_RD" id="6XxJ1FLYEiE" role="37wK5m">
+                    <property role="Xl_RC" value="boolean" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="6XxJ1FLYEiF" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6XxJ1FLYEiy" resolve="formatter" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="Xl_RD" id="6XxJ1FLYEiG" role="37wK5m">
+          <property role="Xl_RC" value="BooleanType" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4peSo3CQ4MP" role="1B3o_S" />
+      <node concept="3clFbW" id="4peSo3CQ5Wp" role="jymVt">
+        <node concept="3cqZAl" id="4peSo3CQ5Wq" role="3clF45" />
+        <node concept="3Tm6S6" id="2zBk6uIqoeS" role="1B3o_S" />
+        <node concept="3clFbS" id="4peSo3CQ5Ws" role="3clF47">
+          <node concept="3clFbF" id="4peSo3CQ61V" role="3cqZAp">
+            <node concept="37vLTI" id="4peSo3CQ61X" role="3clFbG">
+              <node concept="2OqwBi" id="4peSo3CQ621" role="37vLTJ">
+                <node concept="Xjq3P" id="4peSo3CQ624" role="2Oq$k0" />
+                <node concept="2OwXpG" id="4peSo3CQ620" role="2OqNvi">
+                  <ref role="2Oxat5" node="4peSo3CQ61R" resolve="name" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="4peSo3CQ625" role="37vLTx">
+                <ref role="3cqZAo" node="4peSo3CQ60D" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="4peSo3CQ60D" role="3clF46">
+          <property role="TrG5h" value="name" />
+          <node concept="17QB3L" id="4peSo3CQ60C" role="1tU5fm" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="4peSo3CQeqc" role="jymVt">
+        <property role="TrG5h" value="conceptName" />
+        <node concept="17QB3L" id="4peSo3CQexH" role="3clF45" />
+        <node concept="3Tm1VV" id="4peSo3CQeqf" role="1B3o_S" />
+        <node concept="3clFbS" id="4peSo3CQeqg" role="3clF47">
+          <node concept="3clFbF" id="4peSo3CQeLF" role="3cqZAp">
+            <node concept="37vLTw" id="4peSo3CQeLE" role="3clFbG">
+              <ref role="3cqZAo" node="4peSo3CQ61R" resolve="name" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFb_" id="4peSo3CQgRP" role="jymVt">
+        <property role="TrG5h" value="doAction" />
+        <property role="1EzhhJ" value="true" />
+        <node concept="37vLTG" id="4peSo3CQhtO" role="3clF46">
+          <property role="TrG5h" value="formatter" />
+          <node concept="3uibUv" id="6XxJ1FLYsMF" role="1tU5fm">
+            <ref role="3uigEE" node="4peSo3CIWKi" resolve="NodePrinter.NodeFormatter" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="4peSo3CQgRR" role="3clF45" />
+        <node concept="3Tmbuc" id="4peSo3CQ$7S" role="1B3o_S" />
+        <node concept="3clFbS" id="4peSo3CQgRT" role="3clF47" />
+      </node>
+      <node concept="3clFb_" id="6XxJ1FLYeRG" role="jymVt">
+        <property role="TrG5h" value="endAction" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="37vLTG" id="6XxJ1FLYeRH" role="3clF46">
+          <property role="TrG5h" value="formatter" />
+          <node concept="3uibUv" id="6XxJ1FLYt3V" role="1tU5fm">
+            <ref role="3uigEE" node="4peSo3CIWKi" resolve="NodePrinter.NodeFormatter" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="6XxJ1FLYeRJ" role="3clF45" />
+        <node concept="3Tmbuc" id="6XxJ1FLYeRK" role="1B3o_S" />
+        <node concept="3clFbS" id="6XxJ1FLYeRL" role="3clF47" />
+      </node>
+      <node concept="312cEg" id="4peSo3CQ61R" role="jymVt">
+        <property role="TrG5h" value="name" />
+        <node concept="3Tm6S6" id="4peSo3CQ61S" role="1B3o_S" />
+        <node concept="17QB3L" id="4peSo3CQ61U" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4peSo3CQ3Is" role="jymVt" />
+    <node concept="312cEu" id="3gJBs5s$bxr" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="DefaultVariableSymbol" />
+      <node concept="3clFb_" id="3gJBs5s$cVK" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="variableSymbol" />
+        <node concept="37vLTG" id="3gJBs5s$cVL" role="3clF46">
+          <property role="TrG5h" value="variable" />
+          <node concept="3uibUv" id="3gJBs5s$cVM" role="1tU5fm">
+            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+          </node>
+        </node>
+        <node concept="17QB3L" id="4peSo3D15vm" role="3clF45" />
+        <node concept="3Tm1VV" id="3gJBs5s$cVO" role="1B3o_S" />
+        <node concept="3clFbS" id="3gJBs5s$cVQ" role="3clF47">
+          <node concept="3clFbF" id="3gJBs5s$DhZ" role="3cqZAp">
+            <node concept="2YIFZM" id="4peSo3D16mZ" role="3clFbG">
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+              <node concept="37vLTw" id="3gJBs5s$DhY" role="37wK5m">
+                <ref role="3cqZAo" node="3gJBs5s$cVL" resolve="variable" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3gJBs5s$bxs" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="4peSo3CIWrc" role="jymVt" />
+    <node concept="312cEg" id="4peSo3CIVXA" role="jymVt">
+      <property role="TrG5h" value="formatStack" />
+      <node concept="3Tm6S6" id="4peSo3CIVXB" role="1B3o_S" />
+      <node concept="3uibUv" id="4peSo3CIWaF" role="1tU5fm">
+        <ref role="3uigEE" to="33ny:~LinkedList" resolve="LinkedList" />
+        <node concept="3uibUv" id="6infEALrN9U" role="11_B2D">
+          <ref role="3uigEE" node="6infEALqzXA" resolve="NodePrinter.Formatter" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="4peSo3CIZew" role="33vP2m">
+        <node concept="1pGfFk" id="4peSo3CJxdg" role="2ShVmc">
+          <ref role="37wK5l" to="33ny:~LinkedList.&lt;init&gt;()" resolve="LinkedList" />
+          <node concept="3uibUv" id="6infEALrNT$" role="1pMfVU">
+            <ref role="3uigEE" node="6infEALqzXA" resolve="NodePrinter.Formatter" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="4peSo3CK9Ka" role="jymVt">
+      <property role="TrG5h" value="endStack" />
+      <node concept="3Tm6S6" id="4peSo3CK9Kb" role="1B3o_S" />
+      <node concept="3uibUv" id="4peSo3CK9Kc" role="1tU5fm">
+        <ref role="3uigEE" to="33ny:~LinkedList" resolve="LinkedList" />
+        <node concept="3uibUv" id="4peSo3CKagg" role="11_B2D">
+          <ref role="3uigEE" node="5s497Vr8LPr" resolve="NodePrinter.EndWalk" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="4peSo3CK9Ke" role="33vP2m">
+        <node concept="1pGfFk" id="4peSo3CK9Kf" role="2ShVmc">
+          <ref role="37wK5l" to="33ny:~LinkedList.&lt;init&gt;()" resolve="LinkedList" />
+          <node concept="3uibUv" id="4peSo3CKas6" role="1pMfVU">
+            <ref role="3uigEE" node="5s497Vr8LPr" resolve="NodePrinter.EndWalk" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="4peSo3CIw__" role="jymVt">
+      <property role="TrG5h" value="stringBuilder" />
+      <node concept="3Tm6S6" id="4peSo3CIw_A" role="1B3o_S" />
+      <node concept="3uibUv" id="4peSo3CIw_C" role="1tU5fm">
+        <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+      </node>
+    </node>
+    <node concept="312cEg" id="4peSo3D0HuN" role="jymVt">
+      <property role="TrG5h" value="variableSymbol" />
+      <node concept="3Tm6S6" id="4peSo3D0HuO" role="1B3o_S" />
+      <node concept="3uibUv" id="4peSo3D17Iw" role="1tU5fm">
+        <ref role="3uigEE" node="3gJBs5s$bxr" resolve="NodePrinter.DefaultVariableSymbol" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index 40bc994b..dba4e5f7 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -42,7 +42,6 @@
         <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:894463aa-8754-49c0-bf4b-6a32af66b376:jetbrains.mps.jchr" version="0" />
         <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="1" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
@@ -69,8 +68,6 @@
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples)" version="0" />
         <module reference="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" version="0" />
-        <module reference="894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)" version="0" />
-        <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
         <module reference="e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
@@ -87,7 +84,6 @@
         <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
         <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-        <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
         <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
         <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
       </dependencyVersions>
@@ -129,7 +125,6 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:894463aa-8754-49c0-bf4b-6a32af66b376:jetbrains.mps.jchr" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="2" />
     <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="1" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
@@ -166,8 +161,6 @@
     <module reference="96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples)" version="0" />
-    <module reference="894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
@@ -181,7 +174,6 @@
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
index 9f9f247f..be430987 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
@@ -3,10 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
-    <use id="894463aa-8754-49c0-bf4b-6a32af66b376" name="jetbrains.mps.jchr" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
-    <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
index fe0e02d6..20f3ba1f 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
@@ -24,7 +24,6 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:894463aa-8754-49c0-bf4b-6a32af66b376:jetbrains.mps.jchr" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -38,7 +37,6 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
@@ -46,7 +44,6 @@
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
index 062ca64e..23d8cb8b 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
@@ -35,7 +35,6 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
@@ -43,7 +42,6 @@
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-    <module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>