From 97d89a1dcccb1f12f59836ab2eddaaecc51d9961 Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@q60.de>
Date: Wed, 26 Nov 2025 09:30:39 +0100
Subject: [PATCH 1/2] fix(tables): remove EditorCacheHacks.noCaching call

---
 .../itemis/mps/editor/celllayout/layout.mps   |    9 +
 .../generator/template/main@generator.mps     | 1434 ++++----
 .../de/slisson/mps/tables/runtime/cells.mps   | 3146 +++++++----------
 .../slisson/mps/tables/runtime/gridmodel.mps  |  434 +--
 4 files changed, 2116 insertions(+), 2907 deletions(-)

diff --git a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps
index 55374d8edc..5dedacaf36 100644
--- a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps
+++ b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps
@@ -6281,6 +6281,15 @@
       <property role="TrG5h" value="adjustToChildren" />
       <node concept="3Tm1VV" id="40e1npHyCBA" role="1B3o_S" />
       <node concept="3clFbS" id="40e1npHyCBB" role="3clF47">
+        <node concept="3clFbJ" id="70mku7uQCW6" role="3cqZAp">
+          <node concept="3clFbS" id="70mku7uQCW8" role="3clFbx">
+            <node concept="3cpWs6" id="70mku7uQDij" role="3cqZAp" />
+          </node>
+          <node concept="3clFbC" id="70mku7uQDax" role="3clFbw">
+            <node concept="10Nm6u" id="70mku7uQDgz" role="3uHU7w" />
+            <node concept="2V_BSl" id="70mku7uQCY3" role="3uHU7B" />
+          </node>
+        </node>
         <node concept="3clFbF" id="6CbEPf1ZM97" role="3cqZAp">
           <node concept="2OqwBi" id="6CbEPf1ZMmT" role="3clFbG">
             <node concept="2V_BSl" id="6CbEPf1ZM95" role="2Oq$k0" />
diff --git a/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps b/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
index 5e440d7678..79eaddb572 100644
--- a/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
+++ b/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
@@ -49,8 +49,8 @@
     <import index="lwvz" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.selection(MPS.Editor/)" />
     <import index="wwqx" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.logging(MPS.Core/)" />
     <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
+    <import index="yj89" ref="r:8d3d20cd-e020-4a43-bff4-9aef982e4fb8(de.slisson.mps.tables.runtime.transactionalcells)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
-    <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
   </imports>
@@ -128,9 +128,6 @@
       <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" />
@@ -1385,266 +1382,157 @@
           <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
         </node>
         <node concept="3clFbS" id="1dAqnm8Zq8o" role="3clF47">
-          <node concept="3cpWs8" id="28n8$z2IEzE" role="3cqZAp">
-            <node concept="3cpWsn" id="28n8$z2IEzF" role="3cpWs9">
-              <property role="TrG5h" value="childsTracker" />
-              <node concept="3uibUv" id="28n8$z2IEzG" role="1tU5fm">
-                <ref role="3uigEE" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
-              </node>
-              <node concept="10Nm6u" id="28n8$z2IFdp" role="33vP2m" />
-            </node>
-          </node>
-          <node concept="3clFbH" id="1362cT3ezLk" role="3cqZAp" />
-          <node concept="3J1_TO" id="28n8$z2InXN" role="3cqZAp">
-            <node concept="3clFbS" id="1362cT3e$t2" role="1zxBo7">
-              <node concept="3clFbF" id="1362cT3e_NW" role="3cqZAp">
-                <node concept="2YIFZM" id="1362cT3eAe2" role="3clFbG">
-                  <ref role="37wK5l" to="hm5v:1362cT3c3wD" resolve="pushNewInstance" />
-                  <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
-                </node>
+          <node concept="3cpWs8" id="70mku7ulrrJ" role="3cqZAp">
+            <node concept="3cpWsn" id="70mku7ulrrK" role="3cpWs9">
+              <property role="TrG5h" value="editorCell" />
+              <node concept="3uibUv" id="70mku7ulrg2" role="1tU5fm">
+                <ref role="3uigEE" to="hm5v:2Jt5bYCPbd1" resolve="PartialTableEditor" />
               </node>
-              <node concept="3cpWs8" id="1rJc_ytgKUw" role="3cqZAp">
-                <node concept="3cpWsn" id="1rJc_ytgKUx" role="3cpWs9">
-                  <property role="TrG5h" value="grid" />
-                  <property role="3TUv4t" value="true" />
-                  <node concept="3uibUv" id="3olMEllu7qu" role="1tU5fm">
-                    <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                  </node>
-                  <node concept="1rXfSq" id="1rJc_ytgMfL" role="33vP2m">
-                    <ref role="37wK5l" node="1dAqnm8ZqaU" resolve="tableNodeFactory" />
-                    <node concept="37vLTw" id="1rJc_ytgMfM" role="37wK5m">
-                      <ref role="3cqZAo" node="1dAqnm8Zqay" resolve="editorContext" />
-                    </node>
-                    <node concept="37vLTw" id="1rJc_ytgMfN" role="37wK5m">
-                      <ref role="3cqZAo" node="1dAqnm8ZqaA" resolve="node" />
-                    </node>
-                    <node concept="1ZhdrF" id="1rJc_ytgMfO" role="lGtFl">
-                      <property role="2qtEX8" value="baseMethodDeclaration" />
-                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                      <node concept="3$xsQk" id="1rJc_ytgMfP" role="3$ytzL">
-                        <node concept="3clFbS" id="1rJc_ytgMfQ" role="2VODD2">
-                          <node concept="3clFbF" id="1rJc_ytgMfR" role="3cqZAp">
-                            <node concept="2OqwBi" id="1rJc_ytgMfS" role="3clFbG">
-                              <node concept="1iwH70" id="1rJc_ytgMfT" role="2OqNvi">
-                                <ref role="1iwH77" node="1dAqnm8I940" resolve="tableNodeFactory" />
-                                <node concept="2OqwBi" id="1rJc_ytgMfU" role="1iwH7V">
-                                  <node concept="3TrEf2" id="1rJc_ytgMfV" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="bnk3:1dAqnm8pvUN" resolve="cells" />
+              <node concept="2YIFZM" id="70mku7ulrrL" role="33vP2m">
+                <ref role="37wK5l" to="hm5v:70mku7ukS2I" resolve="computeNewCell" />
+                <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
+                <node concept="1bVj0M" id="70mku7ulrrM" role="37wK5m">
+                  <node concept="3clFbS" id="70mku7ulrrN" role="1bW5cS">
+                    <node concept="3cpWs8" id="70mku7ulrrO" role="3cqZAp">
+                      <node concept="3cpWsn" id="70mku7ulrrP" role="3cpWs9">
+                        <property role="TrG5h" value="grid" />
+                        <property role="3TUv4t" value="true" />
+                        <node concept="3uibUv" id="70mku7ulrrQ" role="1tU5fm">
+                          <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
+                        </node>
+                        <node concept="1rXfSq" id="70mku7ulrrR" role="33vP2m">
+                          <ref role="37wK5l" node="1dAqnm8ZqaU" resolve="tableNodeFactory" />
+                          <node concept="37vLTw" id="70mku7ulrrS" role="37wK5m">
+                            <ref role="3cqZAo" node="1dAqnm8Zqay" resolve="editorContext" />
+                          </node>
+                          <node concept="37vLTw" id="70mku7ulrrT" role="37wK5m">
+                            <ref role="3cqZAo" node="1dAqnm8ZqaA" resolve="node" />
+                          </node>
+                          <node concept="1ZhdrF" id="70mku7ulrrU" role="lGtFl">
+                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                            <node concept="3$xsQk" id="70mku7ulrrV" role="3$ytzL">
+                              <node concept="3clFbS" id="70mku7ulrrW" role="2VODD2">
+                                <node concept="3clFbF" id="70mku7ulrrX" role="3cqZAp">
+                                  <node concept="2OqwBi" id="70mku7ulrrY" role="3clFbG">
+                                    <node concept="1iwH70" id="70mku7ulrrZ" role="2OqNvi">
+                                      <ref role="1iwH77" node="1dAqnm8I940" resolve="tableNodeFactory" />
+                                      <node concept="2OqwBi" id="70mku7ulrs0" role="1iwH7V">
+                                        <node concept="3TrEf2" id="70mku7ulrs1" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="bnk3:1dAqnm8pvUN" resolve="cells" />
+                                        </node>
+                                        <node concept="30H73N" id="70mku7ulrs2" role="2Oq$k0" />
+                                      </node>
+                                    </node>
+                                    <node concept="1iwH7S" id="70mku7ulrs3" role="2Oq$k0" />
                                   </node>
-                                  <node concept="30H73N" id="1rJc_ytgMfW" role="2Oq$k0" />
                                 </node>
                               </node>
-                              <node concept="1iwH7S" id="1rJc_ytgMfX" role="2Oq$k0" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="5ryePYd8Jfo" role="3cqZAp">
-                <node concept="3cpWsn" id="5ryePYd8Jfp" role="3cpWs9">
-                  <property role="TrG5h" value="style" />
-                  <property role="3TUv4t" value="true" />
-                  <node concept="3uibUv" id="3ubIyAZ_PpM" role="1tU5fm">
-                    <ref role="3uigEE" to="hox0:~Style" resolve="Style" />
-                  </node>
-                  <node concept="2OqwBi" id="7AHcygoBPz6" role="33vP2m">
-                    <node concept="2ShNRf" id="7AHcygoBPz7" role="2Oq$k0">
-                      <node concept="HV5vD" id="7AHcygoBPz8" role="2ShVmc">
-                        <ref role="HV5vE" to="oghc:7AHcygoswPK" resolve="TableStyleFactoryDummy" />
-                      </node>
-                      <node concept="5jKBG" id="7AHcygoBPz9" role="lGtFl">
-                        <ref role="v9R2y" node="4UkcdCuFKlk" resolve="reduce_IStylable" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="7AHcygoBPza" role="2OqNvi">
-                      <ref role="37wK5l" to="oghc:7AHcygoswSE" resolve="createStyle" />
-                      <node concept="3cmrfG" id="7AHcygoBPzb" role="37wK5m">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                      <node concept="3cmrfG" id="7AHcygoBPzc" role="37wK5m">
-                        <property role="3cmrfH" value="0" />
+                    <node concept="3cpWs8" id="70mku7ulrs4" role="3cqZAp">
+                      <node concept="3cpWsn" id="70mku7ulrs5" role="3cpWs9">
+                        <property role="TrG5h" value="style" />
+                        <property role="3TUv4t" value="true" />
+                        <node concept="3uibUv" id="70mku7ulrs6" role="1tU5fm">
+                          <ref role="3uigEE" to="hox0:~Style" resolve="Style" />
+                        </node>
+                        <node concept="2OqwBi" id="70mku7ulrs7" role="33vP2m">
+                          <node concept="2ShNRf" id="70mku7ulrs8" role="2Oq$k0">
+                            <node concept="HV5vD" id="70mku7ulrs9" role="2ShVmc">
+                              <ref role="HV5vE" to="oghc:7AHcygoswPK" resolve="TableStyleFactoryDummy" />
+                            </node>
+                            <node concept="5jKBG" id="70mku7ulrsa" role="lGtFl">
+                              <ref role="v9R2y" node="4UkcdCuFKlk" resolve="reduce_IStylable" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="70mku7ulrsb" role="2OqNvi">
+                            <ref role="37wK5l" to="oghc:7AHcygoswSE" resolve="createStyle" />
+                            <node concept="3cmrfG" id="70mku7ulrsc" role="37wK5m">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="3cmrfG" id="70mku7ulrsd" role="37wK5m">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="3olMEllxgER" role="3cqZAp">
-                <node concept="2OqwBi" id="3olMEllxhlk" role="3clFbG">
-                  <node concept="37vLTw" id="3olMEllxgEQ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1rJc_ytgKUx" resolve="grid" />
-                  </node>
-                  <node concept="liA8E" id="3olMEllxiCS" role="2OqNvi">
-                    <ref role="37wK5l" to="6dpw:S1tcgxMc9D" resolve="setOrAddStyle" />
-                    <node concept="37vLTw" id="3olMEllxiH2" role="37wK5m">
-                      <ref role="3cqZAo" node="5ryePYd8Jfp" resolve="style" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="3olMEllxiLw" role="3cqZAp" />
-              <node concept="3clFbF" id="28n8$z2IFk6" role="3cqZAp">
-                <node concept="37vLTI" id="28n8$z2IFk8" role="3clFbG">
-                  <node concept="2YIFZM" id="28n8$z2Iyg8" role="37vLTx">
-                    <ref role="37wK5l" to="hm5v:1362cT3c3wX" resolve="popInstance" />
-                    <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
-                  </node>
-                  <node concept="37vLTw" id="28n8$z2IFkc" role="37vLTJ">
-                    <ref role="3cqZAo" node="28n8$z2IEzF" resolve="childsTracker" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbJ" id="1CcsU$v2vB8" role="3cqZAp">
-                <node concept="3clFbS" id="1CcsU$v2vBb" role="3clFbx">
-                  <node concept="3cpWs6" id="1CcsU$v2wtb" role="3cqZAp">
-                    <node concept="2ShNRf" id="1CcsU$v2x4I" role="3cqZAk">
-                      <node concept="1pGfFk" id="1CcsU$v2Hp8" role="2ShVmc">
-                        <ref role="37wK5l" to="g51k:~EditorCell_Error.&lt;init&gt;(jetbrains.mps.openapi.editor.EditorContext,org.jetbrains.mps.openapi.model.SNode,java.lang.String)" resolve="EditorCell_Error" />
-                        <node concept="37vLTw" id="1CcsU$v2HWq" role="37wK5m">
-                          <ref role="3cqZAo" node="1dAqnm8Zqay" resolve="editorContext" />
-                        </node>
-                        <node concept="37vLTw" id="1CcsU$v2J3x" role="37wK5m">
-                          <ref role="3cqZAo" node="1dAqnm8ZqaA" resolve="node" />
+                    <node concept="3clFbF" id="70mku7ulrse" role="3cqZAp">
+                      <node concept="2OqwBi" id="70mku7ulrsf" role="3clFbG">
+                        <node concept="37vLTw" id="70mku7ulrsg" role="2Oq$k0">
+                          <ref role="3cqZAo" node="70mku7ulrrP" resolve="grid" />
                         </node>
-                        <node concept="Xl_RD" id="1CcsU$v2KbK" role="37wK5m">
-                          <property role="Xl_RC" value="not inside table" />
+                        <node concept="liA8E" id="70mku7ulrsh" role="2OqNvi">
+                          <ref role="37wK5l" to="6dpw:S1tcgxMc9D" resolve="setOrAddStyle" />
+                          <node concept="37vLTw" id="70mku7ulrsi" role="37wK5m">
+                            <ref role="3cqZAo" node="70mku7ulrs5" resolve="style" />
+                          </node>
                         </node>
                       </node>
                     </node>
-                  </node>
-                </node>
-                <node concept="3clFbC" id="1CcsU$v2wib" role="3clFbw">
-                  <node concept="10Nm6u" id="1CcsU$v2wlQ" role="3uHU7w" />
-                  <node concept="37vLTw" id="1CcsU$v2wat" role="3uHU7B">
-                    <ref role="3cqZAo" node="28n8$z2IEzF" resolve="childsTracker" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="1dAqnm8Zqae" role="3cqZAp">
-                <node concept="3cpWsn" id="1dAqnm8Zqaf" role="3cpWs9">
-                  <property role="TrG5h" value="editorCell" />
-                  <node concept="2ShNRf" id="1dAqnm8Zqag" role="33vP2m">
-                    <node concept="1pGfFk" id="1dAqnm8Zqah" role="2ShVmc">
-                      <ref role="37wK5l" to="hm5v:2Jt5bYCPbgo" resolve="PartialTableEditor" />
-                      <node concept="37vLTw" id="1dAqnm8Zqai" role="37wK5m">
-                        <ref role="3cqZAo" node="1dAqnm8Zqay" resolve="editorContext" />
-                      </node>
-                      <node concept="37vLTw" id="1dAqnm8Zqaj" role="37wK5m">
-                        <ref role="3cqZAo" node="1dAqnm8ZqaA" resolve="node" />
-                      </node>
-                      <node concept="37vLTw" id="3olMEllxlYO" role="37wK5m">
-                        <ref role="3cqZAo" node="1rJc_ytgKUx" resolve="grid" />
+                    <node concept="3cpWs6" id="70mku7ulrsj" role="3cqZAp">
+                      <node concept="2ShNRf" id="70mku7ulrsk" role="3cqZAk">
+                        <node concept="1pGfFk" id="70mku7ulrsl" role="2ShVmc">
+                          <ref role="37wK5l" to="hm5v:2Jt5bYCPbgo" resolve="PartialTableEditor" />
+                          <node concept="37vLTw" id="70mku7ulrsm" role="37wK5m">
+                            <ref role="3cqZAo" node="1dAqnm8Zqay" resolve="editorContext" />
+                          </node>
+                          <node concept="37vLTw" id="70mku7ulrsn" role="37wK5m">
+                            <ref role="3cqZAo" node="1dAqnm8ZqaA" resolve="node" />
+                          </node>
+                          <node concept="37vLTw" id="70mku7ulrso" role="37wK5m">
+                            <ref role="3cqZAo" node="70mku7ulrrP" resolve="grid" />
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3uibUv" id="3olMEllxjUH" role="1tU5fm">
-                    <ref role="3uigEE" to="hm5v:2Jt5bYCPbd1" resolve="PartialTableEditor" />
-                  </node>
                 </node>
               </node>
-              <node concept="3clFbF" id="28n8$z2I$Ak" role="3cqZAp">
-                <node concept="2OqwBi" id="28n8$z2I_f1" role="3clFbG">
-                  <node concept="2YIFZM" id="28n8$z2I_83" role="2Oq$k0">
-                    <ref role="37wK5l" to="hm5v:1362cT3c3wo" resolve="getInstance" />
-                    <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
-                  </node>
-                  <node concept="liA8E" id="28n8$z2I_rt" role="2OqNvi">
-                    <ref role="37wK5l" to="hm5v:1362cT3cM2o" resolve="registerChild" />
-                    <node concept="37vLTw" id="28n8$z2I_y$" role="37wK5m">
-                      <ref role="3cqZAo" node="1dAqnm8Zqaf" resolve="editorCell" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="4MuW45D0uIo" role="3cqZAp">
-                <node concept="2OqwBi" id="4MuW45D0vn0" role="3clFbG">
-                  <node concept="37vLTw" id="4MuW45D0uIn" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1dAqnm8Zqaf" resolve="editorCell" />
-                  </node>
-                  <node concept="liA8E" id="4MuW45D0yjz" role="2OqNvi">
-                    <ref role="37wK5l" to="hm5v:4MuW45D4Z$X" resolve="initChilds" />
-                    <node concept="37vLTw" id="4MuW45D0$88" role="37wK5m">
-                      <ref role="3cqZAo" node="28n8$z2IEzF" resolve="childsTracker" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="28n8$z2IBHS" role="3cqZAp" />
-              <node concept="3cpWs8" id="1dAqnm8Zqam" role="3cqZAp">
-                <node concept="3cpWsn" id="1dAqnm8Zqan" role="3cpWs9">
-                  <property role="TrG5h" value="i" />
-                  <node concept="10Oyi0" id="1dAqnm8Zqao" role="1tU5fm" />
-                </node>
-                <node concept="5jKBG" id="6hpM9fmFEbd" role="lGtFl">
-                  <ref role="v9R2y" to="tpc3:4v1iCryNDHi" resolve="template_cellSetupBlock" />
-                </node>
-              </node>
-              <node concept="3clFbF" id="1dAqnm8Zqaq" role="3cqZAp">
-                <node concept="5jKBG" id="1dAqnm8Zqar" role="lGtFl">
-                  <ref role="v9R2y" to="tpc3:5t2DUc51aVQ" resolve="template_cellSetSubstituteInfo" />
-                </node>
-                <node concept="2OqwBi" id="1dAqnm8Zqas" role="3clFbG">
-                  <node concept="liA8E" id="1dAqnm8Zqat" role="2OqNvi">
-                    <ref role="37wK5l" to="g51k:~EditorCell_Collection.setSubstituteInfo(jetbrains.mps.openapi.editor.cells.SubstituteInfo)" resolve="setSubstituteInfo" />
-                    <node concept="10Nm6u" id="1dAqnm8Zqau" role="37wK5m" />
-                  </node>
-                  <node concept="37vLTw" id="1dAqnm8Zqav" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1dAqnm8Zqaf" resolve="editorCell" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1MCPN0iqfbN" role="3cqZAp">
-                <node concept="2OqwBi" id="1MCPN0iqfJ2" role="3clFbG">
-                  <node concept="37vLTw" id="1MCPN0iqfbM" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1dAqnm8Zqaf" resolve="editorCell" />
-                  </node>
-                  <node concept="liA8E" id="1MCPN0iqgsr" role="2OqNvi">
-                    <ref role="37wK5l" to="hm5v:1MCPN0ioUI0" resolve="init" />
-                  </node>
-                </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="1dAqnm8Zqam" role="3cqZAp">
+            <node concept="3cpWsn" id="1dAqnm8Zqan" role="3cpWs9">
+              <property role="TrG5h" value="i" />
+              <node concept="10Oyi0" id="1dAqnm8Zqao" role="1tU5fm" />
+            </node>
+            <node concept="5jKBG" id="6hpM9fmFEbd" role="lGtFl">
+              <ref role="v9R2y" to="tpc3:4v1iCryNDHi" resolve="template_cellSetupBlock" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="1dAqnm8Zqaq" role="3cqZAp">
+            <node concept="5jKBG" id="1dAqnm8Zqar" role="lGtFl">
+              <ref role="v9R2y" to="tpc3:5t2DUc51aVQ" resolve="template_cellSetSubstituteInfo" />
+            </node>
+            <node concept="2OqwBi" id="1dAqnm8Zqas" role="3clFbG">
+              <node concept="liA8E" id="1dAqnm8Zqat" role="2OqNvi">
+                <ref role="37wK5l" to="g51k:~EditorCell_Collection.setSubstituteInfo(jetbrains.mps.openapi.editor.cells.SubstituteInfo)" resolve="setSubstituteInfo" />
+                <node concept="10Nm6u" id="1dAqnm8Zqau" role="37wK5m" />
               </node>
-              <node concept="3cpWs6" id="1dAqnm8Zqaw" role="3cqZAp">
-                <node concept="37vLTw" id="1dAqnm8Zqax" role="3cqZAk">
-                  <ref role="3cqZAo" node="1dAqnm8Zqaf" resolve="editorCell" />
-                </node>
+              <node concept="37vLTw" id="1dAqnm8Zqav" role="2Oq$k0">
+                <ref role="3cqZAo" node="70mku7ulrrK" resolve="editorCell" />
               </node>
             </node>
-            <node concept="3uVAMA" id="28n8$z2Iate" role="1zxBo5">
-              <node concept="XOnhg" id="28n8$z2Igiv" role="1zc67B">
-                <property role="TrG5h" value="ex" />
-                <node concept="nSUau" id="8eaLVYG_kXT" role="1tU5fm">
-                  <node concept="3uibUv" id="28n8$z2Iqo4" role="nSUat">
-                    <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
-                  </node>
-                </node>
+          </node>
+          <node concept="3clFbF" id="1MCPN0iqfbN" role="3cqZAp">
+            <node concept="2OqwBi" id="1MCPN0iqfJ2" role="3clFbG">
+              <node concept="37vLTw" id="1MCPN0iqfbM" role="2Oq$k0">
+                <ref role="3cqZAo" node="70mku7ulrrK" resolve="editorCell" />
               </node>
-              <node concept="3clFbS" id="28n8$z2Igix" role="1zc67A">
-                <node concept="3clFbJ" id="28n8$z2IGTT" role="3cqZAp">
-                  <node concept="3clFbS" id="28n8$z2IGTW" role="3clFbx">
-                    <node concept="3clFbF" id="28n8$z2IlxP" role="3cqZAp">
-                      <node concept="2YIFZM" id="28n8$z2Im$F" role="3clFbG">
-                        <ref role="37wK5l" to="hm5v:1362cT3c3wX" resolve="popInstance" />
-                        <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbC" id="28n8$z2IH8e" role="3clFbw">
-                    <node concept="10Nm6u" id="28n8$z2IHbT" role="3uHU7w" />
-                    <node concept="37vLTw" id="28n8$z2IH0S" role="3uHU7B">
-                      <ref role="3cqZAo" node="28n8$z2IEzF" resolve="childsTracker" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="YS8fn" id="28n8$z2IoD$" role="3cqZAp">
-                  <node concept="37vLTw" id="28n8$z2IoHi" role="YScLw">
-                    <ref role="3cqZAo" node="28n8$z2Igiv" resolve="ex" />
-                  </node>
-                </node>
+              <node concept="liA8E" id="1MCPN0iqgsr" role="2OqNvi">
+                <ref role="37wK5l" to="hm5v:1MCPN0ioUI0" resolve="init" />
               </node>
             </node>
           </node>
+          <node concept="3cpWs6" id="1dAqnm8Zqaw" role="3cqZAp">
+            <node concept="37vLTw" id="1dAqnm8Zqax" role="3cqZAk">
+              <ref role="3cqZAo" node="70mku7ulrrK" resolve="editorCell" />
+            </node>
+          </node>
         </node>
         <node concept="37vLTG" id="1dAqnm8Zqay" role="3clF46">
           <property role="TrG5h" value="editorContext" />
@@ -1760,99 +1648,80 @@
         </node>
         <node concept="3clFbS" id="1dAqnm8tX5o" role="3clF47">
           <node concept="3clFbH" id="6eBFmDESDf6" role="3cqZAp" />
-          <node concept="3cpWs8" id="1dAqnm8$DVn" role="3cqZAp">
-            <node concept="3cpWsn" id="1dAqnm8$DVo" role="3cpWs9">
+          <node concept="3cpWs8" id="70mku7uEREY" role="3cqZAp">
+            <node concept="3cpWsn" id="70mku7uEREZ" role="3cpWs9">
               <property role="TrG5h" value="editorCell" />
-              <node concept="3uibUv" id="RywcYxgHoq" role="1tU5fm">
+              <node concept="3uibUv" id="70mku7uEOZF" role="1tU5fm">
                 <ref role="3uigEE" to="hm5v:1dAqnm8$zBn" resolve="TableEditor" />
               </node>
-              <node concept="10Nm6u" id="63X$F8P1V33" role="33vP2m" />
             </node>
           </node>
           <node concept="3cpWs8" id="63X$F8P1Hn7" role="3cqZAp">
             <node concept="3cpWsn" id="63X$F8P1Hn8" role="3cpWs9">
               <property role="TrG5h" value="creator" />
               <node concept="1ajhzC" id="63X$F8P1Hn5" role="1tU5fm">
-                <node concept="3cqZAl" id="63X$F8P1VsE" role="1ajl9A" />
+                <node concept="3cqZAl" id="70mku7uFzbZ" role="1ajl9A" />
               </node>
               <node concept="1bVj0M" id="63X$F8P1Hn9" role="33vP2m">
                 <property role="3yWfEV" value="true" />
                 <node concept="3clFbS" id="63X$F8P1Hna" role="1bW5cS">
-                  <node concept="3clFbF" id="3VRmSegq42r" role="3cqZAp">
-                    <node concept="2YIFZM" id="3VRmSegq5FC" role="3clFbG">
-                      <ref role="37wK5l" to="kvq8:7oq1PhPcG78" resolve="noCaching" />
-                      <ref role="1Pybhc" to="kvq8:7oq1PhPcFua" resolve="EditorCacheHacks" />
-                      <node concept="37vLTw" id="3VRmSegqe_S" role="37wK5m">
-                        <ref role="3cqZAo" node="1dAqnm8tX5H" resolve="editorContext" />
-                      </node>
-                      <node concept="1bVj0M" id="3VRmSegq69k" role="37wK5m">
-                        <node concept="3clFbS" id="3VRmSegq69l" role="1bW5cS">
-                          <node concept="3J1_TO" id="2q4r_et8AbT" role="3cqZAp">
-                            <node concept="3clFbS" id="2q4r_et8AbV" role="1zxBo7">
-                              <node concept="3clFbH" id="6IZZOnw1aO2" role="3cqZAp" />
-                              <node concept="3clFbF" id="1362cT3ep5l" role="3cqZAp">
-                                <node concept="2YIFZM" id="1362cT3eqJm" role="3clFbG">
-                                  <ref role="37wK5l" to="hm5v:1362cT3c3wD" resolve="pushNewInstance" />
-                                  <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="2q4r_et8ERQ" role="3cqZAp">
-                                <node concept="2YIFZM" id="2q4r_et8GsL" role="3clFbG">
-                                  <ref role="37wK5l" to="hm5v:4td5AAzdgxu" resolve="pushNewInstance" />
-                                  <ref role="1Pybhc" to="hm5v:6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-                                </node>
-                              </node>
-                              <node concept="3cpWs8" id="1U60oYwAYez" role="3cqZAp">
-                                <node concept="3cpWsn" id="1U60oYwAYe$" role="3cpWs9">
-                                  <property role="TrG5h" value="grid" />
-                                  <node concept="3uibUv" id="1U60oYwAYe_" role="1tU5fm">
-                                    <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                                  </node>
-                                  <node concept="2ShNRf" id="1U60oYwB044" role="33vP2m">
-                                    <node concept="1pGfFk" id="1U60oYwB03P" role="2ShVmc">
-                                      <ref role="37wK5l" to="6dpw:6tOcB$JOl_n" resolve="Grid" />
-                                    </node>
+                  <node concept="3clFbF" id="70mku7uFrg0" role="3cqZAp">
+                    <node concept="37vLTI" id="70mku7uFrg2" role="3clFbG">
+                      <node concept="2YIFZM" id="70mku7uERF0" role="37vLTx">
+                        <ref role="37wK5l" to="hm5v:70mku7ukS2I" resolve="computeCell" />
+                        <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
+                        <node concept="1bVj0M" id="70mku7uERF1" role="37wK5m">
+                          <node concept="3clFbS" id="70mku7uERF2" role="1bW5cS">
+                            <node concept="3cpWs8" id="70mku7uERF7" role="3cqZAp">
+                              <node concept="3cpWsn" id="70mku7uERF8" role="3cpWs9">
+                                <property role="TrG5h" value="grid" />
+                                <node concept="3uibUv" id="70mku7uERF9" role="1tU5fm">
+                                  <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
+                                </node>
+                                <node concept="2ShNRf" id="70mku7uERFa" role="33vP2m">
+                                  <node concept="1pGfFk" id="70mku7uERFb" role="2ShVmc">
+                                    <ref role="37wK5l" to="6dpw:6tOcB$JOl_n" resolve="Grid" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="1U60oYwAVrP" role="3cqZAp" />
-                              <node concept="3SKdUt" id="6eBFmDEZPfx" role="3cqZAp">
-                                <node concept="1PaTwC" id="7WTFIQIcXr9" role="1aUNEU">
-                                  <node concept="3oM_SD" id="7WTFIQIcXra" role="1PaTwD">
-                                    <property role="3oM_SC" value="column" />
-                                  </node>
-                                  <node concept="3oM_SD" id="7WTFIQIcXrb" role="1PaTwD">
-                                    <property role="3oM_SC" value="headers" />
-                                  </node>
+                            </node>
+                            <node concept="3clFbH" id="70mku7uERFc" role="3cqZAp" />
+                            <node concept="3SKdUt" id="70mku7uERFd" role="3cqZAp">
+                              <node concept="1PaTwC" id="70mku7uERFe" role="1aUNEU">
+                                <node concept="3oM_SD" id="70mku7uERFf" role="1PaTwD">
+                                  <property role="3oM_SC" value="column" />
+                                </node>
+                                <node concept="3oM_SD" id="70mku7uERFg" role="1PaTwD">
+                                  <property role="3oM_SC" value="headers" />
                                 </node>
                               </node>
-                              <node concept="9aQIb" id="6eBFmDF0oSN" role="3cqZAp">
-                                <node concept="3clFbS" id="6eBFmDF0oSP" role="9aQI4">
-                                  <node concept="3cpWs8" id="6eBFmDEZYiP" role="3cqZAp">
-                                    <node concept="3cpWsn" id="6eBFmDEZYiQ" role="3cpWs9">
-                                      <property role="TrG5h" value="headerGrids" />
-                                      <node concept="2ShNRf" id="6eBFmDEZYiR" role="33vP2m">
-                                        <node concept="1pGfFk" id="6eBFmDEZYiS" role="2ShVmc">
-                                          <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
-                                          <node concept="3uibUv" id="3olMEllzpwS" role="1pMfVU">
-                                            <ref role="3uigEE" to="6dpw:3olMEllxFAj" resolve="HeaderGrid" />
-                                          </node>
-                                          <node concept="3cmrfG" id="6eBFmDEZYiU" role="37wK5m">
-                                            <property role="3cmrfH" value="0" />
-                                            <node concept="17Uvod" id="6eBFmDEZYiV" role="lGtFl">
-                                              <property role="2qtEX9" value="value" />
-                                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
-                                              <node concept="3zFVjK" id="6eBFmDEZYiW" role="3zH0cK">
-                                                <node concept="3clFbS" id="6eBFmDEZYiX" role="2VODD2">
-                                                  <node concept="3clFbF" id="6eBFmDEZYiY" role="3cqZAp">
-                                                    <node concept="2OqwBi" id="6eBFmDEZYiZ" role="3clFbG">
-                                                      <node concept="34oBXx" id="6eBFmDEZYj0" role="2OqNvi" />
-                                                      <node concept="2OqwBi" id="6eBFmDEZYj1" role="2Oq$k0">
-                                                        <node concept="3Tsc0h" id="6eBFmDEZYj2" role="2OqNvi">
-                                                          <ref role="3TtcxE" to="bnk3:1dAqnm8mHZm" resolve="columnHeaders" />
-                                                        </node>
-                                                        <node concept="30H73N" id="6eBFmDEZYj3" role="2Oq$k0" />
+                            </node>
+                            <node concept="9aQIb" id="70mku7uERFh" role="3cqZAp">
+                              <node concept="3clFbS" id="70mku7uERFi" role="9aQI4">
+                                <node concept="3cpWs8" id="70mku7uERFj" role="3cqZAp">
+                                  <node concept="3cpWsn" id="70mku7uERFk" role="3cpWs9">
+                                    <property role="TrG5h" value="headerGrids" />
+                                    <node concept="2ShNRf" id="70mku7uERFl" role="33vP2m">
+                                      <node concept="1pGfFk" id="70mku7uERFm" role="2ShVmc">
+                                        <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
+                                        <node concept="3uibUv" id="70mku7uERFn" role="1pMfVU">
+                                          <ref role="3uigEE" to="6dpw:3olMEllxFAj" resolve="HeaderGrid" />
+                                        </node>
+                                        <node concept="3cmrfG" id="70mku7uERFo" role="37wK5m">
+                                          <property role="3cmrfH" value="0" />
+                                          <node concept="17Uvod" id="70mku7uERFp" role="lGtFl">
+                                            <property role="2qtEX9" value="value" />
+                                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
+                                            <node concept="3zFVjK" id="70mku7uERFq" role="3zH0cK">
+                                              <node concept="3clFbS" id="70mku7uERFr" role="2VODD2">
+                                                <node concept="3clFbF" id="70mku7uERFs" role="3cqZAp">
+                                                  <node concept="2OqwBi" id="70mku7uERFt" role="3clFbG">
+                                                    <node concept="34oBXx" id="70mku7uERFu" role="2OqNvi" />
+                                                    <node concept="2OqwBi" id="70mku7uERFv" role="2Oq$k0">
+                                                      <node concept="3Tsc0h" id="70mku7uERFw" role="2OqNvi">
+                                                        <ref role="3TtcxE" to="bnk3:1dAqnm8mHZm" resolve="columnHeaders" />
                                                       </node>
+                                                      <node concept="30H73N" id="70mku7uERFx" role="2Oq$k0" />
                                                     </node>
                                                   </node>
                                                 </node>
@@ -1861,117 +1730,117 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="3uibUv" id="6eBFmDEZYj4" role="1tU5fm">
-                                        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-                                        <node concept="3uibUv" id="3olMEllzo28" role="11_B2D">
-                                          <ref role="3uigEE" to="6dpw:3olMEllxFAj" resolve="HeaderGrid" />
-                                        </node>
+                                    </node>
+                                    <node concept="3uibUv" id="70mku7uERFy" role="1tU5fm">
+                                      <ref role="3uigEE" to="33ny:~List" resolve="List" />
+                                      <node concept="3uibUv" id="70mku7uERFz" role="11_B2D">
+                                        <ref role="3uigEE" to="6dpw:3olMEllxFAj" resolve="HeaderGrid" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3clFbF" id="6eBFmDEZYj6" role="3cqZAp">
-                                    <node concept="1WS0z7" id="6eBFmDEZYj7" role="lGtFl">
-                                      <node concept="3JmXsc" id="6eBFmDEZYj8" role="3Jn$fo">
-                                        <node concept="3clFbS" id="6eBFmDEZYj9" role="2VODD2">
-                                          <node concept="3clFbF" id="6eBFmDEZYja" role="3cqZAp">
-                                            <node concept="2OqwBi" id="6eBFmDEZYjb" role="3clFbG">
-                                              <node concept="3Tsc0h" id="6eBFmDEZYjc" role="2OqNvi">
-                                                <ref role="3TtcxE" to="bnk3:1dAqnm8mHZm" resolve="columnHeaders" />
-                                              </node>
-                                              <node concept="30H73N" id="6eBFmDEZYjd" role="2Oq$k0" />
+                                </node>
+                                <node concept="3clFbF" id="70mku7uERF$" role="3cqZAp">
+                                  <node concept="1WS0z7" id="70mku7uERF_" role="lGtFl">
+                                    <node concept="3JmXsc" id="70mku7uERFA" role="3Jn$fo">
+                                      <node concept="3clFbS" id="70mku7uERFB" role="2VODD2">
+                                        <node concept="3clFbF" id="70mku7uERFC" role="3cqZAp">
+                                          <node concept="2OqwBi" id="70mku7uERFD" role="3clFbG">
+                                            <node concept="3Tsc0h" id="70mku7uERFE" role="2OqNvi">
+                                              <ref role="3TtcxE" to="bnk3:1dAqnm8mHZm" resolve="columnHeaders" />
                                             </node>
+                                            <node concept="30H73N" id="70mku7uERFF" role="2Oq$k0" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="2OqwBi" id="6eBFmDEZYje" role="3clFbG">
-                                      <node concept="liA8E" id="6eBFmDEZYjf" role="2OqNvi">
-                                        <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
-                                        <node concept="1rXfSq" id="6eBFmDEZYjg" role="37wK5m">
-                                          <ref role="37wK5l" node="1dAqnm8Ckh6" resolve="headerNodeFactory" />
-                                          <node concept="37vLTw" id="6eBFmDEZYjh" role="37wK5m">
-                                            <ref role="3cqZAo" node="1dAqnm8tX5H" resolve="editorContext" />
-                                          </node>
-                                          <node concept="37vLTw" id="6eBFmDEZYji" role="37wK5m">
-                                            <ref role="3cqZAo" node="1dAqnm8tX5L" resolve="node" />
-                                          </node>
-                                          <node concept="1ZhdrF" id="6eBFmDEZYjj" role="lGtFl">
-                                            <property role="2qtEX8" value="baseMethodDeclaration" />
-                                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                                            <node concept="3$xsQk" id="6eBFmDEZYjk" role="3$ytzL">
-                                              <node concept="3clFbS" id="6eBFmDEZYjl" role="2VODD2">
-                                                <node concept="3clFbF" id="6eBFmDEZYjm" role="3cqZAp">
-                                                  <node concept="2OqwBi" id="6eBFmDEZYjn" role="3clFbG">
-                                                    <node concept="1iwH70" id="6eBFmDEZYjo" role="2OqNvi">
-                                                      <ref role="1iwH77" node="1dAqnm8C1OR" resolve="headerNodeFactory" />
-                                                      <node concept="30H73N" id="6eBFmDEZYjp" role="1iwH7V" />
-                                                    </node>
-                                                    <node concept="1iwH7S" id="6eBFmDEZYjq" role="2Oq$k0" />
+                                  </node>
+                                  <node concept="2OqwBi" id="70mku7uERFG" role="3clFbG">
+                                    <node concept="liA8E" id="70mku7uERFH" role="2OqNvi">
+                                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
+                                      <node concept="1rXfSq" id="70mku7uERFI" role="37wK5m">
+                                        <ref role="37wK5l" node="1dAqnm8Ckh6" resolve="headerNodeFactory" />
+                                        <node concept="37vLTw" id="70mku7uERFJ" role="37wK5m">
+                                          <ref role="3cqZAo" node="1dAqnm8tX5H" resolve="editorContext" />
+                                        </node>
+                                        <node concept="37vLTw" id="70mku7uERFK" role="37wK5m">
+                                          <ref role="3cqZAo" node="1dAqnm8tX5L" resolve="node" />
+                                        </node>
+                                        <node concept="1ZhdrF" id="70mku7uERFL" role="lGtFl">
+                                          <property role="2qtEX8" value="baseMethodDeclaration" />
+                                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                                          <node concept="3$xsQk" id="70mku7uERFM" role="3$ytzL">
+                                            <node concept="3clFbS" id="70mku7uERFN" role="2VODD2">
+                                              <node concept="3clFbF" id="70mku7uERFO" role="3cqZAp">
+                                                <node concept="2OqwBi" id="70mku7uERFP" role="3clFbG">
+                                                  <node concept="1iwH70" id="70mku7uERFQ" role="2OqNvi">
+                                                    <ref role="1iwH77" node="1dAqnm8C1OR" resolve="headerNodeFactory" />
+                                                    <node concept="30H73N" id="70mku7uERFR" role="1iwH7V" />
                                                   </node>
+                                                  <node concept="1iwH7S" id="70mku7uERFS" role="2Oq$k0" />
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="37vLTw" id="6eBFmDEZYjr" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6eBFmDEZYiQ" resolve="headerGrids" />
-                                      </node>
+                                    </node>
+                                    <node concept="37vLTw" id="70mku7uERFT" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="70mku7uERFk" resolve="headerGrids" />
                                     </node>
                                   </node>
-                                  <node concept="3clFbF" id="1U60oYwXR3r" role="3cqZAp">
-                                    <node concept="2OqwBi" id="1U60oYwXRzv" role="3clFbG">
-                                      <node concept="37vLTw" id="1U60oYwXR3q" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1U60oYwAYe$" resolve="grid" />
-                                      </node>
-                                      <node concept="liA8E" id="1U60oYwXTv1" role="2OqNvi">
-                                        <ref role="37wK5l" to="6dpw:1U60oYwSPVm" resolve="setColumnHeaders" />
-                                        <node concept="37vLTw" id="1U60oYwZ1Fx" role="37wK5m">
-                                          <ref role="3cqZAo" node="6eBFmDEZYiQ" resolve="headerGrids" />
-                                        </node>
+                                </node>
+                                <node concept="3clFbF" id="70mku7uERFU" role="3cqZAp">
+                                  <node concept="2OqwBi" id="70mku7uERFV" role="3clFbG">
+                                    <node concept="37vLTw" id="70mku7uERFW" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="70mku7uERF8" resolve="grid" />
+                                    </node>
+                                    <node concept="liA8E" id="70mku7uERFX" role="2OqNvi">
+                                      <ref role="37wK5l" to="6dpw:1U60oYwSPVm" resolve="setColumnHeaders" />
+                                      <node concept="37vLTw" id="70mku7uERFY" role="37wK5m">
+                                        <ref role="3cqZAo" node="70mku7uERFk" resolve="headerGrids" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="6eBFmDF0lhb" role="3cqZAp" />
-                              <node concept="3SKdUt" id="6eBFmDF02KN" role="3cqZAp">
-                                <node concept="1PaTwC" id="7WTFIQIcXrc" role="1aUNEU">
-                                  <node concept="3oM_SD" id="7WTFIQIcXrd" role="1PaTwD">
-                                    <property role="3oM_SC" value="row" />
-                                  </node>
-                                  <node concept="3oM_SD" id="7WTFIQIcXre" role="1PaTwD">
-                                    <property role="3oM_SC" value="headers" />
-                                  </node>
+                            </node>
+                            <node concept="3clFbH" id="70mku7uERFZ" role="3cqZAp" />
+                            <node concept="3SKdUt" id="70mku7uERG0" role="3cqZAp">
+                              <node concept="1PaTwC" id="70mku7uERG1" role="1aUNEU">
+                                <node concept="3oM_SD" id="70mku7uERG2" role="1PaTwD">
+                                  <property role="3oM_SC" value="row" />
+                                </node>
+                                <node concept="3oM_SD" id="70mku7uERG3" role="1PaTwD">
+                                  <property role="3oM_SC" value="headers" />
                                 </node>
                               </node>
-                              <node concept="9aQIb" id="6eBFmDF0yIT" role="3cqZAp">
-                                <node concept="3clFbS" id="6eBFmDF0yIV" role="9aQI4">
-                                  <node concept="3cpWs8" id="6eBFmDF0dGQ" role="3cqZAp">
-                                    <node concept="3cpWsn" id="6eBFmDF0dGR" role="3cpWs9">
-                                      <property role="TrG5h" value="headerGrids" />
-                                      <node concept="2ShNRf" id="6eBFmDF0dGS" role="33vP2m">
-                                        <node concept="1pGfFk" id="6eBFmDF0dGT" role="2ShVmc">
-                                          <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
-                                          <node concept="3uibUv" id="3olMEllzt1M" role="1pMfVU">
-                                            <ref role="3uigEE" to="6dpw:3olMEllxFAj" resolve="HeaderGrid" />
-                                          </node>
-                                          <node concept="3cmrfG" id="6eBFmDF0dGV" role="37wK5m">
-                                            <property role="3cmrfH" value="0" />
-                                            <node concept="17Uvod" id="6eBFmDF0dGW" role="lGtFl">
-                                              <property role="2qtEX9" value="value" />
-                                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
-                                              <node concept="3zFVjK" id="6eBFmDF0dGX" role="3zH0cK">
-                                                <node concept="3clFbS" id="6eBFmDF0dGY" role="2VODD2">
-                                                  <node concept="3clFbF" id="6eBFmDF0dGZ" role="3cqZAp">
-                                                    <node concept="2OqwBi" id="6eBFmDF0dH0" role="3clFbG">
-                                                      <node concept="34oBXx" id="6eBFmDF0dH1" role="2OqNvi" />
-                                                      <node concept="2OqwBi" id="6eBFmDF0dH2" role="2Oq$k0">
-                                                        <node concept="3Tsc0h" id="6eBFmDF0dH3" role="2OqNvi">
-                                                          <ref role="3TtcxE" to="bnk3:1dAqnm8mIel" resolve="rowHeaders" />
-                                                        </node>
-                                                        <node concept="30H73N" id="6eBFmDF0dH4" role="2Oq$k0" />
+                            </node>
+                            <node concept="9aQIb" id="70mku7uERG4" role="3cqZAp">
+                              <node concept="3clFbS" id="70mku7uERG5" role="9aQI4">
+                                <node concept="3cpWs8" id="70mku7uERG6" role="3cqZAp">
+                                  <node concept="3cpWsn" id="70mku7uERG7" role="3cpWs9">
+                                    <property role="TrG5h" value="headerGrids" />
+                                    <node concept="2ShNRf" id="70mku7uERG8" role="33vP2m">
+                                      <node concept="1pGfFk" id="70mku7uERG9" role="2ShVmc">
+                                        <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
+                                        <node concept="3uibUv" id="70mku7uERGa" role="1pMfVU">
+                                          <ref role="3uigEE" to="6dpw:3olMEllxFAj" resolve="HeaderGrid" />
+                                        </node>
+                                        <node concept="3cmrfG" id="70mku7uERGb" role="37wK5m">
+                                          <property role="3cmrfH" value="0" />
+                                          <node concept="17Uvod" id="70mku7uERGc" role="lGtFl">
+                                            <property role="2qtEX9" value="value" />
+                                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
+                                            <node concept="3zFVjK" id="70mku7uERGd" role="3zH0cK">
+                                              <node concept="3clFbS" id="70mku7uERGe" role="2VODD2">
+                                                <node concept="3clFbF" id="70mku7uERGf" role="3cqZAp">
+                                                  <node concept="2OqwBi" id="70mku7uERGg" role="3clFbG">
+                                                    <node concept="34oBXx" id="70mku7uERGh" role="2OqNvi" />
+                                                    <node concept="2OqwBi" id="70mku7uERGi" role="2Oq$k0">
+                                                      <node concept="3Tsc0h" id="70mku7uERGj" role="2OqNvi">
+                                                        <ref role="3TtcxE" to="bnk3:1dAqnm8mIel" resolve="rowHeaders" />
                                                       </node>
+                                                      <node concept="30H73N" id="70mku7uERGk" role="2Oq$k0" />
                                                     </node>
                                                   </node>
                                                 </node>
@@ -1980,112 +1849,112 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="3uibUv" id="6eBFmDF0dH5" role="1tU5fm">
-                                        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-                                        <node concept="3uibUv" id="3olMEllzrz4" role="11_B2D">
-                                          <ref role="3uigEE" to="6dpw:3olMEllxFAj" resolve="HeaderGrid" />
-                                        </node>
+                                    </node>
+                                    <node concept="3uibUv" id="70mku7uERGl" role="1tU5fm">
+                                      <ref role="3uigEE" to="33ny:~List" resolve="List" />
+                                      <node concept="3uibUv" id="70mku7uERGm" role="11_B2D">
+                                        <ref role="3uigEE" to="6dpw:3olMEllxFAj" resolve="HeaderGrid" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3clFbF" id="6eBFmDF0dH7" role="3cqZAp">
-                                    <node concept="1WS0z7" id="6eBFmDF0dH8" role="lGtFl">
-                                      <node concept="3JmXsc" id="6eBFmDF0dH9" role="3Jn$fo">
-                                        <node concept="3clFbS" id="6eBFmDF0dHa" role="2VODD2">
-                                          <node concept="3clFbF" id="6eBFmDF0dHb" role="3cqZAp">
-                                            <node concept="2OqwBi" id="6eBFmDF0dHc" role="3clFbG">
-                                              <node concept="3Tsc0h" id="6eBFmDF0DaA" role="2OqNvi">
-                                                <ref role="3TtcxE" to="bnk3:1dAqnm8mIel" resolve="rowHeaders" />
-                                              </node>
-                                              <node concept="30H73N" id="6eBFmDF0dHe" role="2Oq$k0" />
+                                </node>
+                                <node concept="3clFbF" id="70mku7uERGn" role="3cqZAp">
+                                  <node concept="1WS0z7" id="70mku7uERGo" role="lGtFl">
+                                    <node concept="3JmXsc" id="70mku7uERGp" role="3Jn$fo">
+                                      <node concept="3clFbS" id="70mku7uERGq" role="2VODD2">
+                                        <node concept="3clFbF" id="70mku7uERGr" role="3cqZAp">
+                                          <node concept="2OqwBi" id="70mku7uERGs" role="3clFbG">
+                                            <node concept="3Tsc0h" id="70mku7uERGt" role="2OqNvi">
+                                              <ref role="3TtcxE" to="bnk3:1dAqnm8mIel" resolve="rowHeaders" />
                                             </node>
+                                            <node concept="30H73N" id="70mku7uERGu" role="2Oq$k0" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="2OqwBi" id="6eBFmDF0dHf" role="3clFbG">
-                                      <node concept="liA8E" id="6eBFmDF0dHg" role="2OqNvi">
-                                        <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
-                                        <node concept="1rXfSq" id="6eBFmDF0dHh" role="37wK5m">
-                                          <ref role="37wK5l" node="1dAqnm8Ckh6" resolve="headerNodeFactory" />
-                                          <node concept="37vLTw" id="6eBFmDF0dHi" role="37wK5m">
-                                            <ref role="3cqZAo" node="1dAqnm8tX5H" resolve="editorContext" />
-                                          </node>
-                                          <node concept="37vLTw" id="6eBFmDF0dHj" role="37wK5m">
-                                            <ref role="3cqZAo" node="1dAqnm8tX5L" resolve="node" />
-                                          </node>
-                                          <node concept="1ZhdrF" id="6eBFmDF0dHk" role="lGtFl">
-                                            <property role="2qtEX8" value="baseMethodDeclaration" />
-                                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                                            <node concept="3$xsQk" id="6eBFmDF0dHl" role="3$ytzL">
-                                              <node concept="3clFbS" id="6eBFmDF0dHm" role="2VODD2">
-                                                <node concept="3clFbF" id="6eBFmDF0dHn" role="3cqZAp">
-                                                  <node concept="2OqwBi" id="6eBFmDF0dHo" role="3clFbG">
-                                                    <node concept="1iwH70" id="6eBFmDF0dHp" role="2OqNvi">
-                                                      <ref role="1iwH77" node="1dAqnm8C1OR" resolve="headerNodeFactory" />
-                                                      <node concept="30H73N" id="6eBFmDF0dHq" role="1iwH7V" />
-                                                    </node>
-                                                    <node concept="1iwH7S" id="6eBFmDF0dHr" role="2Oq$k0" />
+                                  </node>
+                                  <node concept="2OqwBi" id="70mku7uERGv" role="3clFbG">
+                                    <node concept="liA8E" id="70mku7uERGw" role="2OqNvi">
+                                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
+                                      <node concept="1rXfSq" id="70mku7uERGx" role="37wK5m">
+                                        <ref role="37wK5l" node="1dAqnm8Ckh6" resolve="headerNodeFactory" />
+                                        <node concept="37vLTw" id="70mku7uERGy" role="37wK5m">
+                                          <ref role="3cqZAo" node="1dAqnm8tX5H" resolve="editorContext" />
+                                        </node>
+                                        <node concept="37vLTw" id="70mku7uERGz" role="37wK5m">
+                                          <ref role="3cqZAo" node="1dAqnm8tX5L" resolve="node" />
+                                        </node>
+                                        <node concept="1ZhdrF" id="70mku7uERG$" role="lGtFl">
+                                          <property role="2qtEX8" value="baseMethodDeclaration" />
+                                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                                          <node concept="3$xsQk" id="70mku7uERG_" role="3$ytzL">
+                                            <node concept="3clFbS" id="70mku7uERGA" role="2VODD2">
+                                              <node concept="3clFbF" id="70mku7uERGB" role="3cqZAp">
+                                                <node concept="2OqwBi" id="70mku7uERGC" role="3clFbG">
+                                                  <node concept="1iwH70" id="70mku7uERGD" role="2OqNvi">
+                                                    <ref role="1iwH77" node="1dAqnm8C1OR" resolve="headerNodeFactory" />
+                                                    <node concept="30H73N" id="70mku7uERGE" role="1iwH7V" />
                                                   </node>
+                                                  <node concept="1iwH7S" id="70mku7uERGF" role="2Oq$k0" />
                                                 </node>
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="37vLTw" id="6eBFmDF0dHs" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6eBFmDF0dGR" resolve="headerGrids" />
-                                      </node>
+                                    </node>
+                                    <node concept="37vLTw" id="70mku7uERGG" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="70mku7uERG7" resolve="headerGrids" />
                                     </node>
                                   </node>
-                                  <node concept="3clFbF" id="1U60oYwZ5kP" role="3cqZAp">
-                                    <node concept="2OqwBi" id="1U60oYwZ5DO" role="3clFbG">
-                                      <node concept="37vLTw" id="1U60oYwZ5kO" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1U60oYwAYe$" resolve="grid" />
-                                      </node>
-                                      <node concept="liA8E" id="1U60oYwZ7gn" role="2OqNvi">
-                                        <ref role="37wK5l" to="6dpw:1U60oYwTo6l" resolve="setRowHeaders" />
-                                        <node concept="37vLTw" id="1U60oYwZ7kF" role="37wK5m">
-                                          <ref role="3cqZAo" node="6eBFmDF0dGR" resolve="headerGrids" />
-                                        </node>
+                                </node>
+                                <node concept="3clFbF" id="70mku7uERGH" role="3cqZAp">
+                                  <node concept="2OqwBi" id="70mku7uERGI" role="3clFbG">
+                                    <node concept="37vLTw" id="70mku7uERGJ" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="70mku7uERF8" resolve="grid" />
+                                    </node>
+                                    <node concept="liA8E" id="70mku7uERGK" role="2OqNvi">
+                                      <ref role="37wK5l" to="6dpw:1U60oYwTo6l" resolve="setRowHeaders" />
+                                      <node concept="37vLTw" id="70mku7uERGL" role="37wK5m">
+                                        <ref role="3cqZAo" node="70mku7uERG7" resolve="headerGrids" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3cpWs8" id="6eBFmDESI9h" role="3cqZAp">
-                                <node concept="3cpWsn" id="6eBFmDESI9i" role="3cpWs9">
-                                  <property role="TrG5h" value="childGrid" />
-                                  <property role="3TUv4t" value="true" />
-                                  <node concept="3uibUv" id="6eBFmDESI9j" role="1tU5fm">
-                                    <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                                  </node>
-                                  <node concept="1rXfSq" id="3olMEllt4gz" role="33vP2m">
-                                    <ref role="37wK5l" node="1dAqnm8UPZb" resolve="tableNodeFactory" />
-                                    <node concept="37vLTw" id="3olMEllt4g$" role="37wK5m">
-                                      <ref role="3cqZAo" node="1dAqnm8tX5H" resolve="editorContext" />
-                                    </node>
-                                    <node concept="37vLTw" id="3olMEllt4g_" role="37wK5m">
-                                      <ref role="3cqZAo" node="1dAqnm8tX5L" resolve="node" />
-                                    </node>
-                                    <node concept="1ZhdrF" id="3olMEllt4gA" role="lGtFl">
-                                      <property role="2qtEX8" value="baseMethodDeclaration" />
-                                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                                      <node concept="3$xsQk" id="3olMEllt4gB" role="3$ytzL">
-                                        <node concept="3clFbS" id="3olMEllt4gC" role="2VODD2">
-                                          <node concept="3clFbF" id="3olMEllt4gD" role="3cqZAp">
-                                            <node concept="2OqwBi" id="3olMEllt4gE" role="3clFbG">
-                                              <node concept="1iwH70" id="3olMEllt4gF" role="2OqNvi">
-                                                <ref role="1iwH77" node="1dAqnm8I940" resolve="tableNodeFactory" />
-                                                <node concept="2OqwBi" id="3olMEllt4gG" role="1iwH7V">
-                                                  <node concept="3TrEf2" id="3olMEllt4gH" role="2OqNvi">
-                                                    <ref role="3Tt5mk" to="bnk3:1dAqnm8mI9a" resolve="cells" />
-                                                  </node>
-                                                  <node concept="30H73N" id="3olMEllt4gI" role="2Oq$k0" />
+                            </node>
+                            <node concept="3cpWs8" id="70mku7uERGM" role="3cqZAp">
+                              <node concept="3cpWsn" id="70mku7uERGN" role="3cpWs9">
+                                <property role="TrG5h" value="childGrid" />
+                                <property role="3TUv4t" value="true" />
+                                <node concept="3uibUv" id="70mku7uERGO" role="1tU5fm">
+                                  <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
+                                </node>
+                                <node concept="1rXfSq" id="70mku7uERGP" role="33vP2m">
+                                  <ref role="37wK5l" node="1dAqnm8UPZb" resolve="tableNodeFactory" />
+                                  <node concept="37vLTw" id="70mku7uERGQ" role="37wK5m">
+                                    <ref role="3cqZAo" node="1dAqnm8tX5H" resolve="editorContext" />
+                                  </node>
+                                  <node concept="37vLTw" id="70mku7uERGR" role="37wK5m">
+                                    <ref role="3cqZAo" node="1dAqnm8tX5L" resolve="node" />
+                                  </node>
+                                  <node concept="1ZhdrF" id="70mku7uERGS" role="lGtFl">
+                                    <property role="2qtEX8" value="baseMethodDeclaration" />
+                                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                                    <node concept="3$xsQk" id="70mku7uERGT" role="3$ytzL">
+                                      <node concept="3clFbS" id="70mku7uERGU" role="2VODD2">
+                                        <node concept="3clFbF" id="70mku7uERGV" role="3cqZAp">
+                                          <node concept="2OqwBi" id="70mku7uERGW" role="3clFbG">
+                                            <node concept="1iwH70" id="70mku7uERGX" role="2OqNvi">
+                                              <ref role="1iwH77" node="1dAqnm8I940" resolve="tableNodeFactory" />
+                                              <node concept="2OqwBi" id="70mku7uERGY" role="1iwH7V">
+                                                <node concept="3TrEf2" id="70mku7uERGZ" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="bnk3:1dAqnm8mI9a" resolve="cells" />
                                                 </node>
+                                                <node concept="30H73N" id="70mku7uERH0" role="2Oq$k0" />
                                               </node>
-                                              <node concept="1iwH7S" id="3olMEllt4gJ" role="2Oq$k0" />
                                             </node>
+                                            <node concept="1iwH7S" id="70mku7uERH1" role="2Oq$k0" />
                                           </node>
                                         </node>
                                       </node>
@@ -2093,146 +1962,146 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbF" id="1U60oYwBgDl" role="3cqZAp">
-                                <node concept="2OqwBi" id="1U60oYwBhSW" role="3clFbG">
-                                  <node concept="37vLTw" id="1U60oYwBgDk" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6eBFmDESI9i" resolve="childGrid" />
-                                  </node>
-                                  <node concept="liA8E" id="1U60oYwBk6p" role="2OqNvi">
-                                    <ref role="37wK5l" to="6dpw:7C0FR5AKAR8" resolve="setSpanX" />
-                                    <node concept="2YIFZM" id="1U60oYwIh51" role="37wK5m">
-                                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
-                                      <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                      <node concept="3cmrfG" id="1U60oYwIh9Z" role="37wK5m">
-                                        <property role="3cmrfH" value="1" />
+                            </node>
+                            <node concept="3clFbF" id="70mku7uERH2" role="3cqZAp">
+                              <node concept="2OqwBi" id="70mku7uERH3" role="3clFbG">
+                                <node concept="37vLTw" id="70mku7uERH4" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="70mku7uERGN" resolve="childGrid" />
+                                </node>
+                                <node concept="liA8E" id="70mku7uERH5" role="2OqNvi">
+                                  <ref role="37wK5l" to="6dpw:7C0FR5AKAR8" resolve="setSpanX" />
+                                  <node concept="2YIFZM" id="70mku7uERH6" role="37wK5m">
+                                    <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
+                                    <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                                    <node concept="3cmrfG" id="70mku7uERH7" role="37wK5m">
+                                      <property role="3cmrfH" value="1" />
+                                    </node>
+                                    <node concept="2OqwBi" id="70mku7uERH8" role="37wK5m">
+                                      <node concept="37vLTw" id="70mku7uERH9" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="70mku7uERF8" resolve="grid" />
                                       </node>
-                                      <node concept="2OqwBi" id="1U60oYwBkkC" role="37wK5m">
-                                        <node concept="37vLTw" id="1U60oYwBkaY" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1U60oYwAYe$" resolve="grid" />
-                                        </node>
-                                        <node concept="liA8E" id="1U60oYwBltC" role="2OqNvi">
-                                          <ref role="37wK5l" to="6dpw:3jHPIDnLUUW" resolve="getColumnHeadersSizeX" />
-                                        </node>
+                                      <node concept="liA8E" id="70mku7uERHa" role="2OqNvi">
+                                        <ref role="37wK5l" to="6dpw:3jHPIDnLUUW" resolve="getColumnHeadersSizeX" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbF" id="1U60oYwBnfH" role="3cqZAp">
-                                <node concept="2OqwBi" id="1U60oYwBoxc" role="3clFbG">
-                                  <node concept="37vLTw" id="1U60oYwBnfG" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6eBFmDESI9i" resolve="childGrid" />
-                                  </node>
-                                  <node concept="liA8E" id="1U60oYwBpFw" role="2OqNvi">
-                                    <ref role="37wK5l" to="6dpw:7C0FR5AKARf" resolve="setSpanY" />
-                                    <node concept="2YIFZM" id="1U60oYwIioO" role="37wK5m">
-                                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
-                                      <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                      <node concept="3cmrfG" id="1U60oYwIitM" role="37wK5m">
-                                        <property role="3cmrfH" value="1" />
+                            </node>
+                            <node concept="3clFbF" id="70mku7uERHb" role="3cqZAp">
+                              <node concept="2OqwBi" id="70mku7uERHc" role="3clFbG">
+                                <node concept="37vLTw" id="70mku7uERHd" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="70mku7uERGN" resolve="childGrid" />
+                                </node>
+                                <node concept="liA8E" id="70mku7uERHe" role="2OqNvi">
+                                  <ref role="37wK5l" to="6dpw:7C0FR5AKARf" resolve="setSpanY" />
+                                  <node concept="2YIFZM" id="70mku7uERHf" role="37wK5m">
+                                    <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
+                                    <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                                    <node concept="3cmrfG" id="70mku7uERHg" role="37wK5m">
+                                      <property role="3cmrfH" value="1" />
+                                    </node>
+                                    <node concept="2OqwBi" id="70mku7uERHh" role="37wK5m">
+                                      <node concept="37vLTw" id="70mku7uERHi" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="70mku7uERF8" resolve="grid" />
                                       </node>
-                                      <node concept="2OqwBi" id="1U60oYwBpWk" role="37wK5m">
-                                        <node concept="37vLTw" id="1U60oYwBpK5" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1U60oYwAYe$" resolve="grid" />
-                                        </node>
-                                        <node concept="liA8E" id="1U60oYwBrBU" role="2OqNvi">
-                                          <ref role="37wK5l" to="6dpw:3jHPIDnMh7$" resolve="getRowHeadersSizeY" />
-                                        </node>
+                                      <node concept="liA8E" id="70mku7uERHj" role="2OqNvi">
+                                        <ref role="37wK5l" to="6dpw:3jHPIDnMh7$" resolve="getRowHeadersSizeY" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbF" id="1U60oYwBtro" role="3cqZAp">
-                                <node concept="2OqwBi" id="1U60oYwBub$" role="3clFbG">
-                                  <node concept="37vLTw" id="1U60oYwBtrn" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1U60oYwAYe$" resolve="grid" />
+                            </node>
+                            <node concept="3clFbF" id="70mku7uERHk" role="3cqZAp">
+                              <node concept="2OqwBi" id="70mku7uERHl" role="3clFbG">
+                                <node concept="37vLTw" id="70mku7uERHm" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="70mku7uERF8" resolve="grid" />
+                                </node>
+                                <node concept="liA8E" id="70mku7uERHn" role="2OqNvi">
+                                  <ref role="37wK5l" to="6dpw:4UkcdCtPsZI" resolve="setElement" />
+                                  <node concept="3cmrfG" id="70mku7uERHo" role="37wK5m">
+                                    <property role="3cmrfH" value="0" />
                                   </node>
-                                  <node concept="liA8E" id="1U60oYwBw7O" role="2OqNvi">
-                                    <ref role="37wK5l" to="6dpw:4UkcdCtPsZI" resolve="setElement" />
-                                    <node concept="3cmrfG" id="1U60oYwBwrR" role="37wK5m">
-                                      <property role="3cmrfH" value="0" />
-                                    </node>
-                                    <node concept="3cmrfG" id="1U60oYwBwyp" role="37wK5m">
-                                      <property role="3cmrfH" value="0" />
-                                    </node>
-                                    <node concept="37vLTw" id="2c3czgpsYYr" role="37wK5m">
-                                      <ref role="3cqZAo" node="6eBFmDESI9i" resolve="childGrid" />
-                                    </node>
+                                  <node concept="3cmrfG" id="70mku7uERHp" role="37wK5m">
+                                    <property role="3cmrfH" value="0" />
+                                  </node>
+                                  <node concept="37vLTw" id="70mku7uERHq" role="37wK5m">
+                                    <ref role="3cqZAo" node="70mku7uERGN" resolve="childGrid" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="1U60oYwBrHa" role="3cqZAp" />
-                              <node concept="3clFbF" id="63X$F8P1TJw" role="3cqZAp">
-                                <node concept="37vLTI" id="63X$F8P1TJy" role="3clFbG">
-                                  <node concept="2ShNRf" id="1dAqnm8$E88" role="37vLTx">
-                                    <node concept="1pGfFk" id="1dAqnm8$Elo" role="2ShVmc">
-                                      <ref role="37wK5l" to="hm5v:5ivXze3d0z2" resolve="TableEditor" />
-                                      <node concept="37vLTw" id="1dAqnm8$Ey2" role="37wK5m">
-                                        <ref role="3cqZAo" node="1dAqnm8tX5H" resolve="editorContext" />
-                                      </node>
-                                      <node concept="37vLTw" id="1dAqnm8$EIV" role="37wK5m">
-                                        <ref role="3cqZAo" node="1dAqnm8tX5L" resolve="node" />
-                                      </node>
-                                      <node concept="37vLTw" id="1U60oYwB7rk" role="37wK5m">
-                                        <ref role="3cqZAo" node="1U60oYwAYe$" resolve="grid" />
-                                      </node>
-                                      <node concept="2ShNRf" id="5ivXze3d5Zf" role="37wK5m">
-                                        <node concept="YeOm9" id="5ivXze3d862" role="2ShVmc">
-                                          <node concept="1Y3b0j" id="5ivXze3d865" role="YeSDq">
-                                            <property role="2bfB8j" value="true" />
-                                            <ref role="1Y3XeK" to="hm5v:5ivXze3cgBY" resolve="IGridPostprocessor" />
-                                            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                                            <node concept="3Tm1VV" id="5ivXze3d866" role="1B3o_S" />
-                                            <node concept="3clFb_" id="5ivXze3d867" role="jymVt">
-                                              <property role="1EzhhJ" value="false" />
-                                              <property role="TrG5h" value="postprocess" />
-                                              <node concept="37vLTG" id="5ivXze3d868" role="3clF46">
-                                                <property role="TrG5h" value="grid" />
-                                                <node concept="3uibUv" id="5ivXze3d869" role="1tU5fm">
-                                                  <ref role="3uigEE" to="6dpw:RywcYwuy7j" resolve="ITableGrid" />
-                                                </node>
-                                              </node>
-                                              <node concept="37vLTG" id="5ivXze3d86a" role="3clF46">
-                                                <property role="TrG5h" value="node" />
-                                                <node concept="3Tqbb2" id="5ivXze3d86b" role="1tU5fm" />
+                            </node>
+                            <node concept="3clFbH" id="70mku7uERHr" role="3cqZAp" />
+                            <node concept="3clFbF" id="70mku7uLs3I" role="3cqZAp">
+                              <node concept="37vLTI" id="70mku7uLs3K" role="3clFbG">
+                                <node concept="2ShNRf" id="70mku7uERHu" role="37vLTx">
+                                  <node concept="1pGfFk" id="70mku7uERHv" role="2ShVmc">
+                                    <ref role="37wK5l" to="hm5v:5ivXze3d0z2" resolve="TableEditor" />
+                                    <node concept="37vLTw" id="70mku7uERHw" role="37wK5m">
+                                      <ref role="3cqZAo" node="1dAqnm8tX5H" resolve="editorContext" />
+                                    </node>
+                                    <node concept="37vLTw" id="70mku7uERHx" role="37wK5m">
+                                      <ref role="3cqZAo" node="1dAqnm8tX5L" resolve="node" />
+                                    </node>
+                                    <node concept="37vLTw" id="70mku7uERHy" role="37wK5m">
+                                      <ref role="3cqZAo" node="70mku7uERF8" resolve="grid" />
+                                    </node>
+                                    <node concept="2ShNRf" id="70mku7uERHz" role="37wK5m">
+                                      <node concept="YeOm9" id="70mku7uERH$" role="2ShVmc">
+                                        <node concept="1Y3b0j" id="70mku7uERH_" role="YeSDq">
+                                          <property role="2bfB8j" value="true" />
+                                          <ref role="1Y3XeK" to="hm5v:5ivXze3cgBY" resolve="IGridPostprocessor" />
+                                          <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                                          <node concept="3Tm1VV" id="70mku7uERHA" role="1B3o_S" />
+                                          <node concept="3clFb_" id="70mku7uERHB" role="jymVt">
+                                            <property role="1EzhhJ" value="false" />
+                                            <property role="TrG5h" value="postprocess" />
+                                            <node concept="37vLTG" id="70mku7uERHC" role="3clF46">
+                                              <property role="TrG5h" value="grid" />
+                                              <node concept="3uibUv" id="70mku7uERHD" role="1tU5fm">
+                                                <ref role="3uigEE" to="6dpw:RywcYwuy7j" resolve="ITableGrid" />
                                               </node>
-                                              <node concept="37vLTG" id="5ivXze3d86c" role="3clF46">
-                                                <property role="TrG5h" value="editorContext" />
-                                                <node concept="3uibUv" id="5ivXze3d86d" role="1tU5fm">
-                                                  <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-                                                </node>
+                                            </node>
+                                            <node concept="37vLTG" id="70mku7uERHE" role="3clF46">
+                                              <property role="TrG5h" value="node" />
+                                              <node concept="3Tqbb2" id="70mku7uERHF" role="1tU5fm" />
+                                            </node>
+                                            <node concept="37vLTG" id="70mku7uERHG" role="3clF46">
+                                              <property role="TrG5h" value="editorContext" />
+                                              <node concept="3uibUv" id="70mku7uERHH" role="1tU5fm">
+                                                <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
                                               </node>
-                                              <node concept="37vLTG" id="5ivXze3d86e" role="3clF46">
-                                                <property role="TrG5h" value="substituteInfoFactory" />
-                                                <node concept="3uibUv" id="5ivXze3d86f" role="1tU5fm">
-                                                  <ref role="3uigEE" to="18rm:lPJxik8PkQ" resolve="SubstituteInfoFactory" />
-                                                </node>
+                                            </node>
+                                            <node concept="37vLTG" id="70mku7uERHI" role="3clF46">
+                                              <property role="TrG5h" value="substituteInfoFactory" />
+                                              <node concept="3uibUv" id="70mku7uERHJ" role="1tU5fm">
+                                                <ref role="3uigEE" to="18rm:lPJxik8PkQ" resolve="SubstituteInfoFactory" />
                                               </node>
-                                              <node concept="3cqZAl" id="5ivXze3d86g" role="3clF45" />
-                                              <node concept="3Tm1VV" id="5ivXze3d86h" role="1B3o_S" />
-                                              <node concept="3clFbS" id="5ivXze3d86j" role="3clF47">
-                                                <node concept="3clFbH" id="5ivXze3d8Lw" role="3cqZAp">
-                                                  <node concept="2b32R4" id="5ivXze3d8Ma" role="lGtFl">
-                                                    <node concept="3JmXsc" id="5ivXze3d8Md" role="2P8S$">
-                                                      <node concept="3clFbS" id="5ivXze3d8Me" role="2VODD2">
-                                                        <node concept="3clFbF" id="5ivXze3d8WN" role="3cqZAp">
-                                                          <node concept="2OqwBi" id="5ivXze3d9Wt" role="3clFbG">
-                                                            <node concept="2OqwBi" id="5ivXze3d9tJ" role="2Oq$k0">
-                                                              <node concept="2OqwBi" id="5ivXze3d90S" role="2Oq$k0">
-                                                                <node concept="30H73N" id="5ivXze3d8WM" role="2Oq$k0" />
-                                                                <node concept="3TrEf2" id="5ivXze3d9g9" role="2OqNvi">
-                                                                  <ref role="3Tt5mk" to="bnk3:5ivXze3ceBe" resolve="gridPostprocessor" />
-                                                                </node>
-                                                              </node>
-                                                              <node concept="3TrEf2" id="5ivXze3d9Eq" role="2OqNvi">
-                                                                <ref role="3Tt5mk" to="tpee:gyVODHa" resolve="body" />
+                                            </node>
+                                            <node concept="3cqZAl" id="70mku7uERHK" role="3clF45" />
+                                            <node concept="3Tm1VV" id="70mku7uERHL" role="1B3o_S" />
+                                            <node concept="3clFbS" id="70mku7uERHM" role="3clF47">
+                                              <node concept="3clFbH" id="70mku7uERHN" role="3cqZAp">
+                                                <node concept="2b32R4" id="70mku7uERHO" role="lGtFl">
+                                                  <node concept="3JmXsc" id="70mku7uERHP" role="2P8S$">
+                                                    <node concept="3clFbS" id="70mku7uERHQ" role="2VODD2">
+                                                      <node concept="3clFbF" id="70mku7uERHR" role="3cqZAp">
+                                                        <node concept="2OqwBi" id="70mku7uERHS" role="3clFbG">
+                                                          <node concept="2OqwBi" id="70mku7uERHT" role="2Oq$k0">
+                                                            <node concept="2OqwBi" id="70mku7uERHU" role="2Oq$k0">
+                                                              <node concept="30H73N" id="70mku7uERHV" role="2Oq$k0" />
+                                                              <node concept="3TrEf2" id="70mku7uERHW" role="2OqNvi">
+                                                                <ref role="3Tt5mk" to="bnk3:5ivXze3ceBe" resolve="gridPostprocessor" />
                                                               </node>
                                                             </node>
-                                                            <node concept="3Tsc0h" id="5ivXze3dal4" role="2OqNvi">
-                                                              <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                                                            <node concept="3TrEf2" id="70mku7uERHX" role="2OqNvi">
+                                                              <ref role="3Tt5mk" to="tpee:gyVODHa" resolve="body" />
                                                             </node>
                                                           </node>
+                                                          <node concept="3Tsc0h" id="70mku7uERHY" role="2OqNvi">
+                                                            <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                                                          </node>
                                                         </node>
                                                       </node>
                                                     </node>
@@ -2242,19 +2111,19 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="1W57fq" id="5ivXze3dcSA" role="lGtFl">
-                                          <node concept="3IZrLx" id="5ivXze3dcSC" role="3IZSJc">
-                                            <node concept="3clFbS" id="5ivXze3dcSE" role="2VODD2">
-                                              <node concept="3clFbF" id="5ivXze3ddKB" role="3cqZAp">
-                                                <node concept="2OqwBi" id="5ivXze3dfiB" role="3clFbG">
-                                                  <node concept="2OqwBi" id="5ivXze3de6W" role="2Oq$k0">
-                                                    <node concept="30H73N" id="5ivXze3ddKA" role="2Oq$k0" />
-                                                    <node concept="3TrEf2" id="5ivXze3deEB" role="2OqNvi">
-                                                      <ref role="3Tt5mk" to="bnk3:5ivXze3ceBe" resolve="gridPostprocessor" />
-                                                    </node>
+                                      </node>
+                                      <node concept="1W57fq" id="70mku7uERHZ" role="lGtFl">
+                                        <node concept="3IZrLx" id="70mku7uERI0" role="3IZSJc">
+                                          <node concept="3clFbS" id="70mku7uERI1" role="2VODD2">
+                                            <node concept="3clFbF" id="70mku7uERI2" role="3cqZAp">
+                                              <node concept="2OqwBi" id="70mku7uERI3" role="3clFbG">
+                                                <node concept="2OqwBi" id="70mku7uERI4" role="2Oq$k0">
+                                                  <node concept="30H73N" id="70mku7uERI5" role="2Oq$k0" />
+                                                  <node concept="3TrEf2" id="70mku7uERI6" role="2OqNvi">
+                                                    <ref role="3Tt5mk" to="bnk3:5ivXze3ceBe" resolve="gridPostprocessor" />
                                                   </node>
-                                                  <node concept="3x8VRR" id="5ivXze3dfUD" role="2OqNvi" />
                                                 </node>
+                                                <node concept="3x8VRR" id="70mku7uERI7" role="2OqNvi" />
                                               </node>
                                             </node>
                                           </node>
@@ -2262,222 +2131,215 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="37vLTw" id="63X$F8P1TJA" role="37vLTJ">
-                                    <ref role="3cqZAo" node="1dAqnm8$DVo" resolve="editorCell" />
-                                  </node>
                                 </node>
+                                <node concept="37vLTw" id="70mku7uLs3O" role="37vLTJ">
+                                  <ref role="3cqZAo" node="70mku7uEREZ" resolve="editorCell" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3cpWs8" id="70mku7uERI9" role="3cqZAp">
+                              <node concept="3cpWsn" id="70mku7uERIa" role="3cpWs9">
+                                <property role="TrG5h" value="i" />
+                                <node concept="10Oyi0" id="70mku7uERIb" role="1tU5fm" />
+                              </node>
+                              <node concept="5jKBG" id="70mku7uERIc" role="lGtFl">
+                                <ref role="v9R2y" to="tpc3:4v1iCryNDHi" resolve="template_cellSetupBlock" />
                               </node>
-                              <node concept="3cpWs8" id="1dAqnm8tX5x" role="3cqZAp">
-                                <node concept="3cpWsn" id="1dAqnm8tX5y" role="3cpWs9">
-                                  <property role="TrG5h" value="i" />
-                                  <node concept="10Oyi0" id="1dAqnm8tX5z" role="1tU5fm" />
+                            </node>
+                            <node concept="3cpWs8" id="70mku7uERId" role="3cqZAp">
+                              <node concept="3cpWsn" id="70mku7uERIe" role="3cpWs9">
+                                <property role="TrG5h" value="factory" />
+                                <node concept="3uibUv" id="70mku7uERIf" role="1tU5fm">
+                                  <ref role="3uigEE" to="oghc:7AHcygoqpzC" resolve="ITableStyleFactory" />
                                 </node>
-                                <node concept="5jKBG" id="6hpM9fmFEbe" role="lGtFl">
-                                  <ref role="v9R2y" to="tpc3:4v1iCryNDHi" resolve="template_cellSetupBlock" />
+                                <node concept="2ShNRf" id="70mku7uERIg" role="33vP2m">
+                                  <node concept="HV5vD" id="70mku7uERIh" role="2ShVmc">
+                                    <ref role="HV5vE" to="oghc:7AHcygoswPK" resolve="TableStyleFactoryDummy" />
+                                  </node>
+                                  <node concept="5jKBG" id="70mku7uERIi" role="lGtFl">
+                                    <ref role="v9R2y" node="4UkcdCuFKlk" resolve="reduce_IStylable" />
+                                  </node>
                                 </node>
                               </node>
-                              <node concept="3cpWs8" id="25DLT7wc7XP" role="3cqZAp">
-                                <node concept="3cpWsn" id="25DLT7wc7XQ" role="3cpWs9">
-                                  <property role="TrG5h" value="factory" />
-                                  <node concept="3uibUv" id="25DLT7wc7XR" role="1tU5fm">
-                                    <ref role="3uigEE" to="oghc:7AHcygoqpzC" resolve="ITableStyleFactory" />
+                            </node>
+                            <node concept="3clFbF" id="70mku7uERIj" role="3cqZAp">
+                              <node concept="2OqwBi" id="70mku7uERIk" role="3clFbG">
+                                <node concept="2OqwBi" id="70mku7uERIl" role="2Oq$k0">
+                                  <node concept="37vLTw" id="70mku7uERIm" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="70mku7uEREZ" resolve="editorCell" />
                                   </node>
-                                  <node concept="2ShNRf" id="25DLT7wkdrW" role="33vP2m">
-                                    <node concept="HV5vD" id="25DLT7wkdrX" role="2ShVmc">
-                                      <ref role="HV5vE" to="oghc:7AHcygoswPK" resolve="TableStyleFactoryDummy" />
-                                    </node>
-                                    <node concept="5jKBG" id="25DLT7wkdrY" role="lGtFl">
-                                      <ref role="v9R2y" node="4UkcdCuFKlk" resolve="reduce_IStylable" />
-                                    </node>
+                                  <node concept="liA8E" id="70mku7uERIn" role="2OqNvi">
+                                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getStyle()" resolve="getStyle" />
                                   </node>
                                 </node>
-                              </node>
-                              <node concept="3clFbF" id="25DLT7w7RLT" role="3cqZAp">
-                                <node concept="2OqwBi" id="25DLT7w81xA" role="3clFbG">
-                                  <node concept="2OqwBi" id="25DLT7w7Vlz" role="2Oq$k0">
-                                    <node concept="37vLTw" id="25DLT7w7RLR" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1dAqnm8$DVo" resolve="editorCell" />
-                                    </node>
-                                    <node concept="liA8E" id="25DLT7w7ZqS" role="2OqNvi">
-                                      <ref role="37wK5l" to="g51k:~EditorCell_Basic.getStyle()" resolve="getStyle" />
+                                <node concept="liA8E" id="70mku7uERIo" role="2OqNvi">
+                                  <ref role="37wK5l" to="hox0:~Style.putAll(jetbrains.mps.openapi.editor.style.Style)" resolve="putAll" />
+                                  <node concept="2OqwBi" id="70mku7uERIp" role="37wK5m">
+                                    <node concept="37vLTw" id="70mku7uERIq" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="70mku7uERIe" resolve="factory" />
                                     </node>
-                                  </node>
-                                  <node concept="liA8E" id="25DLT7w857t" role="2OqNvi">
-                                    <ref role="37wK5l" to="hox0:~Style.putAll(jetbrains.mps.openapi.editor.style.Style)" resolve="putAll" />
-                                    <node concept="2OqwBi" id="25DLT7wcmGC" role="37wK5m">
-                                      <node concept="37vLTw" id="25DLT7wclD8" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="25DLT7wc7XQ" resolve="factory" />
+                                    <node concept="liA8E" id="70mku7uERIr" role="2OqNvi">
+                                      <ref role="37wK5l" to="oghc:7AHcygoqpVD" resolve="createStyle" />
+                                      <node concept="3cmrfG" id="70mku7uERIs" role="37wK5m">
+                                        <property role="3cmrfH" value="0" />
                                       </node>
-                                      <node concept="liA8E" id="25DLT7wcnSu" role="2OqNvi">
-                                        <ref role="37wK5l" to="oghc:7AHcygoqpVD" resolve="createStyle" />
-                                        <node concept="3cmrfG" id="25DLT7wcoMk" role="37wK5m">
-                                          <property role="3cmrfH" value="0" />
-                                        </node>
-                                        <node concept="3cmrfG" id="25DLT7wctfu" role="37wK5m">
-                                          <property role="3cmrfH" value="0" />
-                                        </node>
+                                      <node concept="3cmrfG" id="70mku7uERIt" role="37wK5m">
+                                        <property role="3cmrfH" value="0" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbF" id="1dAqnm8tX5_" role="3cqZAp">
-                                <node concept="5jKBG" id="1dAqnm8tX5A" role="lGtFl">
-                                  <ref role="v9R2y" to="tpc3:5t2DUc51aVQ" resolve="template_cellSetSubstituteInfo" />
+                            </node>
+                            <node concept="3clFbF" id="70mku7uERIu" role="3cqZAp">
+                              <node concept="5jKBG" id="70mku7uERIv" role="lGtFl">
+                                <ref role="v9R2y" to="tpc3:5t2DUc51aVQ" resolve="template_cellSetSubstituteInfo" />
+                              </node>
+                              <node concept="2OqwBi" id="70mku7uERIw" role="3clFbG">
+                                <node concept="liA8E" id="70mku7uERIx" role="2OqNvi">
+                                  <ref role="37wK5l" to="g51k:~EditorCell_Collection.setSubstituteInfo(jetbrains.mps.openapi.editor.cells.SubstituteInfo)" resolve="setSubstituteInfo" />
+                                  <node concept="10Nm6u" id="70mku7uERIy" role="37wK5m" />
                                 </node>
-                                <node concept="2OqwBi" id="1dAqnm8tX5B" role="3clFbG">
-                                  <node concept="liA8E" id="1dAqnm8tX5C" role="2OqNvi">
-                                    <ref role="37wK5l" to="g51k:~EditorCell_Collection.setSubstituteInfo(jetbrains.mps.openapi.editor.cells.SubstituteInfo)" resolve="setSubstituteInfo" />
-                                    <node concept="10Nm6u" id="1dAqnm8tX5D" role="37wK5m" />
-                                  </node>
-                                  <node concept="37vLTw" id="1dAqnm8tX5E" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1dAqnm8$DVo" resolve="editorCell" />
-                                  </node>
+                                <node concept="37vLTw" id="70mku7uERIz" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="70mku7uEREZ" resolve="editorCell" />
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="BILoO2LKx4" role="3cqZAp" />
-                              <node concept="3clFbF" id="m_yL2MJq5R" role="3cqZAp">
-                                <node concept="2OqwBi" id="m_yL2MJs_r" role="3clFbG">
-                                  <node concept="37vLTw" id="m_yL2MJq5P" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1dAqnm8$DVo" resolve="editorCell" />
-                                  </node>
-                                  <node concept="liA8E" id="m_yL2MJwla" role="2OqNvi">
-                                    <ref role="37wK5l" to="hm5v:m_yL2MICN7" resolve="disableLeftRowEndCells" />
-                                    <node concept="3clFbT" id="m_yL2MJy80" role="37wK5m">
-                                      <property role="3clFbU" value="true" />
-                                    </node>
+                            </node>
+                            <node concept="3clFbH" id="70mku7uERI$" role="3cqZAp" />
+                            <node concept="3clFbF" id="70mku7uERI_" role="3cqZAp">
+                              <node concept="2OqwBi" id="70mku7uERIA" role="3clFbG">
+                                <node concept="37vLTw" id="70mku7uERIB" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="70mku7uEREZ" resolve="editorCell" />
+                                </node>
+                                <node concept="liA8E" id="70mku7uERIC" role="2OqNvi">
+                                  <ref role="37wK5l" to="hm5v:m_yL2MICN7" resolve="disableLeftRowEndCells" />
+                                  <node concept="3clFbT" id="70mku7uERID" role="37wK5m">
+                                    <property role="3clFbU" value="true" />
                                   </node>
                                 </node>
-                                <node concept="1W57fq" id="m_yL2MJCQZ" role="lGtFl">
-                                  <node concept="3IZrLx" id="m_yL2MJCR0" role="3IZSJc">
-                                    <node concept="3clFbS" id="m_yL2MJCR1" role="2VODD2">
-                                      <node concept="3clFbF" id="m_yL2MJFxS" role="3cqZAp">
-                                        <node concept="2OqwBi" id="m_yL2MJGrT" role="3clFbG">
-                                          <node concept="30H73N" id="m_yL2MJFxR" role="2Oq$k0" />
-                                          <node concept="3TrcHB" id="m_yL2MJJ$C" role="2OqNvi">
-                                            <ref role="3TsBF5" to="bnk3:m_yL2MI1K9" resolve="disableLeftRowEndCells" />
-                                          </node>
+                              </node>
+                              <node concept="1W57fq" id="70mku7uERIE" role="lGtFl">
+                                <node concept="3IZrLx" id="70mku7uERIF" role="3IZSJc">
+                                  <node concept="3clFbS" id="70mku7uERIG" role="2VODD2">
+                                    <node concept="3clFbF" id="70mku7uERIH" role="3cqZAp">
+                                      <node concept="2OqwBi" id="70mku7uERII" role="3clFbG">
+                                        <node concept="30H73N" id="70mku7uERIJ" role="2Oq$k0" />
+                                        <node concept="3TrcHB" id="70mku7uERIK" role="2OqNvi">
+                                          <ref role="3TsBF5" to="bnk3:m_yL2MI1K9" resolve="disableLeftRowEndCells" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbF" id="m_yL2MJzPp" role="3cqZAp">
-                                <node concept="2OqwBi" id="m_yL2MJzPq" role="3clFbG">
-                                  <node concept="37vLTw" id="m_yL2MJzPr" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1dAqnm8$DVo" resolve="editorCell" />
-                                  </node>
-                                  <node concept="liA8E" id="m_yL2MJzPs" role="2OqNvi">
-                                    <ref role="37wK5l" to="hm5v:m_yL2MJ3re" resolve="disableRightRowEndCells" />
-                                    <node concept="3clFbT" id="m_yL2MJzPt" role="37wK5m">
-                                      <property role="3clFbU" value="true" />
-                                    </node>
+                            </node>
+                            <node concept="3clFbF" id="70mku7uERIL" role="3cqZAp">
+                              <node concept="2OqwBi" id="70mku7uERIM" role="3clFbG">
+                                <node concept="37vLTw" id="70mku7uERIN" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="70mku7uEREZ" resolve="editorCell" />
+                                </node>
+                                <node concept="liA8E" id="70mku7uERIO" role="2OqNvi">
+                                  <ref role="37wK5l" to="hm5v:m_yL2MJ3re" resolve="disableRightRowEndCells" />
+                                  <node concept="3clFbT" id="70mku7uERIP" role="37wK5m">
+                                    <property role="3clFbU" value="true" />
                                   </node>
                                 </node>
-                                <node concept="1W57fq" id="m_yL2MJNGo" role="lGtFl">
-                                  <node concept="3IZrLx" id="m_yL2MJNGp" role="3IZSJc">
-                                    <node concept="3clFbS" id="m_yL2MJNGq" role="2VODD2">
-                                      <node concept="3clFbF" id="m_yL2MJRgF" role="3cqZAp">
-                                        <node concept="2OqwBi" id="m_yL2MJSdk" role="3clFbG">
-                                          <node concept="30H73N" id="m_yL2MJRgE" role="2Oq$k0" />
-                                          <node concept="3TrcHB" id="m_yL2MJVpN" role="2OqNvi">
-                                            <ref role="3TsBF5" to="bnk3:m_yL2MI1Kc" resolve="disableRightRowEndCells" />
-                                          </node>
+                              </node>
+                              <node concept="1W57fq" id="70mku7uERIQ" role="lGtFl">
+                                <node concept="3IZrLx" id="70mku7uERIR" role="3IZSJc">
+                                  <node concept="3clFbS" id="70mku7uERIS" role="2VODD2">
+                                    <node concept="3clFbF" id="70mku7uERIT" role="3cqZAp">
+                                      <node concept="2OqwBi" id="70mku7uERIU" role="3clFbG">
+                                        <node concept="30H73N" id="70mku7uERIV" role="2Oq$k0" />
+                                        <node concept="3TrcHB" id="70mku7uERIW" role="2OqNvi">
+                                          <ref role="3TsBF5" to="bnk3:m_yL2MI1Kc" resolve="disableRightRowEndCells" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbF" id="7DPEkiwN2f5" role="3cqZAp">
-                                <node concept="2OqwBi" id="7DPEkiwN2f6" role="3clFbG">
-                                  <node concept="37vLTw" id="7DPEkiwN2f7" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1dAqnm8$DVo" resolve="editorCell" />
-                                  </node>
-                                  <node concept="liA8E" id="7DPEkiwN2f8" role="2OqNvi">
-                                    <ref role="37wK5l" to="hm5v:7DPEkiwMAV0" resolve="toggleRowUIActions" />
-                                    <node concept="3clFbT" id="7DPEkiwN2f9" role="37wK5m">
-                                      <property role="3clFbU" value="true" />
-                                    </node>
+                            </node>
+                            <node concept="3clFbF" id="70mku7uERIX" role="3cqZAp">
+                              <node concept="2OqwBi" id="70mku7uERIY" role="3clFbG">
+                                <node concept="37vLTw" id="70mku7uERIZ" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="70mku7uEREZ" resolve="editorCell" />
+                                </node>
+                                <node concept="liA8E" id="70mku7uERJ0" role="2OqNvi">
+                                  <ref role="37wK5l" to="hm5v:7DPEkiwMAV0" resolve="toggleRowUIActions" />
+                                  <node concept="3clFbT" id="70mku7uERJ1" role="37wK5m">
+                                    <property role="3clFbU" value="true" />
                                   </node>
                                 </node>
-                                <node concept="1W57fq" id="7DPEkiwN2fa" role="lGtFl">
-                                  <node concept="3IZrLx" id="7DPEkiwN2fb" role="3IZSJc">
-                                    <node concept="3clFbS" id="7DPEkiwN2fc" role="2VODD2">
-                                      <node concept="3clFbF" id="7DPEkiwN2fd" role="3cqZAp">
-                                        <node concept="2OqwBi" id="7DPEkiwN2fe" role="3clFbG">
-                                          <node concept="30H73N" id="7DPEkiwN2ff" role="2Oq$k0" />
-                                          <node concept="3TrcHB" id="7DPEkiwN2fg" role="2OqNvi">
-                                            <ref role="3TsBF5" to="bnk3:7DPEkiwMTk_" resolve="rowUIActions" />
-                                          </node>
+                              </node>
+                              <node concept="1W57fq" id="70mku7uERJ2" role="lGtFl">
+                                <node concept="3IZrLx" id="70mku7uERJ3" role="3IZSJc">
+                                  <node concept="3clFbS" id="70mku7uERJ4" role="2VODD2">
+                                    <node concept="3clFbF" id="70mku7uERJ5" role="3cqZAp">
+                                      <node concept="2OqwBi" id="70mku7uERJ6" role="3clFbG">
+                                        <node concept="30H73N" id="70mku7uERJ7" role="2Oq$k0" />
+                                        <node concept="3TrcHB" id="70mku7uERJ8" role="2OqNvi">
+                                          <ref role="3TsBF5" to="bnk3:7DPEkiwMTk_" resolve="rowUIActions" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbF" id="56WqtlUhPyP" role="3cqZAp">
-                                <node concept="2OqwBi" id="56WqtlUhPyQ" role="3clFbG">
-                                  <node concept="37vLTw" id="56WqtlUhPyR" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1dAqnm8$DVo" resolve="editorCell" />
-                                  </node>
-                                  <node concept="liA8E" id="56WqtlUhPyS" role="2OqNvi">
-                                    <ref role="37wK5l" to="hm5v:56WqtlUgQQZ" resolve="toggleColumnUIActions" />
-                                    <node concept="3clFbT" id="56WqtlUhPyT" role="37wK5m">
-                                      <property role="3clFbU" value="true" />
-                                    </node>
+                            </node>
+                            <node concept="3clFbF" id="70mku7uERJ9" role="3cqZAp">
+                              <node concept="2OqwBi" id="70mku7uERJa" role="3clFbG">
+                                <node concept="37vLTw" id="70mku7uERJb" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="70mku7uEREZ" resolve="editorCell" />
+                                </node>
+                                <node concept="liA8E" id="70mku7uERJc" role="2OqNvi">
+                                  <ref role="37wK5l" to="hm5v:56WqtlUgQQZ" resolve="toggleColumnUIActions" />
+                                  <node concept="3clFbT" id="70mku7uERJd" role="37wK5m">
+                                    <property role="3clFbU" value="true" />
                                   </node>
                                 </node>
-                                <node concept="1W57fq" id="56WqtlUhPyU" role="lGtFl">
-                                  <node concept="3IZrLx" id="56WqtlUhPyV" role="3IZSJc">
-                                    <node concept="3clFbS" id="56WqtlUhPyW" role="2VODD2">
-                                      <node concept="3clFbF" id="56WqtlUhPyX" role="3cqZAp">
-                                        <node concept="2OqwBi" id="56WqtlUhPyY" role="3clFbG">
-                                          <node concept="30H73N" id="56WqtlUhPyZ" role="2Oq$k0" />
-                                          <node concept="3TrcHB" id="56WqtlUhPz0" role="2OqNvi">
-                                            <ref role="3TsBF5" to="bnk3:56WqtlUgrAs" resolve="columnUIActions" />
-                                          </node>
+                              </node>
+                              <node concept="1W57fq" id="70mku7uERJe" role="lGtFl">
+                                <node concept="3IZrLx" id="70mku7uERJf" role="3IZSJc">
+                                  <node concept="3clFbS" id="70mku7uERJg" role="2VODD2">
+                                    <node concept="3clFbF" id="70mku7uERJh" role="3cqZAp">
+                                      <node concept="2OqwBi" id="70mku7uERJi" role="3clFbG">
+                                        <node concept="30H73N" id="70mku7uERJj" role="2Oq$k0" />
+                                        <node concept="3TrcHB" id="70mku7uERJk" role="2OqNvi">
+                                          <ref role="3TsBF5" to="bnk3:56WqtlUgrAs" resolve="columnUIActions" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="m_yL2MJokU" role="3cqZAp" />
-                              <node concept="3clFbF" id="63X$F8P1Lj6" role="3cqZAp">
-                                <node concept="2OqwBi" id="63X$F8P1LMw" role="3clFbG">
-                                  <node concept="37vLTw" id="63X$F8P1Lj4" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1dAqnm8$DVo" resolve="editorCell" />
-                                  </node>
-                                  <node concept="liA8E" id="63X$F8P1MBw" role="2OqNvi">
-                                    <ref role="37wK5l" to="hm5v:1MCPN0ikrXv" resolve="init" />
-                                  </node>
-                                </node>
-                              </node>
                             </node>
-                            <node concept="1wplmZ" id="zy9odmedoY" role="1zxBo6">
-                              <node concept="3clFbS" id="2q4r_et8AbW" role="1wplMD">
-                                <node concept="3clFbF" id="2q4r_et8GwU" role="3cqZAp">
-                                  <node concept="2YIFZM" id="2q4r_et8G$k" role="3clFbG">
-                                    <ref role="37wK5l" to="hm5v:4td5AAzdgxL" resolve="popInstance" />
-                                    <ref role="1Pybhc" to="hm5v:6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-                                  </node>
+                            <node concept="3clFbF" id="70mku7uEyBc" role="3cqZAp">
+                              <node concept="2OqwBi" id="70mku7uEZXq" role="3clFbG">
+                                <node concept="37vLTw" id="70mku7uERJw" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="70mku7uEREZ" resolve="editorCell" />
                                 </node>
-                                <node concept="3clFbF" id="1362cT3er2M" role="3cqZAp">
-                                  <node concept="2YIFZM" id="1362cT3er6o" role="3clFbG">
-                                    <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
-                                    <ref role="37wK5l" to="hm5v:4MuW45D9IpH" resolve="popInstance" />
-                                    <node concept="3clFbT" id="4MuW45D9Q0U" role="37wK5m">
-                                      <property role="3clFbU" value="true" />
-                                    </node>
-                                  </node>
+                                <node concept="liA8E" id="70mku7uF3EV" role="2OqNvi">
+                                  <ref role="37wK5l" to="hm5v:1MCPN0ikrXv" resolve="init" />
                                 </node>
                               </node>
                             </node>
+                            <node concept="3cpWs6" id="70mku7uJMH_" role="3cqZAp">
+                              <node concept="37vLTw" id="70mku7uJNPp" role="3cqZAk">
+                                <ref role="3cqZAo" node="70mku7uEREZ" resolve="editorCell" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="37vLTw" id="70mku7uFrg6" role="37vLTJ">
+                        <ref role="3cqZAo" node="70mku7uEREZ" resolve="tableCell" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs6" id="70mku7uF6Nj" role="3cqZAp">
+                    <node concept="37vLTw" id="70mku7uF6Nl" role="3cqZAk">
+                      <ref role="3cqZAo" node="70mku7uEREZ" resolve="tableCell" />
                     </node>
                   </node>
                 </node>
@@ -2530,7 +2392,7 @@
           <node concept="3clFbH" id="63X$F8P1XJ0" role="3cqZAp" />
           <node concept="3cpWs6" id="63X$F8P1Yfr" role="3cqZAp">
             <node concept="37vLTw" id="63X$F8P1Z1L" role="3cqZAk">
-              <ref role="3cqZAo" node="1dAqnm8$DVo" resolve="editorCell" />
+              <ref role="3cqZAo" node="70mku7uEREZ" resolve="editorCell" />
             </node>
           </node>
           <node concept="3clFbH" id="2q4r_et8wha" role="3cqZAp" />
@@ -7486,35 +7348,19 @@
                   <node concept="3cpWs8" id="3olMEllIEWJ" role="3cqZAp">
                     <node concept="3cpWsn" id="3olMEllIEWK" role="3cpWs9">
                       <property role="TrG5h" value="cell" />
-                      <node concept="2OqwBi" id="3olMEllIEWL" role="33vP2m">
-                        <node concept="liA8E" id="3olMEllIEWM" role="2OqNvi">
-                          <ref role="37wK5l" to="22ra:~UpdateSession.updateChildNodeCell(org.jetbrains.mps.openapi.model.SNode)" resolve="updateChildNodeCell" />
-                          <node concept="2GrUjf" id="3olMEllIEWN" role="37wK5m">
-                            <ref role="2Gs0qQ" node="3olMEllIEWD" resolve="child" />
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="7wXnfGE5evD" role="2Oq$k0">
-                          <node concept="2OqwBi" id="7wXnfGE5cUc" role="2Oq$k0">
-                            <node concept="2OqwBi" id="7wXnfGE59ib" role="2Oq$k0">
-                              <node concept="37vLTw" id="3olMEllIEWO" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1dAqnm8VFHp" resolve="editorContext" />
-                              </node>
-                              <node concept="liA8E" id="7wXnfGE5ce6" role="2OqNvi">
-                                <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="7wXnfGE5dNz" role="2OqNvi">
-                              <ref role="37wK5l" to="cj4x:~EditorComponent.getUpdater()" resolve="getUpdater" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="7wXnfGE5fhn" role="2OqNvi">
-                            <ref role="37wK5l" to="22ra:~Updater.getCurrentUpdateSession()" resolve="getCurrentUpdateSession" />
-                          </node>
-                        </node>
-                      </node>
                       <node concept="3uibUv" id="3olMEllIEWP" role="1tU5fm">
                         <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
                       </node>
+                      <node concept="2YIFZM" id="70mku7u1ztf" role="33vP2m">
+                        <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
+                        <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+                        <node concept="37vLTw" id="70mku7u2bUl" role="37wK5m">
+                          <ref role="3cqZAo" node="1dAqnm8VFHp" resolve="editorContext" />
+                        </node>
+                        <node concept="2GrUjf" id="70mku7u2dqX" role="37wK5m">
+                          <ref role="2Gs0qQ" node="3olMEllIEWD" resolve="child" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                   <node concept="3clFbF" id="36rxy05P5X" role="3cqZAp">
@@ -7684,9 +7530,6 @@
                         <node concept="37vLTw" id="2q4r_et7QFQ" role="37wK5m">
                           <ref role="3cqZAo" node="3olMEllIEWK" resolve="cell" />
                         </node>
-                        <node concept="37vLTw" id="2q4r_et7QFR" role="37wK5m">
-                          <ref role="3cqZAo" node="3olMEllIEVJ" resolve="grid" />
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -8213,9 +8056,6 @@
                     <node concept="37vLTw" id="31k9kuOyURN" role="37wK5m">
                       <ref role="3cqZAo" node="DXnsYPDrT5" resolve="placeholder" />
                     </node>
-                    <node concept="37vLTw" id="31k9kuOyUVM" role="37wK5m">
-                      <ref role="3cqZAo" node="3olMEllIEVJ" resolve="grid" />
-                    </node>
                   </node>
                 </node>
               </node>
diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
index da672059a7..5b0fcbbabc 100644
--- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
+++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
@@ -69,6 +69,7 @@
     <import index="nivk" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.descriptor(MPS.Editor/)" />
     <import index="tpc2" ref="r:00000000-0000-4000-0000-011c8959029e(jetbrains.mps.lang.editor.structure)" />
     <import index="9p8b" ref="r:2a738fcb-23b4-4d1d-9f52-870528559e28(de.slisson.mps.tables.runtime.selection)" />
+    <import index="yj89" ref="r:8d3d20cd-e020-4a43-bff4-9aef982e4fb8(de.slisson.mps.tables.runtime.transactionalcells)" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -202,7 +203,9 @@
       <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
-      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
+      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
+        <child id="1214996921760" name="bound" index="3ztrMU" />
+      </concept>
       <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
         <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
       </concept>
@@ -315,6 +318,9 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="7024111702304501418" name="jetbrains.mps.baseLanguage.structure.AndAssignmentExpression" flags="nn" index="3vZ8ra" />
+      <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
+        <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
+      </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
       <concept id="1184950988562" name="jetbrains.mps.baseLanguage.structure.ArrayCreator" flags="nn" index="3$_iS1">
@@ -340,6 +346,7 @@
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
         <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
+        <child id="8276990574886367509" name="finallyClause" index="1zxBo6" />
         <child id="8276990574886367508" name="body" index="1zxBo7" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -411,7 +418,11 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
+        <property id="5858074156537516431" name="text" index="x79VB" />
+      </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
         <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
@@ -424,6 +435,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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1204834851141" name="jetbrains.mps.lang.smodel.structure.PoundExpression" flags="ng" index="25Kdxt">
@@ -523,9 +535,6 @@
       <concept id="1209727891789" name="jetbrains.mps.baseLanguage.collections.structure.ComparatorSortOperation" flags="nn" index="2DpFxk">
         <child id="1209727996925" name="ascending" index="2Dq5b$" />
       </concept>
-      <concept id="1331913329176106419" name="jetbrains.mps.baseLanguage.collections.structure.CustomContainerCreator" flags="nn" index="2FnrQI">
-        <reference id="1331913329176106420" name="containerDeclaration" index="2FnrQD" />
-      </concept>
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -536,6 +545,7 @@
       </concept>
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
+        <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
@@ -569,14 +579,6 @@
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
       <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="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="1240824834947" name="jetbrains.mps.baseLanguage.collections.structure.ValueAccessOperation" flags="nn" index="3AV6Ez" />
       <concept id="1240825616499" name="jetbrains.mps.baseLanguage.collections.structure.KeyAccessOperation" flags="nn" index="3AY5_j" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
@@ -584,9 +586,6 @@
         <child id="1197932525128" name="key" index="3ElVtu" />
       </concept>
       <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>
@@ -642,137 +641,6 @@
             </node>
           </node>
         </node>
-        <node concept="1X3_iC" id="5GwePVE5EJS" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="4ncOM422S$D" role="8Wnug">
-            <node concept="2OqwBi" id="4ncOM422SU2" role="3clFbG">
-              <node concept="37vLTw" id="4ncOM422S$C" role="2Oq$k0">
-                <ref role="3cqZAo" node="7Nzu1Mc$SGa" resolve="myGrid" />
-              </node>
-              <node concept="liA8E" id="4ncOM422TAm" role="2OqNvi">
-                <ref role="37wK5l" to="6dpw:4ncOM421W5X" resolve="visitElements" />
-                <node concept="2ShNRf" id="4ncOM422TGI" role="37wK5m">
-                  <node concept="YeOm9" id="4ncOM423miM" role="2ShVmc">
-                    <node concept="1Y3b0j" id="4ncOM423miP" role="YeSDq">
-                      <property role="2bfB8j" value="true" />
-                      <ref role="1Y3XeK" to="6dpw:4ncOM421obJ" resolve="IGridElementVisitor" />
-                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                      <node concept="3Tm1VV" id="4ncOM423miQ" role="1B3o_S" />
-                      <node concept="3clFb_" id="4ncOM423miR" role="jymVt">
-                        <property role="1EzhhJ" value="false" />
-                        <property role="TrG5h" value="visit" />
-                        <node concept="37vLTG" id="4ncOM423miS" role="3clF46">
-                          <property role="TrG5h" value="element" />
-                          <node concept="3uibUv" id="4ncOM423miT" role="1tU5fm">
-                            <ref role="3uigEE" to="6dpw:7C0FR5Aonyd" resolve="IGridElement" />
-                          </node>
-                        </node>
-                        <node concept="3cqZAl" id="4ncOM423miU" role="3clF45" />
-                        <node concept="3Tm1VV" id="4ncOM423miV" role="1B3o_S" />
-                        <node concept="3clFbS" id="4ncOM423miX" role="3clF47">
-                          <node concept="3clFbJ" id="4ncOM423mCj" role="3cqZAp">
-                            <node concept="3clFbS" id="4ncOM423mCk" role="3clFbx">
-                              <node concept="3cpWs8" id="4ncOM423mNb" role="3cqZAp">
-                                <node concept="3cpWsn" id="4ncOM423mNc" role="3cpWs9">
-                                  <property role="TrG5h" value="source" />
-                                  <node concept="3uibUv" id="4ncOM423mNd" role="1tU5fm">
-                                    <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                                  </node>
-                                  <node concept="2OqwBi" id="4ncOM423nLb" role="33vP2m">
-                                    <node concept="1eOMI4" id="4ncOM423nk9" role="2Oq$k0">
-                                      <node concept="10QFUN" id="4ncOM423nk6" role="1eOMHV">
-                                        <node concept="3uibUv" id="4ncOM423nkb" role="10QFUM">
-                                          <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                                        </node>
-                                        <node concept="37vLTw" id="4ncOM423nkc" role="10QFUP">
-                                          <ref role="3cqZAo" node="4ncOM423miS" resolve="element" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="4ncOM423oSd" role="2OqNvi">
-                                      <ref role="37wK5l" to="6dpw:4ncOM41XA6y" resolve="getSourceCell" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbJ" id="4ncOM423oVQ" role="3cqZAp">
-                                <node concept="3clFbS" id="4ncOM423oVT" role="3clFbx">
-                                  <node concept="3clFbF" id="4ncOM423p2n" role="3cqZAp">
-                                    <node concept="1rXfSq" id="4ncOM423p2m" role="3clFbG">
-                                      <ref role="37wK5l" to="g51k:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
-                                      <node concept="37vLTw" id="4ncOM423p5e" role="37wK5m">
-                                        <ref role="3cqZAo" node="4ncOM423mNc" resolve="source" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="2ZW3vV" id="4ncOM423oZ_" role="3clFbw">
-                                  <node concept="3uibUv" id="4ncOM423p0E" role="2ZW6by">
-                                    <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
-                                  </node>
-                                  <node concept="37vLTw" id="4ncOM423oXB" role="2ZW6bz">
-                                    <ref role="3cqZAo" node="4ncOM423mNc" resolve="source" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="2ZW3vV" id="4ncOM423mGB" role="3clFbw">
-                              <node concept="3uibUv" id="4ncOM423mKM" role="2ZW6by">
-                                <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                              </node>
-                              <node concept="37vLTw" id="4ncOM423mD1" role="2ZW6bz">
-                                <ref role="3cqZAo" node="4ncOM423miS" resolve="element" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFb_" id="4ncOM423miZ" role="jymVt">
-                        <property role="1EzhhJ" value="false" />
-                        <property role="TrG5h" value="visitChilds" />
-                        <node concept="10P_77" id="4ncOM423mj0" role="3clF45" />
-                        <node concept="3Tm1VV" id="4ncOM423mj1" role="1B3o_S" />
-                        <node concept="37vLTG" id="4ncOM423mj3" role="3clF46">
-                          <property role="TrG5h" value="grid" />
-                          <node concept="3uibUv" id="4ncOM423mj4" role="1tU5fm">
-                            <ref role="3uigEE" to="6dpw:7C0FR5AuGS8" resolve="IGrid" />
-                          </node>
-                        </node>
-                        <node concept="3clFbS" id="4ncOM423mj5" role="3clF47">
-                          <node concept="3clFbF" id="4ncOM423p7r" role="3cqZAp">
-                            <node concept="3fqX7Q" id="4ncOM423r94" role="3clFbG">
-                              <node concept="2ZW3vV" id="4ncOM423r96" role="3fr31v">
-                                <node concept="3uibUv" id="4ncOM423r97" role="2ZW6by">
-                                  <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
-                                </node>
-                                <node concept="2OqwBi" id="4ncOM423r98" role="2ZW6bz">
-                                  <node concept="1eOMI4" id="4ncOM423r99" role="2Oq$k0">
-                                    <node concept="10QFUN" id="4ncOM423r9a" role="1eOMHV">
-                                      <node concept="3uibUv" id="4ncOM423r9b" role="10QFUM">
-                                        <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                                      </node>
-                                      <node concept="37vLTw" id="4ncOM423r9c" role="10QFUP">
-                                        <ref role="3cqZAo" node="4ncOM423mj3" resolve="grid" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="liA8E" id="4ncOM423r9d" role="2OqNvi">
-                                    <ref role="37wK5l" to="6dpw:4ncOM41XA6y" resolve="getSourceCell" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="3Tm1VV" id="7Nzu1Mc$BT9" role="1B3o_S" />
       <node concept="37vLTG" id="7Nzu1Mc$BTa" role="3clF46">
@@ -814,143 +682,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4ncOM421gwt" role="jymVt" />
-    <node concept="3clFb_" id="4MuW45D4Z$X" role="jymVt">
-      <property role="TrG5h" value="initChilds" />
-      <node concept="37vLTG" id="4MuW45D50cF" role="3clF46">
-        <property role="TrG5h" value="childsTracker" />
-        <node concept="3uibUv" id="4MuW45D50db" role="1tU5fm">
-          <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="4MuW45D4Z$Z" role="3clF45" />
-      <node concept="3Tm1VV" id="4MuW45D4Z_0" role="1B3o_S" />
-      <node concept="3clFbS" id="4MuW45D4Z_1" role="3clF47">
-        <node concept="3clFbF" id="4MuW45D50Re" role="3cqZAp">
-          <node concept="1rXfSq" id="4MuW45D50Rd" role="3clFbG">
-            <ref role="37wK5l" node="5PYr1ZdBFqw" resolve="addRegisteredGridCellsToThis" />
-            <node concept="37vLTw" id="4MuW45D50Uh" role="37wK5m">
-              <ref role="3cqZAo" node="7Nzu1Mc$SGa" resolve="myGrid" />
-            </node>
-            <node concept="37vLTw" id="4MuW45D518$" role="37wK5m">
-              <ref role="3cqZAo" node="4MuW45D50cF" resolve="childsTracker" />
-            </node>
-          </node>
-        </node>
-        <node concept="1_o_46" id="4MuW45D51lY" role="3cqZAp">
-          <node concept="1_o_bx" id="4MuW45D51m0" role="1_o_by">
-            <node concept="1_o_bG" id="4MuW45D51m2" role="1_o_aQ">
-              <property role="TrG5h" value="cell" />
-            </node>
-            <node concept="2OqwBi" id="4MuW45D51wj" role="1_o_bz">
-              <node concept="37vLTw" id="4MuW45D51v2" role="2Oq$k0">
-                <ref role="3cqZAo" node="4MuW45D50cF" resolve="childsTracker" />
-              </node>
-              <node concept="liA8E" id="4MuW45D51FT" role="2OqNvi">
-                <ref role="37wK5l" node="x$t3A6Yyu8" resolve="getRegisteredCells" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbS" id="4MuW45D51m6" role="2LFqv$">
-            <node concept="3clFbJ" id="4MuW45D51KS" role="3cqZAp">
-              <node concept="3clFbS" id="4MuW45D51KT" role="3clFbx">
-                <node concept="3clFbF" id="5Jx74hgxEeM" role="3cqZAp">
-                  <node concept="2OqwBi" id="5Jx74hgxEr_" role="3clFbG">
-                    <node concept="1eOMI4" id="5Jx74hgxEeJ" role="2Oq$k0">
-                      <node concept="10QFUN" id="5Jx74hgxEeG" role="1eOMHV">
-                        <node concept="3uibUv" id="5Jx74hgxEeL" role="10QFUM">
-                          <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
-                        </node>
-                        <node concept="3M$PaV" id="5Jx74hgxEjd" role="10QFUP">
-                          <ref role="3M$S_o" node="4MuW45D51m2" resolve="cell" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="5Jx74hgxGfn" role="2OqNvi">
-                      <ref role="37wK5l" node="5Jx74hguUEO" resolve="memorizeOriginalParent" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="1syh$m3yzfJ" role="3cqZAp">
-                  <node concept="3cpWsn" id="1syh$m3yzfK" role="3cpWs9">
-                    <property role="TrG5h" value="originalParent" />
-                    <node concept="3uibUv" id="1syh$m3yzfI" role="1tU5fm">
-                      <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-                    </node>
-                    <node concept="1eOMI4" id="1syh$m3yzfL" role="33vP2m">
-                      <node concept="10QFUN" id="1syh$m3yzfM" role="1eOMHV">
-                        <node concept="2OqwBi" id="1syh$m3yzfN" role="10QFUP">
-                          <node concept="3M$PaV" id="1syh$m3yzfO" role="2Oq$k0">
-                            <ref role="3M$S_o" node="4MuW45D51m2" resolve="cell" />
-                          </node>
-                          <node concept="liA8E" id="1syh$m3yzfP" role="2OqNvi">
-                            <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                          </node>
-                        </node>
-                        <node concept="3uibUv" id="1syh$m3yzfQ" role="10QFUM">
-                          <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="1syh$m3yzUL" role="3cqZAp">
-                  <node concept="3clFbS" id="1syh$m3yzUN" role="3clFbx">
-                    <node concept="3clFbF" id="1syh$m3ynNV" role="3cqZAp">
-                      <node concept="2OqwBi" id="1syh$m3yo5$" role="3clFbG">
-                        <node concept="37vLTw" id="1syh$m3yzfR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1syh$m3yzfK" resolve="originalParent" />
-                        </node>
-                        <node concept="liA8E" id="1syh$m3yoPn" role="2OqNvi">
-                          <ref role="37wK5l" to="g51k:~EditorCell_Collection.removeCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="removeCell" />
-                          <node concept="1eOMI4" id="1syh$m3ypoY" role="37wK5m">
-                            <node concept="10QFUN" id="1syh$m3ypoZ" role="1eOMHV">
-                              <node concept="3M$PaV" id="1syh$m3ypoX" role="10QFUP">
-                                <ref role="3M$S_o" node="4MuW45D51m2" resolve="cell" />
-                              </node>
-                              <node concept="3uibUv" id="1syh$m3ypmU" role="10QFUM">
-                                <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3y3z36" id="1syh$m3yBhy" role="3clFbw">
-                    <node concept="10Nm6u" id="1syh$m3yBoZ" role="3uHU7w" />
-                    <node concept="37vLTw" id="1syh$m3yB7w" role="3uHU7B">
-                      <ref role="3cqZAo" node="1syh$m3yzfK" resolve="originalParent" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="4MuW45D51VK" role="3cqZAp">
-                  <node concept="1rXfSq" id="4MuW45D51VJ" role="3clFbG">
-                    <ref role="37wK5l" to="g51k:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
-                    <node concept="3M$PaV" id="4MuW45D51Ye" role="37wK5m">
-                      <ref role="3M$S_o" node="4MuW45D51m2" resolve="cell" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2ZW3vV" id="4MuW45D51My" role="3clFbw">
-                <node concept="3uibUv" id="4MuW45D51QP" role="2ZW6by">
-                  <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
-                </node>
-                <node concept="3M$PaV" id="4MuW45D51Lt" role="2ZW6bz">
-                  <ref role="3M$S_o" node="4MuW45D51m2" resolve="cell" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7y7xi3eW5ib" role="3cqZAp">
-          <node concept="1rXfSq" id="7y7xi3eW5i9" role="3clFbG">
-            <ref role="37wK5l" node="7y7xi3eUVjP" resolve="sortChildren" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7y7xi3eUObY" role="jymVt" />
     <node concept="3clFb_" id="7y7xi3eUVjP" role="jymVt">
       <property role="TrG5h" value="sortChildren" />
       <node concept="3cqZAl" id="7y7xi3eUVjR" role="3clF45" />
@@ -1187,467 +918,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4MuW45DgiKB" role="jymVt" />
-    <node concept="3clFb_" id="5PYr1ZdBFqw" role="jymVt">
-      <property role="TrG5h" value="addRegisteredGridCellsToThis" />
-      <node concept="3cqZAl" id="5PYr1ZdBFqy" role="3clF45" />
-      <node concept="3Tmbuc" id="4MuW45D50eT" role="1B3o_S" />
-      <node concept="3clFbS" id="5PYr1ZdBFq$" role="3clF47">
-        <node concept="2Gpval" id="5PYr1ZdBMf6" role="3cqZAp">
-          <node concept="2GrKxI" id="5PYr1ZdBMf7" role="2Gsz3X">
-            <property role="TrG5h" value="element" />
-          </node>
-          <node concept="37vLTw" id="5PYr1ZdBMg4" role="2GsD0m">
-            <ref role="3cqZAo" node="5PYr1ZdBM3i" resolve="grid" />
-          </node>
-          <node concept="3clFbS" id="5PYr1ZdBMf9" role="2LFqv$">
-            <node concept="3clFbJ" id="5PYr1ZdCIaR" role="3cqZAp">
-              <node concept="3clFbS" id="5PYr1ZdCIaU" role="3clFbx">
-                <node concept="3cpWs8" id="2c3czgm$JrS" role="3cqZAp">
-                  <node concept="3cpWsn" id="2c3czgm$JrT" role="3cpWs9">
-                    <property role="TrG5h" value="childGrid" />
-                    <node concept="3uibUv" id="2c3czgm$JrU" role="1tU5fm">
-                      <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                    </node>
-                    <node concept="1eOMI4" id="2c3czgm$JEL" role="33vP2m">
-                      <node concept="10QFUN" id="2c3czgm$JEI" role="1eOMHV">
-                        <node concept="3uibUv" id="2c3czgm$JEN" role="10QFUM">
-                          <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                        </node>
-                        <node concept="2GrUjf" id="2c3czgm$JEO" role="10QFUP">
-                          <ref role="2Gs0qQ" node="5PYr1ZdBMf7" resolve="element" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="1U60oYv$n7_" role="3cqZAp">
-                  <node concept="3clFbS" id="1U60oYv$n7C" role="3clFbx">
-                    <node concept="3cpWs6" id="1U60oYv_XuH" role="3cqZAp" />
-                  </node>
-                  <node concept="3y3z36" id="1U60oYv_X1X" role="3clFbw">
-                    <node concept="10Nm6u" id="1U60oYv_XgB" role="3uHU7w" />
-                    <node concept="2OqwBi" id="4ncOM421foE" role="3uHU7B">
-                      <node concept="37vLTw" id="4ncOM421fgT" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2c3czgm$JrT" resolve="childGrid" />
-                      </node>
-                      <node concept="liA8E" id="4ncOM421gs0" role="2OqNvi">
-                        <ref role="37wK5l" to="6dpw:4ncOM41XA6y" resolve="getSourceCell" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="5PYr1ZdCIra" role="3cqZAp">
-                  <node concept="1rXfSq" id="5PYr1ZdCIr9" role="3clFbG">
-                    <ref role="37wK5l" node="5PYr1ZdBFqw" resolve="addRegisteredGridCellsToThis" />
-                    <node concept="37vLTw" id="2c3czgm$KpD" role="37wK5m">
-                      <ref role="3cqZAo" node="2c3czgm$JrT" resolve="childGrid" />
-                    </node>
-                    <node concept="37vLTw" id="4MuW45CWWNH" role="37wK5m">
-                      <ref role="3cqZAo" node="4MuW45CWVgW" resolve="childsTracker" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2ZW3vV" id="5PYr1ZdCIfg" role="3clFbw">
-                <node concept="3uibUv" id="5PYr1ZdCIkS" role="2ZW6by">
-                  <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                </node>
-                <node concept="2GrUjf" id="5PYr1ZdCIdJ" role="2ZW6bz">
-                  <ref role="2Gs0qQ" node="5PYr1ZdBMf7" resolve="element" />
-                </node>
-              </node>
-              <node concept="3eNFk2" id="5PYr1ZdCIvj" role="3eNLev">
-                <node concept="2ZW3vV" id="5PYr1ZdCIBA" role="3eO9$A">
-                  <node concept="3uibUv" id="5PYr1ZdCIIK" role="2ZW6by">
-                    <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
-                  </node>
-                  <node concept="2GrUjf" id="5PYr1ZdCIAi" role="2ZW6bz">
-                    <ref role="2Gs0qQ" node="5PYr1ZdBMf7" resolve="element" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="5PYr1ZdCIvl" role="3eOfB_">
-                  <node concept="3cpWs8" id="5PYr1ZdBNbP" role="3cqZAp">
-                    <node concept="3cpWsn" id="5PYr1ZdBNbQ" role="3cpWs9">
-                      <property role="TrG5h" value="cell" />
-                      <node concept="3uibUv" id="5PYr1ZdBNbR" role="1tU5fm">
-                        <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                      </node>
-                      <node concept="2EnYce" id="5PYr1ZdBMIo" role="33vP2m">
-                        <node concept="0kSF2" id="5PYr1ZdBMrE" role="2Oq$k0">
-                          <node concept="3uibUv" id="5PYr1ZdBMuD" role="0kSFW">
-                            <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
-                          </node>
-                          <node concept="2GrUjf" id="5PYr1ZdBMjW" role="0kSFX">
-                            <ref role="2Gs0qQ" node="5PYr1ZdBMf7" resolve="element" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="5PYr1ZdBMRM" role="2OqNvi">
-                          <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbJ" id="5PYr1ZdBPzy" role="3cqZAp">
-                    <node concept="1Wc70l" id="4MuW45CWUQX" role="3clFbw">
-                      <node concept="1rXfSq" id="4MuW45DgEoJ" role="3uHU7w">
-                        <ref role="37wK5l" node="4MuW45Dgx0M" resolve="allowAddGridCell" />
-                        <node concept="37vLTw" id="4MuW45DgEuN" role="37wK5m">
-                          <ref role="3cqZAo" node="5PYr1ZdBNbQ" resolve="cell" />
-                        </node>
-                        <node concept="37vLTw" id="4MuW45DgEzm" role="37wK5m">
-                          <ref role="3cqZAo" node="4MuW45CWVgW" resolve="childsTracker" />
-                        </node>
-                      </node>
-                      <node concept="3y3z36" id="5PYr1ZdBPAg" role="3uHU7B">
-                        <node concept="37vLTw" id="5PYr1ZdBP$Z" role="3uHU7B">
-                          <ref role="3cqZAo" node="5PYr1ZdBNbQ" resolve="cell" />
-                        </node>
-                        <node concept="10Nm6u" id="5PYr1ZdBPAX" role="3uHU7w" />
-                      </node>
-                    </node>
-                    <node concept="3clFbS" id="5PYr1ZdBPz_" role="3clFbx">
-                      <node concept="3clFbJ" id="4pb39R1SqTg" role="3cqZAp">
-                        <node concept="3clFbS" id="4pb39R1SqTi" role="3clFbx">
-                          <node concept="3clFbJ" id="4pb39R1Srxk" role="3cqZAp">
-                            <node concept="3clFbS" id="4pb39R1Srxm" role="3clFbx">
-                              <node concept="3clFbF" id="4pb39R1SWME" role="3cqZAp">
-                                <node concept="2OqwBi" id="4pb39R1SX$r" role="3clFbG">
-                                  <node concept="1eOMI4" id="4pb39R1SXnn" role="2Oq$k0">
-                                    <node concept="10QFUN" id="4pb39R1SXno" role="1eOMHV">
-                                      <node concept="2OqwBi" id="4pb39R1SXnk" role="10QFUP">
-                                        <node concept="37vLTw" id="4pb39R1SXnl" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5PYr1ZdBNbQ" resolve="cell" />
-                                        </node>
-                                        <node concept="liA8E" id="4pb39R1SXnm" role="2OqNvi">
-                                          <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                                        </node>
-                                      </node>
-                                      <node concept="3uibUv" id="4pb39R1SXxY" role="10QFUM">
-                                        <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="liA8E" id="4pb39R1SY20" role="2OqNvi">
-                                    <ref role="37wK5l" to="g51k:~EditorCell_Collection.removeCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="removeCell" />
-                                    <node concept="1eOMI4" id="4pb39R1SYCf" role="37wK5m">
-                                      <node concept="10QFUN" id="4pb39R1SYCg" role="1eOMHV">
-                                        <node concept="37vLTw" id="4pb39R1SYCe" role="10QFUP">
-                                          <ref role="3cqZAo" node="5PYr1ZdBNbQ" resolve="cell" />
-                                        </node>
-                                        <node concept="3uibUv" id="4pb39R1SYza" role="10QFUM">
-                                          <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3y3z36" id="4pb39R1SrPs" role="3clFbw">
-                              <node concept="10Nm6u" id="4pb39R1SrX3" role="3uHU7w" />
-                              <node concept="2OqwBi" id="4pb39R1SrKg" role="3uHU7B">
-                                <node concept="37vLTw" id="4pb39R1SrCL" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5PYr1ZdBNbQ" resolve="cell" />
-                                </node>
-                                <node concept="liA8E" id="4pb39R1SrNc" role="2OqNvi">
-                                  <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbF" id="5PYr1ZdBPCc" role="3cqZAp">
-                            <node concept="1rXfSq" id="5PYr1ZdBPCb" role="3clFbG">
-                              <ref role="37wK5l" to="g51k:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
-                              <node concept="37vLTw" id="5PYr1ZdBPDn" role="37wK5m">
-                                <ref role="3cqZAo" node="5PYr1ZdBNbQ" resolve="cell" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3fqX7Q" id="4pb39R1Srby" role="3clFbw">
-                          <node concept="2YIFZM" id="4pb39R1Srb$" role="3fr31v">
-                            <ref role="1Pybhc" to="f4zo:~CellTraversalUtil" resolve="CellTraversalUtil" />
-                            <ref role="37wK5l" to="f4zo:~CellTraversalUtil.isAncestor(jetbrains.mps.openapi.editor.cells.EditorCell,jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="isAncestor" />
-                            <node concept="Xjq3P" id="4pb39R1Srb_" role="37wK5m" />
-                            <node concept="37vLTw" id="4pb39R1SrbA" role="37wK5m">
-                              <ref role="3cqZAo" node="5PYr1ZdBNbQ" resolve="cell" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5PYr1ZdBM3i" role="3clF46">
-        <property role="TrG5h" value="grid" />
-        <node concept="3uibUv" id="5PYr1ZdBM3h" role="1tU5fm">
-          <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4MuW45CWVgW" role="3clF46">
-        <property role="TrG5h" value="childsTracker" />
-        <node concept="3uibUv" id="4MuW45CWVSJ" role="1tU5fm">
-          <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3NocqOagVNn" role="jymVt" />
-    <node concept="3clFb_" id="4MuW45Dgx0M" role="jymVt">
-      <property role="TrG5h" value="allowAddGridCell" />
-      <node concept="37vLTG" id="4MuW45DgAZk" role="3clF46">
-        <property role="TrG5h" value="cell" />
-        <node concept="3uibUv" id="4MuW45DgBGa" role="1tU5fm">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4MuW45DgDBW" role="3clF46">
-        <property role="TrG5h" value="childsTracker" />
-        <node concept="3uibUv" id="4MuW45DgElb" role="1tU5fm">
-          <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
-        </node>
-      </node>
-      <node concept="10P_77" id="4MuW45Dgys$" role="3clF45" />
-      <node concept="3Tmbuc" id="4MuW45DgxNn" role="1B3o_S" />
-      <node concept="3clFbS" id="4MuW45Dgx0Q" role="3clF47">
-        <node concept="3clFbF" id="4MuW45DgEms" role="3cqZAp">
-          <node concept="2OqwBi" id="4MuW45DgEmu" role="3clFbG">
-            <node concept="37vLTw" id="4MuW45DgEmv" role="2Oq$k0">
-              <ref role="3cqZAo" node="4MuW45DgDBW" resolve="childsTracker" />
-            </node>
-            <node concept="liA8E" id="4MuW45DgEmw" role="2OqNvi">
-              <ref role="37wK5l" node="4MuW45CWGkd" resolve="isRegistered" />
-              <node concept="37vLTw" id="4MuW45DgEmx" role="37wK5m">
-                <ref role="3cqZAo" node="4MuW45DgAZk" resolve="cell" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MuW45Dgwnc" role="jymVt" />
-    <node concept="3clFb_" id="3NocqOagW9Z" role="jymVt">
-      <property role="TrG5h" value="addGridCellsWithoutParentToThis" />
-      <node concept="37vLTG" id="3NocqOah0Mb" role="3clF46">
-        <property role="TrG5h" value="grid" />
-        <node concept="3uibUv" id="3NocqOah149" role="1tU5fm">
-          <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="3NocqOagWa1" role="3clF45" />
-      <node concept="3Tmbuc" id="3NocqOah2co" role="1B3o_S" />
-      <node concept="3clFbS" id="3NocqOagWa3" role="3clF47">
-        <node concept="2Gpval" id="3NocqOah17r" role="3cqZAp">
-          <node concept="2GrKxI" id="3NocqOah17s" role="2Gsz3X">
-            <property role="TrG5h" value="element" />
-          </node>
-          <node concept="37vLTw" id="3NocqOah17t" role="2GsD0m">
-            <ref role="3cqZAo" node="3NocqOah0Mb" resolve="grid" />
-          </node>
-          <node concept="3clFbS" id="3NocqOah17u" role="2LFqv$">
-            <node concept="3clFbJ" id="3NocqOah17v" role="3cqZAp">
-              <node concept="3clFbS" id="3NocqOah17w" role="3clFbx">
-                <node concept="3cpWs8" id="3NocqOah17x" role="3cqZAp">
-                  <node concept="3cpWsn" id="3NocqOah17y" role="3cpWs9">
-                    <property role="TrG5h" value="childGrid" />
-                    <node concept="3uibUv" id="3NocqOah17z" role="1tU5fm">
-                      <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                    </node>
-                    <node concept="1eOMI4" id="3NocqOah17$" role="33vP2m">
-                      <node concept="10QFUN" id="3NocqOah17_" role="1eOMHV">
-                        <node concept="3uibUv" id="3NocqOah17A" role="10QFUM">
-                          <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                        </node>
-                        <node concept="2GrUjf" id="3NocqOah17B" role="10QFUP">
-                          <ref role="2Gs0qQ" node="3NocqOah17s" resolve="element" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="3NocqOah17L" role="3cqZAp">
-                  <node concept="1rXfSq" id="3NocqOah17M" role="3clFbG">
-                    <ref role="37wK5l" node="3NocqOagW9Z" resolve="addGridCellsWithoutParentToThis" />
-                    <node concept="37vLTw" id="3NocqOah17N" role="37wK5m">
-                      <ref role="3cqZAo" node="3NocqOah17y" resolve="childGrid" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2ZW3vV" id="3NocqOah17O" role="3clFbw">
-                <node concept="3uibUv" id="3NocqOah17P" role="2ZW6by">
-                  <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                </node>
-                <node concept="2GrUjf" id="3NocqOah17Q" role="2ZW6bz">
-                  <ref role="2Gs0qQ" node="3NocqOah17s" resolve="element" />
-                </node>
-              </node>
-              <node concept="3eNFk2" id="3NocqOah17R" role="3eNLev">
-                <node concept="2ZW3vV" id="3NocqOah17S" role="3eO9$A">
-                  <node concept="3uibUv" id="3NocqOah17T" role="2ZW6by">
-                    <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
-                  </node>
-                  <node concept="2GrUjf" id="3NocqOah17U" role="2ZW6bz">
-                    <ref role="2Gs0qQ" node="3NocqOah17s" resolve="element" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="3NocqOah17V" role="3eOfB_">
-                  <node concept="3cpWs8" id="3NocqOah17W" role="3cqZAp">
-                    <node concept="3cpWsn" id="3NocqOah17X" role="3cpWs9">
-                      <property role="TrG5h" value="cell" />
-                      <node concept="3uibUv" id="3NocqOah17Y" role="1tU5fm">
-                        <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                      </node>
-                      <node concept="2EnYce" id="3NocqOah17Z" role="33vP2m">
-                        <node concept="0kSF2" id="3NocqOah180" role="2Oq$k0">
-                          <node concept="3uibUv" id="3NocqOah181" role="0kSFW">
-                            <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
-                          </node>
-                          <node concept="2GrUjf" id="3NocqOah182" role="0kSFX">
-                            <ref role="2Gs0qQ" node="3NocqOah17s" resolve="element" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="3NocqOah183" role="2OqNvi">
-                          <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbJ" id="3NocqOah184" role="3cqZAp">
-                    <node concept="3clFbS" id="3NocqOah185" role="3clFbx">
-                      <node concept="3clFbJ" id="by82Kq105w" role="3cqZAp">
-                        <node concept="3clFbS" id="by82Kq105z" role="3clFbx">
-                          <node concept="3clFbF" id="3NocqOah186" role="3cqZAp">
-                            <node concept="1rXfSq" id="3NocqOah187" role="3clFbG">
-                              <ref role="37wK5l" to="g51k:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
-                              <node concept="37vLTw" id="3NocqOah188" role="37wK5m">
-                                <ref role="3cqZAo" node="3NocqOah17X" resolve="cell" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="22lmx$" id="by82Kq12Ml" role="3clFbw">
-                          <node concept="3clFbC" id="by82Kq12Mn" role="3uHU7B">
-                            <node concept="2OqwBi" id="by82Kq12Mo" role="3uHU7B">
-                              <node concept="37vLTw" id="by82Kq12Mp" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3NocqOah17X" resolve="cell" />
-                              </node>
-                              <node concept="liA8E" id="by82Kq12Mq" role="2OqNvi">
-                                <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                              </node>
-                            </node>
-                            <node concept="10Nm6u" id="by82Kq12Mr" role="3uHU7w" />
-                          </node>
-                          <node concept="1eOMI4" id="by82Kq27wa" role="3uHU7w">
-                            <node concept="1Wc70l" id="by82Kq27AC" role="1eOMHV">
-                              <node concept="3y3z36" id="by82Kq2881" role="3uHU7w">
-                                <node concept="Xjq3P" id="by82Kq28cL" role="3uHU7w" />
-                                <node concept="2OqwBi" id="by82Kq27Ka" role="3uHU7B">
-                                  <node concept="37vLTw" id="by82Kq27G0" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3NocqOah17X" resolve="cell" />
-                                  </node>
-                                  <node concept="liA8E" id="by82Kq27Tg" role="2OqNvi">
-                                    <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="1Wc70l" id="by82Kq3wN4" role="3uHU7B">
-                                <node concept="17R0WA" id="by82Kq3yF7" role="3uHU7w">
-                                  <node concept="2OqwBi" id="by82Kq3xvC" role="3uHU7B">
-                                    <node concept="2OqwBi" id="by82Kq3x5R" role="2Oq$k0">
-                                      <node concept="37vLTw" id="by82Kq3x0y" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3NocqOah17X" resolve="cell" />
-                                      </node>
-                                      <node concept="liA8E" id="by82Kq3xfS" role="2OqNvi">
-                                        <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="by82Kq3ys8" role="2OqNvi">
-                                      <ref role="37wK5l" to="f4zo:~EditorCell.getCellId()" resolve="getCellId" />
-                                    </node>
-                                  </node>
-                                  <node concept="2OqwBi" id="by82Kq3zMA" role="3uHU7w">
-                                    <node concept="Xjq3P" id="by82Kq3yXF" role="2Oq$k0" />
-                                    <node concept="liA8E" id="by82Kq3_9G" role="2OqNvi">
-                                      <ref role="37wK5l" to="g51k:~EditorCell_Basic.getCellId()" resolve="getCellId" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3clFbC" id="by82Kq12Ms" role="3uHU7B">
-                                  <node concept="2OqwBi" id="by82Kq12Mt" role="3uHU7B">
-                                    <node concept="2OqwBi" id="by82Kq12Mu" role="2Oq$k0">
-                                      <node concept="37vLTw" id="by82Kq12Mv" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3NocqOah17X" resolve="cell" />
-                                      </node>
-                                      <node concept="liA8E" id="by82Kq12Mw" role="2OqNvi">
-                                        <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="by82Kq12Mx" role="2OqNvi">
-                                      <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
-                                    </node>
-                                  </node>
-                                  <node concept="1rXfSq" id="by82Kq12My" role="3uHU7w">
-                                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getSNode()" resolve="getSNode" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3y3z36" id="3NocqOah189" role="3clFbw">
-                      <node concept="37vLTw" id="3NocqOah18a" role="3uHU7B">
-                        <ref role="3cqZAo" node="3NocqOah17X" resolve="cell" />
-                      </node>
-                      <node concept="10Nm6u" id="3NocqOah18b" role="3uHU7w" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3clFb_" id="by82Kq3_ha" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="setCellId" />
-      <property role="DiZV1" value="false" />
-      <node concept="3Tm1VV" id="by82Kq3_hb" role="1B3o_S" />
-      <node concept="3cqZAl" id="by82Kq3_hd" role="3clF45" />
-      <node concept="37vLTG" id="by82Kq3_he" role="3clF46">
-        <property role="TrG5h" value="string" />
-        <node concept="17QB3L" id="by82Kq3A1v" role="1tU5fm" />
-      </node>
-      <node concept="3clFbS" id="by82Kq3_hj" role="3clF47">
-        <node concept="3clFbF" id="by82Kq3_hn" role="3cqZAp">
-          <node concept="3nyPlj" id="by82Kq3_hm" role="3clFbG">
-            <ref role="37wK5l" to="g51k:~EditorCell_Basic.setCellId(java.lang.String)" resolve="setCellId" />
-            <node concept="37vLTw" id="by82Kq3_hl" role="37wK5m">
-              <ref role="3cqZAo" node="by82Kq3_he" resolve="string" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="by82Kq3_Qu" role="3cqZAp">
-          <node concept="1rXfSq" id="by82Kq3_Qt" role="3clFbG">
-            <ref role="37wK5l" node="3NocqOagW9Z" resolve="addGridCellsWithoutParentToThis" />
-            <node concept="37vLTw" id="by82Kq3_TI" role="37wK5m">
-              <ref role="3cqZAo" node="7Nzu1Mc$SGa" resolve="myGrid" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="by82Kq3_hk" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="53E8YBfd$G1" role="jymVt" />
     <node concept="3clFb_" id="53E8YBfdibR" role="jymVt">
       <property role="1EzhhJ" value="false" />
@@ -1992,30 +1262,6 @@
             </node>
           </node>
         </node>
-        <node concept="1X3_iC" id="5GwePVE5EJT" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="5PYr1ZdUsy4" role="8Wnug">
-            <node concept="1rXfSq" id="5PYr1ZdUsy5" role="3clFbG">
-              <ref role="37wK5l" node="5PYr1ZdBFqw" resolve="addRegisteredGridCellsToThis" />
-              <node concept="37vLTw" id="1cFYsK398Eu" role="37wK5m">
-                <ref role="3cqZAo" node="7Nzu1Mc$SGa" resolve="myGrid" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="5GwePVE5EJU" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="2c3czgmGWZi" role="8Wnug">
-            <node concept="1rXfSq" id="2c3czgmGWZh" role="3clFbG">
-              <ref role="37wK5l" node="2c3czgmDsk0" resolve="addHeadersToThis" />
-              <node concept="37vLTw" id="2c3czgmGXUc" role="37wK5m">
-                <ref role="3cqZAo" node="7Nzu1Mc$SGa" resolve="myGrid" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="RywcYxuNgS" role="3cqZAp">
           <node concept="37vLTI" id="RywcYxuNO9" role="3clFbG">
             <node concept="2OqwBi" id="RywcYxuOlw" role="37vLTx">
@@ -2295,13 +1541,9 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="4MuW45D56UO" role="3cqZAp">
-          <node concept="1rXfSq" id="4MuW45D56UN" role="3clFbG">
-            <ref role="37wK5l" node="4MuW45D4Z$X" resolve="initChilds" />
-            <node concept="2YIFZM" id="4MuW45D57Zu" role="37wK5m">
-              <ref role="37wK5l" node="1362cT3c3wo" resolve="getInstance" />
-              <ref role="1Pybhc" node="1362cT3bWqU" resolve="ChildsTracker" />
-            </node>
+        <node concept="3clFbF" id="5QVyGuWC4S9" role="3cqZAp">
+          <node concept="1rXfSq" id="5QVyGuWC4S7" role="3clFbG">
+            <ref role="37wK5l" node="7y7xi3eUVjP" resolve="sortChildren" />
           </node>
         </node>
         <node concept="3clFbF" id="1U60oYvyshg" role="3cqZAp">
@@ -2410,55 +1652,6 @@
         </node>
       </node>
     </node>
-    <node concept="3clFb_" id="4MuW45DgKyF" role="jymVt">
-      <property role="TrG5h" value="allowAddGridCell" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="37vLTG" id="4MuW45DgKyG" role="3clF46">
-        <property role="TrG5h" value="cell" />
-        <node concept="3uibUv" id="4MuW45DgKyH" role="1tU5fm">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4MuW45DgKyI" role="3clF46">
-        <property role="TrG5h" value="childsTracker" />
-        <node concept="3uibUv" id="4MuW45DgKyJ" role="1tU5fm">
-          <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
-        </node>
-      </node>
-      <node concept="10P_77" id="4MuW45DgKyK" role="3clF45" />
-      <node concept="3Tmbuc" id="4MuW45DgKyL" role="1B3o_S" />
-      <node concept="3clFbS" id="4MuW45DgKyS" role="3clF47">
-        <node concept="3clFbF" id="4MuW45DgQ8r" role="3cqZAp">
-          <node concept="22lmx$" id="4MuW45DgQmu" role="3clFbG">
-            <node concept="2OqwBi" id="4MuW45DgQ_W" role="3uHU7w">
-              <node concept="37vLTw" id="4MuW45DgQu5" role="2Oq$k0">
-                <ref role="3cqZAo" node="4MuW45DgKyI" resolve="childsTracker" />
-              </node>
-              <node concept="liA8E" id="4MuW45DgQRL" role="2OqNvi">
-                <ref role="37wK5l" node="4MuW45D8Tfk" resolve="isRegisteredHeader" />
-                <node concept="37vLTw" id="4MuW45DgQTL" role="37wK5m">
-                  <ref role="3cqZAo" node="4MuW45DgKyG" resolve="cell" />
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="4MuW45DgQ8s" role="3uHU7B">
-              <node concept="37vLTw" id="4MuW45DgQ8t" role="2Oq$k0">
-                <ref role="3cqZAo" node="4MuW45DgKyI" resolve="childsTracker" />
-              </node>
-              <node concept="liA8E" id="4MuW45DgQ8u" role="2OqNvi">
-                <ref role="37wK5l" node="4MuW45CWGkd" resolve="isRegistered" />
-                <node concept="37vLTw" id="4MuW45DgQ8v" role="37wK5m">
-                  <ref role="3cqZAo" node="4MuW45DgKyG" resolve="cell" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="4MuW45DgKyT" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="x$t3A6ZT57" role="jymVt" />
     <node concept="3clFb_" id="2c3czgmDsk0" role="jymVt">
       <property role="TrG5h" value="addHeadersToThis" />
@@ -3529,6 +2722,38 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="3clFbF" id="70mku7tXFet" role="3cqZAp">
+                      <node concept="2OqwBi" id="70mku7tXFeu" role="3clFbG">
+                        <node concept="37vLTw" id="70mku7tXFev" role="2Oq$k0">
+                          <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
+                        </node>
+                        <node concept="liA8E" id="70mku7tXFew" role="2OqNvi">
+                          <ref role="37wK5l" node="4gCFRNz0iH7" resolve="setTable" />
+                          <node concept="Xjq3P" id="70mku7tXFex" role="37wK5m" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="70mku7tZwRE" role="3cqZAp">
+                      <node concept="2OqwBi" id="70mku7tZwRF" role="3clFbG">
+                        <node concept="37vLTw" id="70mku7tZwRG" role="2Oq$k0">
+                          <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
+                        </node>
+                        <node concept="liA8E" id="70mku7tZwRH" role="2OqNvi">
+                          <ref role="37wK5l" node="4gCFRNz0sZU" resolve="setPosition" />
+                          <node concept="2ShNRf" id="70mku7tZwRI" role="37wK5m">
+                            <node concept="1pGfFk" id="70mku7tZwRJ" role="2ShVmc">
+                              <ref role="37wK5l" to="sse1:20OswHE0h6W" resolve="GridPosition" />
+                              <node concept="37vLTw" id="70mku7tZwRK" role="37wK5m">
+                                <ref role="3cqZAo" node="20OswHE2j_d" resolve="x" />
+                              </node>
+                              <node concept="37vLTw" id="70mku7tZwRL" role="37wK5m">
+                                <ref role="3cqZAo" node="20OswHE2nXn" resolve="y" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                     <node concept="3cpWs8" id="4vp4nPrptrl" role="3cqZAp">
                       <node concept="3cpWsn" id="4vp4nPrptrm" role="3cpWs9">
                         <property role="TrG5h" value="leafCell" />
@@ -3621,46 +2846,50 @@
                       <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
                     </node>
                   </node>
-                </node>
-                <node concept="3clFbF" id="4gCFRNz0FLc" role="3cqZAp">
-                  <node concept="2OqwBi" id="4gCFRNz0Hhf" role="3clFbG">
-                    <node concept="37vLTw" id="4gCFRNz0FLb" role="2Oq$k0">
-                      <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
-                    </node>
-                    <node concept="liA8E" id="4gCFRNz0Mm4" role="2OqNvi">
-                      <ref role="37wK5l" node="4gCFRNz0iH7" resolve="setTable" />
-                      <node concept="Xjq3P" id="4gCFRNzlNDj" role="37wK5m" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="4gCFRNz0N2h" role="3cqZAp">
-                  <node concept="2OqwBi" id="4gCFRNz0O3K" role="3clFbG">
-                    <node concept="37vLTw" id="4gCFRNz0N2g" role="2Oq$k0">
-                      <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
-                    </node>
-                    <node concept="liA8E" id="4gCFRNz0QGe" role="2OqNvi">
-                      <ref role="37wK5l" node="4gCFRNz0sZU" resolve="setPosition" />
-                      <node concept="2ShNRf" id="4gCFRNz0QHa" role="37wK5m">
-                        <node concept="1pGfFk" id="4gCFRNz0ReZ" role="2ShVmc">
-                          <ref role="37wK5l" to="sse1:20OswHE0h6W" resolve="GridPosition" />
-                          <node concept="37vLTw" id="4gCFRNz0Rgd" role="37wK5m">
-                            <ref role="3cqZAo" node="20OswHE2j_d" resolve="x" />
+                  <node concept="9aQIb" id="70mku7tXukF" role="9aQIa">
+                    <node concept="3clFbS" id="70mku7tXukG" role="9aQI4">
+                      <node concept="3clFbF" id="4gCFRNz0FLc" role="3cqZAp">
+                        <node concept="2OqwBi" id="4gCFRNz0Hhf" role="3clFbG">
+                          <node concept="37vLTw" id="4gCFRNz0FLb" role="2Oq$k0">
+                            <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
                           </node>
-                          <node concept="37vLTw" id="4gCFRNz0RoN" role="37wK5m">
-                            <ref role="3cqZAo" node="20OswHE2nXn" resolve="y" />
+                          <node concept="liA8E" id="4gCFRNz0Mm4" role="2OqNvi">
+                            <ref role="37wK5l" node="4gCFRNz0iH7" resolve="setTable" />
+                            <node concept="Xjq3P" id="4gCFRNzlNDj" role="37wK5m" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="4gCFRNz0N2h" role="3cqZAp">
+                        <node concept="2OqwBi" id="4gCFRNz0O3K" role="3clFbG">
+                          <node concept="37vLTw" id="4gCFRNz0N2g" role="2Oq$k0">
+                            <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
+                          </node>
+                          <node concept="liA8E" id="4gCFRNz0QGe" role="2OqNvi">
+                            <ref role="37wK5l" node="4gCFRNz0sZU" resolve="setPosition" />
+                            <node concept="2ShNRf" id="4gCFRNz0QHa" role="37wK5m">
+                              <node concept="1pGfFk" id="4gCFRNz0ReZ" role="2ShVmc">
+                                <ref role="37wK5l" to="sse1:20OswHE0h6W" resolve="GridPosition" />
+                                <node concept="37vLTw" id="4gCFRNz0Rgd" role="37wK5m">
+                                  <ref role="3cqZAo" node="20OswHE2j_d" resolve="x" />
+                                </node>
+                                <node concept="37vLTw" id="4gCFRNz0RoN" role="37wK5m">
+                                  <ref role="3cqZAo" node="20OswHE2nXn" resolve="y" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="4UkcdCv5uUY" role="3cqZAp">
+                        <node concept="2OqwBi" id="4UkcdCv5w1e" role="3clFbG">
+                          <node concept="37vLTw" id="4UkcdCv5uUX" role="2Oq$k0">
+                            <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
+                          </node>
+                          <node concept="liA8E" id="4UkcdCv5ytC" role="2OqNvi">
+                            <ref role="37wK5l" node="4UkcdCv5gyi" resolve="clearStyle" />
                           </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="4UkcdCv5uUY" role="3cqZAp">
-                  <node concept="2OqwBi" id="4UkcdCv5w1e" role="3clFbG">
-                    <node concept="37vLTw" id="4UkcdCv5uUX" role="2Oq$k0">
-                      <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
-                    </node>
-                    <node concept="liA8E" id="4UkcdCv5ytC" role="2OqNvi">
-                      <ref role="37wK5l" node="4UkcdCv5gyi" resolve="clearStyle" />
                     </node>
                   </node>
                 </node>
@@ -4423,19 +3652,21 @@
   <node concept="312cEu" id="6OOkb_bf0Q2">
     <property role="TrG5h" value="PartialTableExtractor" />
     <node concept="2tJIrI" id="4td5AAzcVg6" role="jymVt" />
-    <node concept="312cEg" id="2ZYnkVx5E5Y" role="jymVt">
-      <property role="TrG5h" value="extracted" />
-      <node concept="3Tm6S6" id="2ZYnkVx5E5Z" role="1B3o_S" />
-      <node concept="2hMVRd" id="2ZYnkVx5F34" role="1tU5fm">
-        <node concept="3uibUv" id="6eBFmDE_nDa" role="2hN53Y">
-          <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="2ZYnkVx5Nbt" role="33vP2m">
-        <node concept="2FnrQI" id="2ZYnkVx5Nbs" role="2ShVmc">
-          <ref role="2FnrQD" to="z8iw:3TJnG96j3pc" resolve="weakHashSet" />
-          <node concept="3uibUv" id="6eBFmDE_oIp" role="HW$YZ">
-            <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
+    <node concept="Wx3nA" id="5QVyGuWdPeh" role="jymVt">
+      <property role="TrG5h" value="CACHED_GRID_KEY" />
+      <property role="3TUv4t" value="true" />
+      <node concept="17QB3L" id="5QVyGuWdPei" role="1tU5fm" />
+      <node concept="3Tm6S6" id="5QVyGuWdPej" role="1B3o_S" />
+      <node concept="3cpWs3" id="5QVyGuWdPek" role="33vP2m">
+        <node concept="Xl_RD" id="5QVyGuWdPel" role="3uHU7w">
+          <property role="Xl_RC" value=".grid" />
+        </node>
+        <node concept="2OqwBi" id="5QVyGuWdPem" role="3uHU7B">
+          <node concept="3VsKOn" id="5QVyGuWdPen" role="2Oq$k0">
+            <ref role="3VsUkX" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
+          </node>
+          <node concept="liA8E" id="5QVyGuWdPeo" role="2OqNvi">
+            <ref role="37wK5l" to="wyt6:~Class.getName()" resolve="getName" />
           </node>
         </node>
       </node>
@@ -4466,16 +3697,12 @@
       <node concept="3clFbS" id="6OOkb_bnoEx" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="6OOkb_bnnUM" role="jymVt" />
-    <node concept="3clFb_" id="6OOkb_bgPcO" role="jymVt">
+    <node concept="2YIFZL" id="5QVyGuWgv$o" role="jymVt">
       <property role="TrG5h" value="extract" />
-      <node concept="3uibUv" id="6eBFmDE_pEL" role="3clF45">
-        <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-      </node>
-      <node concept="3Tm1VV" id="6OOkb_bgPcR" role="1B3o_S" />
       <node concept="3clFbS" id="6OOkb_bgPcS" role="3clF47">
         <node concept="3clFbF" id="6OOkb_bgPex" role="3cqZAp">
           <node concept="1rXfSq" id="6OOkb_bgPew" role="3clFbG">
-            <ref role="37wK5l" node="6OOkb_bf0T_" resolve="extract" />
+            <ref role="37wK5l" node="5QVyGuWgxOJ" resolve="extract" />
             <node concept="37vLTw" id="4td5AAzdThk" role="37wK5m">
               <ref role="3cqZAo" node="4td5AAzdRpr" resolve="context" />
             </node>
@@ -4488,9 +3715,6 @@
             <node concept="37vLTw" id="6OOkb_bgPhE" role="37wK5m">
               <ref role="3cqZAo" node="6OOkb_bgPdJ" resolve="cell" />
             </node>
-            <node concept="37vLTw" id="2c3czgq2ZIb" role="37wK5m">
-              <ref role="3cqZAo" node="2c3czgq2Trk" resolve="contextGrid" />
-            </node>
           </node>
         </node>
       </node>
@@ -4510,51 +3734,75 @@
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
       </node>
-      <node concept="37vLTG" id="2c3czgq2Trk" role="3clF46">
-        <property role="TrG5h" value="contextGrid" />
-        <node concept="3uibUv" id="2c3czgq2V3O" role="1tU5fm">
-          <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-        </node>
+      <node concept="3uibUv" id="6eBFmDE_pEL" role="3clF45">
+        <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
+      </node>
+      <node concept="3Tm6S6" id="5sevPzmDqnY" role="1B3o_S" />
+      <node concept="2AHcQZ" id="5QVyGuWvX$C" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
     </node>
     <node concept="2tJIrI" id="6OOkb_bgPcx" role="jymVt" />
-    <node concept="3clFb_" id="6OOkb_bf0T_" role="jymVt">
+    <node concept="2YIFZL" id="5QVyGuWgxOJ" role="jymVt">
       <property role="TrG5h" value="extract" />
-      <node concept="37vLTG" id="4td5AAzdA$4" role="3clF46">
-        <property role="TrG5h" value="context" />
-        <node concept="3uibUv" id="4td5AAzdDMv" role="1tU5fm">
-          <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4td5AAzdK6$" role="3clF46">
-        <property role="TrG5h" value="snode" />
-        <node concept="3Tqbb2" id="4td5AAzdLOV" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="6OOkb_bgIi3" role="3clF46">
-        <property role="TrG5h" value="rootCell" />
-        <node concept="3uibUv" id="6OOkb_bgPaw" role="1tU5fm">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="6OOkb_bgPbd" role="3clF46">
-        <property role="TrG5h" value="currentCell" />
-        <node concept="3uibUv" id="6OOkb_bgPbu" role="1tU5fm">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2c3czgq2V7K" role="3clF46">
-        <property role="TrG5h" value="contextGrid" />
-        <node concept="3uibUv" id="2c3czgq2WDV" role="1tU5fm">
-          <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="6eBFmDE_ryT" role="3clF45">
-        <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-      </node>
-      <node concept="3Tm1VV" id="6OOkb_bf0TC" role="1B3o_S" />
       <node concept="3clFbS" id="6OOkb_bf0TD" role="3clF47">
         <node concept="3clFbJ" id="6OOkb_biNJQ" role="3cqZAp">
           <node concept="3clFbS" id="6OOkb_biNJT" role="3clFbx">
+            <node concept="3SKdUt" id="5QVyGuWfRTl" role="3cqZAp">
+              <node concept="1PaTwC" id="5QVyGuWfRTm" role="1aUNEU">
+                <node concept="3oM_SD" id="5QVyGuWfSKu" role="1PaTwD">
+                  <property role="3oM_SC" value="Only" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSKv" role="1PaTwD">
+                  <property role="3oM_SC" value="partial" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSLq" role="1PaTwD">
+                  <property role="3oM_SC" value="tables" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSN1" role="1PaTwD">
+                  <property role="3oM_SC" value="are" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSN2" role="1PaTwD">
+                  <property role="3oM_SC" value="merged" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSNX" role="1PaTwD">
+                  <property role="3oM_SC" value="into" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSOS" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSOT" role="1PaTwD">
+                  <property role="3oM_SC" value="parent" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSPO" role="1PaTwD">
+                  <property role="3oM_SC" value="table." />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSPP" role="1PaTwD">
+                  <property role="3oM_SC" value="Regular" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSRE" role="1PaTwD">
+                  <property role="3oM_SC" value="tables" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSS_" role="1PaTwD">
+                  <property role="3oM_SC" value="are" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSTw" role="1PaTwD">
+                  <property role="3oM_SC" value="shown" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSUr" role="1PaTwD">
+                  <property role="3oM_SC" value="as" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSVm" role="1PaTwD">
+                  <property role="3oM_SC" value="an" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSVn" role="1PaTwD">
+                  <property role="3oM_SC" value="independent" />
+                </node>
+                <node concept="3oM_SD" id="5QVyGuWfSXc" role="1PaTwD">
+                  <property role="3oM_SC" value="cell." />
+                </node>
+              </node>
+            </node>
             <node concept="3cpWs6" id="6OOkb_biPHx" role="3cqZAp">
               <node concept="10Nm6u" id="6OOkb_biQFX" role="3cqZAk" />
             </node>
@@ -4569,24 +3817,18 @@
           </node>
           <node concept="3eNFk2" id="6OOkb_biSoh" role="3eNLev">
             <node concept="3clFbS" id="6OOkb_biSoj" role="3eOfB_">
-              <node concept="1X3_iC" id="6QGC01EPlz3" role="lGtFl">
-                <property role="3V$3am" value="statement" />
-                <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                <node concept="3clFbF" id="6OOkb_bi2Hu" role="8Wnug">
-                  <node concept="2OqwBi" id="6OOkb_bi3Bm" role="3clFbG">
-                    <node concept="37vLTw" id="6OOkb_bi2Ht" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6OOkb_bhMV9" resolve="parent" />
+              <node concept="3cpWs8" id="7RfCpYECv11" role="3cqZAp">
+                <node concept="3cpWsn" id="7RfCpYECv12" role="3cpWs9">
+                  <property role="TrG5h" value="partialTable" />
+                  <node concept="3uibUv" id="7RfCpYECv13" role="1tU5fm">
+                    <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
+                  </node>
+                  <node concept="10QFUN" id="7RfCpYEC$_e" role="33vP2m">
+                    <node concept="37vLTw" id="7RfCpYEC$_d" role="10QFUP">
+                      <ref role="3cqZAo" node="6OOkb_bgPbd" resolve="currentCell" />
                     </node>
-                    <node concept="liA8E" id="6OOkb_bih8U" role="2OqNvi">
-                      <ref role="37wK5l" to="g51k:~EditorCell_Collection.removeCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="removeCell" />
-                      <node concept="10QFUN" id="6OOkb_bihT0" role="37wK5m">
-                        <node concept="3uibUv" id="6OOkb_bihV8" role="10QFUM">
-                          <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
-                        </node>
-                        <node concept="37vLTw" id="6OOkb_bih9U" role="10QFUP">
-                          <ref role="3cqZAo" node="6OOkb_bgPbd" resolve="currentCell" />
-                        </node>
-                      </node>
+                    <node concept="3uibUv" id="7RfCpYEC$_c" role="10QFUM">
+                      <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
                     </node>
                   </node>
                 </node>
@@ -4632,6 +3874,29 @@
                   </node>
                 </node>
               </node>
+              <node concept="3clFbH" id="7RfCpYEBRiN" role="3cqZAp" />
+              <node concept="3SKdUt" id="7RfCpYEBSlP" role="3cqZAp">
+                <node concept="1PaTwC" id="7RfCpYEBSlQ" role="1aUNEU">
+                  <node concept="3oM_SD" id="7RfCpYEBV1b" role="1PaTwD">
+                    <property role="3oM_SC" value="Take" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBV3g" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBV3h" role="1PaTwD">
+                    <property role="3oM_SC" value="annotated" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBV5m" role="1PaTwD">
+                    <property role="3oM_SC" value="partial" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBV5B" role="1PaTwD">
+                    <property role="3oM_SC" value="table" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBV6M" role="1PaTwD">
+                    <property role="3oM_SC" value="..." />
+                  </node>
+                </node>
+              </node>
               <node concept="3clFbF" id="6eBFmDEAnxs" role="3cqZAp">
                 <node concept="2OqwBi" id="6eBFmDEApnk" role="3clFbG">
                   <node concept="37vLTw" id="6eBFmDEAnxr" role="2Oq$k0">
@@ -4686,24 +3951,196 @@
                   </node>
                 </node>
               </node>
-              <node concept="3clFbF" id="2ZYnkVx5Q7n" role="3cqZAp">
-                <node concept="2OqwBi" id="2ZYnkVx5ROn" role="3clFbG">
-                  <node concept="37vLTw" id="2ZYnkVx5Q7m" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2ZYnkVx5E5Y" resolve="extracted" />
+              <node concept="3clFbH" id="7RfCpYEC29s" role="3cqZAp" />
+              <node concept="3SKdUt" id="7RfCpYEC3dn" role="3cqZAp">
+                <node concept="1PaTwC" id="7RfCpYECevc" role="1aUNEU">
+                  <node concept="3oM_SD" id="7RfCpYECfE0" role="1PaTwD">
+                    <property role="3oM_SC" value="Change" />
                   </node>
-                  <node concept="TSZUe" id="2ZYnkVx5Vis" role="2OqNvi">
-                    <node concept="10QFUN" id="2ZYnkVx5Vvl" role="25WWJ7">
-                      <node concept="37vLTw" id="2ZYnkVx5W6$" role="10QFUP">
-                        <ref role="3cqZAo" node="6OOkb_bgPbd" resolve="currentCell" />
-                      </node>
-                      <node concept="3uibUv" id="6eBFmDE_x5E" role="10QFUM">
-                        <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
-                      </node>
+                  <node concept="3oM_SD" id="7RfCpYECfFb" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECfFc" role="1PaTwD">
+                    <property role="3oM_SC" value="cell" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECfHh" role="1PaTwD">
+                    <property role="3oM_SC" value="tree" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECfHy" role="1PaTwD">
+                    <property role="3oM_SC" value="structure" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECfMe" role="1PaTwD">
+                    <property role="3oM_SC" value="from" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECfKN" role="1PaTwD">
+                    <property role="3oM_SC" value="MPS'" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECfOz" role="1PaTwD">
+                    <property role="3oM_SC" value="default" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECfO$" role="1PaTwD">
+                    <property role="3oM_SC" value="behavior" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECfPZ" role="1PaTwD">
+                    <property role="3oM_SC" value="to" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECfXa" role="1PaTwD">
+                    <property role="3oM_SC" value="how" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECfYl" role="1PaTwD">
+                    <property role="3oM_SC" value="it's" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECfZK" role="1PaTwD">
+                    <property role="3oM_SC" value="supposed" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECg0V" role="1PaTwD">
+                    <property role="3oM_SC" value="to" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECg0W" role="1PaTwD">
+                    <property role="3oM_SC" value="be" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECg0X" role="1PaTwD">
+                    <property role="3oM_SC" value="to" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECg1e" role="1PaTwD">
+                    <property role="3oM_SC" value="form" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECg29" role="1PaTwD">
+                    <property role="3oM_SC" value="a" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECg2a" role="1PaTwD">
+                    <property role="3oM_SC" value="valid" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECg3l" role="1PaTwD">
+                    <property role="3oM_SC" value="table." />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="6OOkb_bi2Hu" role="3cqZAp">
+                <node concept="2OqwBi" id="6OOkb_bi3Bm" role="3clFbG">
+                  <node concept="37vLTw" id="6OOkb_bi2Ht" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6OOkb_bhMV9" resolve="parent" />
+                  </node>
+                  <node concept="liA8E" id="6OOkb_bih8U" role="2OqNvi">
+                    <ref role="37wK5l" to="g51k:~EditorCell_Collection.removeCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="removeCell" />
+                    <node concept="37vLTw" id="7RfCpYECHR9" role="37wK5m">
+                      <ref role="3cqZAo" node="7RfCpYECv12" resolve="partialTable" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3SKdUt" id="7RfCpYECKot" role="3cqZAp">
+                <node concept="1PaTwC" id="7RfCpYECKou" role="1aUNEU">
+                  <node concept="3oM_SD" id="7RfCpYECKTb" role="1PaTwD">
+                    <property role="3oM_SC" value="Registering" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECKU6" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECKU7" role="1PaTwD">
+                    <property role="3oM_SC" value="cells" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECKU8" role="1PaTwD">
+                    <property role="3oM_SC" value="ensures" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECKVX" role="1PaTwD">
+                    <property role="3oM_SC" value="they" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECKVY" role="1PaTwD">
+                    <property role="3oM_SC" value="get" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECKWT" role="1PaTwD">
+                    <property role="3oM_SC" value="attached" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECKXO" role="1PaTwD">
+                    <property role="3oM_SC" value="again" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECKZD" role="1PaTwD">
+                    <property role="3oM_SC" value="to" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECL1u" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECL2p" role="1PaTwD">
+                    <property role="3oM_SC" value="cell" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYECL2q" role="1PaTwD">
+                    <property role="3oM_SC" value="tree." />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="7RfCpYEC8Xw" role="3cqZAp">
+                <node concept="2OqwBi" id="7RfCpYEC9TY" role="3clFbG">
+                  <node concept="2YIFZM" id="7RfCpYEC9sG" role="2Oq$k0">
+                    <ref role="37wK5l" node="1362cT3c3wo" resolve="getInstance" />
+                    <ref role="1Pybhc" node="1362cT3bWqU" resolve="OrphanCells" />
+                  </node>
+                  <node concept="liA8E" id="7RfCpYECb6L" role="2OqNvi">
+                    <ref role="37wK5l" node="1362cT3cM2o" resolve="registerChild" />
+                    <node concept="37vLTw" id="7RfCpYECc3J" role="37wK5m">
+                      <ref role="3cqZAo" node="7RfCpYECv12" resolve="partialTable" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="7RfCpYECcsY" role="3cqZAp">
+                <node concept="2OqwBi" id="7RfCpYECcsZ" role="3clFbG">
+                  <node concept="2YIFZM" id="7RfCpYECct0" role="2Oq$k0">
+                    <ref role="37wK5l" node="1362cT3c3wo" resolve="getInstance" />
+                    <ref role="1Pybhc" node="1362cT3bWqU" resolve="OrphanCells" />
+                  </node>
+                  <node concept="liA8E" id="7RfCpYECct1" role="2OqNvi">
+                    <ref role="37wK5l" node="1362cT3cM2o" resolve="registerChild" />
+                    <node concept="37vLTw" id="7RfCpYECct2" role="37wK5m">
+                      <ref role="3cqZAo" node="6OOkb_bgIi3" resolve="rootCell" />
                     </node>
                   </node>
                 </node>
               </node>
               <node concept="3clFbH" id="2ZYnkVx5P8_" role="3cqZAp" />
+              <node concept="3SKdUt" id="7RfCpYEBOQs" role="3cqZAp">
+                <node concept="1PaTwC" id="7RfCpYEBOQt" role="1aUNEU">
+                  <node concept="3oM_SD" id="7RfCpYEBPkL" role="1PaTwD">
+                    <property role="3oM_SC" value="..." />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBSZ4" role="1PaTwD">
+                    <property role="3oM_SC" value="and" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBVbb" role="1PaTwD">
+                    <property role="3oM_SC" value="place" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBPkM" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBPlH" role="1PaTwD">
+                    <property role="3oM_SC" value="annotation" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBPos" role="1PaTwD">
+                    <property role="3oM_SC" value="right" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBVnA" role="1PaTwD">
+                    <property role="3oM_SC" value="next" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBVnB" role="1PaTwD">
+                    <property role="3oM_SC" value="to" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBVnS" role="1PaTwD">
+                    <property role="3oM_SC" value="it" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBVsi" role="1PaTwD">
+                    <property role="3oM_SC" value="into" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBVsj" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBVte" role="1PaTwD">
+                    <property role="3oM_SC" value="same" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBVup" role="1PaTwD">
+                    <property role="3oM_SC" value="row." />
+                  </node>
+                </node>
+              </node>
               <node concept="3clFbF" id="6eBFmDEBH5f" role="3cqZAp">
                 <node concept="2OqwBi" id="6eBFmDEBH5g" role="3clFbG">
                   <node concept="37vLTw" id="6eBFmDEBH5h" role="2Oq$k0">
@@ -4729,6 +4166,37 @@
                 </node>
               </node>
               <node concept="3clFbH" id="6eBFmDEBSVc" role="3cqZAp" />
+              <node concept="3SKdUt" id="7RfCpYEBZz3" role="3cqZAp">
+                <node concept="1PaTwC" id="7RfCpYEC07O" role="1aUNEU">
+                  <node concept="3oM_SD" id="7RfCpYEC07P" role="1PaTwD">
+                    <property role="3oM_SC" value="Set" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEC1Xm" role="1PaTwD">
+                    <property role="3oM_SC" value="a" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEC1XB" role="1PaTwD">
+                    <property role="3oM_SC" value="column" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEC1Yy" role="1PaTwD">
+                    <property role="3oM_SC" value="header" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEC1ZZ" role="1PaTwD">
+                    <property role="3oM_SC" value="for" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEC1PE" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEC21a" role="1PaTwD">
+                    <property role="3oM_SC" value="new" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEC1PF" role="1PaTwD">
+                    <property role="3oM_SC" value="annotation" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEC24p" role="1PaTwD">
+                    <property role="3oM_SC" value="cell." />
+                  </node>
+                </node>
+              </node>
               <node concept="3cpWs8" id="6OOkb_bn9vt" role="3cqZAp">
                 <node concept="3cpWsn" id="6OOkb_bn9vw" role="3cpWs9">
                   <property role="TrG5h" value="annotation" />
@@ -4774,7 +4242,7 @@
                             <ref role="3cqZAo" node="4td5AAzdK6$" resolve="snode" />
                           </node>
                           <node concept="37vLTw" id="2c3czgq9co2" role="37wK5m">
-                            <ref role="3cqZAo" node="2c3czgq2V7K" resolve="contextGrid" />
+                            <ref role="3cqZAo" node="6eBFmDEAjBD" resolve="result" />
                           </node>
                         </node>
                       </node>
@@ -4885,6 +4353,56 @@
                   <node concept="3x8VRR" id="6eBFmDEBOk9" role="2OqNvi" />
                 </node>
               </node>
+              <node concept="3clFbH" id="7RfCpYEBVwI" role="3cqZAp" />
+              <node concept="3SKdUt" id="7RfCpYEBWzK" role="3cqZAp">
+                <node concept="1PaTwC" id="7RfCpYEBWzL" role="1aUNEU">
+                  <node concept="3oM_SD" id="7RfCpYEBX2Y" role="1PaTwD">
+                    <property role="3oM_SC" value="The" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBX3V" role="1PaTwD">
+                    <property role="3oM_SC" value="flattening" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBX9s" role="1PaTwD">
+                    <property role="3oM_SC" value="decides" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXbh" role="1PaTwD">
+                    <property role="3oM_SC" value="how" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXcc" role="1PaTwD">
+                    <property role="3oM_SC" value="to" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXcd" role="1PaTwD">
+                    <property role="3oM_SC" value="merge" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXe4" role="1PaTwD">
+                    <property role="3oM_SC" value="both" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXfT" role="1PaTwD">
+                    <property role="3oM_SC" value="of" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXfU" role="1PaTwD">
+                    <property role="3oM_SC" value="them" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXfV" role="1PaTwD">
+                    <property role="3oM_SC" value="and" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXfW" role="1PaTwD">
+                    <property role="3oM_SC" value="sets" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXhL" role="1PaTwD">
+                    <property role="3oM_SC" value="column/rows" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXkw" role="1PaTwD">
+                    <property role="3oM_SC" value="spans" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXkx" role="1PaTwD">
+                    <property role="3oM_SC" value="if" />
+                  </node>
+                  <node concept="3oM_SD" id="7RfCpYEBXls" role="1PaTwD">
+                    <property role="3oM_SC" value="necessary." />
+                  </node>
+                </node>
+              </node>
               <node concept="3clFbF" id="2q4r_etLcSc" role="3cqZAp">
                 <node concept="2OqwBi" id="2q4r_etLehI" role="3clFbG">
                   <node concept="37vLTw" id="2q4r_etLcSb" role="2Oq$k0">
@@ -4917,33 +4435,12 @@
                   </node>
                 </node>
               </node>
-              <node concept="1Wc70l" id="2ZYnkVx5XvP" role="3uHU7B">
-                <node concept="2ZW3vV" id="6OOkb_biTlc" role="3uHU7B">
-                  <node concept="3uibUv" id="6eBFmDE_tSL" role="2ZW6by">
-                    <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
-                  </node>
-                  <node concept="37vLTw" id="6OOkb_biTle" role="2ZW6bz">
-                    <ref role="3cqZAo" node="6OOkb_bgPbd" resolve="currentCell" />
-                  </node>
+              <node concept="2ZW3vV" id="6OOkb_biTlc" role="3uHU7B">
+                <node concept="3uibUv" id="6eBFmDE_tSL" role="2ZW6by">
+                  <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
                 </node>
-                <node concept="3fqX7Q" id="2ZYnkVx642b" role="3uHU7w">
-                  <node concept="2OqwBi" id="2ZYnkVx642d" role="3fr31v">
-                    <node concept="37vLTw" id="2ZYnkVx642e" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2ZYnkVx5E5Y" resolve="extracted" />
-                    </node>
-                    <node concept="3JPx81" id="2ZYnkVx642f" role="2OqNvi">
-                      <node concept="1eOMI4" id="2ZYnkVx642g" role="25WWJ7">
-                        <node concept="10QFUN" id="2ZYnkVx642h" role="1eOMHV">
-                          <node concept="3uibUv" id="6eBFmDE_uBD" role="10QFUM">
-                            <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
-                          </node>
-                          <node concept="37vLTw" id="2ZYnkVx642j" role="10QFUP">
-                            <ref role="3cqZAo" node="6OOkb_bgPbd" resolve="currentCell" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
+                <node concept="37vLTw" id="6OOkb_biTle" role="2ZW6bz">
+                  <ref role="3cqZAo" node="6OOkb_bgPbd" resolve="currentCell" />
                 </node>
               </node>
             </node>
@@ -4979,7 +4476,7 @@
                         <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
                       </node>
                       <node concept="1rXfSq" id="6OOkb_bj45i" role="33vP2m">
-                        <ref role="37wK5l" node="6OOkb_bf0T_" resolve="extract" />
+                        <ref role="37wK5l" node="5QVyGuWgxOJ" resolve="extract" />
                         <node concept="37vLTw" id="4td5AAzdTmP" role="37wK5m">
                           <ref role="3cqZAo" node="4td5AAzdA$4" resolve="context" />
                         </node>
@@ -4992,9 +4489,6 @@
                         <node concept="2GrUjf" id="5Jx74hgyEJb" role="37wK5m">
                           <ref role="2Gs0qQ" node="5Jx74hgy_ND" resolve="child" />
                         </node>
-                        <node concept="37vLTw" id="2c3czgq9aNS" role="37wK5m">
-                          <ref role="3cqZAo" node="2c3czgq2V7K" resolve="contextGrid" />
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -5014,9 +4508,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="1rXfSq" id="5Jx74hgyAX6" role="2GsD0m">
-                  <ref role="37wK5l" node="5Jx74hgxUKD" resolve="combineWithOriginalChildren" />
-                  <node concept="37vLTw" id="5Jx74hgyAYQ" role="37wK5m">
+                <node concept="1rXfSq" id="70mku7uYx6V" role="2GsD0m">
+                  <ref role="37wK5l" node="5QVyGuWgB2R" resolve="combineWithOriginalChildren" />
+                  <node concept="37vLTw" id="70mku7uYy1O" role="37wK5m">
                     <ref role="3cqZAo" node="6OOkb_biEBF" resolve="collection" />
                   </node>
                 </node>
@@ -5037,16 +4531,47 @@
           <node concept="10Nm6u" id="6OOkb_bh_rM" role="3cqZAk" />
         </node>
       </node>
-    </node>
-    <node concept="2tJIrI" id="1U60oYvmLsa" role="jymVt" />
-    <node concept="3clFb_" id="5Jx74hgxUKD" role="jymVt">
-      <property role="TrG5h" value="combineWithOriginalChildren" />
-      <node concept="A3Dl8" id="5Jx74hgyzxX" role="3clF45">
-        <node concept="3uibUv" id="5Jx74hgyzxZ" role="A3Ik2">
+      <node concept="37vLTG" id="4td5AAzdA$4" role="3clF46">
+        <property role="TrG5h" value="context" />
+        <node concept="3uibUv" id="4td5AAzdDMv" role="1tU5fm">
+          <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4td5AAzdK6$" role="3clF46">
+        <property role="TrG5h" value="snode" />
+        <node concept="3Tqbb2" id="4td5AAzdLOV" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6OOkb_bgIi3" role="3clF46">
+        <property role="TrG5h" value="rootCell" />
+        <node concept="3uibUv" id="6OOkb_bgPaw" role="1tU5fm">
+          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6OOkb_bgPbd" role="3clF46">
+        <property role="TrG5h" value="currentCell" />
+        <node concept="3uibUv" id="6OOkb_bgPbu" role="1tU5fm">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
       </node>
-      <node concept="3Tm1VV" id="5Jx74hgxUKG" role="1B3o_S" />
+      <node concept="3uibUv" id="6eBFmDE_ryT" role="3clF45">
+        <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
+      </node>
+      <node concept="3Tm6S6" id="5sevPzmDqWL" role="1B3o_S" />
+      <node concept="2AHcQZ" id="5QVyGuWvVJU" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="P$JXv" id="7RfCpYEBGYR" role="lGtFl">
+        <node concept="TZ5HA" id="7RfCpYEBGYS" role="TZ5H$">
+          <node concept="1dT_AC" id="7RfCpYEBGYT" role="1dT_Ay" />
+        </node>
+        <node concept="x79VA" id="7RfCpYEBGZ6" role="3nqlJM">
+          <property role="x79VB" value="null if no partial table was found and [rootCell] should be rendered as a regular cell." />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="70mku7uRHON" role="jymVt" />
+    <node concept="2YIFZL" id="5QVyGuWgB2R" role="jymVt">
+      <property role="TrG5h" value="combineWithOriginalChildren" />
       <node concept="3clFbS" id="5Jx74hgxUKH" role="3clF47">
         <node concept="3cpWs8" id="5Jx74hgynqX" role="3cqZAp">
           <node concept="3cpWsn" id="5Jx74hgynr0" role="3cpWs9">
@@ -5141,6 +4666,12 @@
           <ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
         </node>
       </node>
+      <node concept="A3Dl8" id="5Jx74hgyzxX" role="3clF45">
+        <node concept="3uibUv" id="5Jx74hgyzxZ" role="A3Ik2">
+          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="5sevPzmDtDz" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="5Jx74hgxTSq" role="jymVt" />
     <node concept="2YIFZL" id="1U60oYvn811" role="jymVt">
@@ -5153,12 +4684,6 @@
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
       </node>
-      <node concept="37vLTG" id="1U60oYvncMB" role="3clF46">
-        <property role="TrG5h" value="parentGrid" />
-        <node concept="3uibUv" id="1U60oYvncPI" role="1tU5fm">
-          <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-        </node>
-      </node>
       <node concept="3clFbS" id="1U60oYvmPbT" role="3clF47">
         <node concept="3clFbJ" id="1U60oYvn9Iv" role="3cqZAp">
           <node concept="3clFbS" id="1U60oYvn9Iw" role="3clFbx">
@@ -5246,6 +4771,101 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="5QVyGuWdWUw" role="3cqZAp">
+          <node concept="3cpWsn" id="5QVyGuWdWUx" role="3cpWs9">
+            <property role="TrG5h" value="gridElement" />
+            <node concept="3uibUv" id="5QVyGuWdWDn" role="1tU5fm">
+              <ref role="3uigEE" to="6dpw:7C0FR5Aonyd" resolve="IGridElement" />
+            </node>
+            <node concept="0kSF2" id="5QVyGuWdWUy" role="33vP2m">
+              <node concept="3uibUv" id="5QVyGuWdWUz" role="0kSFW">
+                <ref role="3uigEE" to="6dpw:7C0FR5Aonyd" resolve="IGridElement" />
+              </node>
+              <node concept="2OqwBi" id="5QVyGuWdWU$" role="0kSFX">
+                <node concept="37vLTw" id="5QVyGuWdWU_" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1U60oYvK3si" resolve="cell" />
+                </node>
+                <node concept="liA8E" id="5QVyGuWdWUA" role="2OqNvi">
+                  <ref role="37wK5l" to="f4zo:~EditorCell.getUserObject(java.lang.Object)" resolve="getUserObject" />
+                  <node concept="37vLTw" id="5QVyGuWdWUB" role="37wK5m">
+                    <ref role="3cqZAo" node="5QVyGuWdPeh" resolve="GRID_KEY" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="5QVyGuWdXyg" role="3cqZAp">
+          <node concept="3clFbS" id="5QVyGuWdXyi" role="3clFbx">
+            <node concept="3cpWs6" id="5QVyGuWdYsV" role="3cqZAp">
+              <node concept="37vLTw" id="5QVyGuWe0WC" role="3cqZAk">
+                <ref role="3cqZAo" node="5QVyGuWdWUx" resolve="gridElement" />
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="5QVyGuWdY4J" role="3clFbw">
+            <node concept="10Nm6u" id="5QVyGuWdYiS" role="3uHU7w" />
+            <node concept="37vLTw" id="5QVyGuWdXJH" role="3uHU7B">
+              <ref role="3cqZAo" node="5QVyGuWdWUx" resolve="gridElement" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5QVyGuWdTPj" role="3cqZAp">
+          <node concept="37vLTI" id="5QVyGuWf$Ui" role="3clFbG">
+            <node concept="1rXfSq" id="5QVyGuWf_8I" role="37vLTx">
+              <ref role="37wK5l" node="5QVyGuWdkoo" resolve="createGridElementFromEditorCell" />
+              <node concept="37vLTw" id="5QVyGuWfBvZ" role="37wK5m">
+                <ref role="3cqZAo" node="1U60oYvK3si" resolve="cell" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5QVyGuWdWUC" role="37vLTJ">
+              <ref role="3cqZAo" node="5QVyGuWdWUx" resolve="gridElement" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5QVyGuWfDRz" role="3cqZAp">
+          <node concept="2OqwBi" id="5QVyGuWfE54" role="3clFbG">
+            <node concept="37vLTw" id="5QVyGuWfDRx" role="2Oq$k0">
+              <ref role="3cqZAo" node="1U60oYvK3si" resolve="cell" />
+            </node>
+            <node concept="liA8E" id="5QVyGuWfEj4" role="2OqNvi">
+              <ref role="37wK5l" to="f4zo:~EditorCell.putUserObject(java.lang.Object,java.lang.Object)" resolve="putUserObject" />
+              <node concept="37vLTw" id="5QVyGuWfEUx" role="37wK5m">
+                <ref role="3cqZAo" node="5QVyGuWdPeh" resolve="GRID_KEY" />
+              </node>
+              <node concept="37vLTw" id="5QVyGuWfIXz" role="37wK5m">
+                <ref role="3cqZAo" node="5QVyGuWdWUx" resolve="gridElement" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="5QVyGuWfBJh" role="3cqZAp">
+          <node concept="37vLTw" id="5QVyGuWfC2w" role="3cqZAk">
+            <ref role="3cqZAo" node="5QVyGuWdWUx" resolve="gridElement" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="1U60oYvK3si" role="3clF46">
+        <property role="TrG5h" value="cell" />
+        <node concept="3uibUv" id="1U60oYvK4Tw" role="1tU5fm">
+          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="1U60oYvKaJ$" role="3clF45">
+        <ref role="3uigEE" to="6dpw:7C0FR5Aonyd" resolve="IGridElement" />
+      </node>
+      <node concept="3Tm1VV" id="1U60oYvJQV_" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5QVyGuWd4uL" role="jymVt" />
+    <node concept="2YIFZL" id="5QVyGuWdkoo" role="jymVt">
+      <property role="TrG5h" value="createGridElementFromEditorCell" />
+      <node concept="37vLTG" id="5QVyGuWdorV" role="3clF46">
+        <property role="TrG5h" value="cell" />
+        <node concept="3uibUv" id="5QVyGuWdorW" role="1tU5fm">
+          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="5QVyGuWd8i6" role="3clF47">
         <node concept="3cpWs8" id="1U60oYvK6o4" role="3cqZAp">
           <node concept="3cpWsn" id="1U60oYvK6o5" role="3cpWs9">
             <property role="TrG5h" value="grid" />
@@ -5255,10 +4875,7 @@
             <node concept="1rXfSq" id="1U60oYvK6pI" role="33vP2m">
               <ref role="37wK5l" node="1U60oYvn811" resolve="getGridFromPartialTable" />
               <node concept="37vLTw" id="1U60oYvK6q$" role="37wK5m">
-                <ref role="3cqZAo" node="1U60oYvK3si" resolve="cell" />
-              </node>
-              <node concept="37vLTw" id="1U60oYvK6sD" role="37wK5m">
-                <ref role="3cqZAo" node="1U60oYvK4TS" resolve="parentGrid" />
+                <ref role="3cqZAo" node="5QVyGuWdorV" resolve="cell" />
               </node>
             </node>
           </node>
@@ -5278,71 +4895,32 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4ncOM41G8hI" role="3cqZAp">
-          <node concept="3cpWsn" id="4ncOM41G8hJ" role="3cpWs9">
-            <property role="TrG5h" value="instance" />
-            <node concept="3uibUv" id="4ncOM41G8hK" role="1tU5fm">
-              <ref role="3uigEE" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-            </node>
-            <node concept="1rXfSq" id="4ncOM41G8MM" role="33vP2m">
-              <ref role="37wK5l" node="4td5AAzdgxe" resolve="getInstance" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="4ncOM41G9bW" role="3cqZAp">
-          <node concept="3clFbS" id="4ncOM41G9bZ" role="3clFbx">
-            <node concept="3cpWs6" id="4ncOM41G9_R" role="3cqZAp">
-              <node concept="2ShNRf" id="4ncOM41G9Me" role="3cqZAk">
-                <node concept="1pGfFk" id="4ncOM41GDSE" role="2ShVmc">
-                  <ref role="37wK5l" to="6dpw:RywcYwuxYJ" resolve="EditorCellGridLeaf" />
-                  <node concept="37vLTw" id="4ncOM41GE25" role="37wK5m">
-                    <ref role="3cqZAo" node="1U60oYvK3si" resolve="cell" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="4ncOM41G9s0" role="3clFbw">
-            <node concept="10Nm6u" id="4ncOM41G9xQ" role="3uHU7w" />
-            <node concept="37vLTw" id="4ncOM41G9lG" role="3uHU7B">
-              <ref role="3cqZAo" node="4ncOM41G8hJ" resolve="instance" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="2q4r_et8u32" role="3cqZAp">
           <node concept="37vLTI" id="2q4r_et8uf5" role="3clFbG">
             <node concept="37vLTw" id="2q4r_et8u31" role="37vLTJ">
               <ref role="3cqZAo" node="1U60oYvK6o5" resolve="grid" />
             </node>
-            <node concept="2OqwBi" id="4ncOM41G7SV" role="37vLTx">
-              <node concept="37vLTw" id="4ncOM41G8WE" role="2Oq$k0">
-                <ref role="3cqZAo" node="4ncOM41G8hJ" resolve="instance" />
-              </node>
-              <node concept="liA8E" id="2q4r_et8rxR" role="2OqNvi">
-                <ref role="37wK5l" node="6OOkb_bgPcO" resolve="extract" />
-                <node concept="2OqwBi" id="2q4r_et8rJC" role="37wK5m">
-                  <node concept="37vLTw" id="2q4r_et8r_y" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1U60oYvK3si" resolve="cell" />
-                  </node>
-                  <node concept="liA8E" id="2q4r_et8s8M" role="2OqNvi">
-                    <ref role="37wK5l" to="f4zo:~EditorCell.getContext()" resolve="getContext" />
-                  </node>
+            <node concept="1rXfSq" id="5QVyGuWgzHQ" role="37vLTx">
+              <ref role="37wK5l" node="5QVyGuWgv$o" resolve="extract" />
+              <node concept="2OqwBi" id="2q4r_et8rJC" role="37wK5m">
+                <node concept="37vLTw" id="2q4r_et8r_y" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5QVyGuWdorV" resolve="cell" />
                 </node>
-                <node concept="2OqwBi" id="2q4r_et8smA" role="37wK5m">
-                  <node concept="37vLTw" id="2q4r_et8shE" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1U60oYvK3si" resolve="cell" />
-                  </node>
-                  <node concept="liA8E" id="2q4r_et8s_Q" role="2OqNvi">
-                    <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
-                  </node>
+                <node concept="liA8E" id="2q4r_et8s8M" role="2OqNvi">
+                  <ref role="37wK5l" to="f4zo:~EditorCell.getContext()" resolve="getContext" />
                 </node>
-                <node concept="37vLTw" id="2q4r_et8sTL" role="37wK5m">
-                  <ref role="3cqZAo" node="1U60oYvK3si" resolve="cell" />
+              </node>
+              <node concept="2OqwBi" id="2q4r_et8smA" role="37wK5m">
+                <node concept="37vLTw" id="2q4r_et8shE" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5QVyGuWdorV" resolve="cell" />
                 </node>
-                <node concept="37vLTw" id="2q4r_et8t4b" role="37wK5m">
-                  <ref role="3cqZAo" node="1U60oYvK4TS" resolve="parentGrid" />
+                <node concept="liA8E" id="2q4r_et8s_Q" role="2OqNvi">
+                  <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
                 </node>
               </node>
+              <node concept="37vLTw" id="2q4r_et8sTL" role="37wK5m">
+                <ref role="3cqZAo" node="5QVyGuWdorV" resolve="cell" />
+              </node>
             </node>
           </node>
         </node>
@@ -5366,194 +4944,63 @@
             <node concept="1pGfFk" id="1U60oYvKsI_" role="2ShVmc">
               <ref role="37wK5l" to="6dpw:RywcYwuxYJ" resolve="EditorCellGridLeaf" />
               <node concept="37vLTw" id="1U60oYvKtNd" role="37wK5m">
-                <ref role="3cqZAo" node="1U60oYvK3si" resolve="cell" />
+                <ref role="3cqZAo" node="5QVyGuWdorV" resolve="cell" />
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="1U60oYvK3si" role="3clF46">
-        <property role="TrG5h" value="cell" />
-        <node concept="3uibUv" id="1U60oYvK4Tw" role="1tU5fm">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="1U60oYvK4TS" role="3clF46">
-        <property role="TrG5h" value="parentGrid" />
-        <node concept="3uibUv" id="1U60oYvK6n0" role="1tU5fm">
-          <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="1U60oYvKaJ$" role="3clF45">
+      <node concept="3uibUv" id="5QVyGuWdl$G" role="3clF45">
         <ref role="3uigEE" to="6dpw:7C0FR5Aonyd" resolve="IGridElement" />
       </node>
-      <node concept="3Tm1VV" id="1U60oYvJQV_" role="1B3o_S" />
+      <node concept="3Tm6S6" id="5QVyGuWdbC6" role="1B3o_S" />
+      <node concept="2AHcQZ" id="5QVyGuWfzX2" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
     </node>
-    <node concept="2tJIrI" id="1U60oYvJPlN" role="jymVt" />
-    <node concept="Wx3nA" id="4td5AAzdgx4" role="jymVt">
-      <property role="TrG5h" value="instances" />
-      <node concept="3Tm6S6" id="4td5AAzdgx5" role="1B3o_S" />
-      <node concept="3uibUv" id="4td5AAzdgx6" role="1tU5fm">
-        <ref role="3uigEE" to="wyt6:~ThreadLocal" resolve="ThreadLocal" />
-        <node concept="oyxx6" id="4td5AAzdgx7" role="11_B2D">
-          <node concept="3uibUv" id="4td5AAzdm10" role="3O5elw">
-            <ref role="3uigEE" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-          </node>
+    <node concept="3Tm1VV" id="6OOkb_bf0Q3" role="1B3o_S" />
+    <node concept="3UR2Jj" id="7RfCpYEBtfq" role="lGtFl">
+      <node concept="TZ5HA" id="7RfCpYEBtfr" role="TZ5H$">
+        <node concept="1dT_AC" id="7RfCpYEBtfs" role="1dT_Ay">
+          <property role="1dT_AB" value="This class handles editor cells from NodeAttributes." />
         </node>
       </node>
-      <node concept="2ShNRf" id="4td5AAzdgx9" role="33vP2m">
-        <node concept="1pGfFk" id="4td5AAzdgxa" role="2ShVmc">
-          <ref role="37wK5l" to="wyt6:~ThreadLocal.&lt;init&gt;()" resolve="ThreadLocal" />
-          <node concept="oyxx6" id="4td5AAzdgxb" role="1pMfVU">
-            <node concept="3uibUv" id="4td5AAzdoge" role="3O5elw">
-              <ref role="3uigEE" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-            </node>
-          </node>
+      <node concept="TZ5HA" id="7RfCpYEBAza" role="TZ5H$">
+        <node concept="1dT_AC" id="7RfCpYEBAzb" role="1dT_Ay">
+          <property role="1dT_AB" value="" />
         </node>
       </node>
-    </node>
-    <node concept="2tJIrI" id="4td5AAzdgxd" role="jymVt" />
-    <node concept="2YIFZL" id="4td5AAzdgxe" role="jymVt">
-      <property role="TrG5h" value="getInstance" />
-      <node concept="3uibUv" id="4td5AAzdsIh" role="3clF45">
-        <ref role="3uigEE" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-      </node>
-      <node concept="3Tm1VV" id="4td5AAzdgxg" role="1B3o_S" />
-      <node concept="3clFbS" id="4td5AAzdgxh" role="3clF47">
-        <node concept="3clFbF" id="4td5AAzdgxi" role="3cqZAp">
-          <node concept="1rXfSq" id="4td5AAzdgxj" role="3clFbG">
-            <ref role="37wK5l" node="4td5AAzdgy0" resolve="initStack" />
-          </node>
-        </node>
-        <node concept="3cpWs6" id="4td5AAzdgxk" role="3cqZAp">
-          <node concept="2OqwBi" id="4td5AAzdgxl" role="3cqZAk">
-            <node concept="2OqwBi" id="4td5AAzdgxm" role="2Oq$k0">
-              <node concept="10M0yZ" id="7Nzu1Mc$SVX" role="2Oq$k0">
-                <ref role="3cqZAo" node="4td5AAzdgx4" resolve="instances" />
-                <ref role="1PxDUh" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-              </node>
-              <node concept="liA8E" id="4td5AAzdgxn" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
-              </node>
-            </node>
-            <node concept="2oR75g" id="4td5AAzdgxo" role="2OqNvi" />
-          </node>
+      <node concept="TZ5HA" id="7RfCpYEBv1M" role="TZ5H$">
+        <node concept="1dT_AC" id="7RfCpYEBv1N" role="1dT_Ay">
+          <property role="1dT_AB" value="For example, if the rows of a table are child nodes, that return a partial table, and a NodeAttribute is added to one " />
         </node>
       </node>
-    </node>
-    <node concept="2tJIrI" id="4td5AAzdgxt" role="jymVt" />
-    <node concept="2YIFZL" id="4td5AAzdgxu" role="jymVt">
-      <property role="TrG5h" value="pushNewInstance" />
-      <node concept="3uibUv" id="4td5AAzdWJ4" role="3clF45">
-        <ref role="3uigEE" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-      </node>
-      <node concept="3Tm1VV" id="4td5AAzdgxw" role="1B3o_S" />
-      <node concept="3clFbS" id="4td5AAzdgxx" role="3clF47">
-        <node concept="3clFbF" id="4td5AAzdgxy" role="3cqZAp">
-          <node concept="1rXfSq" id="4td5AAzdgxz" role="3clFbG">
-            <ref role="37wK5l" node="4td5AAzdgy0" resolve="initStack" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="4td5AAzdgx$" role="3cqZAp">
-          <node concept="2OqwBi" id="4td5AAzdgx_" role="3clFbG">
-            <node concept="2OqwBi" id="4td5AAzdgxA" role="2Oq$k0">
-              <node concept="10M0yZ" id="7Nzu1Mc$SVY" role="2Oq$k0">
-                <ref role="3cqZAo" node="4td5AAzdgx4" resolve="instances" />
-                <ref role="1PxDUh" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-              </node>
-              <node concept="liA8E" id="4td5AAzdgxB" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
-              </node>
-            </node>
-            <node concept="2ArzE6" id="4td5AAzdgxC" role="2OqNvi">
-              <node concept="2ShNRf" id="4td5AAzdgxD" role="25WWJ7">
-                <node concept="1pGfFk" id="4td5AAzdwCN" role="2ShVmc">
-                  <ref role="37wK5l" node="6OOkb_bnoEt" resolve="PartialTableExtractor" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="4td5AAzdgxF" role="3cqZAp">
-          <node concept="1rXfSq" id="4td5AAzdgxG" role="3cqZAk">
-            <ref role="37wK5l" node="4td5AAzdgxe" resolve="getInstance" />
-          </node>
+      <node concept="TZ5HA" id="7RfCpYEBxlm" role="TZ5H$">
+        <node concept="1dT_AC" id="7RfCpYEBxln" role="1dT_Ay">
+          <property role="1dT_AB" value="of them, MPS wraps the partial table with additional cells from the NodeAttribute. This would break the table" />
         </node>
       </node>
-    </node>
-    <node concept="2tJIrI" id="4td5AAzdgxK" role="jymVt" />
-    <node concept="2YIFZL" id="4td5AAzdgxL" role="jymVt">
-      <property role="TrG5h" value="popInstance" />
-      <node concept="3uibUv" id="4td5AAzdYA0" role="3clF45">
-        <ref role="3uigEE" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
+      <node concept="TZ5HA" id="7RfCpYEBzqY" role="TZ5H$">
+        <node concept="1dT_AC" id="7RfCpYEBzqZ" role="1dT_Ay">
+          <property role="1dT_AB" value="structure because the child isn't rendered as a row anymore, but as a single cell." />
+        </node>
       </node>
-      <node concept="3Tm1VV" id="4td5AAzdgxN" role="1B3o_S" />
-      <node concept="3clFbS" id="4td5AAzdgxO" role="3clF47">
-        <node concept="3clFbF" id="4td5AAzdgxP" role="3cqZAp">
-          <node concept="1rXfSq" id="4td5AAzdgxQ" role="3clFbG">
-            <ref role="37wK5l" node="4td5AAzdgy0" resolve="initStack" />
-          </node>
+      <node concept="TZ5HA" id="7RfCpYEBBda" role="TZ5H$">
+        <node concept="1dT_AC" id="7RfCpYEBBdb" role="1dT_Ay">
+          <property role="1dT_AB" value="" />
         </node>
-        <node concept="3cpWs6" id="4td5AAzdgxR" role="3cqZAp">
-          <node concept="2OqwBi" id="4td5AAzdgxS" role="3cqZAk">
-            <node concept="2OqwBi" id="4td5AAzdgxT" role="2Oq$k0">
-              <node concept="10M0yZ" id="7Nzu1Mc$SVZ" role="2Oq$k0">
-                <ref role="1PxDUh" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-                <ref role="3cqZAo" node="4td5AAzdgx4" resolve="instances" />
-              </node>
-              <node concept="liA8E" id="4td5AAzdgxU" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
-              </node>
-            </node>
-            <node concept="2AryhJ" id="4td5AAzdgxV" role="2OqNvi" />
-          </node>
+      </node>
+      <node concept="TZ5HA" id="7RfCpYEBBdc" role="TZ5H$">
+        <node concept="1dT_AC" id="7RfCpYEBBdd" role="1dT_Ay">
+          <property role="1dT_AB" value="To fix that, we search for partial tables inside the cell tree and reshape the tree so that the annotation is rendered" />
         </node>
       </node>
-    </node>
-    <node concept="2tJIrI" id="4td5AAzdgxZ" role="jymVt" />
-    <node concept="2YIFZL" id="4td5AAzdgy0" role="jymVt">
-      <property role="TrG5h" value="initStack" />
-      <node concept="3cqZAl" id="4td5AAzdgy1" role="3clF45" />
-      <node concept="3Tm6S6" id="4td5AAzdgy2" role="1B3o_S" />
-      <node concept="3clFbS" id="4td5AAzdgy3" role="3clF47">
-        <node concept="3clFbJ" id="4td5AAzdgy4" role="3cqZAp">
-          <node concept="3clFbS" id="4td5AAzdgy5" role="3clFbx">
-            <node concept="3clFbF" id="4td5AAzdgy6" role="3cqZAp">
-              <node concept="2OqwBi" id="4td5AAzdgy7" role="3clFbG">
-                <node concept="10M0yZ" id="7Nzu1Mc$SW0" role="2Oq$k0">
-                  <ref role="1PxDUh" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-                  <ref role="3cqZAo" node="4td5AAzdgx4" resolve="instances" />
-                </node>
-                <node concept="liA8E" id="4td5AAzdgy8" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object)" resolve="set" />
-                  <node concept="2ShNRf" id="4td5AAzdgy9" role="37wK5m">
-                    <node concept="2Jqq0_" id="4td5AAzdgya" role="2ShVmc">
-                      <node concept="3uibUv" id="4td5AAze0n$" role="HW$YZ">
-                        <ref role="3uigEE" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="4td5AAzdgyc" role="3clFbw">
-            <node concept="10Nm6u" id="4td5AAzdgyd" role="3uHU7w" />
-            <node concept="2OqwBi" id="4td5AAzdgye" role="3uHU7B">
-              <node concept="10M0yZ" id="7Nzu1Mc$SW1" role="2Oq$k0">
-                <ref role="3cqZAo" node="4td5AAzdgx4" resolve="instances" />
-                <ref role="1PxDUh" node="6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-              </node>
-              <node concept="liA8E" id="4td5AAzdgyf" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
-              </node>
-            </node>
-          </node>
+      <node concept="TZ5HA" id="7RfCpYEBDbF" role="TZ5H$">
+        <node concept="1dT_AC" id="7RfCpYEBDbG" role="1dT_Ay">
+          <property role="1dT_AB" value="in a new column of the same row." />
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4td5AAzdfbQ" role="jymVt" />
-    <node concept="3Tm1VV" id="6OOkb_bf0Q3" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="1Aocu$ARmNl">
     <property role="TrG5h" value="CellLayout_PartialTable" />
@@ -9817,6 +9264,34 @@
           </node>
           <node concept="10Nm6u" id="20OswHE0fop" role="37wK5m" />
         </node>
+        <node concept="3clFbJ" id="5sevPzmxAYc" role="3cqZAp">
+          <node concept="3clFbS" id="5sevPzmxAYe" role="3clFbx">
+            <node concept="YS8fn" id="5sevPzmxCj$" role="3cqZAp">
+              <node concept="2ShNRf" id="5sevPzmxCB1" role="YScLw">
+                <node concept="1pGfFk" id="5sevPzmyqIP" role="2ShVmc">
+                  <property role="373rjd" value="true" />
+                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
+                  <node concept="3cpWs3" id="5sevPzmy_UM" role="37wK5m">
+                    <node concept="37vLTw" id="5sevPzmyA0o" role="3uHU7w">
+                      <ref role="3cqZAo" node="20OswHE1xW$" resolve="wrappedCell" />
+                    </node>
+                    <node concept="Xl_RD" id="5sevPzmyr4e" role="3uHU7B">
+                      <property role="Xl_RC" value="A Grid should have been created for the partial table: " />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2ZW3vV" id="5sevPzmxBFu" role="3clFbw">
+            <node concept="3uibUv" id="5sevPzmxC07" role="2ZW6by">
+              <ref role="3uigEE" node="2Jt5bYCPbd1" resolve="PartialTableEditor" />
+            </node>
+            <node concept="37vLTw" id="5sevPzmxBgO" role="2ZW6bz">
+              <ref role="3cqZAo" node="20OswHE1xW$" resolve="wrappedCell" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="20OswHE1y74" role="3cqZAp">
           <node concept="37vLTI" id="20OswHE1yf0" role="3clFbG">
             <node concept="37vLTw" id="20OswHE1yg2" role="37vLTx">
@@ -9827,6 +9302,18 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="5QVyGuWGlMG" role="3cqZAp">
+          <node concept="2OqwBi" id="5QVyGuWGqls" role="3clFbG">
+            <node concept="2YIFZM" id="5QVyGuWGpQX" role="2Oq$k0">
+              <ref role="37wK5l" node="1362cT3c3wo" resolve="getInstance" />
+              <ref role="1Pybhc" node="1362cT3bWqU" resolve="OrphanCells" />
+            </node>
+            <node concept="liA8E" id="5QVyGuWGuId" role="2OqNvi">
+              <ref role="37wK5l" node="1362cT3cM2o" resolve="registerChild" />
+              <node concept="Xjq3P" id="5QVyGuWGyQk" role="37wK5m" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="90HpR_MoeI" role="3cqZAp" />
         <node concept="3clFbF" id="4381QB0xfDy" role="3cqZAp">
           <node concept="1rXfSq" id="4381QB0xfDx" role="3clFbG">
@@ -12099,18 +11586,12 @@
         </node>
         <node concept="3clFbJ" id="4vp4nPrwDPj" role="3cqZAp">
           <node concept="3clFbS" id="4vp4nPrwDPl" role="3clFbx">
-            <node concept="3clFbF" id="4vp4nPrwJFo" role="3cqZAp">
-              <node concept="1rXfSq" id="4vp4nPrwJFm" role="3clFbG">
-                <ref role="37wK5l" to="g51k:~EditorCell_Collection.removeCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="removeCell" />
-                <node concept="1eOMI4" id="4vp4nPrwMgq" role="37wK5m">
-                  <node concept="10QFUN" id="4vp4nPrwMgn" role="1eOMHV">
-                    <node concept="3uibUv" id="4vp4nPrwMxg" role="10QFUM">
-                      <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
-                    </node>
-                    <node concept="37vLTw" id="4vp4nPrwJY5" role="10QFUP">
-                      <ref role="3cqZAo" node="20OswHE0fyJ" resolve="myWrappedEditorCell" />
-                    </node>
-                  </node>
+            <node concept="3clFbF" id="bMfgm9gXGY" role="3cqZAp">
+              <node concept="2YIFZM" id="bMfgm9hqZD" role="3clFbG">
+                <ref role="37wK5l" to="yj89:bMfgm9h8CU" resolve="removeCell" />
+                <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+                <node concept="37vLTw" id="bMfgm9hFn9" role="37wK5m">
+                  <ref role="3cqZAo" node="20OswHE0fyJ" resolve="myWrappedEditorCell" />
                 </node>
               </node>
             </node>
@@ -12123,36 +11604,24 @@
           </node>
           <node concept="9aQIb" id="4vp4nPrwGRQ" role="9aQIa">
             <node concept="3clFbS" id="4vp4nPrwGRR" role="9aQI4">
-              <node concept="3clFbF" id="22ekhmLmOTS" role="3cqZAp">
-                <node concept="2OqwBi" id="22ekhmLmPva" role="3clFbG">
-                  <node concept="37vLTw" id="22ekhmLmOTQ" role="2Oq$k0">
+              <node concept="3clFbF" id="bMfgm9foHH" role="3cqZAp">
+                <node concept="2YIFZM" id="bMfgm9f_N6" role="3clFbG">
+                  <ref role="37wK5l" to="yj89:bMfgm9dELu" resolve="addEditorCellBefore" />
+                  <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+                  <node concept="37vLTw" id="bMfgm9fIop" role="37wK5m">
                     <ref role="3cqZAo" node="2l3CneTt5qN" resolve="parent" />
                   </node>
-                  <node concept="liA8E" id="22ekhmLmPNF" role="2OqNvi">
-                    <ref role="37wK5l" to="f4zo:~EditorCell_Collection.addEditorCellBefore(jetbrains.mps.openapi.editor.cells.EditorCell,jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCellBefore" />
-                    <node concept="37vLTw" id="22ekhmLmSVY" role="37wK5m">
-                      <ref role="3cqZAo" node="20OswHE0fyJ" resolve="myWrappedEditorCell" />
-                    </node>
-                    <node concept="Xjq3P" id="22ekhmLmSdX" role="37wK5m" />
+                  <node concept="37vLTw" id="bMfgm9gc35" role="37wK5m">
+                    <ref role="3cqZAo" node="20OswHE0fyJ" resolve="myWrappedEditorCell" />
                   </node>
+                  <node concept="Xjq3P" id="bMfgm9glf$" role="37wK5m" />
                 </node>
               </node>
-              <node concept="3clFbF" id="2l3CneTtb4Y" role="3cqZAp">
-                <node concept="2OqwBi" id="2l3CneTtb4Z" role="3clFbG">
-                  <node concept="1eOMI4" id="2l3CneTtb50" role="2Oq$k0">
-                    <node concept="10QFUN" id="2l3CneTtb51" role="1eOMHV">
-                      <node concept="3uibUv" id="2l3CneTtb52" role="10QFUM">
-                        <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-                      </node>
-                      <node concept="37vLTw" id="2l3CneTtb53" role="10QFUP">
-                        <ref role="3cqZAo" node="2l3CneTt5qN" resolve="parent" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="2l3CneTtb54" role="2OqNvi">
-                    <ref role="37wK5l" to="g51k:~EditorCell_Collection.removeCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="removeCell" />
-                    <node concept="Xjq3P" id="2l3CneTtbqs" role="37wK5m" />
-                  </node>
+              <node concept="3clFbF" id="bMfgm9i4sh" role="3cqZAp">
+                <node concept="2YIFZM" id="bMfgm9ih6N" role="3clFbG">
+                  <ref role="37wK5l" to="yj89:bMfgm9h8CU" resolve="removeCell" />
+                  <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+                  <node concept="Xjq3P" id="bMfgm9inBm" role="37wK5m" />
                 </node>
               </node>
             </node>
@@ -15856,73 +15325,15 @@
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="ReH4Susrj2" role="3clF47">
-        <node concept="3clFbJ" id="ReH4Sustub" role="3cqZAp">
-          <node concept="3clFbS" id="ReH4Sustuc" role="3clFbx">
-            <node concept="3clFbF" id="ReH4Susumw" role="3cqZAp">
-              <node concept="2OqwBi" id="ReH4SusuIk" role="3clFbG">
-                <node concept="1eOMI4" id="ReH4Susumq" role="2Oq$k0">
-                  <node concept="10QFUN" id="ReH4Susumn" role="1eOMHV">
-                    <node concept="3uibUv" id="ReH4Susums" role="10QFUM">
-                      <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-                    </node>
-                    <node concept="2OqwBi" id="ReH4Susumt" role="10QFUP">
-                      <node concept="37vLTw" id="ReH4Susumu" role="2Oq$k0">
-                        <ref role="3cqZAo" node="ReH4Susteu" resolve="child" />
-                      </node>
-                      <node concept="liA8E" id="ReH4Susumv" role="2OqNvi">
-                        <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="ReH4Susyz5" role="2OqNvi">
-                  <ref role="37wK5l" to="g51k:~EditorCell_Collection.removeCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="removeCell" />
-                  <node concept="10QFUN" id="ReH4SuszDD" role="37wK5m">
-                    <node concept="3uibUv" id="ReH4SuszLi" role="10QFUM">
-                      <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
-                    </node>
-                    <node concept="37vLTw" id="ReH4SusyEe" role="10QFUP">
-                      <ref role="3cqZAo" node="ReH4Susteu" resolve="child" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Wc70l" id="ReH4SusyM5" role="3clFbw">
-            <node concept="2ZW3vV" id="ReH4SuszhG" role="3uHU7B">
-              <node concept="3uibUv" id="ReH4Susztp" role="2ZW6by">
-                <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
-              </node>
-              <node concept="37vLTw" id="ReH4Susz5t" role="2ZW6bz">
-                <ref role="3cqZAo" node="ReH4Susteu" resolve="child" />
-              </node>
-            </node>
-            <node concept="2ZW3vV" id="ReH4SustZP" role="3uHU7w">
-              <node concept="3uibUv" id="ReH4Susub4" role="2ZW6by">
-                <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-              </node>
-              <node concept="2OqwBi" id="ReH4Sustwb" role="2ZW6bz">
-                <node concept="37vLTw" id="ReH4SustuM" role="2Oq$k0">
-                  <ref role="3cqZAo" node="ReH4Susteu" resolve="child" />
-                </node>
-                <node concept="liA8E" id="ReH4SustIN" role="2OqNvi">
-                  <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="ReH4Sus$d1" role="3cqZAp">
-          <node concept="2OqwBi" id="ReH4Sus$G9" role="3clFbG">
-            <node concept="37vLTw" id="ReH4Sus$d0" role="2Oq$k0">
+        <node concept="3clFbF" id="bMfgm9dyu1" role="3cqZAp">
+          <node concept="2YIFZM" id="bMfgm9dyMM" role="3clFbG">
+            <ref role="37wK5l" to="yj89:3Qp43e36wM3" resolve="addEditorCell" />
+            <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+            <node concept="37vLTw" id="bMfgm9dzdY" role="37wK5m">
               <ref role="3cqZAo" node="ReH4Sust1_" resolve="parent" />
             </node>
-            <node concept="liA8E" id="ReH4SusBlj" role="2OqNvi">
-              <ref role="37wK5l" to="f4zo:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
-              <node concept="37vLTw" id="ReH4SusBmf" role="37wK5m">
-                <ref role="3cqZAo" node="ReH4Susteu" resolve="child" />
-              </node>
+            <node concept="37vLTw" id="bMfgm9dzTC" role="37wK5m">
+              <ref role="3cqZAo" node="ReH4Susteu" resolve="child" />
             </node>
           </node>
         </node>
@@ -16067,44 +15478,18 @@
         </node>
         <node concept="3clFbJ" id="ReH4SuMHM0" role="3cqZAp">
           <node concept="3clFbS" id="ReH4SuMHM3" role="3clFbx">
-            <node concept="3clFbF" id="22ekhmLvqj7" role="3cqZAp">
-              <node concept="2OqwBi" id="22ekhmLvq_s" role="3clFbG">
-                <node concept="37vLTw" id="22ekhmLvqj5" role="2Oq$k0">
+            <node concept="3clFbF" id="bMfgm9e8UC" role="3cqZAp">
+              <node concept="2YIFZM" id="bMfgm9e9k7" role="3clFbG">
+                <ref role="37wK5l" to="yj89:bMfgm9dELu" resolve="addEditorCellBefore" />
+                <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+                <node concept="37vLTw" id="bMfgm9e9Lo" role="37wK5m">
                   <ref role="3cqZAo" node="ReH4Sut27z" resolve="parent" />
                 </node>
-                <node concept="liA8E" id="22ekhmLvqTh" role="2OqNvi">
-                  <ref role="37wK5l" to="f4zo:~EditorCell_Collection.addEditorCellBefore(jetbrains.mps.openapi.editor.cells.EditorCell,jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCellBefore" />
-                  <node concept="37vLTw" id="22ekhmLvrmn" role="37wK5m">
-                    <ref role="3cqZAo" node="ReH4SusWGl" resolve="wrapper" />
-                  </node>
-                  <node concept="37vLTw" id="22ekhmLvraX" role="37wK5m">
-                    <ref role="3cqZAo" node="ReH4SusWDm" resolve="cell" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="ReH4Sut27M" role="3cqZAp">
-              <node concept="2OqwBi" id="ReH4Sut27N" role="3clFbG">
-                <node concept="1eOMI4" id="ReH4Sut27O" role="2Oq$k0">
-                  <node concept="10QFUN" id="ReH4Sut27P" role="1eOMHV">
-                    <node concept="3uibUv" id="ReH4Sut27Q" role="10QFUM">
-                      <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-                    </node>
-                    <node concept="37vLTw" id="ReH4Sut27R" role="10QFUP">
-                      <ref role="3cqZAo" node="ReH4Sut27z" resolve="parent" />
-                    </node>
-                  </node>
+                <node concept="37vLTw" id="bMfgm9eaAS" role="37wK5m">
+                  <ref role="3cqZAo" node="ReH4SusWGl" resolve="wrapper" />
                 </node>
-                <node concept="liA8E" id="ReH4Sut27S" role="2OqNvi">
-                  <ref role="37wK5l" to="g51k:~EditorCell_Collection.removeCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="removeCell" />
-                  <node concept="10QFUN" id="ReH4Sut27T" role="37wK5m">
-                    <node concept="3uibUv" id="ReH4Sut27U" role="10QFUM">
-                      <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
-                    </node>
-                    <node concept="37vLTw" id="ReH4Sut27V" role="10QFUP">
-                      <ref role="3cqZAo" node="ReH4SusWDm" resolve="cell" />
-                    </node>
-                  </node>
+                <node concept="37vLTw" id="bMfgm9ecPt" role="37wK5m">
+                  <ref role="3cqZAo" node="ReH4SusWDm" resolve="cell" />
                 </node>
               </node>
             </node>
@@ -16116,16 +15501,15 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="ReH4Sut27W" role="3cqZAp">
-          <node concept="2OqwBi" id="ReH4Sut27X" role="3clFbG">
-            <node concept="37vLTw" id="ReH4Sut27Y" role="2Oq$k0">
+        <node concept="3clFbF" id="bMfgm9dACT" role="3cqZAp">
+          <node concept="2YIFZM" id="bMfgm9dB43" role="3clFbG">
+            <ref role="37wK5l" to="yj89:3Qp43e36wM3" resolve="addEditorCell" />
+            <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+            <node concept="37vLTw" id="bMfgm9dCjv" role="37wK5m">
               <ref role="3cqZAo" node="ReH4SusWGl" resolve="wrapper" />
             </node>
-            <node concept="liA8E" id="ReH4Sut27Z" role="2OqNvi">
-              <ref role="37wK5l" to="f4zo:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
-              <node concept="37vLTw" id="ReH4Sut280" role="37wK5m">
-                <ref role="3cqZAo" node="ReH4SusWDm" resolve="cell" />
-              </node>
+            <node concept="37vLTw" id="bMfgm9dD41" role="37wK5m">
+              <ref role="3cqZAo" node="ReH4SusWDm" resolve="cell" />
             </node>
           </node>
         </node>
@@ -16151,61 +15535,15 @@
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="x$t3A6ZEV9" role="3clF47">
-        <node concept="3clFbJ" id="x$t3A6ZHCL" role="3cqZAp">
-          <node concept="3clFbS" id="x$t3A6ZHCM" role="3clFbx">
-            <node concept="3clFbF" id="x$t3A6ZHCN" role="3cqZAp">
-              <node concept="2OqwBi" id="x$t3A6ZHCO" role="3clFbG">
-                <node concept="1eOMI4" id="x$t3A6ZHCP" role="2Oq$k0">
-                  <node concept="10QFUN" id="x$t3A6ZHCQ" role="1eOMHV">
-                    <node concept="2OqwBi" id="x$t3A6ZHCR" role="10QFUP">
-                      <node concept="37vLTw" id="x$t3A6ZJgt" role="2Oq$k0">
-                        <ref role="3cqZAo" node="x$t3A6ZI2F" resolve="child" />
-                      </node>
-                      <node concept="liA8E" id="x$t3A6ZHCT" role="2OqNvi">
-                        <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="x$t3A6ZHCU" role="10QFUM">
-                      <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="x$t3A6ZHCV" role="2OqNvi">
-                  <ref role="37wK5l" to="g51k:~EditorCell_Collection.removeCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="removeCell" />
-                  <node concept="10QFUN" id="x$t3A6ZHCW" role="37wK5m">
-                    <node concept="3uibUv" id="x$t3A6ZHCX" role="10QFUM">
-                      <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
-                    </node>
-                    <node concept="37vLTw" id="x$t3A6ZJAz" role="10QFUP">
-                      <ref role="3cqZAo" node="x$t3A6ZI2F" resolve="child" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="x$t3A6ZHCZ" role="3clFbw">
-            <node concept="10Nm6u" id="x$t3A6ZHD0" role="3uHU7w" />
-            <node concept="2OqwBi" id="x$t3A6ZHD1" role="3uHU7B">
-              <node concept="37vLTw" id="x$t3A6ZIUg" role="2Oq$k0">
-                <ref role="3cqZAo" node="x$t3A6ZI2F" resolve="child" />
-              </node>
-              <node concept="liA8E" id="x$t3A6ZHD3" role="2OqNvi">
-                <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="x$t3A6ZKiY" role="3cqZAp">
-          <node concept="2OqwBi" id="x$t3A6ZKJ6" role="3clFbG">
-            <node concept="37vLTw" id="x$t3A6ZKiX" role="2Oq$k0">
+        <node concept="3clFbF" id="bMfgm9efrG" role="3cqZAp">
+          <node concept="2YIFZM" id="bMfgm9efNm" role="3clFbG">
+            <ref role="37wK5l" to="yj89:3Qp43e36wM3" resolve="addEditorCell" />
+            <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+            <node concept="37vLTw" id="bMfgm9egh9" role="37wK5m">
               <ref role="3cqZAo" node="x$t3A6ZIux" resolve="newParent" />
             </node>
-            <node concept="liA8E" id="x$t3A6ZLSk" role="2OqNvi">
-              <ref role="37wK5l" to="f4zo:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
-              <node concept="37vLTw" id="x$t3A6ZQIo" role="37wK5m">
-                <ref role="3cqZAo" node="x$t3A6ZI2F" resolve="child" />
-              </node>
+            <node concept="37vLTw" id="bMfgm9egWp" role="37wK5m">
+              <ref role="3cqZAo" node="x$t3A6ZI2F" resolve="child" />
             </node>
           </node>
         </node>
@@ -17002,14 +16340,6 @@
   </node>
   <node concept="312cEu" id="2Jt5bYCPbd1">
     <property role="TrG5h" value="PartialTableEditor" />
-    <node concept="2tJIrI" id="1Aocu$Ar4Hk" role="jymVt" />
-    <node concept="312cEg" id="5Jx74hguSDb" role="jymVt">
-      <property role="TrG5h" value="myOriginalParent" />
-      <node concept="3Tm6S6" id="5Jx74hguSDc" role="1B3o_S" />
-      <node concept="3uibUv" id="5Jx74hguTpg" role="1tU5fm">
-        <ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="5Jx74hguGP_" role="jymVt" />
     <node concept="3Tm1VV" id="2Jt5bYCPbd2" role="1B3o_S" />
     <node concept="3uibUv" id="7Nzu1McACxx" role="1zkMxy">
@@ -17040,49 +16370,6 @@
             <ref role="3cqZAo" node="2Jt5bYCPbkQ" resolve="grid" />
           </node>
         </node>
-        <node concept="3cpWs8" id="7N9Z2vLQ7Ko" role="3cqZAp">
-          <node concept="3cpWsn" id="7N9Z2vLQ7Kp" role="3cpWs9">
-            <property role="TrG5h" value="instance" />
-            <node concept="3uibUv" id="7N9Z2vLQ6Qn" role="1tU5fm">
-              <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
-            </node>
-            <node concept="2YIFZM" id="7N9Z2vLQ7Kq" role="33vP2m">
-              <ref role="37wK5l" node="1362cT3c3wo" resolve="getInstance" />
-              <ref role="1Pybhc" node="1362cT3bWqU" resolve="ChildsTracker" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="7N9Z2vLQdN7" role="3cqZAp">
-          <node concept="3clFbS" id="7N9Z2vLQdN9" role="3clFbx">
-            <node concept="YS8fn" id="7N9Z2vLQfJe" role="3cqZAp">
-              <node concept="2ShNRf" id="7N9Z2vLQg4_" role="YScLw">
-                <node concept="1pGfFk" id="7N9Z2vLQmhN" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-                  <node concept="Xl_RD" id="7N9Z2vLQmPI" role="37wK5m">
-                    <property role="Xl_RC" value="ChildsTracker is null: the partial table might not be part of a table." />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="7N9Z2vLQf4K" role="3clFbw">
-            <node concept="10Nm6u" id="7N9Z2vLQfq1" role="3uHU7w" />
-            <node concept="37vLTw" id="7N9Z2vLQepU" role="3uHU7B">
-              <ref role="3cqZAo" node="7N9Z2vLQ7Kp" resolve="instance" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1362cT3iaI5" role="3cqZAp">
-          <node concept="2OqwBi" id="1362cT3ibbW" role="3clFbG">
-            <node concept="liA8E" id="1362cT3ibyX" role="2OqNvi">
-              <ref role="37wK5l" node="1362cT3cM2o" resolve="registerChild" />
-              <node concept="Xjq3P" id="1362cT3ib$7" role="37wK5m" />
-            </node>
-            <node concept="37vLTw" id="7N9Z2vLQ7Kr" role="2Oq$k0">
-              <ref role="3cqZAo" node="7N9Z2vLQ7Kp" resolve="instance" />
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="20OswHDM4Be" role="3cqZAp">
           <node concept="3cpWsn" id="20OswHDM4Bf" role="3cpWs9">
             <property role="TrG5h" value="deleteAction" />
@@ -17168,72 +16455,12 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="20OswHDGbuz" role="jymVt" />
-    <node concept="3clFb_" id="5Jx74hguUEO" role="jymVt">
-      <property role="TrG5h" value="memorizeOriginalParent" />
-      <node concept="3cqZAl" id="5Jx74hguUEQ" role="3clF45" />
-      <node concept="3Tm1VV" id="5Jx74hguUER" role="1B3o_S" />
-      <node concept="3clFbS" id="5Jx74hguUES" role="3clF47">
-        <node concept="3clFbF" id="5Jx74hgv3Ax" role="3cqZAp">
-          <node concept="37vLTI" id="5Jx74hgv4Tp" role="3clFbG">
-            <node concept="1rXfSq" id="5Jx74hgv50a" role="37vLTx">
-              <ref role="37wK5l" to="g51k:~EditorCell_Basic.getParent()" resolve="getParent" />
-            </node>
-            <node concept="37vLTw" id="5Jx74hgv3Aw" role="37vLTJ">
-              <ref role="3cqZAo" node="5Jx74hguSDb" resolve="myOriginalParent" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5Jx74hgv53I" role="jymVt" />
-    <node concept="3clFb_" id="5Jx74hgv5ZW" role="jymVt">
-      <property role="TrG5h" value="resetToOriginalParent" />
-      <node concept="3cqZAl" id="5Jx74hgv5ZY" role="3clF45" />
-      <node concept="3Tm1VV" id="5Jx74hgv5ZZ" role="1B3o_S" />
-      <node concept="3clFbS" id="5Jx74hgv600" role="3clF47">
-        <node concept="3clFbJ" id="5Jx74hgvs1W" role="3cqZAp">
-          <node concept="3clFbS" id="5Jx74hgvs1Y" role="3clFbx">
-            <node concept="3clFbF" id="5Jx74hgvhtq" role="3cqZAp">
-              <node concept="2OqwBi" id="5Jx74hgvhBn" role="3clFbG">
-                <node concept="37vLTw" id="5Jx74hgvhtp" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5Jx74hguSDb" resolve="myOriginalParent" />
-                </node>
-                <node concept="liA8E" id="5Jx74hgvixt" role="2OqNvi">
-                  <ref role="37wK5l" to="f4zo:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
-                  <node concept="Xjq3P" id="5Jx74hgviAM" role="37wK5m" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="5Jx74hgvskL" role="3clFbw">
-            <node concept="10Nm6u" id="5Jx74hgvsqJ" role="3uHU7w" />
-            <node concept="37vLTw" id="5Jx74hgvs7t" role="3uHU7B">
-              <ref role="3cqZAo" node="5Jx74hguSDb" resolve="myOriginalParent" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="5Jx74hguTXg" role="jymVt" />
     <node concept="3clFb_" id="1MCPN0ioUI0" role="jymVt">
       <property role="TrG5h" value="init" />
       <node concept="3cqZAl" id="1MCPN0ioUI2" role="3clF45" />
       <node concept="3Tm1VV" id="1MCPN0ioUI3" role="1B3o_S" />
-      <node concept="3clFbS" id="1MCPN0ioUI4" role="3clF47">
-        <node concept="1X3_iC" id="5GwePVE5EJZ" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="5PYr1ZdCJ6W" role="8Wnug">
-            <node concept="1rXfSq" id="5PYr1ZdCJ6V" role="3clFbG">
-              <ref role="37wK5l" node="5PYr1ZdBFqw" resolve="addRegisteredGridCellsToThis" />
-              <node concept="37vLTw" id="1MCPN0ip08S" role="37wK5m">
-                <ref role="3cqZAo" node="7Nzu1Mc$SGa" resolve="myGrid" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
+      <node concept="3clFbS" id="1MCPN0ioUI4" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="2Jt5bYCPcga" role="jymVt" />
     <node concept="3clFb_" id="1wS0_2LK5ZA" role="jymVt">
@@ -33021,30 +32248,14 @@
             <node concept="3uibUv" id="3600dVer_An" role="1tU5fm">
               <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
             </node>
-            <node concept="2OqwBi" id="3600dVer_Ao" role="33vP2m">
-              <node concept="2OqwBi" id="3600dVer_Ap" role="2Oq$k0">
-                <node concept="2OqwBi" id="3600dVer_Aq" role="2Oq$k0">
-                  <node concept="2OqwBi" id="3600dVer_Ar" role="2Oq$k0">
-                    <node concept="1rXfSq" id="3600dVerCdQ" role="2Oq$k0">
-                      <ref role="37wK5l" to="nivk:~AbstractEditorBuilder.getEditorContext()" resolve="getEditorContext" />
-                    </node>
-                    <node concept="liA8E" id="3600dVer_At" role="2OqNvi">
-                      <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="3600dVer_Au" role="2OqNvi">
-                    <ref role="37wK5l" to="cj4x:~EditorComponent.getUpdater()" resolve="getUpdater" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="3600dVer_Av" role="2OqNvi">
-                  <ref role="37wK5l" to="22ra:~Updater.getCurrentUpdateSession()" resolve="getCurrentUpdateSession" />
-                </node>
+            <node concept="2YIFZM" id="70mku7u1_oJ" role="33vP2m">
+              <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
+              <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+              <node concept="1rXfSq" id="70mku7u1_oK" role="37wK5m">
+                <ref role="37wK5l" to="nivk:~AbstractEditorBuilder.getEditorContext()" resolve="getEditorContext" />
               </node>
-              <node concept="liA8E" id="3600dVer_Aw" role="2OqNvi">
-                <ref role="37wK5l" to="22ra:~UpdateSession.updateChildNodeCell(org.jetbrains.mps.openapi.model.SNode)" resolve="updateChildNodeCell" />
-                <node concept="37vLTw" id="3600dVer_Ax" role="37wK5m">
-                  <ref role="3cqZAo" node="3600dVer_Ai" resolve="node" />
-                </node>
+              <node concept="37vLTw" id="70mku7u1_oL" role="37wK5m">
+                <ref role="3cqZAo" node="3600dVer_Ai" resolve="node" />
               </node>
             </node>
           </node>
@@ -33402,45 +32613,310 @@
     <node concept="2tJIrI" id="nl9fhaid84" role="jymVt" />
   </node>
   <node concept="312cEu" id="1362cT3bWqU">
-    <property role="TrG5h" value="ChildsTracker" />
-    <node concept="2tJIrI" id="1362cT3bWxu" role="jymVt" />
+    <property role="TrG5h" value="OrphanCells" />
+    <node concept="2tJIrI" id="70mku7ufh6C" role="jymVt" />
     <node concept="312cEg" id="1362cT3cSef" role="jymVt">
-      <property role="TrG5h" value="myChilds" />
+      <property role="TrG5h" value="createdCells" />
       <node concept="3Tm6S6" id="1362cT3cSeg" role="1B3o_S" />
-      <node concept="3uibUv" id="1362cT3cS_J" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-        <node concept="3uibUv" id="1362cT3cSA6" role="11_B2D">
+      <node concept="2hMVRd" id="70mku7u9_WV" role="1tU5fm">
+        <node concept="3uibUv" id="70mku7u9_WX" role="2hN53Y">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
       </node>
       <node concept="2ShNRf" id="1362cT3cSDH" role="33vP2m">
-        <node concept="1pGfFk" id="1362cT3cTul" role="2ShVmc">
-          <ref role="37wK5l" to="33ny:~HashSet.&lt;init&gt;()" resolve="HashSet" />
-          <node concept="3uibUv" id="1362cT3cTCy" role="1pMfVU">
-            <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-          </node>
-        </node>
+        <node concept="2i4dXS" id="70mku7u9GjC" role="2ShVmc" />
       </node>
     </node>
     <node concept="312cEg" id="4MuW45D84xH" role="jymVt">
-      <property role="TrG5h" value="myHeaderChilds" />
+      <property role="TrG5h" value="createdHeaderCells" />
       <node concept="3Tm6S6" id="4MuW45D84xI" role="1B3o_S" />
-      <node concept="3uibUv" id="4MuW45D85_x" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-        <node concept="3uibUv" id="4MuW45D85A8" role="11_B2D">
+      <node concept="2hMVRd" id="70mku7u9Bg$" role="1tU5fm">
+        <node concept="3uibUv" id="70mku7u9BgA" role="2hN53Y">
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
       </node>
       <node concept="2ShNRf" id="4MuW45D85Cn" role="33vP2m">
-        <node concept="1pGfFk" id="4MuW45D8C6i" role="2ShVmc">
-          <ref role="37wK5l" to="33ny:~HashSet.&lt;init&gt;()" resolve="HashSet" />
-          <node concept="3uibUv" id="4MuW45D8CgH" role="1pMfVU">
+        <node concept="2i4dXS" id="70mku7u9K3P" role="2ShVmc" />
+      </node>
+    </node>
+    <node concept="312cEg" id="5QVyGuWybFl" role="jymVt">
+      <property role="TrG5h" value="isInNextTree" />
+      <node concept="3Tm6S6" id="5QVyGuWybFm" role="1B3o_S" />
+      <node concept="3rvAFt" id="5QVyGuWzgUu" role="1tU5fm">
+        <node concept="3uibUv" id="5QVyGuWzi2z" role="3rvQeY">
+          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+        </node>
+        <node concept="3uibUv" id="5QVyGuWzkcZ" role="3rvSg0">
+          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="5QVyGuWzqPu" role="33vP2m">
+        <node concept="3rGOSV" id="5QVyGuWzqKZ" role="2ShVmc">
+          <node concept="3uibUv" id="5QVyGuWzqL0" role="3rHrn6">
             <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
           </node>
+          <node concept="3uibUv" id="5QVyGuWzqL1" role="3rHtpV">
+            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+          </node>
         </node>
       </node>
     </node>
     <node concept="2tJIrI" id="36rxy05z0O" role="jymVt" />
+    <node concept="3clFb_" id="70mku7uDyhk" role="jymVt">
+      <property role="TrG5h" value="parentCreated" />
+      <node concept="37vLTG" id="70mku7uD$BG" role="3clF46">
+        <property role="TrG5h" value="parentCell" />
+        <node concept="3uibUv" id="70mku7uD_n8" role="1tU5fm">
+          <ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="70mku7uDyhm" role="3clF45" />
+      <node concept="3Tm1VV" id="70mku7uDyhn" role="1B3o_S" />
+      <node concept="3clFbS" id="70mku7uDyho" role="3clF47">
+        <node concept="3clFbF" id="5QVyGuWzHsy" role="3cqZAp">
+          <node concept="37vLTI" id="5QVyGuWzLPm" role="3clFbG">
+            <node concept="3clFbT" id="5QVyGuWzMFC" role="37vLTx">
+              <property role="3clFbU" value="true" />
+            </node>
+            <node concept="3EllGN" id="5QVyGuWzJE_" role="37vLTJ">
+              <node concept="37vLTw" id="5QVyGuWzKpY" role="3ElVtu">
+                <ref role="3cqZAo" node="70mku7uD$BG" resolve="parentCell" />
+              </node>
+              <node concept="37vLTw" id="5QVyGuWzHsw" role="3ElQJh">
+                <ref role="3cqZAo" node="5QVyGuWybFl" resolve="orphanStatus" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="70mku7uDZ5R" role="3cqZAp">
+          <node concept="2GrKxI" id="70mku7uDZ5T" role="2Gsz3X">
+            <property role="TrG5h" value="child" />
+          </node>
+          <node concept="37vLTw" id="70mku7uE0k7" role="2GsD0m">
+            <ref role="3cqZAo" node="1362cT3cSef" resolve="myChilds" />
+          </node>
+          <node concept="3clFbS" id="70mku7uDZ5X" role="2LFqv$">
+            <node concept="3clFbJ" id="5QVyGuW$bM_" role="3cqZAp">
+              <node concept="3clFbS" id="5QVyGuW$bMB" role="3clFbx">
+                <node concept="3clFbF" id="70mku7uE106" role="3cqZAp">
+                  <node concept="2OqwBi" id="70mku7uE7sB" role="3clFbG">
+                    <node concept="37vLTw" id="5QVyGuWnZx3" role="2Oq$k0">
+                      <ref role="3cqZAo" node="70mku7uD$BG" resolve="parentCell" />
+                    </node>
+                    <node concept="liA8E" id="70mku7uE8DO" role="2OqNvi">
+                      <ref role="37wK5l" to="f4zo:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
+                      <node concept="2GrUjf" id="70mku7uE9hS" role="37wK5m">
+                        <ref role="2Gs0qQ" node="70mku7uDZ5T" resolve="child" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3fqX7Q" id="5QVyGuW_diU" role="3clFbw">
+                <node concept="1rXfSq" id="5QVyGuW_diW" role="3fr31v">
+                  <ref role="37wK5l" node="5QVyGuW$kTZ" resolve="isAlreadyInNextTree" />
+                  <node concept="2GrUjf" id="5QVyGuW_diX" role="37wK5m">
+                    <ref role="2Gs0qQ" node="70mku7uDZ5T" resolve="child" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="70mku7uE9Ss" role="3cqZAp">
+          <node concept="2GrKxI" id="70mku7uE9St" role="2Gsz3X">
+            <property role="TrG5h" value="child" />
+          </node>
+          <node concept="37vLTw" id="70mku7uE9Su" role="2GsD0m">
+            <ref role="3cqZAo" node="4MuW45D84xH" resolve="myHeaderChilds" />
+          </node>
+          <node concept="3clFbS" id="70mku7uE9Sv" role="2LFqv$">
+            <node concept="3clFbJ" id="5QVyGuW$g1b" role="3cqZAp">
+              <node concept="3clFbS" id="5QVyGuW$g1d" role="3clFbx">
+                <node concept="3clFbF" id="70mku7uE9Sw" role="3cqZAp">
+                  <node concept="2OqwBi" id="70mku7uE9Sx" role="3clFbG">
+                    <node concept="37vLTw" id="5QVyGuWo0MP" role="2Oq$k0">
+                      <ref role="3cqZAo" node="70mku7uD$BG" resolve="parentCell" />
+                    </node>
+                    <node concept="liA8E" id="70mku7uE9SA" role="2OqNvi">
+                      <ref role="37wK5l" to="f4zo:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
+                      <node concept="2GrUjf" id="70mku7uE9SB" role="37wK5m">
+                        <ref role="2Gs0qQ" node="70mku7uE9St" resolve="child" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3fqX7Q" id="5QVyGuW_eAd" role="3clFbw">
+                <node concept="1rXfSq" id="5QVyGuW_eAf" role="3fr31v">
+                  <ref role="37wK5l" node="5QVyGuW$kTZ" resolve="isAlreadyInNextTree" />
+                  <node concept="2GrUjf" id="5QVyGuW_eAg" role="37wK5m">
+                    <ref role="2Gs0qQ" node="70mku7uE9St" resolve="child" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5QVyGuWy4Qo" role="jymVt" />
+    <node concept="3clFb_" id="5QVyGuW$kTZ" role="jymVt">
+      <property role="TrG5h" value="isAlreadyInNextTree" />
+      <node concept="37vLTG" id="5QVyGuW$vQN" role="3clF46">
+        <property role="TrG5h" value="cell" />
+        <node concept="3uibUv" id="5QVyGuW$wv_" role="1tU5fm">
+          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+        </node>
+      </node>
+      <node concept="10P_77" id="5QVyGuW$mSl" role="3clF45" />
+      <node concept="3Tm1VV" id="5QVyGuW$kU2" role="1B3o_S" />
+      <node concept="3clFbS" id="5QVyGuW$kU3" role="3clF47">
+        <node concept="3cpWs8" id="5QVyGuW$v8Q" role="3cqZAp">
+          <node concept="3cpWsn" id="5QVyGuW$v8R" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="3uibUv" id="5QVyGuW$v8S" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+            </node>
+            <node concept="3EllGN" id="5QVyGuW$v8T" role="33vP2m">
+              <node concept="37vLTw" id="5QVyGuW$v8U" role="3ElVtu">
+                <ref role="3cqZAo" node="5QVyGuW$vQN" resolve="cell" />
+              </node>
+              <node concept="37vLTw" id="5QVyGuW$v8V" role="3ElQJh">
+                <ref role="3cqZAo" node="5QVyGuWybFl" resolve="orphanStatus" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="5QVyGuW$v8W" role="3cqZAp">
+          <node concept="3clFbS" id="5QVyGuW$v8X" role="3clFbx">
+            <node concept="3cpWs6" id="5QVyGuW$v8Y" role="3cqZAp">
+              <node concept="37vLTw" id="5QVyGuW$v8Z" role="3cqZAk">
+                <ref role="3cqZAo" node="5QVyGuW$v8R" resolve="result" />
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="5QVyGuW$v90" role="3clFbw">
+            <node concept="10Nm6u" id="5QVyGuW$v91" role="3uHU7w" />
+            <node concept="37vLTw" id="5QVyGuW$v92" role="3uHU7B">
+              <ref role="3cqZAo" node="5QVyGuW$v8R" resolve="result" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="5QVyGuW$v93" role="3cqZAp">
+          <node concept="3cpWsn" id="5QVyGuW$v94" role="3cpWs9">
+            <property role="TrG5h" value="parent" />
+            <node concept="3uibUv" id="5QVyGuW$v95" role="1tU5fm">
+              <ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
+            </node>
+            <node concept="2OqwBi" id="5QVyGuW$v96" role="33vP2m">
+              <node concept="37vLTw" id="5QVyGuW$v97" role="2Oq$k0">
+                <ref role="3cqZAo" node="5QVyGuW$vQN" resolve="cell" />
+              </node>
+              <node concept="liA8E" id="5QVyGuW$v98" role="2OqNvi">
+                <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="5QVyGuW$v99" role="3cqZAp">
+          <node concept="3clFbS" id="5QVyGuW$v9a" role="3clFbx">
+            <node concept="3clFbJ" id="5QVyGuW$HFH" role="3cqZAp">
+              <node concept="3clFbS" id="5QVyGuW$HFJ" role="3clFbx">
+                <node concept="3clFbF" id="5QVyGuW$TBY" role="3cqZAp">
+                  <node concept="37vLTI" id="5QVyGuW$V_v" role="3clFbG">
+                    <node concept="3clFbT" id="5QVyGuW$WjW" role="37vLTx">
+                      <property role="3clFbU" value="true" />
+                    </node>
+                    <node concept="37vLTw" id="5QVyGuW$TBW" role="37vLTJ">
+                      <ref role="3cqZAo" node="5QVyGuW$v8R" resolve="result" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="22lmx$" id="5QVyGuW$PK6" role="3clFbw">
+                <node concept="2OqwBi" id="5QVyGuW$Rby" role="3uHU7w">
+                  <node concept="37vLTw" id="5QVyGuW$QvJ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4MuW45D84xH" resolve="createdHeaderChilds" />
+                  </node>
+                  <node concept="3JPx81" id="5QVyGuW$SdP" role="2OqNvi">
+                    <node concept="37vLTw" id="5QVyGuW$SU4" role="25WWJ7">
+                      <ref role="3cqZAo" node="5QVyGuW$v94" resolve="parent" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="5QVyGuW$Ky0" role="3uHU7B">
+                  <node concept="37vLTw" id="5QVyGuW$Iqk" role="2Oq$k0">
+                    <ref role="3cqZAo" node="1362cT3cSef" resolve="createdCells" />
+                  </node>
+                  <node concept="3JPx81" id="5QVyGuW$NEd" role="2OqNvi">
+                    <node concept="37vLTw" id="5QVyGuW$Olm" role="25WWJ7">
+                      <ref role="3cqZAo" node="5QVyGuW$v94" resolve="parent" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="9aQIb" id="5QVyGuW_afm" role="9aQIa">
+                <node concept="3clFbS" id="5QVyGuW_afn" role="9aQI4">
+                  <node concept="3clFbF" id="5QVyGuW$v9b" role="3cqZAp">
+                    <node concept="37vLTI" id="5QVyGuW$v9c" role="3clFbG">
+                      <node concept="1rXfSq" id="5QVyGuW$v9d" role="37vLTx">
+                        <ref role="37wK5l" node="5QVyGuW$kTZ" resolve="isAlreadyInNextTree" />
+                        <node concept="37vLTw" id="5QVyGuW$v9e" role="37wK5m">
+                          <ref role="3cqZAo" node="5QVyGuW$v94" resolve="parent" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="5QVyGuW$v9f" role="37vLTJ">
+                        <ref role="3cqZAo" node="5QVyGuW$v8R" resolve="result" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="5QVyGuW$v9g" role="3clFbw">
+            <node concept="37vLTw" id="5QVyGuW$v9h" role="3uHU7B">
+              <ref role="3cqZAo" node="5QVyGuW$v94" resolve="parent" />
+            </node>
+            <node concept="10Nm6u" id="5QVyGuW$v9i" role="3uHU7w" />
+          </node>
+          <node concept="9aQIb" id="5QVyGuW_5Un" role="9aQIa">
+            <node concept="3clFbS" id="5QVyGuW_5Uo" role="9aQI4">
+              <node concept="3clFbF" id="5QVyGuW_6Db" role="3cqZAp">
+                <node concept="37vLTI" id="5QVyGuW_8n6" role="3clFbG">
+                  <node concept="3clFbT" id="5QVyGuW_8WI" role="37vLTx" />
+                  <node concept="37vLTw" id="5QVyGuW_6Da" role="37vLTJ">
+                    <ref role="3cqZAo" node="5QVyGuW$v8R" resolve="result" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5QVyGuW$v9p" role="3cqZAp">
+          <node concept="37vLTI" id="5QVyGuW$v9q" role="3clFbG">
+            <node concept="37vLTw" id="5QVyGuW$v9r" role="37vLTx">
+              <ref role="3cqZAo" node="5QVyGuW$v8R" resolve="result" />
+            </node>
+            <node concept="3EllGN" id="5QVyGuW$v9s" role="37vLTJ">
+              <node concept="37vLTw" id="5QVyGuW$v9t" role="3ElVtu">
+                <ref role="3cqZAo" node="5QVyGuW$vQN" resolve="cell" />
+              </node>
+              <node concept="37vLTw" id="5QVyGuW$v9u" role="3ElQJh">
+                <ref role="3cqZAo" node="5QVyGuWybFl" resolve="orphanStatus" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="5QVyGuW$v9v" role="3cqZAp">
+          <node concept="37vLTw" id="5QVyGuW$v9w" role="3cqZAk">
+            <ref role="3cqZAo" node="5QVyGuW$v8R" resolve="result" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="70mku7uDxwU" role="jymVt" />
     <node concept="3clFb_" id="4MuW45D8Esq" role="jymVt">
       <property role="TrG5h" value="registerHeader" />
       <node concept="37vLTG" id="4MuW45D8Hn6" role="3clF46">
@@ -33457,9 +32933,8 @@
             <node concept="37vLTw" id="4MuW45D8IoN" role="2Oq$k0">
               <ref role="3cqZAo" node="4MuW45D84xH" resolve="myHeaderChilds" />
             </node>
-            <node concept="liA8E" id="4MuW45D8Kjg" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Set.add(java.lang.Object)" resolve="add" />
-              <node concept="37vLTw" id="4MuW45D8KtS" role="37wK5m">
+            <node concept="TSZUe" id="70mku7u9RJh" role="2OqNvi">
+              <node concept="37vLTw" id="70mku7u9SD6" role="25WWJ7">
                 <ref role="3cqZAo" node="4MuW45D8Hn6" resolve="child" />
               </node>
             </node>
@@ -33470,9 +32945,8 @@
             <node concept="37vLTw" id="4MuW45D8KOm" role="2Oq$k0">
               <ref role="3cqZAo" node="1362cT3cSef" resolve="myChilds" />
             </node>
-            <node concept="liA8E" id="4MuW45D8MU6" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Set.remove(java.lang.Object)" resolve="remove" />
-              <node concept="37vLTw" id="4MuW45D8N4I" role="37wK5m">
+            <node concept="3dhRuq" id="70mku7u9VYs" role="2OqNvi">
+              <node concept="37vLTw" id="70mku7u9WR$" role="25WWJ7">
                 <ref role="3cqZAo" node="4MuW45D8Hn6" resolve="child" />
               </node>
             </node>
@@ -33490,15 +32964,10 @@
           <node concept="3clFbS" id="4MuW45D8Nwq" role="3clFbx">
             <node concept="3cpWs6" id="4MuW45D8QfV" role="3cqZAp" />
           </node>
-          <node concept="2OqwBi" id="4MuW45D8ObD" role="3clFbw">
-            <node concept="37vLTw" id="4MuW45D8NG0" role="2Oq$k0">
-              <ref role="3cqZAo" node="4MuW45D84xH" resolve="myHeaderChilds" />
-            </node>
-            <node concept="liA8E" id="4MuW45D8PT_" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Set.contains(java.lang.Object)" resolve="contains" />
-              <node concept="37vLTw" id="4MuW45D8Q4j" role="37wK5m">
-                <ref role="3cqZAo" node="1362cT3cY05" resolve="child" />
-              </node>
+          <node concept="1rXfSq" id="70mku7ub$1h" role="3clFbw">
+            <ref role="37wK5l" node="4MuW45D8Tfk" resolve="isRegisteredHeader" />
+            <node concept="37vLTw" id="70mku7ub_1V" role="37wK5m">
+              <ref role="3cqZAo" node="1362cT3cY05" resolve="child" />
             </node>
           </node>
         </node>
@@ -33507,9 +32976,8 @@
             <node concept="37vLTw" id="1362cT3cXSB" role="2Oq$k0">
               <ref role="3cqZAo" node="1362cT3cSef" resolve="myChilds" />
             </node>
-            <node concept="liA8E" id="1362cT3d0xZ" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Set.add(java.lang.Object)" resolve="add" />
-              <node concept="37vLTw" id="1362cT3d0G9" role="37wK5m">
+            <node concept="TSZUe" id="70mku7ua6oN" role="2OqNvi">
+              <node concept="37vLTw" id="70mku7ua82w" role="25WWJ7">
                 <ref role="3cqZAo" node="1362cT3cY05" resolve="child" />
               </node>
             </node>
@@ -33540,9 +33008,8 @@
             <node concept="37vLTw" id="4MuW45CWOKZ" role="2Oq$k0">
               <ref role="3cqZAo" node="1362cT3cSef" resolve="myChilds" />
             </node>
-            <node concept="liA8E" id="4MuW45CWQO1" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Set.contains(java.lang.Object)" resolve="contains" />
-              <node concept="37vLTw" id="4MuW45CWQYH" role="37wK5m">
+            <node concept="3JPx81" id="70mku7ua9Zo" role="2OqNvi">
+              <node concept="37vLTw" id="70mku7uaaLG" role="25WWJ7">
                 <ref role="3cqZAo" node="4MuW45CWMV$" resolve="cell" />
               </node>
             </node>
@@ -33561,9 +33028,8 @@
             <node concept="37vLTw" id="4MuW45D8Zr3" role="2Oq$k0">
               <ref role="3cqZAo" node="4MuW45D84xH" resolve="myHeaderChilds" />
             </node>
-            <node concept="liA8E" id="4MuW45D93m8" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Set.contains(java.lang.Object)" resolve="contains" />
-              <node concept="37vLTw" id="4MuW45D94FH" role="37wK5m">
+            <node concept="3JPx81" id="70mku7uaco8" role="2OqNvi">
+              <node concept="37vLTw" id="70mku7uad8H" role="25WWJ7">
                 <ref role="3cqZAo" node="4MuW45D93wI" resolve="cell" />
               </node>
             </node>
@@ -33588,14 +33054,10 @@
       </node>
       <node concept="3Tm1VV" id="x$t3A6Yyub" role="1B3o_S" />
       <node concept="3clFbS" id="x$t3A6Yyuc" role="3clF47">
-        <node concept="3clFbF" id="x$t3A6YEDz" role="3cqZAp">
-          <node concept="2ShNRf" id="x$t3A6YEDx" role="3clFbG">
-            <node concept="1pGfFk" id="x$t3A6ZfAG" role="2ShVmc">
-              <ref role="37wK5l" to="33ny:~HashSet.&lt;init&gt;(java.util.Collection)" resolve="HashSet" />
-              <node concept="3uibUv" id="x$t3A6ZfKF" role="1pMfVU">
-                <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-              </node>
-              <node concept="37vLTw" id="x$t3A6ZfOE" role="37wK5m">
+        <node concept="3clFbF" id="70mku7uaG5o" role="3cqZAp">
+          <node concept="2ShNRf" id="70mku7uaG5k" role="3clFbG">
+            <node concept="2i4dXS" id="70mku7uaHGA" role="2ShVmc">
+              <node concept="37vLTw" id="70mku7uaLc4" role="I$8f6">
                 <ref role="3cqZAo" node="1362cT3cSef" resolve="myChilds" />
               </node>
             </node>
@@ -33615,13 +33077,9 @@
       <node concept="3Tm1VV" id="4MuW45D96p3" role="1B3o_S" />
       <node concept="3clFbS" id="4MuW45D96p4" role="3clF47">
         <node concept="3clFbF" id="4MuW45D96p5" role="3cqZAp">
-          <node concept="2ShNRf" id="4MuW45D96p6" role="3clFbG">
-            <node concept="1pGfFk" id="4MuW45D96p7" role="2ShVmc">
-              <ref role="37wK5l" to="33ny:~HashSet.&lt;init&gt;(java.util.Collection)" resolve="HashSet" />
-              <node concept="3uibUv" id="4MuW45D96p8" role="1pMfVU">
-                <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-              </node>
-              <node concept="37vLTw" id="4MuW45D9hAA" role="37wK5m">
+          <node concept="2ShNRf" id="70mku7ua$wV" role="3clFbG">
+            <node concept="2i4dXS" id="70mku7ua_VD" role="2ShVmc">
+              <node concept="37vLTw" id="70mku7uak0I" role="I$8f6">
                 <ref role="3cqZAo" node="4MuW45D84xH" resolve="myHeaderChilds" />
               </node>
             </node>
@@ -33642,11 +33100,40 @@
         </node>
       </node>
       <node concept="2ShNRf" id="1362cT3c3wj" role="33vP2m">
-        <node concept="1pGfFk" id="1362cT3c3wk" role="2ShVmc">
-          <ref role="37wK5l" to="wyt6:~ThreadLocal.&lt;init&gt;()" resolve="ThreadLocal" />
-          <node concept="oyxx6" id="1362cT3c3wl" role="1pMfVU">
-            <node concept="3uibUv" id="1362cT3cFUP" role="3O5elw">
-              <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
+        <node concept="YeOm9" id="5QVyGuWmUIf" role="2ShVmc">
+          <node concept="1Y3b0j" id="5QVyGuWmUIi" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <property role="373rjd" value="true" />
+            <ref role="37wK5l" to="wyt6:~ThreadLocal.&lt;init&gt;()" resolve="ThreadLocal" />
+            <ref role="1Y3XeK" to="wyt6:~ThreadLocal" resolve="ThreadLocal" />
+            <node concept="3Tm1VV" id="5QVyGuWmUIj" role="1B3o_S" />
+            <node concept="oyxx6" id="1362cT3c3wl" role="2Ghqu4">
+              <node concept="3uibUv" id="1362cT3cFUP" role="3O5elw">
+                <ref role="3uigEE" node="1362cT3bWqU" resolve="OrphanCells" />
+              </node>
+            </node>
+            <node concept="3clFb_" id="5QVyGuWmV9M" role="jymVt">
+              <property role="TrG5h" value="initialValue" />
+              <node concept="3Tmbuc" id="5QVyGuWmV9N" role="1B3o_S" />
+              <node concept="oyxx6" id="5QVyGuWmV9T" role="3clF45">
+                <node concept="3uibUv" id="5QVyGuWmV9U" role="3O5elw">
+                  <ref role="3uigEE" node="1362cT3bWqU" resolve="OrphanCells" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="5QVyGuWmV9V" role="3clF47">
+                <node concept="3clFbF" id="5QVyGuWmYpz" role="3cqZAp">
+                  <node concept="2ShNRf" id="5QVyGuWmYp_" role="3clFbG">
+                    <node concept="2Jqq0_" id="5QVyGuWmYpA" role="2ShVmc">
+                      <node concept="3uibUv" id="5QVyGuWmYpB" role="HW$YZ">
+                        <ref role="3uigEE" node="1362cT3bWqU" resolve="OrphanCells" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="5QVyGuWmV9W" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" />
+              </node>
             </node>
           </node>
         </node>
@@ -33660,11 +33147,6 @@
       </node>
       <node concept="3Tm1VV" id="1362cT3c3wq" role="1B3o_S" />
       <node concept="3clFbS" id="1362cT3c3wr" role="3clF47">
-        <node concept="3clFbF" id="1362cT3c3ws" role="3cqZAp">
-          <node concept="1rXfSq" id="1362cT3c3wt" role="3clFbG">
-            <ref role="37wK5l" node="1362cT3c3xd" resolve="initStack" />
-          </node>
-        </node>
         <node concept="3cpWs6" id="1362cT3c3wu" role="3cqZAp">
           <node concept="2OqwBi" id="1362cT3c3wv" role="3cqZAk">
             <node concept="2OqwBi" id="1362cT3c3ww" role="2Oq$k0">
@@ -33680,17 +33162,25 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1362cT3c3wC" role="jymVt" />
+    <node concept="2tJIrI" id="70mku7ul_j9" role="jymVt" />
     <node concept="2YIFZL" id="1362cT3c3wD" role="jymVt">
       <property role="TrG5h" value="pushNewInstance" />
       <node concept="3uibUv" id="1362cT3cJd4" role="3clF45">
         <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
       </node>
-      <node concept="3Tm1VV" id="1362cT3c3wF" role="1B3o_S" />
+      <node concept="3Tm6S6" id="5QVyGuWmT2J" role="1B3o_S" />
       <node concept="3clFbS" id="1362cT3c3wG" role="3clF47">
-        <node concept="3clFbF" id="1362cT3c3wH" role="3cqZAp">
-          <node concept="1rXfSq" id="1362cT3c3wI" role="3clFbG">
-            <ref role="37wK5l" node="1362cT3c3xd" resolve="initStack" />
+        <node concept="3cpWs8" id="70mku7uDuQ6" role="3cqZAp">
+          <node concept="3cpWsn" id="70mku7uDuQ7" role="3cpWs9">
+            <property role="TrG5h" value="newInstance" />
+            <node concept="3uibUv" id="70mku7uDupX" role="1tU5fm">
+              <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
+            </node>
+            <node concept="2ShNRf" id="70mku7uDuQ8" role="33vP2m">
+              <node concept="HV5vD" id="70mku7uDuQ9" role="2ShVmc">
+                <ref role="HV5vE" node="1362cT3bWqU" resolve="ChildsTracker" />
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbF" id="1362cT3c3wJ" role="3cqZAp">
@@ -33704,35 +33194,15 @@
               </node>
             </node>
             <node concept="2ArzE6" id="1362cT3c3wO" role="2OqNvi">
-              <node concept="2ShNRf" id="1362cT3c3wP" role="25WWJ7">
-                <node concept="HV5vD" id="1362cT3cEIW" role="2ShVmc">
-                  <ref role="HV5vE" node="1362cT3bWqU" resolve="ChildsTracker" />
-                </node>
+              <node concept="37vLTw" id="70mku7uDuQa" role="25WWJ7">
+                <ref role="3cqZAo" node="70mku7uDuQ7" resolve="tracker" />
               </node>
             </node>
           </node>
         </node>
         <node concept="3cpWs6" id="1362cT3c3wR" role="3cqZAp">
-          <node concept="1rXfSq" id="1362cT3c3wS" role="3cqZAk">
-            <ref role="37wK5l" node="1362cT3c3wo" resolve="getInstance" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1362cT3c3wW" role="jymVt" />
-    <node concept="2YIFZL" id="1362cT3c3wX" role="jymVt">
-      <property role="TrG5h" value="popInstance" />
-      <node concept="3uibUv" id="1362cT3cJhG" role="3clF45">
-        <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
-      </node>
-      <node concept="3Tm1VV" id="1362cT3c3wZ" role="1B3o_S" />
-      <node concept="3clFbS" id="1362cT3c3x0" role="3clF47">
-        <node concept="3clFbF" id="4MuW45D9IoA" role="3cqZAp">
-          <node concept="1rXfSq" id="4MuW45D9Io_" role="3clFbG">
-            <ref role="37wK5l" node="4MuW45D9IpH" resolve="popInstance" />
-            <node concept="3clFbT" id="4MuW45D9Ip9" role="37wK5m">
-              <property role="3clFbU" value="false" />
-            </node>
+          <node concept="37vLTw" id="70mku7ucpZ_" role="3cqZAk">
+            <ref role="3cqZAo" node="70mku7uDuQ7" resolve="newInstance" />
           </node>
         </node>
       </node>
@@ -33742,12 +33212,16 @@
       <property role="TrG5h" value="popInstance" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="4MuW45D9qZY" role="3clF47">
-        <node concept="3clFbF" id="1362cT3c3x1" role="3cqZAp">
-          <node concept="1rXfSq" id="1362cT3c3x2" role="3clFbG">
-            <ref role="37wK5l" node="1362cT3c3xd" resolve="initStack" />
-          </node>
+      <node concept="37vLTG" id="70mku7uf19P" role="3clF46">
+        <property role="TrG5h" value="parentCell" />
+        <node concept="3uibUv" id="70mku7uf2dk" role="1tU5fm">
+          <ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
+        </node>
+        <node concept="2AHcQZ" id="70mku7ufdbi" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
+      </node>
+      <node concept="3clFbS" id="4MuW45D9qZY" role="3clF47">
         <node concept="3cpWs8" id="4MuW45D9kKc" role="3cqZAp">
           <node concept="3cpWsn" id="4MuW45D9kKd" role="3cpWs9">
             <property role="TrG5h" value="removed" />
@@ -33767,115 +33241,139 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4MuW45D9l8E" role="3cqZAp">
-          <node concept="3cpWsn" id="4MuW45D9l8F" role="3cpWs9">
-            <property role="TrG5h" value="current" />
-            <node concept="3uibUv" id="4MuW45D9l8G" role="1tU5fm">
-              <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
-            </node>
-            <node concept="1rXfSq" id="4MuW45D9ldX" role="33vP2m">
-              <ref role="37wK5l" node="1362cT3c3wo" resolve="getInstance" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="4MuW45D9liO" role="3cqZAp">
-          <node concept="3clFbS" id="4MuW45D9liR" role="3clFbx">
-            <node concept="3clFbF" id="4MuW45D9lwl" role="3cqZAp">
-              <node concept="2OqwBi" id="4MuW45D9m8K" role="3clFbG">
-                <node concept="2OqwBi" id="4MuW45D9lwZ" role="2Oq$k0">
-                  <node concept="37vLTw" id="4MuW45D9lwk" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4MuW45D9l8F" resolve="current" />
-                  </node>
-                  <node concept="2OwXpG" id="4MuW45D9lL0" role="2OqNvi">
-                    <ref role="2Oxat5" node="4MuW45D84xH" resolve="myHeaderChilds" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="4MuW45D9nMb" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Set.addAll(java.util.Collection)" resolve="addAll" />
-                  <node concept="2OqwBi" id="4MuW45D9nUe" role="37wK5m">
-                    <node concept="37vLTw" id="4MuW45D9nP4" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4MuW45D9kKd" resolve="removed" />
-                    </node>
-                    <node concept="2OwXpG" id="4MuW45D9o37" role="2OqNvi">
-                      <ref role="2Oxat5" node="4MuW45D84xH" resolve="myHeaderChilds" />
-                    </node>
-                  </node>
+        <node concept="3clFbH" id="70mku7ufdDR" role="3cqZAp" />
+        <node concept="3clFbJ" id="70mku7uuA6a" role="3cqZAp">
+          <node concept="3clFbS" id="70mku7uuA6c" role="3clFbx">
+            <node concept="YS8fn" id="70mku7uuJ68" role="3cqZAp">
+              <node concept="2ShNRf" id="70mku7uuJEd" role="YScLw">
+                <node concept="1pGfFk" id="70mku7uuMuR" role="2ShVmc">
+                  <property role="373rjd" value="true" />
+                  <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;()" resolve="IllegalStateException" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1Wc70l" id="4MuW45D9JXt" role="3clFbw">
-            <node concept="3fqX7Q" id="4MuW45D9LmB" role="3uHU7w">
-              <node concept="37vLTw" id="4MuW45D9LmD" role="3fr31v">
-                <ref role="3cqZAo" node="4MuW45D9GAZ" resolve="popHeaders" />
+          <node concept="2OqwBi" id="70mku7uuHry" role="3clFbw">
+            <node concept="37vLTw" id="70mku7uuGMf" role="2Oq$k0">
+              <ref role="3cqZAo" node="4MuW45D9kKd" resolve="removed" />
+            </node>
+            <node concept="liA8E" id="70mku7uuHWr" role="2OqNvi">
+              <ref role="37wK5l" node="4MuW45CWGkd" resolve="isRegistered" />
+              <node concept="37vLTw" id="70mku7uuIx5" role="37wK5m">
+                <ref role="3cqZAo" node="70mku7uf19P" resolve="owner" />
               </node>
             </node>
-            <node concept="3y3z36" id="4MuW45D9lrL" role="3uHU7B">
-              <node concept="37vLTw" id="4MuW45D9lnp" role="3uHU7B">
-                <ref role="3cqZAo" node="4MuW45D9l8F" resolve="current" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="70mku7uEiff" role="3cqZAp">
+          <node concept="2OqwBi" id="70mku7uEj4d" role="3clFbG">
+            <node concept="37vLTw" id="70mku7uEifd" role="2Oq$k0">
+              <ref role="3cqZAo" node="4MuW45D9kKd" resolve="removed" />
+            </node>
+            <node concept="liA8E" id="70mku7uEjNu" role="2OqNvi">
+              <ref role="37wK5l" node="70mku7uDyhk" resolve="done" />
+              <node concept="37vLTw" id="70mku7uEkvv" role="37wK5m">
+                <ref role="3cqZAo" node="70mku7uf19P" resolve="owner" />
               </node>
-              <node concept="10Nm6u" id="4MuW45D9lvF" role="3uHU7w" />
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="70mku7uc6eD" role="3cqZAp" />
         <node concept="3cpWs6" id="1362cT3c3x3" role="3cqZAp">
           <node concept="37vLTw" id="4MuW45D9o_h" role="3cqZAk">
             <ref role="3cqZAo" node="4MuW45D9kKd" resolve="removed" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="4MuW45D9GAZ" role="3clF46">
-        <property role="TrG5h" value="popHeaders" />
-        <node concept="10P_77" id="4MuW45D9HX1" role="1tU5fm" />
-      </node>
       <node concept="3uibUv" id="4MuW45D9$tJ" role="3clF45">
         <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
       </node>
-      <node concept="3Tm1VV" id="4MuW45D9qZX" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="1362cT3c3xc" role="jymVt" />
-    <node concept="2YIFZL" id="1362cT3c3xd" role="jymVt">
-      <property role="TrG5h" value="initStack" />
-      <node concept="3cqZAl" id="1362cT3c3xe" role="3clF45" />
-      <node concept="3Tm6S6" id="1362cT3c3xf" role="1B3o_S" />
-      <node concept="3clFbS" id="1362cT3c3xg" role="3clF47">
-        <node concept="3clFbJ" id="1362cT3c3xh" role="3cqZAp">
-          <node concept="3clFbS" id="1362cT3c3xi" role="3clFbx">
-            <node concept="3clFbF" id="1362cT3c3xj" role="3cqZAp">
-              <node concept="2OqwBi" id="1362cT3c3xk" role="3clFbG">
-                <node concept="37vLTw" id="1362cT3c3xw" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1362cT3c3we" resolve="instances" />
-                </node>
-                <node concept="liA8E" id="1362cT3c3xm" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object)" resolve="set" />
-                  <node concept="2ShNRf" id="1362cT3c3xn" role="37wK5m">
-                    <node concept="2Jqq0_" id="1362cT3c3xo" role="2ShVmc">
-                      <node concept="3uibUv" id="1362cT3cJlG" role="HW$YZ">
-                        <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
-                      </node>
-                    </node>
+      <node concept="3Tm6S6" id="5QVyGuWmSP$" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="70mku7ukBQa" role="jymVt" />
+    <node concept="2YIFZL" id="70mku7ukS2I" role="jymVt">
+      <property role="TrG5h" value="computeCell" />
+      <node concept="3clFbS" id="70mku7ukEda" role="3clF47">
+        <node concept="3cpWs8" id="70mku7ukYTj" role="3cqZAp">
+          <node concept="3cpWsn" id="70mku7ukYTk" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="16syzq" id="70mku7ulxwI" role="1tU5fm">
+              <ref role="16sUi3" node="70mku7ulubu" resolve="T" />
+            </node>
+            <node concept="10Nm6u" id="70mku7ul0oB" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3J1_TO" id="70mku7ukU08" role="3cqZAp">
+          <node concept="3clFbS" id="70mku7ukU09" role="1zxBo7">
+            <node concept="3clFbF" id="70mku7ukVxF" role="3cqZAp">
+              <node concept="1rXfSq" id="70mku7ukVxE" role="3clFbG">
+                <ref role="37wK5l" node="1362cT3c3wD" resolve="pushNewInstance" />
+              </node>
+            </node>
+            <node concept="3clFbF" id="70mku7ul0E3" role="3cqZAp">
+              <node concept="37vLTI" id="70mku7ul0Zh" role="3clFbG">
+                <node concept="2Sg_IR" id="70mku7ul1xf" role="37vLTx">
+                  <node concept="37vLTw" id="70mku7ul1xg" role="2SgG2M">
+                    <ref role="3cqZAo" node="70mku7ukO$Z" resolve="body" />
                   </node>
                 </node>
+                <node concept="37vLTw" id="70mku7ul0E1" role="37vLTJ">
+                  <ref role="3cqZAo" node="70mku7ukYTk" resolve="result" />
+                </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbC" id="1362cT3c3xq" role="3clFbw">
-            <node concept="10Nm6u" id="1362cT3c3xr" role="3uHU7w" />
-            <node concept="2OqwBi" id="1362cT3c3xs" role="3uHU7B">
-              <node concept="37vLTw" id="1362cT3c3xz" role="2Oq$k0">
-                <ref role="3cqZAo" node="1362cT3c3we" resolve="instances" />
-              </node>
-              <node concept="liA8E" id="1362cT3c3xu" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
+          <node concept="1wplmZ" id="70mku7ukVjp" role="1zxBo6">
+            <node concept="3clFbS" id="70mku7ukVjq" role="1wplMD">
+              <node concept="3clFbF" id="70mku7ukVKX" role="3cqZAp">
+                <node concept="1rXfSq" id="70mku7ukVKW" role="3clFbG">
+                  <ref role="37wK5l" node="4MuW45D9IpH" resolve="popInstance" />
+                  <node concept="37vLTw" id="70mku7ul1KO" role="37wK5m">
+                    <ref role="3cqZAo" node="70mku7ukYTk" resolve="result" />
+                  </node>
+                </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3cpWs6" id="70mku7ul4$f" role="3cqZAp">
+          <node concept="37vLTw" id="70mku7ul5XJ" role="3cqZAk">
+            <ref role="3cqZAo" node="70mku7ukYTk" resolve="result" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="70mku7ukO$Z" role="3clF46">
+        <property role="TrG5h" value="body" />
+        <node concept="1ajhzC" id="70mku7ukQ2b" role="1tU5fm">
+          <node concept="16syzq" id="70mku7uluuJ" role="1ajl9A">
+            <ref role="16sUi3" node="70mku7ulubu" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="16syzq" id="70mku7uluLF" role="3clF45">
+        <ref role="16sUi3" node="70mku7ulubu" resolve="T" />
+      </node>
+      <node concept="3Tm1VV" id="70mku7ukEd9" role="1B3o_S" />
+      <node concept="16euLQ" id="70mku7ulubu" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="70mku7ulumL" role="3ztrMU">
+          <ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
+        </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1362cT3bWxw" role="jymVt" />
-    <node concept="2tJIrI" id="1362cT3bWxz" role="jymVt" />
     <node concept="3Tm1VV" id="1362cT3bWqV" role="1B3o_S" />
+    <node concept="3UR2Jj" id="70mku7uCZWO" role="lGtFl">
+      <node concept="TZ5HA" id="70mku7uCZWP" role="TZ5H$">
+        <node concept="1dT_AC" id="70mku7uCZWQ" role="1dT_Ay">
+          <property role="1dT_AB" value="All cells shown in the editor must be part of the cell tree. " />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="70mku7uD37i" role="TZ5H$">
+        <node concept="1dT_AC" id="70mku7uD37j" role="1dT_Ay">
+          <property role="1dT_AB" value="This class ensures that all created cells are added to some parent cell." />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7HQUZCSFbzb">
     <property role="TrG5h" value="TableLayout" />
@@ -35240,9 +34738,10 @@
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
       <node concept="3clFbS" id="7HQUZCSIEdX" role="3clF47">
-        <node concept="YS8fn" id="7HQUZCSIJ_Q" role="3cqZAp">
-          <node concept="2ShNRf" id="7HQUZCSIJ_R" role="YScLw">
-            <node concept="1pGfFk" id="7HQUZCSIJ_S" role="2ShVmc">
+        <node concept="YS8fn" id="5QVyGuWA7R5" role="3cqZAp">
+          <node concept="2ShNRf" id="5QVyGuWA8fQ" role="YScLw">
+            <node concept="1pGfFk" id="5QVyGuWAauz" role="2ShVmc">
+              <property role="373rjd" value="true" />
               <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
             </node>
           </node>
@@ -35275,9 +34774,10 @@
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
       <node concept="3clFbS" id="7HQUZCSIEeb" role="3clF47">
-        <node concept="YS8fn" id="7HQUZCSIJ_s" role="3cqZAp">
-          <node concept="2ShNRf" id="7HQUZCSIJ_t" role="YScLw">
-            <node concept="1pGfFk" id="7HQUZCSIJ_u" role="2ShVmc">
+        <node concept="YS8fn" id="5QVyGuWAaNw" role="3cqZAp">
+          <node concept="2ShNRf" id="5QVyGuWAaNx" role="YScLw">
+            <node concept="1pGfFk" id="5QVyGuWAaNy" role="2ShVmc">
+              <property role="373rjd" value="true" />
               <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
             </node>
           </node>
@@ -35310,9 +34810,10 @@
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
       <node concept="3clFbS" id="7HQUZCSIEep" role="3clF47">
-        <node concept="YS8fn" id="7HQUZCSIIfZ" role="3cqZAp">
-          <node concept="2ShNRf" id="7HQUZCSIIjQ" role="YScLw">
-            <node concept="1pGfFk" id="7HQUZCSIJ_6" role="2ShVmc">
+        <node concept="YS8fn" id="5QVyGuWAb3y" role="3cqZAp">
+          <node concept="2ShNRf" id="5QVyGuWAb3z" role="YScLw">
+            <node concept="1pGfFk" id="5QVyGuWAb3$" role="2ShVmc">
+              <property role="373rjd" value="true" />
               <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
             </node>
           </node>
@@ -35340,9 +34841,10 @@
       <node concept="3cqZAl" id="7HQUZCSIEey" role="3clF45" />
       <node concept="3Tm1VV" id="7HQUZCSIEez" role="1B3o_S" />
       <node concept="3clFbS" id="7HQUZCSIEeA" role="3clF47">
-        <node concept="YS8fn" id="7HQUZCSIJFE" role="3cqZAp">
-          <node concept="2ShNRf" id="7HQUZCSIJFF" role="YScLw">
-            <node concept="1pGfFk" id="7HQUZCSIJFG" role="2ShVmc">
+        <node concept="YS8fn" id="5QVyGuWAbil" role="3cqZAp">
+          <node concept="2ShNRf" id="5QVyGuWAbim" role="YScLw">
+            <node concept="1pGfFk" id="5QVyGuWAbin" role="2ShVmc">
+              <property role="373rjd" value="true" />
               <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
             </node>
           </node>
@@ -35372,9 +34874,10 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
       <node concept="3clFbS" id="4C4txgwR8ZL" role="3clF47">
-        <node concept="YS8fn" id="4C4txgwR9fO" role="3cqZAp">
-          <node concept="2ShNRf" id="4C4txgwR9fP" role="YScLw">
-            <node concept="1pGfFk" id="4C4txgwR9fQ" role="2ShVmc">
+        <node concept="YS8fn" id="5QVyGuWAby3" role="3cqZAp">
+          <node concept="2ShNRf" id="5QVyGuWAby4" role="YScLw">
+            <node concept="1pGfFk" id="5QVyGuWAby5" role="2ShVmc">
+              <property role="373rjd" value="true" />
               <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
             </node>
           </node>
@@ -35473,16 +34976,52 @@
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
       <node concept="3clFbS" id="7HQUZCSIOZW" role="3clF47">
+        <node concept="3cpWs8" id="70mku7uN_mD" role="3cqZAp">
+          <node concept="3cpWsn" id="70mku7uN_mE" role="3cpWs9">
+            <property role="TrG5h" value="children" />
+            <node concept="_YKpA" id="70mku7uNzky" role="1tU5fm">
+              <node concept="3uibUv" id="70mku7uNzk_" role="_ZDj9">
+                <ref role="3uigEE" to="xggr:ZjQ6tpoGLj" resolve="ILayoutable" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="70mku7uN_mF" role="33vP2m">
+              <node concept="37vLTw" id="70mku7uN_mG" role="2Oq$k0">
+                <ref role="3cqZAo" node="7HQUZCSIOZO" resolve="container" />
+              </node>
+              <node concept="liA8E" id="70mku7uN_mH" role="2OqNvi">
+                <ref role="37wK5l" to="xggr:ZjQ6tpoyQj" resolve="getChildren" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="70mku7uNBHk" role="3cqZAp">
+          <node concept="3clFbS" id="70mku7uNBHm" role="3clFbx">
+            <node concept="3cpWs6" id="70mku7uNK5H" role="3cqZAp">
+              <node concept="2ShNRf" id="70mku7uNMyd" role="3cqZAk">
+                <node concept="1pGfFk" id="70mku7uNMqn" role="2ShVmc">
+                  <ref role="37wK5l" to="rtot:ZjQ6tpoDHS" resolve="Size" />
+                  <node concept="3cmrfG" id="70mku7uNNKD" role="37wK5m">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                  <node concept="3cmrfG" id="70mku7uNR59" role="37wK5m">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="70mku7uNFhk" role="3clFbw">
+            <node concept="37vLTw" id="70mku7uNCWD" role="2Oq$k0">
+              <ref role="3cqZAo" node="70mku7uN_mE" resolve="children" />
+            </node>
+            <node concept="1v1jN8" id="70mku7uNIRu" role="2OqNvi" />
+          </node>
+        </node>
         <node concept="3clFbF" id="7HQUZCSJL$o" role="3cqZAp">
           <node concept="2OqwBi" id="7HQUZCSJMIL" role="3clFbG">
             <node concept="2OqwBi" id="7HQUZCSJLRs" role="2Oq$k0">
-              <node concept="2OqwBi" id="7HQUZCSJLC$" role="2Oq$k0">
-                <node concept="37vLTw" id="7HQUZCSJL$n" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7HQUZCSIOZO" resolve="container" />
-                </node>
-                <node concept="liA8E" id="7HQUZCSJLJc" role="2OqNvi">
-                  <ref role="37wK5l" to="xggr:ZjQ6tpoyQj" resolve="getChildren" />
-                </node>
+              <node concept="37vLTw" id="70mku7uN_mI" role="2Oq$k0">
+                <ref role="3cqZAo" node="70mku7uN_mE" resolve="children" />
               </node>
               <node concept="1uHKPH" id="7HQUZCSJMhh" role="2OqNvi" />
             </node>
@@ -35522,16 +35061,52 @@
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
       <node concept="3clFbS" id="7HQUZCSIP09" role="3clF47">
+        <node concept="3cpWs8" id="70mku7uODfG" role="3cqZAp">
+          <node concept="3cpWsn" id="70mku7uODfH" role="3cpWs9">
+            <property role="TrG5h" value="children" />
+            <node concept="_YKpA" id="70mku7uOtT_" role="1tU5fm">
+              <node concept="3uibUv" id="70mku7uOtTC" role="_ZDj9">
+                <ref role="3uigEE" to="xggr:ZjQ6tpoGLj" resolve="ILayoutable" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="70mku7uODfI" role="33vP2m">
+              <node concept="37vLTw" id="70mku7uODfJ" role="2Oq$k0">
+                <ref role="3cqZAo" node="7HQUZCSIP01" resolve="container" />
+              </node>
+              <node concept="liA8E" id="70mku7uODfK" role="2OqNvi">
+                <ref role="37wK5l" to="xggr:ZjQ6tpoyQj" resolve="getChildren" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="70mku7uOEVx" role="3cqZAp">
+          <node concept="3clFbS" id="70mku7uOEVy" role="3clFbx">
+            <node concept="3cpWs6" id="70mku7uOEVz" role="3cqZAp">
+              <node concept="2ShNRf" id="70mku7uOEV$" role="3cqZAk">
+                <node concept="1pGfFk" id="70mku7uOEV_" role="2ShVmc">
+                  <ref role="37wK5l" to="rtot:ZjQ6tpoDHS" resolve="Size" />
+                  <node concept="3cmrfG" id="70mku7uOEVA" role="37wK5m">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                  <node concept="3cmrfG" id="70mku7uOEVB" role="37wK5m">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="70mku7uOEVC" role="3clFbw">
+            <node concept="37vLTw" id="70mku7uOEVD" role="2Oq$k0">
+              <ref role="3cqZAo" node="70mku7uODfH" resolve="children" />
+            </node>
+            <node concept="1v1jN8" id="70mku7uOEVE" role="2OqNvi" />
+          </node>
+        </node>
         <node concept="3clFbF" id="7HQUZCSJNg2" role="3cqZAp">
           <node concept="2OqwBi" id="7HQUZCSJNg3" role="3clFbG">
             <node concept="2OqwBi" id="7HQUZCSJNg4" role="2Oq$k0">
-              <node concept="2OqwBi" id="7HQUZCSJNg5" role="2Oq$k0">
-                <node concept="37vLTw" id="7HQUZCSJNg6" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7HQUZCSIP01" resolve="container" />
-                </node>
-                <node concept="liA8E" id="7HQUZCSJNg7" role="2OqNvi">
-                  <ref role="37wK5l" to="xggr:ZjQ6tpoyQj" resolve="getChildren" />
-                </node>
+              <node concept="37vLTw" id="70mku7uODfL" role="2Oq$k0">
+                <ref role="3cqZAo" node="70mku7uODfH" resolve="children" />
               </node>
               <node concept="1uHKPH" id="7HQUZCSJNg8" role="2OqNvi" />
             </node>
@@ -35566,6 +35141,35 @@
       <node concept="3cqZAl" id="7HQUZCSIP0j" role="3clF45" />
       <node concept="3Tm1VV" id="7HQUZCSIP0k" role="1B3o_S" />
       <node concept="3clFbS" id="7HQUZCSIP0l" role="3clF47">
+        <node concept="3cpWs8" id="70mku7uPunY" role="3cqZAp">
+          <node concept="3cpWsn" id="70mku7uPunZ" role="3cpWs9">
+            <property role="TrG5h" value="children" />
+            <node concept="_YKpA" id="70mku7uPiOt" role="1tU5fm">
+              <node concept="3uibUv" id="70mku7uPiOw" role="_ZDj9">
+                <ref role="3uigEE" to="xggr:ZjQ6tpoGLj" resolve="ILayoutable" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="70mku7uPuo0" role="33vP2m">
+              <node concept="37vLTw" id="70mku7uPuo1" role="2Oq$k0">
+                <ref role="3cqZAo" node="7HQUZCSIP0e" resolve="container" />
+              </node>
+              <node concept="liA8E" id="70mku7uPuo2" role="2OqNvi">
+                <ref role="37wK5l" to="xggr:ZjQ6tpoyQj" resolve="getChildren" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="70mku7uPxUV" role="3cqZAp">
+          <node concept="3clFbS" id="70mku7uPxUX" role="3clFbx">
+            <node concept="3cpWs6" id="70mku7uPF76" role="3cqZAp" />
+          </node>
+          <node concept="2OqwBi" id="70mku7uPAfh" role="3clFbw">
+            <node concept="37vLTw" id="70mku7uPzT2" role="2Oq$k0">
+              <ref role="3cqZAo" node="70mku7uPunZ" resolve="children" />
+            </node>
+            <node concept="1v1jN8" id="70mku7uPDR9" role="2OqNvi" />
+          </node>
+        </node>
         <node concept="3cpWs8" id="7HQUZCSK94D" role="3cqZAp">
           <node concept="3cpWsn" id="7HQUZCSK94E" role="3cpWs9">
             <property role="TrG5h" value="child" />
@@ -35573,13 +35177,8 @@
               <ref role="3uigEE" to="xggr:ZjQ6tpoGLj" resolve="ILayoutable" />
             </node>
             <node concept="2OqwBi" id="7HQUZCSK94F" role="33vP2m">
-              <node concept="2OqwBi" id="7HQUZCSK94G" role="2Oq$k0">
-                <node concept="37vLTw" id="7HQUZCSK94H" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7HQUZCSIP0e" resolve="container" />
-                </node>
-                <node concept="liA8E" id="7HQUZCSK94I" role="2OqNvi">
-                  <ref role="37wK5l" to="xggr:ZjQ6tpoyQj" resolve="getChildren" />
-                </node>
+              <node concept="37vLTw" id="70mku7uPuo3" role="2Oq$k0">
+                <ref role="3cqZAo" node="70mku7uPunZ" resolve="children" />
               </node>
               <node concept="1uHKPH" id="7HQUZCSK94J" role="2OqNvi" />
             </node>
@@ -35625,13 +35224,8 @@
                 <ref role="37wK5l" to="rtot:17yTjuFMZj" resolve="min" />
                 <node concept="2OqwBi" id="7HQUZCSKWqZ" role="37wK5m">
                   <node concept="2OqwBi" id="7HQUZCSKWr0" role="2Oq$k0">
-                    <node concept="2OqwBi" id="7HQUZCSKWr1" role="2Oq$k0">
-                      <node concept="37vLTw" id="7HQUZCSKWr2" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7HQUZCSIP0e" resolve="container" />
-                      </node>
-                      <node concept="liA8E" id="7HQUZCSKWr3" role="2OqNvi">
-                        <ref role="37wK5l" to="xggr:ZjQ6tpoyQj" resolve="getChildren" />
-                      </node>
+                    <node concept="37vLTw" id="70mku7uPuo4" role="2Oq$k0">
+                      <ref role="3cqZAo" node="70mku7uPunZ" resolve="children" />
                     </node>
                     <node concept="1uHKPH" id="7HQUZCSKWr4" role="2OqNvi" />
                   </node>
diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps
index a96e2d2e3f..995363bd2a 100644
--- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps
+++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps
@@ -35,7 +35,7 @@
     <import index="zce0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.smodel.action(MPS.Editor/)" />
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" implicit="true" />
+    <import index="yj89" ref="r:8d3d20cd-e020-4a43-bff4-9aef982e4fb8(de.slisson.mps.tables.runtime.transactionalcells)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -397,9 +397,6 @@
       <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="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
@@ -422,10 +419,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1235573135402" name="jetbrains.mps.baseLanguage.collections.structure.SingletonSequenceCreator" flags="nn" index="2HTt$P">
-        <child id="1235573175711" name="elementType" index="2HTBi0" />
-        <child id="1235573187520" name="singletonValue" index="2HTEbv" />
-      </concept>
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
@@ -433,7 +426,6 @@
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
-      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <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" />
@@ -448,7 +440,6 @@
       </concept>
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
-      <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="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
@@ -458,7 +449,6 @@
       <concept id="1522217801069396578" name="jetbrains.mps.baseLanguage.collections.structure.FoldLeftOperation" flags="nn" index="1MD8d$">
         <child id="1522217801069421796" name="seed" index="1MDeny" />
       </concept>
-      <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
   </registry>
   <node concept="3HP615" id="7C0FR5Aonyd">
@@ -23292,30 +23282,14 @@
               <node concept="3cpWs6" id="RywcYy0YSg" role="3cqZAp">
                 <node concept="1rXfSq" id="2c3czgq0FwQ" role="3cqZAk">
                   <ref role="37wK5l" node="2c3czgq0rYU" resolve="trackCreatedCell" />
-                  <node concept="2OqwBi" id="RywcYy0Z5n" role="37wK5m">
-                    <node concept="2OqwBi" id="7wXnfGE517l" role="2Oq$k0">
-                      <node concept="2OqwBi" id="7wXnfGE50Cn" role="2Oq$k0">
-                        <node concept="2OqwBi" id="7wXnfGE4TUF" role="2Oq$k0">
-                          <node concept="37vLTw" id="RywcYy0YYB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="RywcYwuxY0" resolve="myContext" />
-                          </node>
-                          <node concept="liA8E" id="7wXnfGE50v8" role="2OqNvi">
-                            <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="7wXnfGE50XY" role="2OqNvi">
-                          <ref role="37wK5l" to="cj4x:~EditorComponent.getUpdater()" resolve="getUpdater" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="7wXnfGE51wJ" role="2OqNvi">
-                        <ref role="37wK5l" to="22ra:~Updater.getCurrentUpdateSession()" resolve="getCurrentUpdateSession" />
-                      </node>
+                  <node concept="2YIFZM" id="70mku7u1ztf" role="37wK5m">
+                    <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
+                    <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+                    <node concept="37vLTw" id="70mku7u1Fyi" role="37wK5m">
+                      <ref role="3cqZAo" node="RywcYwuxY0" resolve="myContext" />
                     </node>
-                    <node concept="liA8E" id="RywcYy0ZgF" role="2OqNvi">
-                      <ref role="37wK5l" to="22ra:~UpdateSession.updateChildNodeCell(org.jetbrains.mps.openapi.model.SNode)" resolve="updateChildNodeCell" />
-                      <node concept="37vLTw" id="RywcYy0ZnL" role="37wK5m">
-                        <ref role="3cqZAo" node="RywcYy0Y3X" resolve="node" />
-                      </node>
+                    <node concept="37vLTw" id="70mku7u1$WB" role="37wK5m">
+                      <ref role="3cqZAo" node="RywcYy0Y3X" resolve="node" />
                     </node>
                   </node>
                 </node>
@@ -23398,6 +23372,34 @@
       <node concept="3cqZAl" id="RywcYwuxYK" role="3clF45" />
       <node concept="3Tm1VV" id="RywcYwuxYL" role="1B3o_S" />
       <node concept="3clFbS" id="RywcYwuxYM" role="3clF47">
+        <node concept="3clFbJ" id="5sevPzmxAYc" role="3cqZAp">
+          <node concept="3clFbS" id="5sevPzmxAYe" role="3clFbx">
+            <node concept="YS8fn" id="5sevPzmxCj$" role="3cqZAp">
+              <node concept="2ShNRf" id="5sevPzmxCB1" role="YScLw">
+                <node concept="1pGfFk" id="5sevPzmyqIP" role="2ShVmc">
+                  <property role="373rjd" value="true" />
+                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
+                  <node concept="3cpWs3" id="5sevPzmy_UM" role="37wK5m">
+                    <node concept="37vLTw" id="5sevPzmyA0o" role="3uHU7w">
+                      <ref role="3cqZAo" node="RywcYwuxYQ" resolve="cell" />
+                    </node>
+                    <node concept="Xl_RD" id="5sevPzmyr4e" role="3uHU7B">
+                      <property role="Xl_RC" value="A Grid should have been created for the partial table: " />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2ZW3vV" id="5sevPzmxBFu" role="3clFbw">
+            <node concept="3uibUv" id="5sevPzmxC07" role="2ZW6by">
+              <ref role="3uigEE" to="hm5v:2Jt5bYCPbd1" resolve="PartialTableEditor" />
+            </node>
+            <node concept="37vLTw" id="5sevPzmxBgO" role="2ZW6bz">
+              <ref role="3cqZAo" node="RywcYwuxYQ" resolve="cell" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="RywcYwuxYN" role="3cqZAp">
           <node concept="1rXfSq" id="RywcYwuxYO" role="3clFbG">
             <ref role="37wK5l" node="RywcYwuxYT" resolve="setEditorCell" />
@@ -23429,23 +23431,6 @@
       <node concept="3cqZAl" id="RywcYwuxYW" role="3clF45" />
       <node concept="3Tm1VV" id="RywcYwuxYX" role="1B3o_S" />
       <node concept="3clFbS" id="RywcYwuxYY" role="3clF47">
-        <node concept="3clFbJ" id="5PYr1ZdFUu$" role="3cqZAp">
-          <node concept="3clFbS" id="5PYr1ZdFUuB" role="3clFbx">
-            <node concept="YS8fn" id="5PYr1ZdFUxY" role="3cqZAp">
-              <node concept="2ShNRf" id="5PYr1ZdFUyl" role="YScLw">
-                <node concept="1pGfFk" id="5PYr1ZdG2Bd" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="5PYr1ZdFUwS" role="3clFbw">
-            <node concept="10Nm6u" id="5PYr1ZdFUxq" role="3uHU7w" />
-            <node concept="37vLTw" id="5PYr1ZdFUvV" role="3uHU7B">
-              <ref role="3cqZAo" node="RywcYwuxYU" resolve="cell" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="RywcYwuxYZ" role="3cqZAp">
           <node concept="37vLTI" id="RywcYwuxZ0" role="3clFbG">
             <node concept="37vLTw" id="RywcYwuxZ1" role="37vLTx">
@@ -23456,6 +23441,20 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="3mrQsPSIsEK" role="3cqZAp">
+          <node concept="2OqwBi" id="3mrQsPSItxA" role="3clFbG">
+            <node concept="2YIFZM" id="3mrQsPSIt13" role="2Oq$k0">
+              <ref role="37wK5l" to="hm5v:1362cT3c3wo" resolve="getInstance" />
+              <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="OrphanCells" />
+            </node>
+            <node concept="liA8E" id="3mrQsPSIurM" role="2OqNvi">
+              <ref role="37wK5l" to="hm5v:1362cT3cM2o" resolve="registerChild" />
+              <node concept="37vLTw" id="3mrQsPSIv7t" role="37wK5m">
+                <ref role="3cqZAo" node="RywcYwuxYU" resolve="cell" />
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3clFb_" id="RywcYxrr5_" role="jymVt">
@@ -24255,9 +24254,6 @@
                 <node concept="37vLTw" id="DXnsYPQ9s3" role="37wK5m">
                   <ref role="3cqZAo" node="DXnsYPQ1Uy" resolve="cell" />
                 </node>
-                <node concept="37vLTw" id="DXnsYPQ9s4" role="37wK5m">
-                  <ref role="3cqZAo" node="RywcYwuxZY" resolve="myGrid" />
-                </node>
               </node>
             </node>
           </node>
@@ -29423,13 +29419,6 @@
       <node concept="3Tm6S6" id="3iamoNAozTg" role="1B3o_S" />
       <node concept="10P_77" id="3iamoNAo$zx" role="1tU5fm" />
     </node>
-    <node concept="312cEg" id="2c3czgpDkXv" role="jymVt">
-      <property role="TrG5h" value="myParentGrid" />
-      <node concept="3Tm6S6" id="2c3czgpDkXw" role="1B3o_S" />
-      <node concept="3uibUv" id="2c3czgpDmOD" role="1tU5fm">
-        <ref role="3uigEE" node="7C0FR5Aonzr" resolve="Grid" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="RywcYwAbXi" role="jymVt" />
     <node concept="3clFbW" id="RywcYwAbXC" role="jymVt">
       <node concept="3cqZAl" id="RywcYwAbXE" role="3clF45" />
@@ -29496,16 +29485,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="2c3czgpDnel" role="3cqZAp">
-          <node concept="37vLTI" id="2c3czgpDnBI" role="3clFbG">
-            <node concept="37vLTw" id="2c3czgpDnHI" role="37vLTx">
-              <ref role="3cqZAo" node="2c3czgpDmPH" resolve="parentGrid" />
-            </node>
-            <node concept="37vLTw" id="2c3czgpDnek" role="37vLTJ">
-              <ref role="3cqZAo" node="2c3czgpDkXv" resolve="myParentGrid" />
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="37vLTG" id="RywcYwAbXV" role="3clF46">
         <property role="TrG5h" value="editorContext" />
@@ -29858,46 +29837,33 @@
         </node>
       </node>
       <node concept="3clFbS" id="1dAqnm8NYSt" role="3clF47">
-        <node concept="3clFbJ" id="2c3czgpDqmY" role="3cqZAp">
-          <node concept="3clFbS" id="2c3czgpDqn1" role="3clFbx">
-            <node concept="3cpWs8" id="2c3czgpDpPc" role="3cqZAp">
-              <node concept="3cpWsn" id="2c3czgpDpPd" role="3cpWs9">
-                <property role="TrG5h" value="element" />
-                <node concept="2YIFZM" id="2c3czgpDpV$" role="33vP2m">
-                  <ref role="37wK5l" to="hm5v:1U60oYvKx9m" resolve="getGridElementFromEditorCell" />
-                  <ref role="1Pybhc" to="hm5v:6OOkb_bf0Q2" resolve="PartialTableExtractor" />
-                  <node concept="37vLTw" id="2c3czgpDpYA" role="37wK5m">
-                    <ref role="3cqZAo" node="1dAqnm8NYSE" resolve="editorCell" />
-                  </node>
-                  <node concept="37vLTw" id="2c3czgpDq5t" role="37wK5m">
-                    <ref role="3cqZAo" node="2c3czgpDkXv" resolve="myParentGrid" />
-                  </node>
-                </node>
-                <node concept="3uibUv" id="2c3czgpDrxr" role="1tU5fm">
-                  <ref role="3uigEE" node="7C0FR5Aonyd" resolve="IGridElement" />
-                </node>
+        <node concept="3cpWs8" id="2c3czgpDpPc" role="3cqZAp">
+          <node concept="3cpWsn" id="2c3czgpDpPd" role="3cpWs9">
+            <property role="TrG5h" value="element" />
+            <node concept="2YIFZM" id="2c3czgpDpV$" role="33vP2m">
+              <ref role="37wK5l" to="hm5v:1U60oYvKx9m" resolve="getGridElementFromEditorCell" />
+              <ref role="1Pybhc" to="hm5v:6OOkb_bf0Q2" resolve="PartialTableExtractor" />
+              <node concept="37vLTw" id="2c3czgpDpYA" role="37wK5m">
+                <ref role="3cqZAo" node="1dAqnm8NYSE" resolve="editorCell" />
               </node>
             </node>
-            <node concept="3clFbJ" id="2c3czgpDrKG" role="3cqZAp">
-              <node concept="3clFbS" id="2c3czgpDrKJ" role="3clFbx">
-                <node concept="3cpWs6" id="2c3czgpDsch" role="3cqZAp">
-                  <node concept="37vLTw" id="2c3czgpDtVd" role="3cqZAk">
-                    <ref role="3cqZAo" node="2c3czgpDpPd" resolve="element" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3y3z36" id="2c3czgpDs8L" role="3clFbw">
-                <node concept="10Nm6u" id="2c3czgpDsaw" role="3uHU7w" />
-                <node concept="37vLTw" id="2c3czgpDs6f" role="3uHU7B">
-                  <ref role="3cqZAo" node="2c3czgpDpPd" resolve="element" />
-                </node>
+            <node concept="3uibUv" id="2c3czgpDrxr" role="1tU5fm">
+              <ref role="3uigEE" node="7C0FR5Aonyd" resolve="IGridElement" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2c3czgpDrKG" role="3cqZAp">
+          <node concept="3clFbS" id="2c3czgpDrKJ" role="3clFbx">
+            <node concept="3cpWs6" id="2c3czgpDsch" role="3cqZAp">
+              <node concept="37vLTw" id="2c3czgpDtVd" role="3cqZAk">
+                <ref role="3cqZAo" node="2c3czgpDpPd" resolve="element" />
               </node>
             </node>
           </node>
-          <node concept="3y3z36" id="2c3czgpDqNT" role="3clFbw">
-            <node concept="10Nm6u" id="2c3czgpDqUT" role="3uHU7w" />
-            <node concept="37vLTw" id="2c3czgpDqvv" role="3uHU7B">
-              <ref role="3cqZAo" node="2c3czgpDkXv" resolve="myParentGrid" />
+          <node concept="3y3z36" id="2c3czgpDs8L" role="3clFbw">
+            <node concept="10Nm6u" id="2c3czgpDsaw" role="3uHU7w" />
+            <node concept="37vLTw" id="2c3czgpDs6f" role="3uHU7B">
+              <ref role="3cqZAo" node="2c3czgpDpPd" resolve="element" />
             </node>
           </node>
         </node>
@@ -29928,30 +29894,14 @@
             <node concept="3uibUv" id="36rxy05fS$" role="1tU5fm">
               <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
             </node>
-            <node concept="2OqwBi" id="36rxy05fY6" role="33vP2m">
-              <node concept="liA8E" id="36rxy05fY7" role="2OqNvi">
-                <ref role="37wK5l" to="22ra:~UpdateSession.updateChildNodeCell(org.jetbrains.mps.openapi.model.SNode)" resolve="updateChildNodeCell" />
-                <node concept="37vLTw" id="36rxy05fY8" role="37wK5m">
-                  <ref role="3cqZAo" node="1dAqnm8NZxq" resolve="snode" />
-                </node>
+            <node concept="2YIFZM" id="70mku7u1KZQ" role="33vP2m">
+              <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
+              <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+              <node concept="37vLTw" id="70mku7u1O_h" role="37wK5m">
+                <ref role="3cqZAo" node="RywcYwAbVp" resolve="myEditorContext" />
               </node>
-              <node concept="2OqwBi" id="7wXnfGE54_4" role="2Oq$k0">
-                <node concept="2OqwBi" id="7wXnfGE54k6" role="2Oq$k0">
-                  <node concept="2OqwBi" id="7wXnfGE5467" role="2Oq$k0">
-                    <node concept="37vLTw" id="36rxy05fY9" role="2Oq$k0">
-                      <ref role="3cqZAo" node="RywcYwAbVp" resolve="myEditorContext" />
-                    </node>
-                    <node concept="liA8E" id="7wXnfGE54hP" role="2OqNvi">
-                      <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="7wXnfGE54y1" role="2OqNvi">
-                    <ref role="37wK5l" to="cj4x:~EditorComponent.getUpdater()" resolve="getUpdater" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="7wXnfGE54RK" role="2OqNvi">
-                  <ref role="37wK5l" to="22ra:~Updater.getCurrentUpdateSession()" resolve="getCurrentUpdateSession" />
-                </node>
+              <node concept="37vLTw" id="70mku7u1KZR" role="37wK5m">
+                <ref role="3cqZAo" node="1dAqnm8NZxq" resolve="snode" />
               </node>
             </node>
           </node>
@@ -30281,30 +30231,14 @@
                       <node concept="3uibUv" id="1362cT3jWNv" role="1tU5fm">
                         <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
                       </node>
-                      <node concept="2OqwBi" id="1362cT3jWVW" role="33vP2m">
-                        <node concept="2OqwBi" id="7wXnfGE53Ba" role="2Oq$k0">
-                          <node concept="2OqwBi" id="7wXnfGE53ku" role="2Oq$k0">
-                            <node concept="2OqwBi" id="7wXnfGE534x" role="2Oq$k0">
-                              <node concept="37vLTw" id="1362cT3jWVX" role="2Oq$k0">
-                                <ref role="3cqZAo" node="RywcYwAbVp" resolve="myEditorContext" />
-                              </node>
-                              <node concept="liA8E" id="7wXnfGE53hm" role="2OqNvi">
-                                <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="7wXnfGE53zM" role="2OqNvi">
-                              <ref role="37wK5l" to="cj4x:~EditorComponent.getUpdater()" resolve="getUpdater" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="7wXnfGE53UR" role="2OqNvi">
-                            <ref role="37wK5l" to="22ra:~Updater.getCurrentUpdateSession()" resolve="getCurrentUpdateSession" />
-                          </node>
+                      <node concept="2YIFZM" id="bMfgm9f0ho" role="33vP2m">
+                        <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
+                        <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+                        <node concept="37vLTw" id="bMfgm9f0hp" role="37wK5m">
+                          <ref role="3cqZAo" node="RywcYwAbVp" resolve="myEditorContext" />
                         </node>
-                        <node concept="liA8E" id="1362cT3jWVY" role="2OqNvi">
-                          <ref role="37wK5l" to="22ra:~UpdateSession.updateChildNodeCell(org.jetbrains.mps.openapi.model.SNode)" resolve="updateChildNodeCell" />
-                          <node concept="2GrUjf" id="1362cT3jWVZ" role="37wK5m">
-                            <ref role="2Gs0qQ" node="3iamoNAq4UX" resolve="node" />
-                          </node>
+                        <node concept="2GrUjf" id="bMfgm9f6ID" role="37wK5m">
+                          <ref role="2Gs0qQ" node="3iamoNAq4UX" resolve="node" />
                         </node>
                       </node>
                     </node>
@@ -30323,16 +30257,15 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="3iamoNAq6zl" role="3cqZAp">
-                    <node concept="2OqwBi" id="3iamoNAq6Ut" role="3clFbG">
-                      <node concept="37vLTw" id="3iamoNAq6zk" role="2Oq$k0">
+                  <node concept="3clFbF" id="bMfgm9eqkZ" role="3cqZAp">
+                    <node concept="2YIFZM" id="bMfgm9etY0" role="3clFbG">
+                      <ref role="37wK5l" to="yj89:3Qp43e36wM3" resolve="addEditorCell" />
+                      <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+                      <node concept="37vLTw" id="bMfgm9evOy" role="37wK5m">
                         <ref role="3cqZAo" node="3iamoNApKZ0" resolve="collectionCell" />
                       </node>
-                      <node concept="liA8E" id="3iamoNAq9OQ" role="2OqNvi">
-                        <ref role="37wK5l" to="f4zo:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
-                        <node concept="37vLTw" id="1362cT3jZ0A" role="37wK5m">
-                          <ref role="3cqZAo" node="1362cT3jWNu" resolve="nodeCell" />
-                        </node>
+                      <node concept="37vLTw" id="bMfgm9eznw" role="37wK5m">
+                        <ref role="3cqZAo" node="1362cT3jWNu" resolve="nodeCell" />
                       </node>
                     </node>
                   </node>
@@ -31468,30 +31401,14 @@
             <node concept="3uibUv" id="1362cT3ki_d" role="1tU5fm">
               <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
             </node>
-            <node concept="2OqwBi" id="RywcYwKG2i" role="33vP2m">
-              <node concept="2OqwBi" id="7wXnfGE56IU" role="2Oq$k0">
-                <node concept="2OqwBi" id="7wXnfGE56tp" role="2Oq$k0">
-                  <node concept="2OqwBi" id="7wXnfGE56eR" role="2Oq$k0">
-                    <node concept="37vLTw" id="RywcYwKFYj" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1dAqnm8Wxtd" resolve="myContext" />
-                    </node>
-                    <node concept="liA8E" id="7wXnfGE56qX" role="2OqNvi">
-                      <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="7wXnfGE56Ga" role="2OqNvi">
-                    <ref role="37wK5l" to="cj4x:~EditorComponent.getUpdater()" resolve="getUpdater" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="7wXnfGE571M" role="2OqNvi">
-                  <ref role="37wK5l" to="22ra:~Updater.getCurrentUpdateSession()" resolve="getCurrentUpdateSession" />
-                </node>
+            <node concept="2YIFZM" id="70mku7u1Wcz" role="33vP2m">
+              <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
+              <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+              <node concept="37vLTw" id="70mku7u20rW" role="37wK5m">
+                <ref role="3cqZAo" node="1dAqnm8Wxtd" resolve="myContext" />
               </node>
-              <node concept="liA8E" id="RywcYwKGfR" role="2OqNvi">
-                <ref role="37wK5l" to="22ra:~UpdateSession.updateChildNodeCell(org.jetbrains.mps.openapi.model.SNode)" resolve="updateChildNodeCell" />
-                <node concept="37vLTw" id="RywcYwKGjd" role="37wK5m">
-                  <ref role="3cqZAo" node="1dAqnm8WT$A" resolve="snode" />
-                </node>
+              <node concept="37vLTw" id="70mku7u1Wc$" role="37wK5m">
+                <ref role="3cqZAo" node="1dAqnm8WT$A" resolve="snode" />
               </node>
             </node>
           </node>
@@ -32379,157 +32296,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7EUu569glhm" role="jymVt" />
-    <node concept="2YIFZL" id="7EUu569gqd8" role="jymVt">
-      <property role="TrG5h" value="descendantsOfSameNode" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="7EUu569gmjg" role="3clF47">
-        <node concept="3cpWs8" id="7EUu569grdm" role="3cqZAp">
-          <node concept="3cpWsn" id="7EUu569grdp" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="A3Dl8" id="7EUu569grdj" role="1tU5fm">
-              <node concept="3uibUv" id="7EUu569greP" role="A3Ik2">
-                <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="7EUu569grka" role="33vP2m">
-              <node concept="2HTt$P" id="7EUu569grjx" role="2ShVmc">
-                <node concept="3uibUv" id="7EUu569grjy" role="2HTBi0">
-                  <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                </node>
-                <node concept="37vLTw" id="7EUu569grmX" role="2HTEbv">
-                  <ref role="3cqZAo" node="7EUu569gpGQ" resolve="cell" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="7EUu569grqX" role="3cqZAp">
-          <node concept="3clFbS" id="7EUu569grqZ" role="3clFbx">
-            <node concept="3cpWs8" id="7EUu569grBI" role="3cqZAp">
-              <node concept="3cpWsn" id="7EUu569grBL" role="3cpWs9">
-                <property role="TrG5h" value="children" />
-                <node concept="A3Dl8" id="7EUu569grBF" role="1tU5fm">
-                  <node concept="3uibUv" id="7EUu569grD4" role="A3Ik2">
-                    <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                  </node>
-                </node>
-                <node concept="1eOMI4" id="7EUu569grIC" role="33vP2m">
-                  <node concept="10QFUN" id="7EUu569grI_" role="1eOMHV">
-                    <node concept="3uibUv" id="7EUu569grIE" role="10QFUM">
-                      <ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
-                    </node>
-                    <node concept="37vLTw" id="7EUu569grIF" role="10QFUP">
-                      <ref role="3cqZAo" node="7EUu569gpGQ" resolve="cell" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7EUu569grMY" role="3cqZAp">
-              <node concept="37vLTI" id="7EUu569gs1S" role="3clFbG">
-                <node concept="2OqwBi" id="7EUu569gs8j" role="37vLTx">
-                  <node concept="37vLTw" id="7EUu569gs4v" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7EUu569grdp" resolve="result" />
-                  </node>
-                  <node concept="3QWeyG" id="7EUu569gsfR" role="2OqNvi">
-                    <node concept="2OqwBi" id="7EUu569gtoG" role="576Qk">
-                      <node concept="2OqwBi" id="7EUu569gsnH" role="2Oq$k0">
-                        <node concept="37vLTw" id="7EUu569gsj9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7EUu569grBL" resolve="children" />
-                        </node>
-                        <node concept="3zZkjj" id="7EUu569gswi" role="2OqNvi">
-                          <node concept="1bVj0M" id="7EUu569gswk" role="23t8la">
-                            <node concept="3clFbS" id="7EUu569gswl" role="1bW5cS">
-                              <node concept="3clFbF" id="7EUu569gsA2" role="3cqZAp">
-                                <node concept="3clFbC" id="7EUu569gsLK" role="3clFbG">
-                                  <node concept="2OqwBi" id="7EUu569gt6_" role="3uHU7w">
-                                    <node concept="2OqwBi" id="7EUu569gsW9" role="2Oq$k0">
-                                      <node concept="37vLTw" id="7EUu569gsQU" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="7Z$RfkF7Jc7" resolve="it" />
-                                      </node>
-                                      <node concept="liA8E" id="7EUu569gt1q" role="2OqNvi">
-                                        <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="7EUu569gtjz" role="2OqNvi">
-                                      <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
-                                    </node>
-                                  </node>
-                                  <node concept="2OqwBi" id="7EUu569gsDh" role="3uHU7B">
-                                    <node concept="37vLTw" id="7EUu569gsA1" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7Z$RfkF7Jc7" resolve="it" />
-                                    </node>
-                                    <node concept="liA8E" id="7EUu569gsHN" role="2OqNvi">
-                                      <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="gl6BB" id="7Z$RfkF7Jc7" role="1bW2Oz">
-                              <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7Z$RfkF7Jc8" role="1tU5fm" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3goQfb" id="7EUu569gvzs" role="2OqNvi">
-                        <node concept="1bVj0M" id="7EUu569gvzu" role="23t8la">
-                          <node concept="3clFbS" id="7EUu569gvzv" role="1bW5cS">
-                            <node concept="3clFbF" id="7EUu569gvzw" role="3cqZAp">
-                              <node concept="1rXfSq" id="7EUu569gvzx" role="3clFbG">
-                                <ref role="37wK5l" node="7EUu569gqd8" resolve="descendantsOfSameNode" />
-                                <node concept="37vLTw" id="7EUu569gvzy" role="37wK5m">
-                                  <ref role="3cqZAo" node="7Z$RfkF7Jc9" resolve="it" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="gl6BB" id="7Z$RfkF7Jc9" role="1bW2Oz">
-                            <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7Z$RfkF7Jca" role="1tU5fm" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="7EUu569grMW" role="37vLTJ">
-                  <ref role="3cqZAo" node="7EUu569grdp" resolve="result" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2ZW3vV" id="7EUu569grwm" role="3clFbw">
-            <node concept="3uibUv" id="7EUu569grxS" role="2ZW6by">
-              <ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
-            </node>
-            <node concept="37vLTw" id="7EUu569grtB" role="2ZW6bz">
-              <ref role="3cqZAo" node="7EUu569gpGQ" resolve="cell" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7EUu569gu8Z" role="3cqZAp">
-          <node concept="37vLTw" id="7EUu569gu8X" role="3clFbG">
-            <ref role="3cqZAo" node="7EUu569grdp" resolve="result" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7EUu569gpGQ" role="3clF46">
-        <property role="TrG5h" value="cell" />
-        <node concept="3uibUv" id="7EUu569gqcj" role="1tU5fm">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-      </node>
-      <node concept="A3Dl8" id="7EUu569gpdB" role="3clF45">
-        <node concept="3uibUv" id="7EUu569gpGC" role="A3Ik2">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="7EUu569gqZw" role="1B3o_S" />
-    </node>
     <node concept="3Tm1VV" id="1dAqnm8WxrK" role="1B3o_S" />
   </node>
   <node concept="3HP615" id="1k7j3NO7uTJ">

From d8fc5621ad4ded460b7f98cb13aed38a9235126a Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@q60.de>
Date: Mon, 1 Dec 2025 15:10:24 +0100
Subject: [PATCH 2/2] fix(tables): remove EditorCacheHacks.noCaching call

---
 .../generator/template/main@generator.mps     |    4 +-
 .../de/slisson/mps/tables/runtime/cells.mps   | 2271 +++++++++--------
 .../slisson/mps/tables/runtime/gridmodel.mps  |  200 +-
 .../slisson/mps/tables/runtime/substitute.mps |    8 +-
 4 files changed, 1304 insertions(+), 1179 deletions(-)

diff --git a/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps b/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
index 79eaddb572..9ea1c2bf4b 100644
--- a/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
+++ b/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
@@ -7352,8 +7352,8 @@
                         <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
                       </node>
                       <node concept="2YIFZM" id="70mku7u1ztf" role="33vP2m">
-                        <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
-                        <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+                        <ref role="37wK5l" to="hm5v:3mrQsPSMCN1" resolve="createNodeCell" />
+                        <ref role="1Pybhc" to="hm5v:6tOcB$JKlIC" resolve="TableUtils" />
                         <node concept="37vLTw" id="70mku7u2bUl" role="37wK5m">
                           <ref role="3cqZAo" node="1dAqnm8VFHp" resolve="editorContext" />
                         </node>
diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
index 5b0fcbbabc..9ef368b7b9 100644
--- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
+++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
@@ -2527,23 +2527,6 @@
       <node concept="3cqZAl" id="20OswHE1Rmv" role="3clF45" />
       <node concept="3Tm6S6" id="20OswHE2gBJ" role="1B3o_S" />
       <node concept="3clFbS" id="20OswHE1Rmx" role="3clF47">
-        <node concept="3cpWs8" id="2l3CneTrYCt" role="3cqZAp">
-          <node concept="3cpWsn" id="2l3CneTrYCw" role="3cpWs9">
-            <property role="TrG5h" value="usedWrappers" />
-            <node concept="2hMVRd" id="2l3CneTrYCp" role="1tU5fm">
-              <node concept="3uibUv" id="7Nzu1Mc_tHN" role="2hN53Y">
-                <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="2l3CneTs6td" role="33vP2m">
-              <node concept="2i4dXS" id="2l3CneTs6sW" role="2ShVmc">
-                <node concept="3uibUv" id="7Nzu1Mc_uj8" role="HW$YZ">
-                  <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1Dw8fO" id="20OswHE2j_b" role="3cqZAp">
           <node concept="3clFbS" id="20OswHE2j_c" role="2LFqv$">
             <node concept="1Dw8fO" id="20OswHE2nXl" role="3cqZAp">
@@ -2593,303 +2576,55 @@
                     <node concept="3uibUv" id="7Nzu1Mc_wwK" role="1tU5fm">
                       <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
                     </node>
-                    <node concept="0kSF2" id="4gCFRNyZIP4" role="33vP2m">
-                      <node concept="3uibUv" id="7Nzu1Mc_uSt" role="0kSFW">
-                        <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
+                    <node concept="2OqwBi" id="7Nzu1McBAjb" role="33vP2m">
+                      <node concept="37vLTw" id="4gCFRNyZIAB" role="2Oq$k0">
+                        <ref role="3cqZAo" node="20OswHE2oZ7" resolve="leaf" />
                       </node>
-                      <node concept="2OqwBi" id="7Nzu1McBAjb" role="0kSFX">
-                        <node concept="37vLTw" id="4gCFRNyZIAB" role="2Oq$k0">
-                          <ref role="3cqZAo" node="20OswHE2oZ7" resolve="leaf" />
-                        </node>
-                        <node concept="liA8E" id="7Nzu1McBBb5" role="2OqNvi">
-                          <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                        </node>
+                      <node concept="liA8E" id="7Nzu1McBBb5" role="2OqNvi">
+                        <ref role="37wK5l" to="6dpw:3mrQsPSUHfI" resolve="getGridCell" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbJ" id="4gCFRNyZJjz" role="3cqZAp">
-                  <node concept="3clFbS" id="4gCFRNyZJjA" role="3clFbx">
-                    <node concept="3cpWs8" id="5b_lkyAhqKo" role="3cqZAp">
-                      <node concept="3cpWsn" id="5b_lkyAhqKp" role="3cpWs9">
-                        <property role="TrG5h" value="nodeForGridCell" />
-                        <node concept="3uibUv" id="5b_lkyAhqKn" role="1tU5fm">
-                          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                        </node>
-                        <node concept="1rXfSq" id="5b_lkyAhqKq" role="33vP2m">
-                          <ref role="37wK5l" to="g51k:~EditorCell_Basic.getSNode()" resolve="getSNode" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbJ" id="5b_lkyAht2c" role="3cqZAp">
-                      <node concept="3clFbS" id="5b_lkyAht2e" role="3clFbx">
-                        <node concept="3clFbF" id="5b_lkyAhPRg" role="3cqZAp">
-                          <node concept="37vLTI" id="5b_lkyAhQg0" role="3clFbG">
-                            <node concept="37vLTw" id="5b_lkyAhPRe" role="37vLTJ">
-                              <ref role="3cqZAo" node="5b_lkyAhqKp" resolve="nodeForGridCell" />
-                            </node>
-                            <node concept="2OqwBi" id="5b_lkyAhQxC" role="37vLTx">
-                              <node concept="2OqwBi" id="5b_lkyAhQxD" role="2Oq$k0">
-                                <node concept="37vLTw" id="5b_lkyAhQxE" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="20OswHE2oZ7" resolve="leaf" />
-                                </node>
-                                <node concept="liA8E" id="5b_lkyAhQxF" role="2OqNvi">
-                                  <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="5b_lkyAhQxG" role="2OqNvi">
-                                <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1Wc70l" id="5b_lkyAhF2o" role="3clFbw">
-                        <node concept="17R0WA" id="5b_lkyAhDKZ" role="3uHU7w">
-                          <node concept="2OqwBi" id="5b_lkyAh$uW" role="3uHU7B">
-                            <node concept="2OqwBi" id="5b_lkyAhwFO" role="2Oq$k0">
-                              <node concept="2OqwBi" id="5b_lkyAhu3J" role="2Oq$k0">
-                                <node concept="37vLTw" id="5b_lkyAhtz4" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="20OswHE2oZ7" resolve="leaf" />
-                                </node>
-                                <node concept="liA8E" id="5b_lkyAhwsk" role="2OqNvi">
-                                  <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="5b_lkyAhzhS" role="2OqNvi">
-                                <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="5b_lkyAhCBV" role="2OqNvi">
-                              <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="5b_lkyAhLLx" role="3uHU7w">
-                            <node concept="2OqwBi" id="5b_lkyAhLvm" role="2Oq$k0">
-                              <node concept="37vLTw" id="5b_lkyAhLvn" role="2Oq$k0">
-                                <ref role="3cqZAo" node="20OswHE2oZ7" resolve="leaf" />
-                              </node>
-                              <node concept="liA8E" id="5b_lkyAhLvo" role="2OqNvi">
-                                <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="5b_lkyAhOpB" role="2OqNvi">
-                              <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3y3z36" id="5b_lkyAhKd3" role="3uHU7B">
-                          <node concept="10Nm6u" id="5b_lkyAhLhv" role="3uHU7w" />
-                          <node concept="2OqwBi" id="5b_lkyAhGne" role="3uHU7B">
-                            <node concept="2OqwBi" id="5b_lkyAhG3g" role="2Oq$k0">
-                              <node concept="37vLTw" id="5b_lkyAhG3h" role="2Oq$k0">
-                                <ref role="3cqZAo" node="20OswHE2oZ7" resolve="leaf" />
-                              </node>
-                              <node concept="liA8E" id="5b_lkyAhG3i" role="2OqNvi">
-                                <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="5b_lkyAhIYC" role="2OqNvi">
-                              <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="4gCFRNyZKi7" role="3cqZAp">
-                      <node concept="37vLTI" id="4gCFRNyZKM2" role="3clFbG">
-                        <node concept="37vLTw" id="4gCFRNyZKi6" role="37vLTJ">
-                          <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
-                        </node>
-                        <node concept="2ShNRf" id="20OswHE2rhF" role="37vLTx">
-                          <node concept="1pGfFk" id="20OswHE2rJJ" role="2ShVmc">
-                            <ref role="37wK5l" node="20OswHE0eFq" resolve="EditorCell_GridCell" />
-                            <node concept="1rXfSq" id="20OswHE2rSN" role="37wK5m">
-                              <ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext()" resolve="getContext" />
-                            </node>
-                            <node concept="37vLTw" id="5b_lkyAhqKr" role="37wK5m">
-                              <ref role="3cqZAo" node="5b_lkyAhqKp" resolve="nodeForGridCell" />
-                            </node>
-                            <node concept="2OqwBi" id="7Nzu1McBHIk" role="37wK5m">
-                              <node concept="37vLTw" id="7Nzu1McBHCA" role="2Oq$k0">
-                                <ref role="3cqZAo" node="20OswHE2oZ7" resolve="leaf" />
-                              </node>
-                              <node concept="liA8E" id="7Nzu1McBHTO" role="2OqNvi">
-                                <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="70mku7tXFet" role="3cqZAp">
-                      <node concept="2OqwBi" id="70mku7tXFeu" role="3clFbG">
-                        <node concept="37vLTw" id="70mku7tXFev" role="2Oq$k0">
-                          <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
-                        </node>
-                        <node concept="liA8E" id="70mku7tXFew" role="2OqNvi">
-                          <ref role="37wK5l" node="4gCFRNz0iH7" resolve="setTable" />
-                          <node concept="Xjq3P" id="70mku7tXFex" role="37wK5m" />
-                        </node>
-                      </node>
+                <node concept="3clFbF" id="4gCFRNz0FLc" role="3cqZAp">
+                  <node concept="2OqwBi" id="4gCFRNz0Hhf" role="3clFbG">
+                    <node concept="37vLTw" id="4gCFRNz0FLb" role="2Oq$k0">
+                      <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
                     </node>
-                    <node concept="3clFbF" id="70mku7tZwRE" role="3cqZAp">
-                      <node concept="2OqwBi" id="70mku7tZwRF" role="3clFbG">
-                        <node concept="37vLTw" id="70mku7tZwRG" role="2Oq$k0">
-                          <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
-                        </node>
-                        <node concept="liA8E" id="70mku7tZwRH" role="2OqNvi">
-                          <ref role="37wK5l" node="4gCFRNz0sZU" resolve="setPosition" />
-                          <node concept="2ShNRf" id="70mku7tZwRI" role="37wK5m">
-                            <node concept="1pGfFk" id="70mku7tZwRJ" role="2ShVmc">
-                              <ref role="37wK5l" to="sse1:20OswHE0h6W" resolve="GridPosition" />
-                              <node concept="37vLTw" id="70mku7tZwRK" role="37wK5m">
-                                <ref role="3cqZAo" node="20OswHE2j_d" resolve="x" />
-                              </node>
-                              <node concept="37vLTw" id="70mku7tZwRL" role="37wK5m">
-                                <ref role="3cqZAo" node="20OswHE2nXn" resolve="y" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="liA8E" id="4gCFRNz0Mm4" role="2OqNvi">
+                      <ref role="37wK5l" node="4gCFRNz0iH7" resolve="setTable" />
+                      <node concept="Xjq3P" id="4gCFRNzlNDj" role="37wK5m" />
                     </node>
-                    <node concept="3cpWs8" id="4vp4nPrptrl" role="3cqZAp">
-                      <node concept="3cpWsn" id="4vp4nPrptrm" role="3cpWs9">
-                        <property role="TrG5h" value="leafCell" />
-                        <node concept="3uibUv" id="4vp4nPrptrk" role="1tU5fm">
-                          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                        </node>
-                        <node concept="2OqwBi" id="4vp4nPrptrn" role="33vP2m">
-                          <node concept="37vLTw" id="4vp4nPrptro" role="2Oq$k0">
-                            <ref role="3cqZAo" node="20OswHE2oZ7" resolve="leaf" />
-                          </node>
-                          <node concept="liA8E" id="4vp4nPrptrp" role="2OqNvi">
-                            <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2$JKZl" id="4vp4nPrpste" role="3cqZAp">
-                      <node concept="3clFbS" id="4vp4nPrpstg" role="2LFqv$">
-                        <node concept="3clFbF" id="4vp4nPrpO5t" role="3cqZAp">
-                          <node concept="2OqwBi" id="4vp4nPrpw5f" role="3clFbG">
-                            <node concept="1eOMI4" id="4vp4nPrpvaU" role="2Oq$k0">
-                              <node concept="10QFUN" id="4vp4nPrpvaR" role="1eOMHV">
-                                <node concept="3uibUv" id="4vp4nPrpvbD" role="10QFUM">
-                                  <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
-                                </node>
-                                <node concept="2OqwBi" id="4vp4nPrpvno" role="10QFUP">
-                                  <node concept="37vLTw" id="4vp4nPrpvhu" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4vp4nPrptrm" resolve="leafCell" />
-                                  </node>
-                                  <node concept="liA8E" id="4vp4nPrpvDj" role="2OqNvi">
-                                    <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="4vp4nPrpygq" role="2OqNvi">
-                              <ref role="37wK5l" node="2l3CneTsW_W" resolve="unwrap" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2ZW3vV" id="4vp4nPrpuyX" role="2$JKZa">
-                        <node concept="3uibUv" id="4vp4nPrpuN$" role="2ZW6by">
-                          <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
-                        </node>
-                        <node concept="2OqwBi" id="4vp4nPrrgVw" role="2ZW6bz">
-                          <node concept="37vLTw" id="4vp4nPrrhBF" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4vp4nPrptrm" resolve="leafCell" />
-                          </node>
-                          <node concept="liA8E" id="4vp4nPrrhe2" role="2OqNvi">
-                            <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                          </node>
-                        </node>
-                      </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="4gCFRNz0N2h" role="3cqZAp">
+                  <node concept="2OqwBi" id="4gCFRNz0O3K" role="3clFbG">
+                    <node concept="37vLTw" id="4gCFRNz0N2g" role="2Oq$k0">
+                      <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
                     </node>
-                    <node concept="3clFbF" id="ReH4Sut6dn" role="3cqZAp">
-                      <node concept="2YIFZM" id="7Nzu1McBHW9" role="3clFbG">
-                        <ref role="37wK5l" node="ReH4SusVIS" resolve="wrapCell" />
-                        <ref role="1Pybhc" node="6tOcB$JKlIC" resolve="TableUtils" />
-                        <node concept="2OqwBi" id="7Nzu1McBOp4" role="37wK5m">
-                          <node concept="37vLTw" id="7Nzu1McBHWa" role="2Oq$k0">
-                            <ref role="3cqZAo" node="20OswHE2oZ7" resolve="leaf" />
-                          </node>
-                          <node concept="liA8E" id="7Nzu1McBODP" role="2OqNvi">
-                            <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
+                    <node concept="liA8E" id="4gCFRNz0QGe" role="2OqNvi">
+                      <ref role="37wK5l" node="4gCFRNz0sZU" resolve="setPosition" />
+                      <node concept="2ShNRf" id="4gCFRNz0QHa" role="37wK5m">
+                        <node concept="1pGfFk" id="4gCFRNz0ReZ" role="2ShVmc">
+                          <ref role="37wK5l" to="sse1:20OswHE0h6W" resolve="GridPosition" />
+                          <node concept="37vLTw" id="4gCFRNz0Rgd" role="37wK5m">
+                            <ref role="3cqZAo" node="20OswHE2j_d" resolve="x" />
                           </node>
-                        </node>
-                        <node concept="37vLTw" id="7Nzu1McBHWb" role="37wK5m">
-                          <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="7Nzu1McBPcg" role="3cqZAp">
-                      <node concept="2OqwBi" id="7Nzu1McBPG4" role="3clFbG">
-                        <node concept="37vLTw" id="7Nzu1McBPcf" role="2Oq$k0">
-                          <ref role="3cqZAo" node="20OswHE2oZ7" resolve="leaf" />
-                        </node>
-                        <node concept="liA8E" id="7Nzu1McBPYX" role="2OqNvi">
-                          <ref role="37wK5l" to="6dpw:RywcYwuxYT" resolve="setEditorCell" />
-                          <node concept="37vLTw" id="7Nzu1McBQ0f" role="37wK5m">
-                            <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
+                          <node concept="37vLTw" id="4gCFRNz0RoN" role="37wK5m">
+                            <ref role="3cqZAo" node="20OswHE2nXn" resolve="y" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbC" id="4gCFRNyZKgU" role="3clFbw">
-                    <node concept="10Nm6u" id="4gCFRNyZKhy" role="3uHU7w" />
-                    <node concept="37vLTw" id="4gCFRNyZJCJ" role="3uHU7B">
+                </node>
+                <node concept="3clFbF" id="4UkcdCv5uUY" role="3cqZAp">
+                  <node concept="2OqwBi" id="4UkcdCv5w1e" role="3clFbG">
+                    <node concept="37vLTw" id="4UkcdCv5uUX" role="2Oq$k0">
                       <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
                     </node>
-                  </node>
-                  <node concept="9aQIb" id="70mku7tXukF" role="9aQIa">
-                    <node concept="3clFbS" id="70mku7tXukG" role="9aQI4">
-                      <node concept="3clFbF" id="4gCFRNz0FLc" role="3cqZAp">
-                        <node concept="2OqwBi" id="4gCFRNz0Hhf" role="3clFbG">
-                          <node concept="37vLTw" id="4gCFRNz0FLb" role="2Oq$k0">
-                            <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
-                          </node>
-                          <node concept="liA8E" id="4gCFRNz0Mm4" role="2OqNvi">
-                            <ref role="37wK5l" node="4gCFRNz0iH7" resolve="setTable" />
-                            <node concept="Xjq3P" id="4gCFRNzlNDj" role="37wK5m" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="4gCFRNz0N2h" role="3cqZAp">
-                        <node concept="2OqwBi" id="4gCFRNz0O3K" role="3clFbG">
-                          <node concept="37vLTw" id="4gCFRNz0N2g" role="2Oq$k0">
-                            <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
-                          </node>
-                          <node concept="liA8E" id="4gCFRNz0QGe" role="2OqNvi">
-                            <ref role="37wK5l" node="4gCFRNz0sZU" resolve="setPosition" />
-                            <node concept="2ShNRf" id="4gCFRNz0QHa" role="37wK5m">
-                              <node concept="1pGfFk" id="4gCFRNz0ReZ" role="2ShVmc">
-                                <ref role="37wK5l" to="sse1:20OswHE0h6W" resolve="GridPosition" />
-                                <node concept="37vLTw" id="4gCFRNz0Rgd" role="37wK5m">
-                                  <ref role="3cqZAo" node="20OswHE2j_d" resolve="x" />
-                                </node>
-                                <node concept="37vLTw" id="4gCFRNz0RoN" role="37wK5m">
-                                  <ref role="3cqZAo" node="20OswHE2nXn" resolve="y" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="4UkcdCv5uUY" role="3cqZAp">
-                        <node concept="2OqwBi" id="4UkcdCv5w1e" role="3clFbG">
-                          <node concept="37vLTw" id="4UkcdCv5uUX" role="2Oq$k0">
-                            <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
-                          </node>
-                          <node concept="liA8E" id="4UkcdCv5ytC" role="2OqNvi">
-                            <ref role="37wK5l" node="4UkcdCv5gyi" resolve="clearStyle" />
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="liA8E" id="4UkcdCv5ytC" role="2OqNvi">
+                      <ref role="37wK5l" node="4UkcdCv5gyi" resolve="clearStyle" />
                     </node>
                   </node>
                 </node>
@@ -2937,18 +2672,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbF" id="2l3CneTs733" role="3cqZAp">
-                  <node concept="2OqwBi" id="2l3CneTs8cK" role="3clFbG">
-                    <node concept="37vLTw" id="2l3CneTs732" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2l3CneTrYCw" resolve="usedWrappers" />
-                    </node>
-                    <node concept="TSZUe" id="2l3CneTsbCD" role="2OqNvi">
-                      <node concept="37vLTw" id="2l3CneTsbKd" role="25WWJ7">
-                        <ref role="3cqZAo" node="20OswHE2reV" resolve="wrapper" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
               </node>
               <node concept="3cpWsn" id="20OswHE2nXn" role="1Duv9x">
                 <property role="TrG5h" value="y" />
@@ -8180,6 +7903,17 @@
       <node concept="3uibUv" id="7Nzu1Mc_qXi" role="1tU5fm">
         <ref role="3uigEE" to="sse1:20OswHE0h3P" resolve="GridPosition" />
       </node>
+      <node concept="2ShNRf" id="3mrQsPT0ipL" role="33vP2m">
+        <node concept="1pGfFk" id="3mrQsPT0i8w" role="2ShVmc">
+          <ref role="37wK5l" to="sse1:20OswHE0h6W" resolve="GridPosition" />
+          <node concept="3cmrfG" id="3mrQsPT0ppz" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+          </node>
+          <node concept="3cmrfG" id="3mrQsPT0Afc" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="312cEg" id="4UkcdCv3Odo" role="jymVt">
       <property role="TrG5h" value="myTableStyle" />
@@ -8654,6 +8388,22 @@
                         <node concept="10Oyi0" id="3IadBSKQBDQ" role="1tU5fm" />
                       </node>
                     </node>
+                    <node concept="3cpWs8" id="7a_Gs756mTZ" role="3cqZAp">
+                      <node concept="3cpWsn" id="7a_Gs756mU0" role="3cpWs9">
+                        <property role="TrG5h" value="table" />
+                        <node concept="3uibUv" id="7a_Gs7562vG" role="1tU5fm">
+                          <ref role="3uigEE" node="1dAqnm8$zBn" resolve="TableEditor" />
+                        </node>
+                        <node concept="2OqwBi" id="7a_Gs756mU1" role="33vP2m">
+                          <node concept="37vLTw" id="7a_Gs756mU2" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1oWwpQDTgkn" resolve="cell" />
+                          </node>
+                          <node concept="liA8E" id="7a_Gs756mU3" role="2OqNvi">
+                            <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                     <node concept="3clFbJ" id="3IadBSKR0u0" role="3cqZAp">
                       <node concept="3clFbS" id="3IadBSKR0u2" role="3clFbx">
                         <node concept="3clFbF" id="3IadBSKRqRY" role="3cqZAp">
@@ -8693,19 +8443,27 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="2OqwBi" id="6L2tYd2ODkY" role="3uHU7w">
-                                <node concept="2OqwBi" id="6L2tYd2Oceg" role="2Oq$k0">
-                                  <node concept="37vLTw" id="6L2tYd2O8Tp" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1oWwpQDTgkn" resolve="cell" />
+                              <node concept="1eOMI4" id="7a_Gs758PZl" role="3uHU7w">
+                                <node concept="3K4zz7" id="7a_Gs759urO" role="1eOMHV">
+                                  <node concept="3cmrfG" id="7a_Gs759Mpa" role="3K4E3e">
+                                    <property role="3cmrfH" value="0" />
                                   </node>
-                                  <node concept="liA8E" id="6L2tYd2OAgh" role="2OqNvi">
-                                    <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+                                  <node concept="3clFbC" id="7a_Gs759lo9" role="3K4Cdx">
+                                    <node concept="10Nm6u" id="7a_Gs759rju" role="3uHU7w" />
+                                    <node concept="37vLTw" id="7a_Gs7593ye" role="3uHU7B">
+                                      <ref role="3cqZAo" node="7a_Gs756mU0" resolve="table" />
+                                    </node>
                                   </node>
-                                </node>
-                                <node concept="liA8E" id="6L2tYd2OL4J" role="2OqNvi">
-                                  <ref role="37wK5l" node="6L2tYd2Kkna" resolve="getVerticalStickyCellOffset" />
-                                  <node concept="37vLTw" id="6L2tYd2OUcN" role="37wK5m">
-                                    <ref role="3cqZAo" node="1oWwpQDTgkn" resolve="cell" />
+                                  <node concept="2OqwBi" id="6L2tYd2ODkY" role="3K4GZi">
+                                    <node concept="37vLTw" id="7a_Gs756mU4" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="7a_Gs756mU0" resolve="table" />
+                                    </node>
+                                    <node concept="liA8E" id="6L2tYd2OL4J" role="2OqNvi">
+                                      <ref role="37wK5l" node="6L2tYd2Kkna" resolve="getVerticalStickyCellOffset" />
+                                      <node concept="37vLTw" id="6L2tYd2OUcN" role="37wK5m">
+                                        <ref role="3cqZAo" node="1oWwpQDTgkn" resolve="cell" />
+                                      </node>
+                                    </node>
                                   </node>
                                 </node>
                               </node>
@@ -8745,19 +8503,27 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="2OqwBi" id="3IadBSKYt8n" role="3uHU7w">
-                                  <node concept="2OqwBi" id="3IadBSKYt8o" role="2Oq$k0">
-                                    <node concept="37vLTw" id="3IadBSKYt8p" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1oWwpQDTgkn" resolve="cell" />
+                                <node concept="1eOMI4" id="7a_Gs75ayNr" role="3uHU7w">
+                                  <node concept="3K4zz7" id="7a_Gs75b8w$" role="1eOMHV">
+                                    <node concept="3cmrfG" id="7a_Gs75bgVl" role="3K4E3e">
+                                      <property role="3cmrfH" value="0" />
                                     </node>
-                                    <node concept="liA8E" id="3IadBSKYt8q" role="2OqNvi">
-                                      <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+                                    <node concept="3clFbC" id="7a_Gs75aM1D" role="3K4Cdx">
+                                      <node concept="10Nm6u" id="7a_Gs75aROS" role="3uHU7w" />
+                                      <node concept="37vLTw" id="7a_Gs75aFgt" role="3uHU7B">
+                                        <ref role="3cqZAo" node="7a_Gs756mU0" resolve="table" />
+                                      </node>
                                     </node>
-                                  </node>
-                                  <node concept="liA8E" id="3IadBSKYt8r" role="2OqNvi">
-                                    <ref role="37wK5l" node="3IadBSKPn1A" resolve="getHorizonalStickyCellOffset" />
-                                    <node concept="37vLTw" id="3IadBSKYt8s" role="37wK5m">
-                                      <ref role="3cqZAo" node="1oWwpQDTgkn" resolve="cell" />
+                                    <node concept="2OqwBi" id="3IadBSKYt8n" role="3K4GZi">
+                                      <node concept="37vLTw" id="7a_Gs756mU5" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="7a_Gs756mU0" resolve="table" />
+                                      </node>
+                                      <node concept="liA8E" id="3IadBSKYt8r" role="2OqNvi">
+                                        <ref role="37wK5l" node="3IadBSKPn1A" resolve="getHorizonalStickyCellOffset" />
+                                        <node concept="37vLTw" id="3IadBSKYt8s" role="37wK5m">
+                                          <ref role="3cqZAo" node="1oWwpQDTgkn" resolve="cell" />
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -10738,6 +10504,17 @@
       </node>
       <node concept="3Tm1VV" id="2FAXvauHUvQ" role="1B3o_S" />
       <node concept="3clFbS" id="2FAXvauHUvR" role="3clF47">
+        <node concept="3cpWs8" id="7a_Gs750BNF" role="3cqZAp">
+          <node concept="3cpWsn" id="7a_Gs750BNG" role="3cpWs9">
+            <property role="TrG5h" value="table" />
+            <node concept="3uibUv" id="7a_Gs750tbq" role="1tU5fm">
+              <ref role="3uigEE" node="1dAqnm8$zBn" resolve="TableEditor" />
+            </node>
+            <node concept="1rXfSq" id="7a_Gs750BNH" role="33vP2m">
+              <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbJ" id="2FAXvauHUvS" role="3cqZAp">
           <node concept="3clFbS" id="2FAXvauHUvT" role="3clFbx">
             <node concept="3cpWs6" id="2FAXvauHUvU" role="3cqZAp">
@@ -10745,8 +10522,8 @@
                 <node concept="2OqwBi" id="2FAXvauHUvW" role="2Oq$k0">
                   <node concept="2OqwBi" id="2FAXvauHUvX" role="2Oq$k0">
                     <node concept="2OqwBi" id="2FAXvauHUvY" role="2Oq$k0">
-                      <node concept="1rXfSq" id="2FAXvauHUvZ" role="2Oq$k0">
-                        <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+                      <node concept="37vLTw" id="7a_Gs750BNJ" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7a_Gs750BNG" resolve="table" />
                       </node>
                       <node concept="liA8E" id="2FAXvauHUw0" role="2OqNvi">
                         <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
@@ -10772,32 +10549,40 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="2FAXvauHUw6" role="3clFbw">
-            <node concept="2OqwBi" id="2FAXvauHUw7" role="2Oq$k0">
-              <node concept="2OqwBi" id="2FAXvauHUw8" role="2Oq$k0">
-                <node concept="2OqwBi" id="2FAXvauHUw9" role="2Oq$k0">
-                  <node concept="1rXfSq" id="2FAXvauHUwa" role="2Oq$k0">
-                    <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+          <node concept="1Wc70l" id="7a_Gs750TQl" role="3clFbw">
+            <node concept="3y3z36" id="7a_Gs75187g" role="3uHU7B">
+              <node concept="10Nm6u" id="7a_Gs751bc2" role="3uHU7w" />
+              <node concept="37vLTw" id="7a_Gs750ZU$" role="3uHU7B">
+                <ref role="3cqZAo" node="7a_Gs750BNG" resolve="table" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2FAXvauHUw6" role="3uHU7w">
+              <node concept="2OqwBi" id="2FAXvauHUw7" role="2Oq$k0">
+                <node concept="2OqwBi" id="2FAXvauHUw8" role="2Oq$k0">
+                  <node concept="2OqwBi" id="2FAXvauHUw9" role="2Oq$k0">
+                    <node concept="37vLTw" id="7a_Gs750BNI" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7a_Gs750BNG" resolve="table" />
+                    </node>
+                    <node concept="liA8E" id="2FAXvauHUwb" role="2OqNvi">
+                      <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
+                    </node>
                   </node>
-                  <node concept="liA8E" id="2FAXvauHUwb" role="2OqNvi">
-                    <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
+                  <node concept="liA8E" id="2FAXvauHUwc" role="2OqNvi">
+                    <ref role="37wK5l" to="6dpw:20OswHEb5oT" resolve="getElement" />
+                    <node concept="1rXfSq" id="2FAXvauHUwd" role="37wK5m">
+                      <ref role="37wK5l" node="4gCFRNz3a7W" resolve="getGridPosition" />
+                    </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="2FAXvauHUwc" role="2OqNvi">
-                  <ref role="37wK5l" to="6dpw:20OswHEb5oT" resolve="getElement" />
-                  <node concept="1rXfSq" id="2FAXvauHUwd" role="37wK5m">
-                    <ref role="37wK5l" node="4gCFRNz3a7W" resolve="getGridPosition" />
-                  </node>
+                <node concept="liA8E" id="2FAXvauHUwe" role="2OqNvi">
+                  <ref role="37wK5l" to="6dpw:3olMEllwaBa" resolve="getStyle" />
                 </node>
               </node>
-              <node concept="liA8E" id="2FAXvauHUwe" role="2OqNvi">
-                <ref role="37wK5l" to="6dpw:3olMEllwaBa" resolve="getStyle" />
-              </node>
-            </node>
-            <node concept="liA8E" id="2FAXvauHUwf" role="2OqNvi">
-              <ref role="37wK5l" to="hox0:~Style.isSpecified(jetbrains.mps.openapi.editor.style.StyleAttribute)" resolve="isSpecified" />
-              <node concept="37vLTw" id="2FAXvauHUwg" role="37wK5m">
-                <ref role="3cqZAo" node="2FAXvauHUvM" resolve="attribute" />
+              <node concept="liA8E" id="2FAXvauHUwf" role="2OqNvi">
+                <ref role="37wK5l" to="hox0:~Style.isSpecified(jetbrains.mps.openapi.editor.style.StyleAttribute)" resolve="isSpecified" />
+                <node concept="37vLTw" id="2FAXvauHUwg" role="37wK5m">
+                  <ref role="3cqZAo" node="2FAXvauHUvM" resolve="attribute" />
+                </node>
               </node>
             </node>
           </node>
@@ -10902,8 +10687,8 @@
             <node concept="3cpWs6" id="25DLT7ws3qa" role="3cqZAp">
               <node concept="2OqwBi" id="25DLT7wsoPR" role="3cqZAk">
                 <node concept="2OqwBi" id="25DLT7wsgSg" role="2Oq$k0">
-                  <node concept="1rXfSq" id="25DLT7wsaOO" role="2Oq$k0">
-                    <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+                  <node concept="37vLTw" id="7a_Gs750BNK" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7a_Gs750BNG" resolve="table" />
                   </node>
                   <node concept="liA8E" id="25DLT7wsmcG" role="2OqNvi">
                     <ref role="37wK5l" to="g51k:~EditorCell_Basic.getStyle()" resolve="getStyle" />
@@ -10918,19 +10703,27 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="25DLT7wrBTz" role="3clFbw">
-            <node concept="2OqwBi" id="25DLT7wrtwc" role="2Oq$k0">
-              <node concept="1rXfSq" id="25DLT7wrnwW" role="2Oq$k0">
-                <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
-              </node>
-              <node concept="liA8E" id="25DLT7wr_7l" role="2OqNvi">
-                <ref role="37wK5l" to="g51k:~EditorCell_Basic.getStyle()" resolve="getStyle" />
+          <node concept="1Wc70l" id="7a_Gs751lQh" role="3clFbw">
+            <node concept="3y3z36" id="7a_Gs751E_3" role="3uHU7B">
+              <node concept="10Nm6u" id="7a_Gs751IQX" role="3uHU7w" />
+              <node concept="37vLTw" id="7a_Gs751$mQ" role="3uHU7B">
+                <ref role="3cqZAo" node="7a_Gs750BNG" resolve="table" />
               </node>
             </node>
-            <node concept="liA8E" id="25DLT7wrFWZ" role="2OqNvi">
-              <ref role="37wK5l" to="hox0:~Style.isSpecified(jetbrains.mps.openapi.editor.style.StyleAttribute)" resolve="isSpecified" />
-              <node concept="37vLTw" id="25DLT7wrSqt" role="37wK5m">
-                <ref role="3cqZAo" node="2FAXvauHUvM" resolve="attribute" />
+            <node concept="2OqwBi" id="25DLT7wrBTz" role="3uHU7w">
+              <node concept="2OqwBi" id="25DLT7wrtwc" role="2Oq$k0">
+                <node concept="37vLTw" id="7a_Gs750BNL" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7a_Gs750BNG" resolve="table" />
+                </node>
+                <node concept="liA8E" id="25DLT7wr_7l" role="2OqNvi">
+                  <ref role="37wK5l" to="g51k:~EditorCell_Basic.getStyle()" resolve="getStyle" />
+                </node>
+              </node>
+              <node concept="liA8E" id="25DLT7wrFWZ" role="2OqNvi">
+                <ref role="37wK5l" to="hox0:~Style.isSpecified(jetbrains.mps.openapi.editor.style.StyleAttribute)" resolve="isSpecified" />
+                <node concept="37vLTw" id="25DLT7wrSqt" role="37wK5m">
+                  <ref role="3cqZAo" node="2FAXvauHUvM" resolve="attribute" />
+                </node>
               </node>
             </node>
           </node>
@@ -10943,8 +10736,8 @@
                 <node concept="2OqwBi" id="25DLT7wNtzX" role="2Oq$k0">
                   <node concept="2OqwBi" id="25DLT7wNtzY" role="2Oq$k0">
                     <node concept="2OqwBi" id="25DLT7wNtzZ" role="2Oq$k0">
-                      <node concept="1rXfSq" id="25DLT7wNt$0" role="2Oq$k0">
-                        <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+                      <node concept="37vLTw" id="7a_Gs750BNM" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7a_Gs750BNG" resolve="table" />
                       </node>
                       <node concept="liA8E" id="25DLT7wNt$1" role="2OqNvi">
                         <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
@@ -10970,41 +10763,49 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="25DLT7wNt$7" role="3clFbw">
-            <node concept="2OqwBi" id="25DLT7wNt$8" role="2Oq$k0">
-              <node concept="2OqwBi" id="25DLT7wNt$9" role="2Oq$k0">
-                <node concept="2OqwBi" id="25DLT7wNt$a" role="2Oq$k0">
-                  <node concept="1rXfSq" id="25DLT7wNt$b" role="2Oq$k0">
-                    <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
-                  </node>
-                  <node concept="liA8E" id="25DLT7wNt$c" role="2OqNvi">
-                    <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
+          <node concept="1Wc70l" id="7a_Gs751ReI" role="3clFbw">
+            <node concept="3y3z36" id="7a_Gs7523XH" role="3uHU7B">
+              <node concept="10Nm6u" id="7a_Gs752eSq" role="3uHU7w" />
+              <node concept="37vLTw" id="7a_Gs751XJz" role="3uHU7B">
+                <ref role="3cqZAo" node="7a_Gs750BNG" resolve="table" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="25DLT7wNt$7" role="3uHU7w">
+              <node concept="2OqwBi" id="25DLT7wNt$8" role="2Oq$k0">
+                <node concept="2OqwBi" id="25DLT7wNt$9" role="2Oq$k0">
+                  <node concept="2OqwBi" id="25DLT7wNt$a" role="2Oq$k0">
+                    <node concept="37vLTw" id="7a_Gs750BNN" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7a_Gs750BNG" resolve="table" />
+                    </node>
+                    <node concept="liA8E" id="25DLT7wNt$c" role="2OqNvi">
+                      <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
+                    </node>
                   </node>
-                </node>
-                <node concept="liA8E" id="25DLT7wNt$d" role="2OqNvi">
-                  <ref role="37wK5l" to="6dpw:20OswHEb5oT" resolve="getElement" />
-                  <node concept="2ShNRf" id="25DLT7wNMx7" role="37wK5m">
-                    <node concept="1pGfFk" id="25DLT7wOhOD" role="2ShVmc">
-                      <property role="373rjd" value="true" />
-                      <ref role="37wK5l" to="sse1:20OswHE0h6W" resolve="GridPosition" />
-                      <node concept="3cmrfG" id="25DLT7wOrxr" role="37wK5m">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                      <node concept="3cmrfG" id="25DLT7wO$Er" role="37wK5m">
-                        <property role="3cmrfH" value="0" />
+                  <node concept="liA8E" id="25DLT7wNt$d" role="2OqNvi">
+                    <ref role="37wK5l" to="6dpw:20OswHEb5oT" resolve="getElement" />
+                    <node concept="2ShNRf" id="25DLT7wNMx7" role="37wK5m">
+                      <node concept="1pGfFk" id="25DLT7wOhOD" role="2ShVmc">
+                        <property role="373rjd" value="true" />
+                        <ref role="37wK5l" to="sse1:20OswHE0h6W" resolve="GridPosition" />
+                        <node concept="3cmrfG" id="25DLT7wOrxr" role="37wK5m">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="3cmrfG" id="25DLT7wO$Er" role="37wK5m">
+                          <property role="3cmrfH" value="0" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
+                <node concept="liA8E" id="25DLT7wNt$f" role="2OqNvi">
+                  <ref role="37wK5l" to="6dpw:3olMEllwaBa" resolve="getStyle" />
+                </node>
               </node>
-              <node concept="liA8E" id="25DLT7wNt$f" role="2OqNvi">
-                <ref role="37wK5l" to="6dpw:3olMEllwaBa" resolve="getStyle" />
-              </node>
-            </node>
-            <node concept="liA8E" id="25DLT7wNt$g" role="2OqNvi">
-              <ref role="37wK5l" to="hox0:~Style.isSpecified(jetbrains.mps.openapi.editor.style.StyleAttribute)" resolve="isSpecified" />
-              <node concept="37vLTw" id="25DLT7wNt$h" role="37wK5m">
-                <ref role="3cqZAo" node="2FAXvauHUvM" resolve="attribute" />
+              <node concept="liA8E" id="25DLT7wNt$g" role="2OqNvi">
+                <ref role="37wK5l" to="hox0:~Style.isSpecified(jetbrains.mps.openapi.editor.style.StyleAttribute)" resolve="isSpecified" />
+                <node concept="37vLTw" id="25DLT7wNt$h" role="37wK5m">
+                  <ref role="3cqZAo" node="2FAXvauHUvM" resolve="attribute" />
+                </node>
               </node>
             </node>
           </node>
@@ -11174,12 +10975,92 @@
       </node>
       <node concept="3Tm1VV" id="4gCFRNzc0zd" role="1B3o_S" />
       <node concept="3clFbS" id="4gCFRNzc0ze" role="3clF47">
-        <node concept="3clFbF" id="4gCFRNzcfen" role="3cqZAp">
-          <node concept="37vLTw" id="4gCFRNzcfem" role="3clFbG">
+        <node concept="3clFbJ" id="7a_Gs74O$ed" role="3cqZAp">
+          <node concept="3clFbS" id="7a_Gs74O$ef" role="3clFbx">
+            <node concept="3cpWs6" id="7a_Gs74OVBi" role="3cqZAp">
+              <node concept="37vLTw" id="7a_Gs74P0Gd" role="3cqZAk">
+                <ref role="3cqZAo" node="20OswHE0grm" resolve="myTable" />
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="7a_Gs74OKIn" role="3clFbw">
+            <node concept="10Nm6u" id="7a_Gs74ONMz" role="3uHU7w" />
+            <node concept="37vLTw" id="7a_Gs74OEDM" role="3uHU7B">
+              <ref role="3cqZAo" node="20OswHE0grm" resolve="myTable" />
+            </node>
+          </node>
+        </node>
+        <node concept="1Dw8fO" id="7a_Gs74RM1H" role="3cqZAp">
+          <node concept="3clFbS" id="7a_Gs74RM1J" role="2LFqv$">
+            <node concept="3clFbJ" id="7a_Gs74TMcA" role="3cqZAp">
+              <node concept="3clFbS" id="7a_Gs74TMcC" role="3clFbx">
+                <node concept="3clFbF" id="7a_Gs74Ybwp" role="3cqZAp">
+                  <node concept="37vLTI" id="7a_Gs74YnNm" role="3clFbG">
+                    <node concept="37vLTw" id="7a_Gs74Ybwn" role="37vLTJ">
+                      <ref role="3cqZAo" node="20OswHE0grm" resolve="myTable" />
+                    </node>
+                    <node concept="1eOMI4" id="7a_Gs74Yw4X" role="37vLTx">
+                      <node concept="10QFUN" id="7a_Gs74Yw4Y" role="1eOMHV">
+                        <node concept="3uibUv" id="7a_Gs74Yw4Z" role="10QFUM">
+                          <ref role="3uigEE" node="1dAqnm8$zBn" resolve="TableEditor" />
+                        </node>
+                        <node concept="37vLTw" id="7a_Gs74Yw50" role="10QFUP">
+                          <ref role="3cqZAo" node="7a_Gs74RM1K" resolve="ancestor" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3zACq4" id="7a_Gs74YH8p" role="3cqZAp" />
+              </node>
+              <node concept="2ZW3vV" id="7a_Gs74U5vw" role="3clFbw">
+                <node concept="3uibUv" id="7a_Gs74Ue5y" role="2ZW6by">
+                  <ref role="3uigEE" node="1dAqnm8$zBn" resolve="TableEditor" />
+                </node>
+                <node concept="37vLTw" id="7a_Gs74TYP1" role="2ZW6bz">
+                  <ref role="3cqZAo" node="7a_Gs74RM1K" resolve="ancestor" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="7a_Gs74RM1K" role="1Duv9x">
+            <property role="TrG5h" value="ancestor" />
+            <node concept="3uibUv" id="7a_Gs74RVEG" role="1tU5fm">
+              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+            </node>
+            <node concept="1rXfSq" id="7a_Gs74SeYX" role="33vP2m">
+              <ref role="37wK5l" node="6MTMjob3xGq" resolve="getParent" />
+            </node>
+          </node>
+          <node concept="3y3z36" id="7a_Gs74SANJ" role="1Dwp0S">
+            <node concept="10Nm6u" id="7a_Gs74SDTA" role="3uHU7w" />
+            <node concept="37vLTw" id="7a_Gs74SugP" role="3uHU7B">
+              <ref role="3cqZAo" node="7a_Gs74RM1K" resolve="ancestor" />
+            </node>
+          </node>
+          <node concept="37vLTI" id="7a_Gs74SShW" role="1Dwrff">
+            <node concept="2OqwBi" id="7a_Gs74TcJL" role="37vLTx">
+              <node concept="37vLTw" id="7a_Gs74T7mm" role="2Oq$k0">
+                <ref role="3cqZAo" node="7a_Gs74RM1K" resolve="ancestor" />
+              </node>
+              <node concept="liA8E" id="7a_Gs74ToVj" role="2OqNvi">
+                <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7a_Gs74SJUa" role="37vLTJ">
+              <ref role="3cqZAo" node="7a_Gs74RM1K" resolve="ancestor" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="7a_Gs74UMNH" role="3cqZAp">
+          <node concept="37vLTw" id="7a_Gs74Z5qa" role="3cqZAk">
             <ref role="3cqZAo" node="20OswHE0grm" resolve="myTable" />
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="7a_Gs750bAt" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
     </node>
     <node concept="2tJIrI" id="4gCFRNz0hjk" role="jymVt" />
     <node concept="3clFb_" id="4gCFRNz0sZU" role="jymVt">
@@ -11329,6 +11210,9 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="3mrQsPSZC_j" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
     </node>
     <node concept="2tJIrI" id="4UkcdCv3h7T" role="jymVt" />
     <node concept="3clFb_" id="4UkcdCv41sp" role="jymVt">
@@ -12108,93 +11992,108 @@
             <ref role="37wK5l" node="2FAXvauHM9x" resolve="syncStyles" />
           </node>
         </node>
-        <node concept="3clFbJ" id="1sFAfq9yE$A" role="3cqZAp">
-          <node concept="3clFbS" id="1sFAfq9yE$C" role="3clFbx">
-            <node concept="3clFbJ" id="3IadBSLuF4R" role="3cqZAp">
-              <node concept="3clFbS" id="3IadBSLuF4T" role="3clFbx">
-                <node concept="3clFbF" id="6L2tYd2I716" role="3cqZAp">
-                  <node concept="2OqwBi" id="6L2tYd2ICcx" role="3clFbG">
-                    <node concept="2OqwBi" id="6L2tYd2IllY" role="2Oq$k0">
-                      <node concept="2OqwBi" id="6L2tYd2Iah2" role="2Oq$k0">
-                        <node concept="Xjq3P" id="6L2tYd2I714" role="2Oq$k0" />
-                        <node concept="liA8E" id="6L2tYd2Ih37" role="2OqNvi">
-                          <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+        <node concept="3cpWs8" id="7a_Gs754UZW" role="3cqZAp">
+          <node concept="3cpWsn" id="7a_Gs754UZX" role="3cpWs9">
+            <property role="TrG5h" value="table" />
+            <node concept="3uibUv" id="7a_Gs754JDl" role="1tU5fm">
+              <ref role="3uigEE" node="1dAqnm8$zBn" resolve="TableEditor" />
+            </node>
+            <node concept="1rXfSq" id="7a_Gs754UZY" role="33vP2m">
+              <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7a_Gs752uTS" role="3cqZAp">
+          <node concept="3clFbS" id="7a_Gs752uTU" role="3clFbx">
+            <node concept="3clFbJ" id="1sFAfq9yE$A" role="3cqZAp">
+              <node concept="3clFbS" id="1sFAfq9yE$C" role="3clFbx">
+                <node concept="3clFbJ" id="3IadBSLuF4R" role="3cqZAp">
+                  <node concept="3clFbS" id="3IadBSLuF4T" role="3clFbx">
+                    <node concept="3clFbF" id="6L2tYd2I716" role="3cqZAp">
+                      <node concept="2OqwBi" id="6L2tYd2ICcx" role="3clFbG">
+                        <node concept="2OqwBi" id="6L2tYd2IllY" role="2Oq$k0">
+                          <node concept="37vLTw" id="7a_Gs7556xY" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7a_Gs754UZX" resolve="table" />
+                          </node>
+                          <node concept="2OwXpG" id="6L2tYd2IwPR" role="2OqNvi">
+                            <ref role="2Oxat5" node="3IadBSLtu3W" resolve="horizontallyStickyCells" />
+                          </node>
+                        </node>
+                        <node concept="TSZUe" id="6L2tYd2IINB" role="2OqNvi">
+                          <node concept="Xjq3P" id="6L2tYd2INia" role="25WWJ7" />
                         </node>
                       </node>
-                      <node concept="2OwXpG" id="6L2tYd2IwPR" role="2OqNvi">
-                        <ref role="2Oxat5" node="3IadBSLtu3W" resolve="horizontallyStickyCells" />
-                      </node>
-                    </node>
-                    <node concept="TSZUe" id="6L2tYd2IINB" role="2OqNvi">
-                      <node concept="Xjq3P" id="6L2tYd2INia" role="25WWJ7" />
                     </node>
                   </node>
+                  <node concept="1rXfSq" id="3IadBSLvAu6" role="3clFbw">
+                    <ref role="37wK5l" node="7$DZq89VgMe" resolve="isHorizontallyStickyCell" />
+                  </node>
                 </node>
-              </node>
-              <node concept="1rXfSq" id="3IadBSLvAu6" role="3clFbw">
-                <ref role="37wK5l" node="7$DZq89VgMe" resolve="isHorizontallyStickyCell" />
-              </node>
-            </node>
-            <node concept="3clFbJ" id="3IadBSLwIsp" role="3cqZAp">
-              <node concept="3clFbS" id="3IadBSLwIsr" role="3clFbx">
-                <node concept="3clFbF" id="3IadBSLwd81" role="3cqZAp">
-                  <node concept="2OqwBi" id="3IadBSLwd82" role="3clFbG">
-                    <node concept="2OqwBi" id="3IadBSLwd83" role="2Oq$k0">
-                      <node concept="2OqwBi" id="3IadBSLwd84" role="2Oq$k0">
-                        <node concept="Xjq3P" id="3IadBSLwd85" role="2Oq$k0" />
-                        <node concept="liA8E" id="3IadBSLwd86" role="2OqNvi">
-                          <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+                <node concept="3clFbJ" id="3IadBSLwIsp" role="3cqZAp">
+                  <node concept="3clFbS" id="3IadBSLwIsr" role="3clFbx">
+                    <node concept="3clFbF" id="3IadBSLwd81" role="3cqZAp">
+                      <node concept="2OqwBi" id="3IadBSLwd82" role="3clFbG">
+                        <node concept="2OqwBi" id="3IadBSLwd83" role="2Oq$k0">
+                          <node concept="37vLTw" id="7a_Gs755hF1" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7a_Gs754UZX" resolve="table" />
+                          </node>
+                          <node concept="2OwXpG" id="3IadBSLwd87" role="2OqNvi">
+                            <ref role="2Oxat5" node="6L2tYd2GScA" resolve="verticallyStickyCells" />
+                          </node>
+                        </node>
+                        <node concept="TSZUe" id="3IadBSLwd88" role="2OqNvi">
+                          <node concept="Xjq3P" id="3IadBSLwd89" role="25WWJ7" />
                         </node>
-                      </node>
-                      <node concept="2OwXpG" id="3IadBSLwd87" role="2OqNvi">
-                        <ref role="2Oxat5" node="6L2tYd2GScA" resolve="verticallyStickyCells" />
                       </node>
                     </node>
-                    <node concept="TSZUe" id="3IadBSLwd88" role="2OqNvi">
-                      <node concept="Xjq3P" id="3IadBSLwd89" role="25WWJ7" />
-                    </node>
                   </node>
-                </node>
-              </node>
-              <node concept="1rXfSq" id="3IadBSLwTAn" role="3clFbw">
-                <ref role="37wK5l" node="quM1lwQ2f0" resolve="isVerticallyStickyCell" />
-              </node>
-            </node>
-            <node concept="3cpWs8" id="1sFAfq9$eZN" role="3cqZAp">
-              <node concept="3cpWsn" id="1sFAfq9$eZO" role="3cpWs9">
-                <property role="TrG5h" value="editorComponent" />
-                <node concept="3uibUv" id="1sFAfq9$bZI" role="1tU5fm">
-                  <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-                </node>
-                <node concept="10QFUN" id="1sFAfq9$nyn" role="33vP2m">
-                  <node concept="3uibUv" id="1sFAfq9$qv6" role="10QFUM">
-                    <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+                  <node concept="1rXfSq" id="3IadBSLwTAn" role="3clFbw">
+                    <ref role="37wK5l" node="quM1lwQ2f0" resolve="isVerticallyStickyCell" />
                   </node>
-                  <node concept="2OqwBi" id="1sFAfq9$eZP" role="10QFUP">
-                    <node concept="Xjq3P" id="1sFAfq9$eZQ" role="2Oq$k0" />
-                    <node concept="liA8E" id="1sFAfq9$eZR" role="2OqNvi">
-                      <ref role="37wK5l" to="g51k:~EditorCell_Basic.getEditorComponent()" resolve="getEditorComponent" />
+                </node>
+                <node concept="3cpWs8" id="1sFAfq9$eZN" role="3cqZAp">
+                  <node concept="3cpWsn" id="1sFAfq9$eZO" role="3cpWs9">
+                    <property role="TrG5h" value="editorComponent" />
+                    <node concept="3uibUv" id="1sFAfq9$bZI" role="1tU5fm">
+                      <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+                    </node>
+                    <node concept="10QFUN" id="1sFAfq9$nyn" role="33vP2m">
+                      <node concept="3uibUv" id="1sFAfq9$qv6" role="10QFUM">
+                        <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+                      </node>
+                      <node concept="2OqwBi" id="1sFAfq9$eZP" role="10QFUP">
+                        <node concept="Xjq3P" id="1sFAfq9$eZQ" role="2Oq$k0" />
+                        <node concept="liA8E" id="1sFAfq9$eZR" role="2OqNvi">
+                          <ref role="37wK5l" to="g51k:~EditorCell_Basic.getEditorComponent()" resolve="getEditorComponent" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="5prQSJ4LcQT" role="3cqZAp">
-              <node concept="2OqwBi" id="5prQSJ4LfrI" role="3clFbG">
-                <node concept="37vLTw" id="5prQSJ4LcQR" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1sFAfq9$eZO" resolve="editorComponent" />
-                </node>
-                <node concept="liA8E" id="5prQSJ4LlU1" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~EditorComponent.addAdditionalPainter(jetbrains.mps.nodeEditor.AdditionalPainter)" resolve="addAdditionalPainter" />
-                  <node concept="37vLTw" id="1oWwpQDIJEV" role="37wK5m">
-                    <ref role="3cqZAo" node="5prQSJ4LSYn" resolve="painter" />
+                <node concept="3clFbF" id="5prQSJ4LcQT" role="3cqZAp">
+                  <node concept="2OqwBi" id="5prQSJ4LfrI" role="3clFbG">
+                    <node concept="37vLTw" id="5prQSJ4LcQR" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1sFAfq9$eZO" resolve="editorComponent" />
+                    </node>
+                    <node concept="liA8E" id="5prQSJ4LlU1" role="2OqNvi">
+                      <ref role="37wK5l" to="exr9:~EditorComponent.addAdditionalPainter(jetbrains.mps.nodeEditor.AdditionalPainter)" resolve="addAdditionalPainter" />
+                      <node concept="37vLTw" id="1oWwpQDIJEV" role="37wK5m">
+                        <ref role="3cqZAo" node="5prQSJ4LSYn" resolve="painter" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1rXfSq" id="3IadBSLvuyo" role="3clFbw">
+                <ref role="37wK5l" node="3IadBSLu3ql" resolve="isStickyCell" />
+              </node>
             </node>
           </node>
-          <node concept="1rXfSq" id="3IadBSLvuyo" role="3clFbw">
-            <ref role="37wK5l" node="3IadBSLu3ql" resolve="isStickyCell" />
+          <node concept="3y3z36" id="7a_Gs752MwQ" role="3clFbw">
+            <node concept="10Nm6u" id="7a_Gs752Pt4" role="3uHU7w" />
+            <node concept="37vLTw" id="7a_Gs754UZZ" role="3uHU7B">
+              <ref role="3cqZAo" node="7a_Gs754UZX" resolve="table" />
+            </node>
           </node>
         </node>
       </node>
@@ -12214,126 +12113,141 @@
             <ref role="37wK5l" to="g51k:~EditorCell_Collection.onRemove()" resolve="onRemove" />
           </node>
         </node>
-        <node concept="3clFbJ" id="u304WJIDb$" role="3cqZAp">
-          <node concept="3clFbS" id="u304WJIDb_" role="3clFbx">
-            <node concept="3clFbJ" id="4fVtJFvnWnJ" role="3cqZAp">
-              <node concept="3clFbS" id="4fVtJFvnWnK" role="3clFbx">
-                <node concept="3clFbF" id="4fVtJFvnWnL" role="3cqZAp">
-                  <node concept="2OqwBi" id="4fVtJFvnWnM" role="3clFbG">
-                    <node concept="2OqwBi" id="4fVtJFvnWnN" role="2Oq$k0">
-                      <node concept="2OqwBi" id="4fVtJFvnWnO" role="2Oq$k0">
-                        <node concept="Xjq3P" id="4fVtJFvnWnP" role="2Oq$k0" />
-                        <node concept="liA8E" id="4fVtJFvnWnQ" role="2OqNvi">
-                          <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+        <node concept="3cpWs8" id="7a_Gs754ftU" role="3cqZAp">
+          <node concept="3cpWsn" id="7a_Gs754ftV" role="3cpWs9">
+            <property role="TrG5h" value="table" />
+            <node concept="3uibUv" id="7a_Gs7549wg" role="1tU5fm">
+              <ref role="3uigEE" node="1dAqnm8$zBn" resolve="TableEditor" />
+            </node>
+            <node concept="1rXfSq" id="7a_Gs754ftW" role="33vP2m">
+              <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7a_Gs753sXz" role="3cqZAp">
+          <node concept="3clFbS" id="7a_Gs753sX_" role="3clFbx">
+            <node concept="3clFbJ" id="u304WJIDb$" role="3cqZAp">
+              <node concept="3clFbS" id="u304WJIDb_" role="3clFbx">
+                <node concept="3clFbJ" id="4fVtJFvnWnJ" role="3cqZAp">
+                  <node concept="3clFbS" id="4fVtJFvnWnK" role="3clFbx">
+                    <node concept="3clFbF" id="4fVtJFvnWnL" role="3cqZAp">
+                      <node concept="2OqwBi" id="4fVtJFvnWnM" role="3clFbG">
+                        <node concept="2OqwBi" id="4fVtJFvnWnN" role="2Oq$k0">
+                          <node concept="37vLTw" id="7a_Gs754tel" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7a_Gs754ftV" resolve="table" />
+                          </node>
+                          <node concept="2OwXpG" id="4fVtJFvnWnR" role="2OqNvi">
+                            <ref role="2Oxat5" node="3IadBSLtu3W" resolve="horizontallyStickyCells" />
+                          </node>
+                        </node>
+                        <node concept="3dhRuq" id="4fVtJFvo8kL" role="2OqNvi">
+                          <node concept="Xjq3P" id="4fVtJFvo8kN" role="25WWJ7" />
                         </node>
                       </node>
-                      <node concept="2OwXpG" id="4fVtJFvnWnR" role="2OqNvi">
-                        <ref role="2Oxat5" node="3IadBSLtu3W" resolve="horizontallyStickyCells" />
-                      </node>
-                    </node>
-                    <node concept="3dhRuq" id="4fVtJFvo8kL" role="2OqNvi">
-                      <node concept="Xjq3P" id="4fVtJFvo8kN" role="25WWJ7" />
                     </node>
                   </node>
+                  <node concept="1rXfSq" id="4fVtJFvnWnU" role="3clFbw">
+                    <ref role="37wK5l" node="7$DZq89VgMe" resolve="isHorizontallyStickyCell" />
+                  </node>
                 </node>
-              </node>
-              <node concept="1rXfSq" id="4fVtJFvnWnU" role="3clFbw">
-                <ref role="37wK5l" node="7$DZq89VgMe" resolve="isHorizontallyStickyCell" />
-              </node>
-            </node>
-            <node concept="3clFbJ" id="4fVtJFvnWoy" role="3cqZAp">
-              <node concept="3clFbS" id="4fVtJFvnWoz" role="3clFbx">
-                <node concept="3clFbF" id="4fVtJFvnWo$" role="3cqZAp">
-                  <node concept="2OqwBi" id="4fVtJFvnWo_" role="3clFbG">
-                    <node concept="2OqwBi" id="4fVtJFvnWoA" role="2Oq$k0">
-                      <node concept="2OqwBi" id="4fVtJFvnWoB" role="2Oq$k0">
-                        <node concept="Xjq3P" id="4fVtJFvnWoC" role="2Oq$k0" />
-                        <node concept="liA8E" id="4fVtJFvnWoD" role="2OqNvi">
-                          <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+                <node concept="3clFbJ" id="4fVtJFvnWoy" role="3cqZAp">
+                  <node concept="3clFbS" id="4fVtJFvnWoz" role="3clFbx">
+                    <node concept="3clFbF" id="4fVtJFvnWo$" role="3cqZAp">
+                      <node concept="2OqwBi" id="4fVtJFvnWo_" role="3clFbG">
+                        <node concept="2OqwBi" id="4fVtJFvnWoA" role="2Oq$k0">
+                          <node concept="37vLTw" id="7a_Gs754EOB" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7a_Gs754ftV" resolve="table" />
+                          </node>
+                          <node concept="2OwXpG" id="4fVtJFvnWoE" role="2OqNvi">
+                            <ref role="2Oxat5" node="6L2tYd2GScA" resolve="verticallyStickyCells" />
+                          </node>
+                        </node>
+                        <node concept="3dhRuq" id="4fVtJFvogAc" role="2OqNvi">
+                          <node concept="Xjq3P" id="4fVtJFvogAe" role="25WWJ7" />
                         </node>
                       </node>
-                      <node concept="2OwXpG" id="4fVtJFvnWoE" role="2OqNvi">
-                        <ref role="2Oxat5" node="6L2tYd2GScA" resolve="verticallyStickyCells" />
-                      </node>
-                    </node>
-                    <node concept="3dhRuq" id="4fVtJFvogAc" role="2OqNvi">
-                      <node concept="Xjq3P" id="4fVtJFvogAe" role="25WWJ7" />
                     </node>
                   </node>
-                </node>
-              </node>
-              <node concept="1rXfSq" id="4fVtJFvnWoH" role="3clFbw">
-                <ref role="37wK5l" node="quM1lwQ2f0" resolve="isVerticallyStickyCell" />
-              </node>
-            </node>
-            <node concept="3cpWs8" id="u304WJIDbA" role="3cqZAp">
-              <node concept="3cpWsn" id="u304WJIDbB" role="3cpWs9">
-                <property role="TrG5h" value="editorComponent" />
-                <node concept="3uibUv" id="u304WJIDbC" role="1tU5fm">
-                  <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-                </node>
-                <node concept="10QFUN" id="u304WJIDbD" role="33vP2m">
-                  <node concept="3uibUv" id="u304WJIDbE" role="10QFUM">
-                    <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+                  <node concept="1rXfSq" id="4fVtJFvnWoH" role="3clFbw">
+                    <ref role="37wK5l" node="quM1lwQ2f0" resolve="isVerticallyStickyCell" />
                   </node>
-                  <node concept="2OqwBi" id="u304WJIDbF" role="10QFUP">
-                    <node concept="Xjq3P" id="u304WJIDbG" role="2Oq$k0" />
-                    <node concept="liA8E" id="u304WJIDbH" role="2OqNvi">
-                      <ref role="37wK5l" to="g51k:~EditorCell_Basic.getEditorComponent()" resolve="getEditorComponent" />
+                </node>
+                <node concept="3cpWs8" id="u304WJIDbA" role="3cqZAp">
+                  <node concept="3cpWsn" id="u304WJIDbB" role="3cpWs9">
+                    <property role="TrG5h" value="editorComponent" />
+                    <node concept="3uibUv" id="u304WJIDbC" role="1tU5fm">
+                      <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+                    </node>
+                    <node concept="10QFUN" id="u304WJIDbD" role="33vP2m">
+                      <node concept="3uibUv" id="u304WJIDbE" role="10QFUM">
+                        <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+                      </node>
+                      <node concept="2OqwBi" id="u304WJIDbF" role="10QFUP">
+                        <node concept="Xjq3P" id="u304WJIDbG" role="2Oq$k0" />
+                        <node concept="liA8E" id="u304WJIDbH" role="2OqNvi">
+                          <ref role="37wK5l" to="g51k:~EditorCell_Basic.getEditorComponent()" resolve="getEditorComponent" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="7Sfyg9RgerQ" role="3cqZAp">
-              <node concept="3clFbS" id="7Sfyg9RgerS" role="3clFbx">
-                <node concept="3clFbF" id="7Sfyg9Rad8T" role="3cqZAp">
-                  <node concept="2OqwBi" id="7Sfyg9RagO7" role="3clFbG">
-                    <node concept="Xjq3P" id="7Sfyg9Rad8R" role="2Oq$k0" />
-                    <node concept="liA8E" id="7Sfyg9RapIQ" role="2OqNvi">
-                      <ref role="37wK5l" to="g51k:~EditorCell_Collection.removeCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="removeCell" />
-                      <node concept="37vLTw" id="7Sfyg9Razo5" role="37wK5m">
-                        <ref role="3cqZAo" node="20OswHE0fyJ" resolve="myWrappedEditorCell" />
+                <node concept="3clFbJ" id="7Sfyg9RgerQ" role="3cqZAp">
+                  <node concept="3clFbS" id="7Sfyg9RgerS" role="3clFbx">
+                    <node concept="3clFbF" id="7Sfyg9Rad8T" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Sfyg9RagO7" role="3clFbG">
+                        <node concept="Xjq3P" id="7Sfyg9Rad8R" role="2Oq$k0" />
+                        <node concept="liA8E" id="7Sfyg9RapIQ" role="2OqNvi">
+                          <ref role="37wK5l" to="g51k:~EditorCell_Collection.removeCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="removeCell" />
+                          <node concept="37vLTw" id="7Sfyg9Razo5" role="37wK5m">
+                            <ref role="3cqZAo" node="20OswHE0fyJ" resolve="myWrappedEditorCell" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="7Sfyg9RgufO" role="3clFbw">
+                    <node concept="Xjq3P" id="7Sfyg9Rgp7X" role="2Oq$k0" />
+                    <node concept="liA8E" id="7Sfyg9RgBvs" role="2OqNvi">
+                      <ref role="37wK5l" to="g51k:~EditorCell_Collection.containsCell(jetbrains.mps.nodeEditor.cells.EditorCell)" resolve="containsCell" />
+                      <node concept="10QFUN" id="7Sfyg9RhiRQ" role="37wK5m">
+                        <node concept="3uibUv" id="7Sfyg9RhtIf" role="10QFUM">
+                          <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
+                        </node>
+                        <node concept="37vLTw" id="7Sfyg9RgILR" role="10QFUP">
+                          <ref role="3cqZAo" node="20OswHE0fyJ" resolve="myWrappedEditorCell" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
-              </node>
-              <node concept="2OqwBi" id="7Sfyg9RgufO" role="3clFbw">
-                <node concept="Xjq3P" id="7Sfyg9Rgp7X" role="2Oq$k0" />
-                <node concept="liA8E" id="7Sfyg9RgBvs" role="2OqNvi">
-                  <ref role="37wK5l" to="g51k:~EditorCell_Collection.containsCell(jetbrains.mps.nodeEditor.cells.EditorCell)" resolve="containsCell" />
-                  <node concept="10QFUN" id="7Sfyg9RhiRQ" role="37wK5m">
-                    <node concept="3uibUv" id="7Sfyg9RhtIf" role="10QFUM">
-                      <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
+                <node concept="3clFbF" id="5prQSJ56M3s" role="3cqZAp">
+                  <node concept="2OqwBi" id="5prQSJ56M3u" role="3clFbG">
+                    <node concept="37vLTw" id="5prQSJ56M3v" role="2Oq$k0">
+                      <ref role="3cqZAo" node="u304WJIDbB" resolve="editorComponent" />
                     </node>
-                    <node concept="37vLTw" id="7Sfyg9RgILR" role="10QFUP">
-                      <ref role="3cqZAo" node="20OswHE0fyJ" resolve="myWrappedEditorCell" />
+                    <node concept="liA8E" id="5prQSJ56M3w" role="2OqNvi">
+                      <ref role="37wK5l" to="exr9:~EditorComponent.removeAdditionalPainter(jetbrains.mps.nodeEditor.AdditionalPainter)" resolve="removeAdditionalPainter" />
+                      <node concept="37vLTw" id="1oWwpQDJeEL" role="37wK5m">
+                        <ref role="3cqZAo" node="5prQSJ4LSYn" resolve="painter" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3clFbF" id="5prQSJ56M3s" role="3cqZAp">
-              <node concept="2OqwBi" id="5prQSJ56M3u" role="3clFbG">
-                <node concept="37vLTw" id="5prQSJ56M3v" role="2Oq$k0">
-                  <ref role="3cqZAo" node="u304WJIDbB" resolve="editorComponent" />
+              <node concept="22lmx$" id="7$DZq89WGnL" role="3clFbw">
+                <node concept="1rXfSq" id="7$DZq89WOo9" role="3uHU7B">
+                  <ref role="37wK5l" node="7$DZq89VgMe" resolve="isHorizontallyStickyCell" />
                 </node>
-                <node concept="liA8E" id="5prQSJ56M3w" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~EditorComponent.removeAdditionalPainter(jetbrains.mps.nodeEditor.AdditionalPainter)" resolve="removeAdditionalPainter" />
-                  <node concept="37vLTw" id="1oWwpQDJeEL" role="37wK5m">
-                    <ref role="3cqZAo" node="5prQSJ4LSYn" resolve="painter" />
-                  </node>
+                <node concept="1rXfSq" id="quM1lwS2kB" role="3uHU7w">
+                  <ref role="37wK5l" node="quM1lwQ2f0" resolve="isVerticallyStickyCell" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="22lmx$" id="7$DZq89WGnL" role="3clFbw">
-            <node concept="1rXfSq" id="7$DZq89WOo9" role="3uHU7B">
-              <ref role="37wK5l" node="7$DZq89VgMe" resolve="isHorizontallyStickyCell" />
-            </node>
-            <node concept="1rXfSq" id="quM1lwS2kB" role="3uHU7w">
-              <ref role="37wK5l" node="quM1lwQ2f0" resolve="isVerticallyStickyCell" />
+          <node concept="3y3z36" id="7a_Gs753G6f" role="3clFbw">
+            <node concept="10Nm6u" id="7a_Gs753OAW" role="3uHU7w" />
+            <node concept="37vLTw" id="7a_Gs754ftX" role="3uHU7B">
+              <ref role="3cqZAo" node="7a_Gs754ftV" resolve="table" />
             </node>
           </node>
         </node>
@@ -16116,38 +16030,33 @@
                 <node concept="3uibUv" id="7IUya7c4DRK" role="1tU5fm">
                   <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
                 </node>
-                <node concept="10QFUN" id="7IUya7c4DRL" role="33vP2m">
-                  <node concept="3uibUv" id="7IUya7c4DRM" role="10QFUM">
-                    <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
-                  </node>
-                  <node concept="2EnYce" id="7IUya7c4DRN" role="10QFUP">
-                    <node concept="0kSF2" id="7IUya7c4DRO" role="2Oq$k0">
-                      <node concept="3uibUv" id="7IUya7c4DRP" role="0kSFW">
-                        <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
+                <node concept="2EnYce" id="7IUya7c4DRN" role="33vP2m">
+                  <node concept="0kSF2" id="7IUya7c4DRO" role="2Oq$k0">
+                    <node concept="3uibUv" id="7IUya7c4DRP" role="0kSFW">
+                      <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
+                    </node>
+                    <node concept="2OqwBi" id="7IUya7c4DRQ" role="0kSFX">
+                      <node concept="37vLTw" id="7IUya7c4DRR" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7IUya7c4DRb" resolve="grid" />
                       </node>
-                      <node concept="2OqwBi" id="7IUya7c4DRQ" role="0kSFX">
-                        <node concept="37vLTw" id="7IUya7c4DRR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7IUya7c4DRb" resolve="grid" />
+                      <node concept="liA8E" id="7IUya7c4DRS" role="2OqNvi">
+                        <ref role="37wK5l" to="6dpw:4UkcdCtMnDB" resolve="getElement" />
+                        <node concept="37vLTw" id="7IUya7c4DRT" role="37wK5m">
+                          <ref role="3cqZAo" node="7IUya7c4DSd" resolve="x" />
                         </node>
-                        <node concept="liA8E" id="7IUya7c4DRS" role="2OqNvi">
-                          <ref role="37wK5l" to="6dpw:4UkcdCtMnDB" resolve="getElement" />
-                          <node concept="37vLTw" id="7IUya7c4DRT" role="37wK5m">
-                            <ref role="3cqZAo" node="7IUya7c4DSd" resolve="x" />
+                        <node concept="2OqwBi" id="7IUya7c4DRU" role="37wK5m">
+                          <node concept="37vLTw" id="7IUya7c4DRV" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7IUya7c4DRq" resolve="myPosition" />
                           </node>
-                          <node concept="2OqwBi" id="7IUya7c4DRU" role="37wK5m">
-                            <node concept="37vLTw" id="7IUya7c4DRV" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7IUya7c4DRq" resolve="myPosition" />
-                            </node>
-                            <node concept="liA8E" id="7IUya7c4DRW" role="2OqNvi">
-                              <ref role="37wK5l" to="sse1:GrM9mu4M1z" resolve="getY" />
-                            </node>
+                          <node concept="liA8E" id="7IUya7c4DRW" role="2OqNvi">
+                            <ref role="37wK5l" to="sse1:GrM9mu4M1z" resolve="getY" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="7IUya7c4DRX" role="2OqNvi">
-                      <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                    </node>
+                  </node>
+                  <node concept="liA8E" id="7IUya7c4DRX" role="2OqNvi">
+                    <ref role="37wK5l" to="6dpw:3mrQsPSUHfI" resolve="getGridCell" />
                   </node>
                 </node>
               </node>
@@ -16336,6 +16245,82 @@
         <node concept="3bZ5Sz" id="3eolunUT17A" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="3mrQsPSMsyt" role="jymVt" />
+    <node concept="2YIFZL" id="3mrQsPSMCN1" role="jymVt">
+      <property role="TrG5h" value="createNodeCell" />
+      <node concept="3clFbS" id="3mrQsPSMtER" role="3clF47">
+        <node concept="3cpWs8" id="3mrQsPSNCuK" role="3cqZAp">
+          <node concept="3cpWsn" id="3mrQsPSNCuL" role="3cpWs9">
+            <property role="TrG5h" value="cell" />
+            <node concept="3uibUv" id="3mrQsPSNBfB" role="1tU5fm">
+              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+            </node>
+            <node concept="2OqwBi" id="3mrQsPSNCuM" role="33vP2m">
+              <node concept="2OqwBi" id="3mrQsPSNCuN" role="2Oq$k0">
+                <node concept="2OqwBi" id="3mrQsPSNCuO" role="2Oq$k0">
+                  <node concept="2OqwBi" id="3mrQsPSNCuP" role="2Oq$k0">
+                    <node concept="37vLTw" id="3mrQsPSNCuQ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3mrQsPSMIJh" resolve="editorContext" />
+                    </node>
+                    <node concept="liA8E" id="3mrQsPSNCuR" role="2OqNvi">
+                      <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3mrQsPSNCuS" role="2OqNvi">
+                    <ref role="37wK5l" to="cj4x:~EditorComponent.getUpdater()" resolve="getUpdater" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="3mrQsPSNCuT" role="2OqNvi">
+                  <ref role="37wK5l" to="22ra:~Updater.getCurrentUpdateSession()" resolve="getCurrentUpdateSession" />
+                </node>
+              </node>
+              <node concept="liA8E" id="3mrQsPSNCuU" role="2OqNvi">
+                <ref role="37wK5l" to="22ra:~UpdateSession.updateChildNodeCell(org.jetbrains.mps.openapi.model.SNode)" resolve="updateChildNodeCell" />
+                <node concept="37vLTw" id="3mrQsPSNCuV" role="37wK5m">
+                  <ref role="3cqZAo" node="3mrQsPSMx6E" resolve="node" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="70mku7uwJaQ" role="3cqZAp">
+          <node concept="2OqwBi" id="70mku7uwJva" role="3clFbG">
+            <node concept="2YIFZM" id="70mku7uwJk4" role="2Oq$k0">
+              <ref role="37wK5l" node="1362cT3c3wo" resolve="getInstance" />
+              <ref role="1Pybhc" node="1362cT3bWqU" resolve="ChildsTracker" />
+            </node>
+            <node concept="liA8E" id="70mku7uwJF4" role="2OqNvi">
+              <ref role="37wK5l" node="1362cT3cM2o" resolve="registerChild" />
+              <node concept="37vLTw" id="70mku7uwJJC" role="37wK5m">
+                <ref role="3cqZAo" node="3mrQsPSNCuL" resolve="cell" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3mrQsPSMJX0" role="3cqZAp">
+          <node concept="37vLTw" id="3mrQsPSNCuW" role="3clFbG">
+            <ref role="3cqZAo" node="3mrQsPSNCuL" resolve="cell" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="3mrQsPSNygp" role="3cqZAp" />
+      </node>
+      <node concept="37vLTG" id="3mrQsPSMIJh" role="3clF46">
+        <property role="TrG5h" value="editorContext" />
+        <node concept="3uibUv" id="3mrQsPSMJ4P" role="1tU5fm">
+          <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3mrQsPSMx6E" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3uibUv" id="3mrQsPSM_Gu" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="3mrQsPSMB9S" role="3clF45">
+        <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+      </node>
+      <node concept="3Tm1VV" id="3mrQsPSMtEQ" role="1B3o_S" />
+    </node>
     <node concept="3Tm1VV" id="6tOcB$JKlID" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="2Jt5bYCPbd1">
@@ -16460,7 +16445,13 @@
       <property role="TrG5h" value="init" />
       <node concept="3cqZAl" id="1MCPN0ioUI2" role="3clF45" />
       <node concept="3Tm1VV" id="1MCPN0ioUI3" role="1B3o_S" />
-      <node concept="3clFbS" id="1MCPN0ioUI4" role="3clF47" />
+      <node concept="3clFbS" id="1MCPN0ioUI4" role="3clF47">
+        <node concept="3clFbF" id="3mrQsPSRGrF" role="3cqZAp">
+          <node concept="1rXfSq" id="3mrQsPSRGrE" role="3clFbG">
+            <ref role="37wK5l" node="7y7xi3eUVjP" resolve="sortChildren" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="2Jt5bYCPcga" role="jymVt" />
     <node concept="3clFb_" id="1wS0_2LK5ZA" role="jymVt">
@@ -24299,166 +24290,187 @@
         </node>
         <node concept="3clFbJ" id="4gCFRNz3yTI" role="3cqZAp">
           <node concept="3clFbS" id="4gCFRNz3yTL" role="3clFbx">
-            <node concept="3cpWs8" id="4gCFRNz9nLj" role="3cqZAp">
-              <node concept="3cpWsn" id="4gCFRNz9nLk" role="3cpWs9">
-                <property role="TrG5h" value="grid" />
-                <node concept="3uibUv" id="6eBFmDEFwW7" role="1tU5fm">
-                  <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                </node>
-                <node concept="2OqwBi" id="4gCFRNzcqdE" role="33vP2m">
-                  <node concept="2OqwBi" id="4gCFRNz9u6$" role="2Oq$k0">
-                    <node concept="37vLTw" id="4gCFRNzbEYJ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4gCFRNz3yIs" resolve="gridCell" />
-                    </node>
-                    <node concept="liA8E" id="4gCFRNz9wFI" role="2OqNvi">
-                      <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="4gCFRNzcw2P" role="2OqNvi">
-                    <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
-                  </node>
+            <node concept="3cpWs8" id="7a_Gs75cbEh" role="3cqZAp">
+              <node concept="3cpWsn" id="7a_Gs75cbEi" role="3cpWs9">
+                <property role="TrG5h" value="table" />
+                <node concept="3uibUv" id="7a_Gs75cabJ" role="1tU5fm">
+                  <ref role="3uigEE" node="1dAqnm8$zBn" resolve="TableEditor" />
                 </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="ReH4SuC7d_" role="3cqZAp" />
-            <node concept="3cpWs8" id="ReH4SuCqv0" role="3cqZAp">
-              <node concept="3cpWsn" id="ReH4SuCqv1" role="3cpWs9">
-                <property role="TrG5h" value="pos" />
-                <node concept="3uibUv" id="ReH4SuCqv2" role="1tU5fm">
-                  <ref role="3uigEE" to="sse1:20OswHE0h3P" resolve="GridPosition" />
-                </node>
-                <node concept="2OqwBi" id="ReH4SuCr_j" role="33vP2m">
-                  <node concept="37vLTw" id="ReH4SuCr_k" role="2Oq$k0">
+                <node concept="2OqwBi" id="7a_Gs75cbEj" role="33vP2m">
+                  <node concept="37vLTw" id="7a_Gs75cbEk" role="2Oq$k0">
                     <ref role="3cqZAo" node="4gCFRNz3yIs" resolve="gridCell" />
                   </node>
-                  <node concept="liA8E" id="ReH4SuCr_l" role="2OqNvi">
-                    <ref role="37wK5l" node="4gCFRNz3a7W" resolve="getGridPosition" />
+                  <node concept="liA8E" id="7a_Gs75cbEl" role="2OqNvi">
+                    <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="ReH4SuCzkG" role="3cqZAp">
-              <node concept="37vLTI" id="ReH4SuC$qr" role="3clFbG">
-                <node concept="3K4zz7" id="ReH4SuC$UZ" role="37vLTx">
-                  <node concept="2OqwBi" id="6eBFmDEFzPR" role="3K4E3e">
-                    <node concept="37vLTw" id="6eBFmDEFznw" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4gCFRNz9nLk" resolve="grid" />
+            <node concept="3clFbJ" id="7a_Gs75chPE" role="3cqZAp">
+              <node concept="3clFbS" id="7a_Gs75chPG" role="3clFbx">
+                <node concept="3cpWs8" id="4gCFRNz9nLj" role="3cqZAp">
+                  <node concept="3cpWsn" id="4gCFRNz9nLk" role="3cpWs9">
+                    <property role="TrG5h" value="grid" />
+                    <node concept="3uibUv" id="6eBFmDEFwW7" role="1tU5fm">
+                      <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
                     </node>
-                    <node concept="liA8E" id="6eBFmDEF$Ea" role="2OqNvi">
-                      <ref role="37wK5l" to="6dpw:20OswHE0P4u" resolve="next" />
-                      <node concept="37vLTw" id="6eBFmDEF$FK" role="37wK5m">
-                        <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
+                    <node concept="2OqwBi" id="4gCFRNzcqdE" role="33vP2m">
+                      <node concept="37vLTw" id="7a_Gs75cbEm" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7a_Gs75cbEi" resolve="table" />
+                      </node>
+                      <node concept="liA8E" id="4gCFRNzcw2P" role="2OqNvi">
+                        <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
                       </node>
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="6eBFmDEF_5A" role="3K4GZi">
-                    <node concept="37vLTw" id="6eBFmDEF$JK" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4gCFRNz9nLk" resolve="grid" />
+                </node>
+                <node concept="3cpWs8" id="ReH4SuCqv0" role="3cqZAp">
+                  <node concept="3cpWsn" id="ReH4SuCqv1" role="3cpWs9">
+                    <property role="TrG5h" value="pos" />
+                    <node concept="3uibUv" id="ReH4SuCqv2" role="1tU5fm">
+                      <ref role="3uigEE" to="sse1:20OswHE0h3P" resolve="GridPosition" />
                     </node>
-                    <node concept="liA8E" id="6eBFmDEF_Da" role="2OqNvi">
-                      <ref role="37wK5l" to="6dpw:2UGBFGot4RB" resolve="previous" />
-                      <node concept="37vLTw" id="6eBFmDEF_Ee" role="37wK5m">
-                        <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
+                    <node concept="2OqwBi" id="ReH4SuCr_j" role="33vP2m">
+                      <node concept="37vLTw" id="ReH4SuCr_k" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4gCFRNz3yIs" resolve="gridCell" />
+                      </node>
+                      <node concept="liA8E" id="ReH4SuCr_l" role="2OqNvi">
+                        <ref role="37wK5l" node="4gCFRNz3a7W" resolve="getGridPosition" />
                       </node>
                     </node>
                   </node>
-                  <node concept="37vLTw" id="ReH4SuC$rs" role="3K4Cdx">
-                    <ref role="3cqZAo" node="4gCFRNz2OnO" resolve="forward" />
-                  </node>
                 </node>
-                <node concept="37vLTw" id="ReH4SuCzkF" role="37vLTJ">
-                  <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
-                </node>
-              </node>
-            </node>
-            <node concept="2$JKZl" id="ReH4SuCx86" role="3cqZAp">
-              <node concept="3clFbS" id="ReH4SuCx88" role="2LFqv$">
-                <node concept="3cpWs8" id="ReH4SuCIlj" role="3cqZAp">
-                  <node concept="3cpWsn" id="ReH4SuCIlk" role="3cpWs9">
-                    <property role="TrG5h" value="sibling" />
-                    <node concept="3uibUv" id="ReH4SuCIll" role="1tU5fm">
-                      <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                    </node>
-                    <node concept="2EnYce" id="6eBFmDEFDwx" role="33vP2m">
-                      <node concept="0kSF2" id="6eBFmDEF_Gf" role="2Oq$k0">
-                        <node concept="3uibUv" id="6eBFmDEFACS" role="0kSFW">
-                          <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
+                <node concept="3clFbF" id="ReH4SuCzkG" role="3cqZAp">
+                  <node concept="37vLTI" id="ReH4SuC$qr" role="3clFbG">
+                    <node concept="3K4zz7" id="ReH4SuC$UZ" role="37vLTx">
+                      <node concept="2OqwBi" id="6eBFmDEFzPR" role="3K4E3e">
+                        <node concept="37vLTw" id="6eBFmDEFznw" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4gCFRNz9nLk" resolve="grid" />
                         </node>
-                        <node concept="2OqwBi" id="ReH4SuCIOa" role="0kSFX">
-                          <node concept="37vLTw" id="ReH4SuCIwm" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4gCFRNz9nLk" resolve="grid" />
+                        <node concept="liA8E" id="6eBFmDEF$Ea" role="2OqNvi">
+                          <ref role="37wK5l" to="6dpw:20OswHE0P4u" resolve="next" />
+                          <node concept="37vLTw" id="6eBFmDEF$FK" role="37wK5m">
+                            <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
                           </node>
-                          <node concept="liA8E" id="ReH4SuCLHr" role="2OqNvi">
-                            <ref role="37wK5l" to="6dpw:20OswHEb5oT" resolve="getElement" />
-                            <node concept="37vLTw" id="ReH4SuCLKq" role="37wK5m">
-                              <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
-                            </node>
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="6eBFmDEF_5A" role="3K4GZi">
+                        <node concept="37vLTw" id="6eBFmDEF$JK" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4gCFRNz9nLk" resolve="grid" />
+                        </node>
+                        <node concept="liA8E" id="6eBFmDEF_Da" role="2OqNvi">
+                          <ref role="37wK5l" to="6dpw:2UGBFGot4RB" resolve="previous" />
+                          <node concept="37vLTw" id="6eBFmDEF_Ee" role="37wK5m">
+                            <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="6eBFmDEFCGV" role="2OqNvi">
-                        <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
+                      <node concept="37vLTw" id="ReH4SuC$rs" role="3K4Cdx">
+                        <ref role="3cqZAo" node="4gCFRNz2OnO" resolve="forward" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="ReH4SuCzkF" role="37vLTJ">
+                      <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
+                    </node>
                   </node>
                 </node>
-                <node concept="3clFbJ" id="ReH4SuCM53" role="3cqZAp">
-                  <node concept="3clFbS" id="ReH4SuCM56" role="3clFbx">
-                    <node concept="3cpWs6" id="ReH4SuCMgf" role="3cqZAp">
-                      <node concept="37vLTw" id="ReH4SuCNvK" role="3cqZAk">
-                        <ref role="3cqZAo" node="ReH4SuCIlk" resolve="sibling" />
+                <node concept="2$JKZl" id="ReH4SuCx86" role="3cqZAp">
+                  <node concept="3clFbS" id="ReH4SuCx88" role="2LFqv$">
+                    <node concept="3cpWs8" id="ReH4SuCIlj" role="3cqZAp">
+                      <node concept="3cpWsn" id="ReH4SuCIlk" role="3cpWs9">
+                        <property role="TrG5h" value="sibling" />
+                        <node concept="3uibUv" id="ReH4SuCIll" role="1tU5fm">
+                          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                        </node>
+                        <node concept="2EnYce" id="6eBFmDEFDwx" role="33vP2m">
+                          <node concept="0kSF2" id="6eBFmDEF_Gf" role="2Oq$k0">
+                            <node concept="3uibUv" id="6eBFmDEFACS" role="0kSFW">
+                              <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
+                            </node>
+                            <node concept="2OqwBi" id="ReH4SuCIOa" role="0kSFX">
+                              <node concept="37vLTw" id="ReH4SuCIwm" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4gCFRNz9nLk" resolve="grid" />
+                              </node>
+                              <node concept="liA8E" id="ReH4SuCLHr" role="2OqNvi">
+                                <ref role="37wK5l" to="6dpw:20OswHEb5oT" resolve="getElement" />
+                                <node concept="37vLTw" id="ReH4SuCLKq" role="37wK5m">
+                                  <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="6eBFmDEFCGV" role="2OqNvi">
+                            <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
+                          </node>
+                        </node>
                       </node>
                     </node>
-                  </node>
-                  <node concept="3y3z36" id="ReH4SuCMer" role="3clFbw">
-                    <node concept="10Nm6u" id="ReH4SuCMfm" role="3uHU7w" />
-                    <node concept="37vLTw" id="ReH4SuCMcS" role="3uHU7B">
-                      <ref role="3cqZAo" node="ReH4SuCIlk" resolve="sibling" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="ReH4SuCLOT" role="3cqZAp">
-                  <node concept="37vLTI" id="ReH4SuCLOU" role="3clFbG">
-                    <node concept="3K4zz7" id="ReH4SuCLOV" role="37vLTx">
-                      <node concept="2OqwBi" id="6eBFmDEFIQp" role="3K4E3e">
-                        <node concept="37vLTw" id="6eBFmDEFIo2" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4gCFRNz9nLk" resolve="grid" />
+                    <node concept="3clFbJ" id="ReH4SuCM53" role="3cqZAp">
+                      <node concept="3clFbS" id="ReH4SuCM56" role="3clFbx">
+                        <node concept="3cpWs6" id="ReH4SuCMgf" role="3cqZAp">
+                          <node concept="37vLTw" id="ReH4SuCNvK" role="3cqZAk">
+                            <ref role="3cqZAo" node="ReH4SuCIlk" resolve="sibling" />
+                          </node>
                         </node>
-                        <node concept="liA8E" id="6eBFmDEFJEw" role="2OqNvi">
-                          <ref role="37wK5l" to="6dpw:20OswHE0P4u" resolve="next" />
-                          <node concept="37vLTw" id="6eBFmDEFJGk" role="37wK5m">
-                            <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
+                      </node>
+                      <node concept="3y3z36" id="ReH4SuCMer" role="3clFbw">
+                        <node concept="10Nm6u" id="ReH4SuCMfm" role="3uHU7w" />
+                        <node concept="37vLTw" id="ReH4SuCMcS" role="3uHU7B">
+                          <ref role="3cqZAo" node="ReH4SuCIlk" resolve="sibling" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="ReH4SuCLOT" role="3cqZAp">
+                      <node concept="37vLTI" id="ReH4SuCLOU" role="3clFbG">
+                        <node concept="3K4zz7" id="ReH4SuCLOV" role="37vLTx">
+                          <node concept="2OqwBi" id="6eBFmDEFIQp" role="3K4E3e">
+                            <node concept="37vLTw" id="6eBFmDEFIo2" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4gCFRNz9nLk" resolve="grid" />
+                            </node>
+                            <node concept="liA8E" id="6eBFmDEFJEw" role="2OqNvi">
+                              <ref role="37wK5l" to="6dpw:20OswHE0P4u" resolve="next" />
+                              <node concept="37vLTw" id="6eBFmDEFJGk" role="37wK5m">
+                                <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="6eBFmDEFK5N" role="3K4GZi">
+                            <node concept="37vLTw" id="6eBFmDEFJJX" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4gCFRNz9nLk" resolve="grid" />
+                            </node>
+                            <node concept="liA8E" id="6eBFmDEFKD9" role="2OqNvi">
+                              <ref role="37wK5l" to="6dpw:2UGBFGot4RB" resolve="previous" />
+                              <node concept="37vLTw" id="6eBFmDEFKEz" role="37wK5m">
+                                <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="ReH4SuCLP4" role="3K4Cdx">
+                            <ref role="3cqZAo" node="4gCFRNz2OnO" resolve="forward" />
                           </node>
                         </node>
-                      </node>
-                      <node concept="2OqwBi" id="6eBFmDEFK5N" role="3K4GZi">
-                        <node concept="37vLTw" id="6eBFmDEFJJX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4gCFRNz9nLk" resolve="grid" />
-                        </node>
-                        <node concept="liA8E" id="6eBFmDEFKD9" role="2OqNvi">
-                          <ref role="37wK5l" to="6dpw:2UGBFGot4RB" resolve="previous" />
-                          <node concept="37vLTw" id="6eBFmDEFKEz" role="37wK5m">
-                            <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
-                          </node>
+                        <node concept="37vLTw" id="ReH4SuCLP5" role="37vLTJ">
+                          <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="ReH4SuCLP4" role="3K4Cdx">
-                        <ref role="3cqZAo" node="4gCFRNz2OnO" resolve="forward" />
-                      </node>
                     </node>
-                    <node concept="37vLTw" id="ReH4SuCLP5" role="37vLTJ">
+                  </node>
+                  <node concept="3y3z36" id="ReH4SuCydI" role="2$JKZa">
+                    <node concept="10Nm6u" id="ReH4SuCyeF" role="3uHU7w" />
+                    <node concept="37vLTw" id="ReH4SuCycC" role="3uHU7B">
                       <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3y3z36" id="ReH4SuCydI" role="2$JKZa">
-                <node concept="10Nm6u" id="ReH4SuCyeF" role="3uHU7w" />
-                <node concept="37vLTw" id="ReH4SuCycC" role="3uHU7B">
-                  <ref role="3cqZAo" node="ReH4SuCqv1" resolve="pos" />
+              <node concept="3y3z36" id="7a_Gs75cnkv" role="3clFbw">
+                <node concept="10Nm6u" id="7a_Gs75cq1c" role="3uHU7w" />
+                <node concept="37vLTw" id="7a_Gs75ck2x" role="3uHU7B">
+                  <ref role="3cqZAo" node="7a_Gs75cbEi" resolve="table" />
                 </node>
               </node>
             </node>
+            <node concept="3clFbH" id="ReH4SuC7d_" role="3cqZAp" />
             <node concept="3cpWs6" id="MOb1pQ3pnr" role="3cqZAp">
               <node concept="10Nm6u" id="MOb1pQ3qhf" role="3cqZAk" />
             </node>
@@ -25942,196 +25954,217 @@
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="7cmJr8BboDK" role="3cqZAp">
-              <node concept="3cpWsn" id="7cmJr8BboDL" role="3cpWs9">
-                <property role="TrG5h" value="grid" />
-                <node concept="3uibUv" id="6eBFmDEFPFE" role="1tU5fm">
-                  <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                </node>
-                <node concept="2OqwBi" id="7cmJr8BboDO" role="33vP2m">
-                  <node concept="2OqwBi" id="7cmJr8BboDP" role="2Oq$k0">
-                    <node concept="37vLTw" id="7cmJr8BboDQ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7cmJr8BboDv" resolve="gridCell" />
-                    </node>
-                    <node concept="liA8E" id="7cmJr8BboDR" role="2OqNvi">
-                      <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="7cmJr8BboDS" role="2OqNvi">
-                    <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="7cmJr8BboDT" role="3cqZAp">
-              <node concept="3cpWsn" id="7cmJr8BboDU" role="3cpWs9">
-                <property role="TrG5h" value="currentGridPos" />
-                <node concept="3uibUv" id="7cmJr8BboDV" role="1tU5fm">
-                  <ref role="3uigEE" to="sse1:20OswHE0h3P" resolve="GridPosition" />
+            <node concept="3cpWs8" id="7a_Gs75cC2f" role="3cqZAp">
+              <node concept="3cpWsn" id="7a_Gs75cC2g" role="3cpWs9">
+                <property role="TrG5h" value="table" />
+                <node concept="3uibUv" id="7a_Gs75c_iq" role="1tU5fm">
+                  <ref role="3uigEE" node="1dAqnm8$zBn" resolve="TableEditor" />
                 </node>
-                <node concept="2OqwBi" id="7cmJr8BboDW" role="33vP2m">
-                  <node concept="37vLTw" id="7cmJr8BboDX" role="2Oq$k0">
+                <node concept="2OqwBi" id="7a_Gs75cC2h" role="33vP2m">
+                  <node concept="37vLTw" id="7a_Gs75cC2i" role="2Oq$k0">
                     <ref role="3cqZAo" node="7cmJr8BboDv" resolve="gridCell" />
                   </node>
-                  <node concept="liA8E" id="7cmJr8BboDY" role="2OqNvi">
-                    <ref role="37wK5l" node="4gCFRNz3a7W" resolve="getGridPosition" />
+                  <node concept="liA8E" id="7a_Gs75cC2j" role="2OqNvi">
+                    <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="7cmJr8BboDZ" role="3cqZAp">
-              <node concept="3cpWsn" id="7cmJr8BboE0" role="3cpWs9">
-                <property role="TrG5h" value="aboveGridPos" />
-                <node concept="3uibUv" id="7cmJr8BboE1" role="1tU5fm">
-                  <ref role="3uigEE" to="sse1:20OswHE0h3P" resolve="GridPosition" />
-                </node>
-                <node concept="2OqwBi" id="7cmJr8BboE2" role="33vP2m">
-                  <node concept="37vLTw" id="7cmJr8BboE3" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7cmJr8BboDU" resolve="currentGridPos" />
-                  </node>
-                  <node concept="liA8E" id="7cmJr8BboE4" role="2OqNvi">
-                    <ref role="37wK5l" to="sse1:20OswHE0Kly" resolve="deriveY" />
-                    <node concept="3cpWsd" id="7cmJr8BbJX2" role="37wK5m">
-                      <node concept="2OqwBi" id="7cmJr8BbJX4" role="3uHU7B">
-                        <node concept="37vLTw" id="7cmJr8BbJX5" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7cmJr8BboDU" resolve="currentGridPos" />
-                        </node>
-                        <node concept="liA8E" id="7cmJr8BbJX6" role="2OqNvi">
-                          <ref role="37wK5l" to="sse1:GrM9mu4M1z" resolve="getY" />
-                        </node>
+            <node concept="3clFbJ" id="7a_Gs75cDsg" role="3cqZAp">
+              <node concept="3clFbS" id="7a_Gs75cDsi" role="3clFbx">
+                <node concept="3cpWs8" id="7cmJr8BboDK" role="3cqZAp">
+                  <node concept="3cpWsn" id="7cmJr8BboDL" role="3cpWs9">
+                    <property role="TrG5h" value="grid" />
+                    <node concept="3uibUv" id="6eBFmDEFPFE" role="1tU5fm">
+                      <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
+                    </node>
+                    <node concept="2OqwBi" id="7cmJr8BboDO" role="33vP2m">
+                      <node concept="37vLTw" id="7a_Gs75cC2k" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7a_Gs75cC2g" resolve="table" />
                       </node>
-                      <node concept="3cmrfG" id="7cmJr8BbJX7" role="3uHU7w">
-                        <property role="3cmrfH" value="1" />
+                      <node concept="liA8E" id="7cmJr8BboDS" role="2OqNvi">
+                        <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
                       </node>
                     </node>
                   </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="7cmJr8BboEe" role="3cqZAp">
-              <node concept="3clFbS" id="7cmJr8BboEf" role="3clFbx">
-                <node concept="3cpWs8" id="7cmJr8BboEg" role="3cqZAp">
-                  <node concept="3cpWsn" id="7cmJr8BboEh" role="3cpWs9">
-                    <property role="TrG5h" value="aboveGridCell" />
-                    <node concept="10QFUN" id="7cmJr8BBD_B" role="33vP2m">
-                      <node concept="2EnYce" id="68cHeL4KEjM" role="10QFUP">
-                        <node concept="0kSF2" id="3pU1nrlXh1K" role="2Oq$k0">
-                          <node concept="3uibUv" id="3pU1nrlXhIv" role="0kSFW">
-                            <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
-                          </node>
-                          <node concept="2OqwBi" id="7cmJr8BboEi" role="0kSFX">
-                            <node concept="37vLTw" id="7cmJr8BboEj" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7cmJr8BboDL" resolve="grid" />
-                            </node>
-                            <node concept="liA8E" id="7cmJr8BboEk" role="2OqNvi">
-                              <ref role="37wK5l" to="6dpw:20OswHEb5oT" resolve="getElement" />
-                              <node concept="37vLTw" id="7cmJr8BboEl" role="37wK5m">
-                                <ref role="3cqZAo" node="7cmJr8BboE0" resolve="aboveGridPos" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="3pU1nrlXiTf" role="2OqNvi">
-                          <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                        </node>
+                <node concept="3cpWs8" id="7cmJr8BboDT" role="3cqZAp">
+                  <node concept="3cpWsn" id="7cmJr8BboDU" role="3cpWs9">
+                    <property role="TrG5h" value="currentGridPos" />
+                    <node concept="3uibUv" id="7cmJr8BboDV" role="1tU5fm">
+                      <ref role="3uigEE" to="sse1:20OswHE0h3P" resolve="GridPosition" />
+                    </node>
+                    <node concept="2OqwBi" id="7cmJr8BboDW" role="33vP2m">
+                      <node concept="37vLTw" id="7cmJr8BboDX" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7cmJr8BboDv" resolve="gridCell" />
                       </node>
-                      <node concept="3uibUv" id="7cmJr8BBD_C" role="10QFUM">
-                        <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
+                      <node concept="liA8E" id="7cmJr8BboDY" role="2OqNvi">
+                        <ref role="37wK5l" node="4gCFRNz3a7W" resolve="getGridPosition" />
                       </node>
                     </node>
-                    <node concept="3uibUv" id="7cmJr8BBzKF" role="1tU5fm">
-                      <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
-                    </node>
                   </node>
                 </node>
-                <node concept="3clFbJ" id="7cmJr8BboEn" role="3cqZAp">
-                  <property role="TyiWK" value="true" />
-                  <property role="TyiWL" value="false" />
-                  <node concept="3clFbS" id="7cmJr8BboEo" role="3clFbx">
-                    <node concept="3cpWs8" id="7cmJr8BboEp" role="3cqZAp">
-                      <node concept="3cpWsn" id="7cmJr8BboEq" role="3cpWs9">
-                        <property role="TrG5h" value="lastLeaf" />
-                        <node concept="3uibUv" id="7cmJr8BboEr" role="1tU5fm">
-                          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                        </node>
-                        <node concept="2YIFZM" id="7cmJr8BboEs" role="33vP2m">
-                          <ref role="37wK5l" node="4zzNcfNAMBz" resolve="getLastLeaf" />
-                          <ref role="1Pybhc" node="4gCFRNz2KOM" resolve="TableTraversalUtil" />
-                          <node concept="37vLTw" id="7cmJr8BboEt" role="37wK5m">
-                            <ref role="3cqZAo" node="7cmJr8BboEh" resolve="aboveGridCell" />
+                <node concept="3cpWs8" id="7cmJr8BboDZ" role="3cqZAp">
+                  <node concept="3cpWsn" id="7cmJr8BboE0" role="3cpWs9">
+                    <property role="TrG5h" value="aboveGridPos" />
+                    <node concept="3uibUv" id="7cmJr8BboE1" role="1tU5fm">
+                      <ref role="3uigEE" to="sse1:20OswHE0h3P" resolve="GridPosition" />
+                    </node>
+                    <node concept="2OqwBi" id="7cmJr8BboE2" role="33vP2m">
+                      <node concept="37vLTw" id="7cmJr8BboE3" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7cmJr8BboDU" resolve="currentGridPos" />
+                      </node>
+                      <node concept="liA8E" id="7cmJr8BboE4" role="2OqNvi">
+                        <ref role="37wK5l" to="sse1:20OswHE0Kly" resolve="deriveY" />
+                        <node concept="3cpWsd" id="7cmJr8BbJX2" role="37wK5m">
+                          <node concept="2OqwBi" id="7cmJr8BbJX4" role="3uHU7B">
+                            <node concept="37vLTw" id="7cmJr8BbJX5" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7cmJr8BboDU" resolve="currentGridPos" />
+                            </node>
+                            <node concept="liA8E" id="7cmJr8BbJX6" role="2OqNvi">
+                              <ref role="37wK5l" to="sse1:GrM9mu4M1z" resolve="getY" />
+                            </node>
+                          </node>
+                          <node concept="3cmrfG" id="7cmJr8BbJX7" role="3uHU7w">
+                            <property role="3cmrfH" value="1" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="7cmJr8BboEu" role="3cqZAp">
-                      <node concept="3cpWsn" id="7cmJr8BboEv" role="3cpWs9">
-                        <property role="TrG5h" value="aboveBelow" />
-                        <node concept="3uibUv" id="7cmJr8BboEw" role="1tU5fm">
-                          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                        </node>
-                        <node concept="1rXfSq" id="7cmJr8BboEA" role="33vP2m">
-                          <ref role="37wK5l" node="4zzNcfNSKWv" resolve="getLower" />
-                          <node concept="37vLTw" id="7cmJr8BboEB" role="37wK5m">
-                            <ref role="3cqZAo" node="7cmJr8BboEq" resolve="lastLeaf" />
-                          </node>
-                          <node concept="10M0yZ" id="7Nzu1McB6oZ" role="37wK5m">
-                            <ref role="3cqZAo" node="7cmJr8AGMfM" resolve="ALWAYS_TRUE_CONDITION" />
-                            <ref role="1PxDUh" node="4gCFRNz2KOM" resolve="TableTraversalUtil" />
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="7cmJr8BboEe" role="3cqZAp">
+                  <node concept="3clFbS" id="7cmJr8BboEf" role="3clFbx">
+                    <node concept="3cpWs8" id="7cmJr8BboEg" role="3cqZAp">
+                      <node concept="3cpWsn" id="7cmJr8BboEh" role="3cpWs9">
+                        <property role="TrG5h" value="aboveGridCell" />
+                        <node concept="10QFUN" id="7cmJr8BBD_B" role="33vP2m">
+                          <node concept="2EnYce" id="68cHeL4KEjM" role="10QFUP">
+                            <node concept="0kSF2" id="3pU1nrlXh1K" role="2Oq$k0">
+                              <node concept="3uibUv" id="3pU1nrlXhIv" role="0kSFW">
+                                <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
+                              </node>
+                              <node concept="2OqwBi" id="7cmJr8BboEi" role="0kSFX">
+                                <node concept="37vLTw" id="7cmJr8BboEj" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="7cmJr8BboDL" resolve="grid" />
+                                </node>
+                                <node concept="liA8E" id="7cmJr8BboEk" role="2OqNvi">
+                                  <ref role="37wK5l" to="6dpw:20OswHEb5oT" resolve="getElement" />
+                                  <node concept="37vLTw" id="7cmJr8BboEl" role="37wK5m">
+                                    <ref role="3cqZAo" node="7cmJr8BboE0" resolve="aboveGridPos" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="3pU1nrlXiTf" role="2OqNvi">
+                              <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
+                            </node>
                           </node>
-                          <node concept="37vLTw" id="7cmJr8BboEC" role="37wK5m">
-                            <ref role="3cqZAo" node="7cmJr8ADb6_" resolve="caretX" />
+                          <node concept="3uibUv" id="7cmJr8BBD_C" role="10QFUM">
+                            <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
                           </node>
                         </node>
+                        <node concept="3uibUv" id="7cmJr8BBzKF" role="1tU5fm">
+                          <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="7cmJr8BboED" role="3cqZAp">
-                      <node concept="3cpWsn" id="7cmJr8BboEE" role="3cpWs9">
-                        <property role="TrG5h" value="target" />
-                        <node concept="3uibUv" id="7cmJr8BboEF" role="1tU5fm">
-                          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                    <node concept="3clFbJ" id="7cmJr8BboEn" role="3cqZAp">
+                      <property role="TyiWK" value="true" />
+                      <property role="TyiWL" value="false" />
+                      <node concept="3clFbS" id="7cmJr8BboEo" role="3clFbx">
+                        <node concept="3cpWs8" id="7cmJr8BboEp" role="3cqZAp">
+                          <node concept="3cpWsn" id="7cmJr8BboEq" role="3cpWs9">
+                            <property role="TrG5h" value="lastLeaf" />
+                            <node concept="3uibUv" id="7cmJr8BboEr" role="1tU5fm">
+                              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                            </node>
+                            <node concept="2YIFZM" id="7cmJr8BboEs" role="33vP2m">
+                              <ref role="37wK5l" node="4zzNcfNAMBz" resolve="getLastLeaf" />
+                              <ref role="1Pybhc" node="4gCFRNz2KOM" resolve="TableTraversalUtil" />
+                              <node concept="37vLTw" id="7cmJr8BboEt" role="37wK5m">
+                                <ref role="3cqZAo" node="7cmJr8BboEh" resolve="aboveGridCell" />
+                              </node>
+                            </node>
+                          </node>
                         </node>
-                        <node concept="1rXfSq" id="7cmJr8BboEM" role="33vP2m">
-                          <ref role="37wK5l" node="4zzNcfNPRuG" resolve="getUpper" />
-                          <node concept="37vLTw" id="7cmJr8BboEN" role="37wK5m">
-                            <ref role="3cqZAo" node="7cmJr8BboEv" resolve="aboveBelow" />
+                        <node concept="3cpWs8" id="7cmJr8BboEu" role="3cqZAp">
+                          <node concept="3cpWsn" id="7cmJr8BboEv" role="3cpWs9">
+                            <property role="TrG5h" value="aboveBelow" />
+                            <node concept="3uibUv" id="7cmJr8BboEw" role="1tU5fm">
+                              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                            </node>
+                            <node concept="1rXfSq" id="7cmJr8BboEA" role="33vP2m">
+                              <ref role="37wK5l" node="4zzNcfNSKWv" resolve="getLower" />
+                              <node concept="37vLTw" id="7cmJr8BboEB" role="37wK5m">
+                                <ref role="3cqZAo" node="7cmJr8BboEq" resolve="lastLeaf" />
+                              </node>
+                              <node concept="10M0yZ" id="7Nzu1McB6oZ" role="37wK5m">
+                                <ref role="3cqZAo" node="7cmJr8AGMfM" resolve="ALWAYS_TRUE_CONDITION" />
+                                <ref role="1PxDUh" node="4gCFRNz2KOM" resolve="TableTraversalUtil" />
+                              </node>
+                              <node concept="37vLTw" id="7cmJr8BboEC" role="37wK5m">
+                                <ref role="3cqZAo" node="7cmJr8ADb6_" resolve="caretX" />
+                              </node>
+                            </node>
                           </node>
-                          <node concept="2ShNRf" id="7cmJr8BBooB" role="37wK5m">
-                            <node concept="1pGfFk" id="7cmJr8BBooC" role="2ShVmc">
-                              <ref role="37wK5l" node="7cmJr8BAIcm" resolve="TableTraversalUtil.SameGridCellCondition" />
-                              <node concept="37vLTw" id="7cmJr8BBuyW" role="37wK5m">
-                                <ref role="3cqZAo" node="7cmJr8BboEh" resolve="aboveGridCell" />
+                        </node>
+                        <node concept="3cpWs8" id="7cmJr8BboED" role="3cqZAp">
+                          <node concept="3cpWsn" id="7cmJr8BboEE" role="3cpWs9">
+                            <property role="TrG5h" value="target" />
+                            <node concept="3uibUv" id="7cmJr8BboEF" role="1tU5fm">
+                              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                            </node>
+                            <node concept="1rXfSq" id="7cmJr8BboEM" role="33vP2m">
+                              <ref role="37wK5l" node="4zzNcfNPRuG" resolve="getUpper" />
+                              <node concept="37vLTw" id="7cmJr8BboEN" role="37wK5m">
+                                <ref role="3cqZAo" node="7cmJr8BboEv" resolve="aboveBelow" />
+                              </node>
+                              <node concept="2ShNRf" id="7cmJr8BBooB" role="37wK5m">
+                                <node concept="1pGfFk" id="7cmJr8BBooC" role="2ShVmc">
+                                  <ref role="37wK5l" node="7cmJr8BAIcm" resolve="SameGridCellCondition" />
+                                  <node concept="37vLTw" id="7cmJr8BBuyW" role="37wK5m">
+                                    <ref role="3cqZAo" node="7cmJr8BboEh" resolve="aboveGridCell" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="37vLTw" id="7cmJr8BboEP" role="37wK5m">
+                                <ref role="3cqZAo" node="7cmJr8ADb6_" resolve="caretX" />
                               </node>
                             </node>
                           </node>
-                          <node concept="37vLTw" id="7cmJr8BboEP" role="37wK5m">
-                            <ref role="3cqZAo" node="7cmJr8ADb6_" resolve="caretX" />
+                        </node>
+                        <node concept="3cpWs6" id="7cmJr8BboEQ" role="3cqZAp">
+                          <node concept="37vLTw" id="7cmJr8BboER" role="3cqZAk">
+                            <ref role="3cqZAo" node="7cmJr8BboEE" resolve="target" />
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="3cpWs6" id="7cmJr8BboEQ" role="3cqZAp">
-                      <node concept="37vLTw" id="7cmJr8BboER" role="3cqZAk">
-                        <ref role="3cqZAo" node="7cmJr8BboEE" resolve="target" />
+                      <node concept="3y3z36" id="7cmJr8BboES" role="3clFbw">
+                        <node concept="10Nm6u" id="7cmJr8BboET" role="3uHU7w" />
+                        <node concept="37vLTw" id="7cmJr8BboEU" role="3uHU7B">
+                          <ref role="3cqZAo" node="7cmJr8BboEh" resolve="aboveGridCell" />
+                        </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3y3z36" id="7cmJr8BboES" role="3clFbw">
-                    <node concept="10Nm6u" id="7cmJr8BboET" role="3uHU7w" />
-                    <node concept="37vLTw" id="7cmJr8BboEU" role="3uHU7B">
-                      <ref role="3cqZAo" node="7cmJr8BboEh" resolve="aboveGridCell" />
+                  <node concept="2OqwBi" id="7cmJr8BboEV" role="3clFbw">
+                    <node concept="37vLTw" id="7cmJr8BboEW" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7cmJr8BboDL" resolve="grid" />
+                    </node>
+                    <node concept="liA8E" id="7cmJr8BboEX" role="2OqNvi">
+                      <ref role="37wK5l" to="6dpw:6eBFmDEG9Y0" resolve="isValidPosition" />
+                      <node concept="37vLTw" id="7cmJr8BboEY" role="37wK5m">
+                        <ref role="3cqZAo" node="7cmJr8BboE0" resolve="aboveGridPos" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="2OqwBi" id="7cmJr8BboEV" role="3clFbw">
-                <node concept="37vLTw" id="7cmJr8BboEW" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7cmJr8BboDL" resolve="grid" />
-                </node>
-                <node concept="liA8E" id="7cmJr8BboEX" role="2OqNvi">
-                  <ref role="37wK5l" to="6dpw:6eBFmDEG9Y0" resolve="isValidPosition" />
-                  <node concept="37vLTw" id="7cmJr8BboEY" role="37wK5m">
-                    <ref role="3cqZAo" node="7cmJr8BboE0" resolve="aboveGridPos" />
-                  </node>
+              <node concept="3y3z36" id="7a_Gs75cFCG" role="3clFbw">
+                <node concept="10Nm6u" id="7a_Gs75cGSP" role="3uHU7w" />
+                <node concept="37vLTw" id="7a_Gs75cE9o" role="3uHU7B">
+                  <ref role="3cqZAo" node="7a_Gs75cC2g" resolve="table" />
                 </node>
               </node>
             </node>
@@ -26250,196 +26283,217 @@
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="7cmJr8Beegi" role="3cqZAp">
-              <node concept="3cpWsn" id="7cmJr8Beegj" role="3cpWs9">
-                <property role="TrG5h" value="grid" />
-                <node concept="3uibUv" id="6eBFmDEHvFf" role="1tU5fm">
-                  <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
-                </node>
-                <node concept="2OqwBi" id="7cmJr8Beegm" role="33vP2m">
-                  <node concept="2OqwBi" id="7cmJr8Beegn" role="2Oq$k0">
-                    <node concept="37vLTw" id="7cmJr8Beego" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7cmJr8Beeg5" resolve="gridCell" />
-                    </node>
-                    <node concept="liA8E" id="7cmJr8Beegp" role="2OqNvi">
-                      <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="7cmJr8Beegq" role="2OqNvi">
-                    <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="7cmJr8Beegr" role="3cqZAp">
-              <node concept="3cpWsn" id="7cmJr8Beegs" role="3cpWs9">
-                <property role="TrG5h" value="currentGridPos" />
-                <node concept="3uibUv" id="7cmJr8Beegt" role="1tU5fm">
-                  <ref role="3uigEE" to="sse1:20OswHE0h3P" resolve="GridPosition" />
+            <node concept="3cpWs8" id="7a_Gs75cLxj" role="3cqZAp">
+              <node concept="3cpWsn" id="7a_Gs75cLxk" role="3cpWs9">
+                <property role="TrG5h" value="table" />
+                <node concept="3uibUv" id="7a_Gs75c_i6" role="1tU5fm">
+                  <ref role="3uigEE" node="1dAqnm8$zBn" resolve="TableEditor" />
                 </node>
-                <node concept="2OqwBi" id="7cmJr8Beegu" role="33vP2m">
-                  <node concept="37vLTw" id="7cmJr8Beegv" role="2Oq$k0">
+                <node concept="2OqwBi" id="7a_Gs75cLxl" role="33vP2m">
+                  <node concept="37vLTw" id="7a_Gs75cLxm" role="2Oq$k0">
                     <ref role="3cqZAo" node="7cmJr8Beeg5" resolve="gridCell" />
                   </node>
-                  <node concept="liA8E" id="7cmJr8Beegw" role="2OqNvi">
-                    <ref role="37wK5l" node="4gCFRNz3a7W" resolve="getGridPosition" />
+                  <node concept="liA8E" id="7a_Gs75cLxn" role="2OqNvi">
+                    <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="7cmJr8Beegx" role="3cqZAp">
-              <node concept="3cpWsn" id="7cmJr8Beegy" role="3cpWs9">
-                <property role="TrG5h" value="aboveGridPos" />
-                <node concept="3uibUv" id="7cmJr8Beegz" role="1tU5fm">
-                  <ref role="3uigEE" to="sse1:20OswHE0h3P" resolve="GridPosition" />
-                </node>
-                <node concept="2OqwBi" id="7cmJr8Beeg$" role="33vP2m">
-                  <node concept="37vLTw" id="7cmJr8Beeg_" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7cmJr8Beegs" resolve="currentGridPos" />
-                  </node>
-                  <node concept="liA8E" id="7cmJr8BeegA" role="2OqNvi">
-                    <ref role="37wK5l" to="sse1:20OswHE0Kly" resolve="deriveY" />
-                    <node concept="3cpWs3" id="7cmJr8Bh8OJ" role="37wK5m">
-                      <node concept="2OqwBi" id="7cmJr8Bh8OL" role="3uHU7B">
-                        <node concept="37vLTw" id="7cmJr8Bh8OM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7cmJr8Beegs" resolve="currentGridPos" />
-                        </node>
-                        <node concept="liA8E" id="7cmJr8Bh8ON" role="2OqNvi">
-                          <ref role="37wK5l" to="sse1:GrM9mu4M1z" resolve="getY" />
-                        </node>
+            <node concept="3clFbJ" id="7a_Gs75cNiw" role="3cqZAp">
+              <node concept="3clFbS" id="7a_Gs75cNiy" role="3clFbx">
+                <node concept="3cpWs8" id="7cmJr8Beegi" role="3cqZAp">
+                  <node concept="3cpWsn" id="7cmJr8Beegj" role="3cpWs9">
+                    <property role="TrG5h" value="grid" />
+                    <node concept="3uibUv" id="6eBFmDEHvFf" role="1tU5fm">
+                      <ref role="3uigEE" to="6dpw:7C0FR5Aonzr" resolve="Grid" />
+                    </node>
+                    <node concept="2OqwBi" id="7cmJr8Beegm" role="33vP2m">
+                      <node concept="37vLTw" id="7a_Gs75cLxo" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7a_Gs75cLxk" resolve="table" />
                       </node>
-                      <node concept="3cmrfG" id="7cmJr8Bh8OO" role="3uHU7w">
-                        <property role="3cmrfH" value="1" />
+                      <node concept="liA8E" id="7cmJr8Beegq" role="2OqNvi">
+                        <ref role="37wK5l" node="7Nzu1McBs8f" resolve="getGrid" />
                       </node>
                     </node>
                   </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="7cmJr8BeegG" role="3cqZAp">
-              <node concept="3clFbS" id="7cmJr8BeegH" role="3clFbx">
-                <node concept="3cpWs8" id="7cmJr8BeegI" role="3cqZAp">
-                  <node concept="3cpWsn" id="7cmJr8BeegJ" role="3cpWs9">
-                    <property role="TrG5h" value="belowGridCell" />
-                    <node concept="10QFUN" id="7cmJr8BBSDM" role="33vP2m">
-                      <node concept="2EnYce" id="68cHeL4MTRO" role="10QFUP">
-                        <node concept="0kSF2" id="3pU1nrlVUeL" role="2Oq$k0">
-                          <node concept="3uibUv" id="3pU1nrlWeEi" role="0kSFW">
-                            <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
-                          </node>
-                          <node concept="2OqwBi" id="7cmJr8BeegK" role="0kSFX">
-                            <node concept="37vLTw" id="7cmJr8BeegL" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7cmJr8Beegj" resolve="grid" />
-                            </node>
-                            <node concept="liA8E" id="7cmJr8BeegM" role="2OqNvi">
-                              <ref role="37wK5l" to="6dpw:20OswHEb5oT" resolve="getElement" />
-                              <node concept="37vLTw" id="7cmJr8BeegN" role="37wK5m">
-                                <ref role="3cqZAo" node="7cmJr8Beegy" resolve="aboveGridPos" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="3pU1nrlWgab" role="2OqNvi">
-                          <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
-                        </node>
+                <node concept="3cpWs8" id="7cmJr8Beegr" role="3cqZAp">
+                  <node concept="3cpWsn" id="7cmJr8Beegs" role="3cpWs9">
+                    <property role="TrG5h" value="currentGridPos" />
+                    <node concept="3uibUv" id="7cmJr8Beegt" role="1tU5fm">
+                      <ref role="3uigEE" to="sse1:20OswHE0h3P" resolve="GridPosition" />
+                    </node>
+                    <node concept="2OqwBi" id="7cmJr8Beegu" role="33vP2m">
+                      <node concept="37vLTw" id="7cmJr8Beegv" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7cmJr8Beeg5" resolve="gridCell" />
                       </node>
-                      <node concept="3uibUv" id="7cmJr8BBSDN" role="10QFUM">
-                        <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
+                      <node concept="liA8E" id="7cmJr8Beegw" role="2OqNvi">
+                        <ref role="37wK5l" node="4gCFRNz3a7W" resolve="getGridPosition" />
                       </node>
                     </node>
-                    <node concept="3uibUv" id="7cmJr8BBKu5" role="1tU5fm">
-                      <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
-                    </node>
                   </node>
                 </node>
-                <node concept="3clFbJ" id="7cmJr8BeegP" role="3cqZAp">
-                  <property role="TyiWK" value="true" />
-                  <property role="TyiWL" value="false" />
-                  <node concept="3clFbS" id="7cmJr8BeegQ" role="3clFbx">
-                    <node concept="3cpWs8" id="7cmJr8BeegR" role="3cqZAp">
-                      <node concept="3cpWsn" id="7cmJr8BeegS" role="3cpWs9">
-                        <property role="TrG5h" value="firstLeaf" />
-                        <node concept="3uibUv" id="7cmJr8BeegT" role="1tU5fm">
-                          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                        </node>
-                        <node concept="2YIFZM" id="7cmJr8Bf0c9" role="33vP2m">
-                          <ref role="37wK5l" node="4zzNcfNAKcj" resolve="getFirstLeaf" />
-                          <ref role="1Pybhc" node="4gCFRNz2KOM" resolve="TableTraversalUtil" />
-                          <node concept="37vLTw" id="7cmJr8Bf0ca" role="37wK5m">
-                            <ref role="3cqZAo" node="7cmJr8BeegJ" resolve="belowGridCell" />
+                <node concept="3cpWs8" id="7cmJr8Beegx" role="3cqZAp">
+                  <node concept="3cpWsn" id="7cmJr8Beegy" role="3cpWs9">
+                    <property role="TrG5h" value="aboveGridPos" />
+                    <node concept="3uibUv" id="7cmJr8Beegz" role="1tU5fm">
+                      <ref role="3uigEE" to="sse1:20OswHE0h3P" resolve="GridPosition" />
+                    </node>
+                    <node concept="2OqwBi" id="7cmJr8Beeg$" role="33vP2m">
+                      <node concept="37vLTw" id="7cmJr8Beeg_" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7cmJr8Beegs" resolve="currentGridPos" />
+                      </node>
+                      <node concept="liA8E" id="7cmJr8BeegA" role="2OqNvi">
+                        <ref role="37wK5l" to="sse1:20OswHE0Kly" resolve="deriveY" />
+                        <node concept="3cpWs3" id="7cmJr8Bh8OJ" role="37wK5m">
+                          <node concept="2OqwBi" id="7cmJr8Bh8OL" role="3uHU7B">
+                            <node concept="37vLTw" id="7cmJr8Bh8OM" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7cmJr8Beegs" resolve="currentGridPos" />
+                            </node>
+                            <node concept="liA8E" id="7cmJr8Bh8ON" role="2OqNvi">
+                              <ref role="37wK5l" to="sse1:GrM9mu4M1z" resolve="getY" />
+                            </node>
+                          </node>
+                          <node concept="3cmrfG" id="7cmJr8Bh8OO" role="3uHU7w">
+                            <property role="3cmrfH" value="1" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="7cmJr8BeegW" role="3cqZAp">
-                      <node concept="3cpWsn" id="7cmJr8BeegX" role="3cpWs9">
-                        <property role="TrG5h" value="above" />
-                        <node concept="3uibUv" id="7cmJr8BeegY" role="1tU5fm">
-                          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                        </node>
-                        <node concept="1rXfSq" id="7cmJr8BeegZ" role="33vP2m">
-                          <ref role="37wK5l" node="4zzNcfNPRuG" resolve="getUpper" />
-                          <node concept="37vLTw" id="7cmJr8Beeh0" role="37wK5m">
-                            <ref role="3cqZAo" node="7cmJr8BeegS" resolve="firstLeaf" />
-                          </node>
-                          <node concept="10M0yZ" id="7Nzu1McB6p0" role="37wK5m">
-                            <ref role="1PxDUh" node="4gCFRNz2KOM" resolve="TableTraversalUtil" />
-                            <ref role="3cqZAo" node="7cmJr8AGMfM" resolve="ALWAYS_TRUE_CONDITION" />
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="7cmJr8BeegG" role="3cqZAp">
+                  <node concept="3clFbS" id="7cmJr8BeegH" role="3clFbx">
+                    <node concept="3cpWs8" id="7cmJr8BeegI" role="3cqZAp">
+                      <node concept="3cpWsn" id="7cmJr8BeegJ" role="3cpWs9">
+                        <property role="TrG5h" value="belowGridCell" />
+                        <node concept="10QFUN" id="7cmJr8BBSDM" role="33vP2m">
+                          <node concept="2EnYce" id="68cHeL4MTRO" role="10QFUP">
+                            <node concept="0kSF2" id="3pU1nrlVUeL" role="2Oq$k0">
+                              <node concept="3uibUv" id="3pU1nrlWeEi" role="0kSFW">
+                                <ref role="3uigEE" to="6dpw:RywcYwuxY_" resolve="EditorCellGridLeaf" />
+                              </node>
+                              <node concept="2OqwBi" id="7cmJr8BeegK" role="0kSFX">
+                                <node concept="37vLTw" id="7cmJr8BeegL" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="7cmJr8Beegj" resolve="grid" />
+                                </node>
+                                <node concept="liA8E" id="7cmJr8BeegM" role="2OqNvi">
+                                  <ref role="37wK5l" to="6dpw:20OswHEb5oT" resolve="getElement" />
+                                  <node concept="37vLTw" id="7cmJr8BeegN" role="37wK5m">
+                                    <ref role="3cqZAo" node="7cmJr8Beegy" resolve="aboveGridPos" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="3pU1nrlWgab" role="2OqNvi">
+                              <ref role="37wK5l" to="6dpw:RywcYwuxZ4" resolve="getEditorCell" />
+                            </node>
                           </node>
-                          <node concept="37vLTw" id="7cmJr8Beeh1" role="37wK5m">
-                            <ref role="3cqZAo" node="7cmJr8AUp0J" resolve="caretX" />
+                          <node concept="3uibUv" id="7cmJr8BBSDN" role="10QFUM">
+                            <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
                           </node>
                         </node>
+                        <node concept="3uibUv" id="7cmJr8BBKu5" role="1tU5fm">
+                          <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="7cmJr8Beeh2" role="3cqZAp">
-                      <node concept="3cpWsn" id="7cmJr8Beeh3" role="3cpWs9">
-                        <property role="TrG5h" value="target" />
-                        <node concept="3uibUv" id="7cmJr8Beeh4" role="1tU5fm">
-                          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                    <node concept="3clFbJ" id="7cmJr8BeegP" role="3cqZAp">
+                      <property role="TyiWK" value="true" />
+                      <property role="TyiWL" value="false" />
+                      <node concept="3clFbS" id="7cmJr8BeegQ" role="3clFbx">
+                        <node concept="3cpWs8" id="7cmJr8BeegR" role="3cqZAp">
+                          <node concept="3cpWsn" id="7cmJr8BeegS" role="3cpWs9">
+                            <property role="TrG5h" value="firstLeaf" />
+                            <node concept="3uibUv" id="7cmJr8BeegT" role="1tU5fm">
+                              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                            </node>
+                            <node concept="2YIFZM" id="7cmJr8Bf0c9" role="33vP2m">
+                              <ref role="37wK5l" node="4zzNcfNAKcj" resolve="getFirstLeaf" />
+                              <ref role="1Pybhc" node="4gCFRNz2KOM" resolve="TableTraversalUtil" />
+                              <node concept="37vLTw" id="7cmJr8Bf0ca" role="37wK5m">
+                                <ref role="3cqZAo" node="7cmJr8BeegJ" resolve="belowGridCell" />
+                              </node>
+                            </node>
+                          </node>
                         </node>
-                        <node concept="1rXfSq" id="7cmJr8Beeh5" role="33vP2m">
-                          <ref role="37wK5l" node="4zzNcfNSKWv" resolve="getLower" />
-                          <node concept="37vLTw" id="7cmJr8Beeh6" role="37wK5m">
-                            <ref role="3cqZAo" node="7cmJr8BeegX" resolve="above" />
+                        <node concept="3cpWs8" id="7cmJr8BeegW" role="3cqZAp">
+                          <node concept="3cpWsn" id="7cmJr8BeegX" role="3cpWs9">
+                            <property role="TrG5h" value="above" />
+                            <node concept="3uibUv" id="7cmJr8BeegY" role="1tU5fm">
+                              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                            </node>
+                            <node concept="1rXfSq" id="7cmJr8BeegZ" role="33vP2m">
+                              <ref role="37wK5l" node="4zzNcfNPRuG" resolve="getUpper" />
+                              <node concept="37vLTw" id="7cmJr8Beeh0" role="37wK5m">
+                                <ref role="3cqZAo" node="7cmJr8BeegS" resolve="firstLeaf" />
+                              </node>
+                              <node concept="10M0yZ" id="7Nzu1McB6p0" role="37wK5m">
+                                <ref role="1PxDUh" node="4gCFRNz2KOM" resolve="TableTraversalUtil" />
+                                <ref role="3cqZAo" node="7cmJr8AGMfM" resolve="ALWAYS_TRUE_CONDITION" />
+                              </node>
+                              <node concept="37vLTw" id="7cmJr8Beeh1" role="37wK5m">
+                                <ref role="3cqZAo" node="7cmJr8AUp0J" resolve="caretX" />
+                              </node>
+                            </node>
                           </node>
-                          <node concept="2ShNRf" id="7cmJr8BB5Ey" role="37wK5m">
-                            <node concept="1pGfFk" id="7cmJr8BBaHz" role="2ShVmc">
-                              <ref role="37wK5l" node="7cmJr8BAIcm" resolve="TableTraversalUtil.SameGridCellCondition" />
-                              <node concept="37vLTw" id="7cmJr8BBEF0" role="37wK5m">
-                                <ref role="3cqZAo" node="7cmJr8BeegJ" resolve="belowGridCell" />
+                        </node>
+                        <node concept="3cpWs8" id="7cmJr8Beeh2" role="3cqZAp">
+                          <node concept="3cpWsn" id="7cmJr8Beeh3" role="3cpWs9">
+                            <property role="TrG5h" value="target" />
+                            <node concept="3uibUv" id="7cmJr8Beeh4" role="1tU5fm">
+                              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                            </node>
+                            <node concept="1rXfSq" id="7cmJr8Beeh5" role="33vP2m">
+                              <ref role="37wK5l" node="4zzNcfNSKWv" resolve="getLower" />
+                              <node concept="37vLTw" id="7cmJr8Beeh6" role="37wK5m">
+                                <ref role="3cqZAo" node="7cmJr8BeegX" resolve="above" />
+                              </node>
+                              <node concept="2ShNRf" id="7cmJr8BB5Ey" role="37wK5m">
+                                <node concept="1pGfFk" id="7cmJr8BBaHz" role="2ShVmc">
+                                  <ref role="37wK5l" node="7cmJr8BAIcm" resolve="SameGridCellCondition" />
+                                  <node concept="37vLTw" id="7cmJr8BBEF0" role="37wK5m">
+                                    <ref role="3cqZAo" node="7cmJr8BeegJ" resolve="belowGridCell" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="37vLTw" id="7cmJr8Beeh8" role="37wK5m">
+                                <ref role="3cqZAo" node="7cmJr8AUp0J" resolve="caretX" />
                               </node>
                             </node>
                           </node>
-                          <node concept="37vLTw" id="7cmJr8Beeh8" role="37wK5m">
-                            <ref role="3cqZAo" node="7cmJr8AUp0J" resolve="caretX" />
+                        </node>
+                        <node concept="3cpWs6" id="7cmJr8Beeh9" role="3cqZAp">
+                          <node concept="37vLTw" id="7cmJr8Beeha" role="3cqZAk">
+                            <ref role="3cqZAo" node="7cmJr8Beeh3" resolve="target" />
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="3cpWs6" id="7cmJr8Beeh9" role="3cqZAp">
-                      <node concept="37vLTw" id="7cmJr8Beeha" role="3cqZAk">
-                        <ref role="3cqZAo" node="7cmJr8Beeh3" resolve="target" />
+                      <node concept="3y3z36" id="7cmJr8Beehb" role="3clFbw">
+                        <node concept="10Nm6u" id="7cmJr8Beehc" role="3uHU7w" />
+                        <node concept="37vLTw" id="7cmJr8Beehd" role="3uHU7B">
+                          <ref role="3cqZAo" node="7cmJr8BeegJ" resolve="belowGridCell" />
+                        </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3y3z36" id="7cmJr8Beehb" role="3clFbw">
-                    <node concept="10Nm6u" id="7cmJr8Beehc" role="3uHU7w" />
-                    <node concept="37vLTw" id="7cmJr8Beehd" role="3uHU7B">
-                      <ref role="3cqZAo" node="7cmJr8BeegJ" resolve="belowGridCell" />
+                  <node concept="2OqwBi" id="7cmJr8Beehe" role="3clFbw">
+                    <node concept="37vLTw" id="7cmJr8Beehf" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7cmJr8Beegj" resolve="grid" />
+                    </node>
+                    <node concept="liA8E" id="7cmJr8Beehg" role="2OqNvi">
+                      <ref role="37wK5l" to="6dpw:6eBFmDEG9Y0" resolve="isValidPosition" />
+                      <node concept="37vLTw" id="7cmJr8Beehh" role="37wK5m">
+                        <ref role="3cqZAo" node="7cmJr8Beegy" resolve="aboveGridPos" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="2OqwBi" id="7cmJr8Beehe" role="3clFbw">
-                <node concept="37vLTw" id="7cmJr8Beehf" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7cmJr8Beegj" resolve="grid" />
-                </node>
-                <node concept="liA8E" id="7cmJr8Beehg" role="2OqNvi">
-                  <ref role="37wK5l" to="6dpw:6eBFmDEG9Y0" resolve="isValidPosition" />
-                  <node concept="37vLTw" id="7cmJr8Beehh" role="37wK5m">
-                    <ref role="3cqZAo" node="7cmJr8Beegy" resolve="aboveGridPos" />
-                  </node>
+              <node concept="3y3z36" id="7a_Gs75cPwg" role="3clFbw">
+                <node concept="10Nm6u" id="7a_Gs75cQGS" role="3uHU7w" />
+                <node concept="37vLTw" id="7a_Gs75cNDN" role="3uHU7B">
+                  <ref role="3cqZAo" node="7a_Gs75cLxk" resolve="table" />
                 </node>
               </node>
             </node>
@@ -27518,20 +27572,41 @@
       <node concept="3clFbS" id="4gCFRNz7q_N" role="3clF47">
         <node concept="3clFbJ" id="4gCFRNz7GzF" role="3cqZAp">
           <node concept="3clFbS" id="4gCFRNz7GzG" role="3clFbx">
-            <node concept="3cpWs6" id="4gCFRNzcJmY" role="3cqZAp">
-              <node concept="2OqwBi" id="4gCFRNzcQCU" role="3cqZAk">
-                <node concept="1eOMI4" id="4gCFRNzcML9" role="2Oq$k0">
-                  <node concept="10QFUN" id="4gCFRNzcML6" role="1eOMHV">
-                    <node concept="3uibUv" id="4gCFRNzcMLb" role="10QFUM">
-                      <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
-                    </node>
-                    <node concept="37vLTw" id="4gCFRNzcMLc" role="10QFUP">
-                      <ref role="3cqZAo" node="4gCFRNz7_7f" resolve="cell" />
+            <node concept="3cpWs8" id="7a_Gs75bK_m" role="3cqZAp">
+              <node concept="3cpWsn" id="7a_Gs75bK_n" role="3cpWs9">
+                <property role="TrG5h" value="table" />
+                <node concept="3uibUv" id="7a_Gs75bIhp" role="1tU5fm">
+                  <ref role="3uigEE" node="1dAqnm8$zBn" resolve="TableEditor" />
+                </node>
+                <node concept="2OqwBi" id="7a_Gs75bK_o" role="33vP2m">
+                  <node concept="1eOMI4" id="7a_Gs75bK_p" role="2Oq$k0">
+                    <node concept="10QFUN" id="7a_Gs75bK_q" role="1eOMHV">
+                      <node concept="3uibUv" id="7a_Gs75bK_r" role="10QFUM">
+                        <ref role="3uigEE" node="20OswHE0eA6" resolve="EditorCell_GridCell" />
+                      </node>
+                      <node concept="37vLTw" id="7a_Gs75bK_s" role="10QFUP">
+                        <ref role="3cqZAo" node="4gCFRNz7_7f" resolve="cell" />
+                      </node>
                     </node>
                   </node>
+                  <node concept="liA8E" id="7a_Gs75bK_t" role="2OqNvi">
+                    <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+                  </node>
                 </node>
-                <node concept="liA8E" id="4gCFRNzcYRk" role="2OqNvi">
-                  <ref role="37wK5l" node="4gCFRNzc0za" resolve="getTable" />
+              </node>
+            </node>
+            <node concept="3clFbJ" id="7a_Gs75bQPo" role="3cqZAp">
+              <node concept="3clFbS" id="7a_Gs75bQPq" role="3clFbx">
+                <node concept="3cpWs6" id="4gCFRNzcJmY" role="3cqZAp">
+                  <node concept="37vLTw" id="7a_Gs75bK_u" role="3cqZAk">
+                    <ref role="3cqZAo" node="7a_Gs75bK_n" resolve="table" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3y3z36" id="7a_Gs75bX4O" role="3clFbw">
+                <node concept="10Nm6u" id="7a_Gs75bZgG" role="3uHU7w" />
+                <node concept="37vLTw" id="7a_Gs75bSJz" role="3uHU7B">
+                  <ref role="3cqZAo" node="7a_Gs75bK_n" resolve="table" />
                 </node>
               </node>
             </node>
@@ -27544,18 +27619,14 @@
               <ref role="3cqZAo" node="4gCFRNz7_7f" resolve="cell" />
             </node>
           </node>
-          <node concept="9aQIb" id="4gCFRNzd5Oa" role="9aQIa">
-            <node concept="3clFbS" id="4gCFRNzd5Ob" role="9aQI4">
-              <node concept="3cpWs6" id="4gCFRNzd9cM" role="3cqZAp">
-                <node concept="2OqwBi" id="4gCFRNzdbye" role="3cqZAk">
-                  <node concept="37vLTw" id="4gCFRNzdbuq" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4gCFRNz7_7f" resolve="cell" />
-                  </node>
-                  <node concept="liA8E" id="4gCFRNzde1x" role="2OqNvi">
-                    <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
-                  </node>
-                </node>
-              </node>
+        </node>
+        <node concept="3cpWs6" id="4gCFRNzd9cM" role="3cqZAp">
+          <node concept="2OqwBi" id="4gCFRNzdbye" role="3cqZAk">
+            <node concept="37vLTw" id="4gCFRNzdbuq" role="2Oq$k0">
+              <ref role="3cqZAo" node="4gCFRNz7_7f" resolve="cell" />
+            </node>
+            <node concept="liA8E" id="4gCFRNzde1x" role="2OqNvi">
+              <ref role="37wK5l" to="f4zo:~EditorCell.getParent()" resolve="getParent" />
             </node>
           </node>
         </node>
@@ -32249,8 +32320,8 @@
               <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
             </node>
             <node concept="2YIFZM" id="70mku7u1_oJ" role="33vP2m">
-              <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
-              <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+              <ref role="37wK5l" node="3mrQsPSMCN1" resolve="createNodeCell" />
+              <ref role="1Pybhc" node="6tOcB$JKlIC" resolve="TableUtils" />
               <node concept="1rXfSq" id="70mku7u1_oK" role="37wK5m">
                 <ref role="37wK5l" to="nivk:~AbstractEditorBuilder.getEditorContext()" resolve="getEditorContext" />
               </node>
@@ -32260,20 +32331,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="3600dVer_Ay" role="3cqZAp">
-          <node concept="2OqwBi" id="3600dVer_Az" role="3clFbG">
-            <node concept="2YIFZM" id="3600dVer_A$" role="2Oq$k0">
-              <ref role="37wK5l" node="1362cT3c3wo" resolve="getInstance" />
-              <ref role="1Pybhc" node="1362cT3bWqU" resolve="ChildsTracker" />
-            </node>
-            <node concept="liA8E" id="3600dVer_A_" role="2OqNvi">
-              <ref role="37wK5l" node="1362cT3cM2o" resolve="registerChild" />
-              <node concept="37vLTw" id="3600dVer_AA" role="37wK5m">
-                <ref role="3cqZAo" node="3600dVer_Am" resolve="nodeCell" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbJ" id="3600dVer_AB" role="3cqZAp">
           <node concept="3clFbS" id="3600dVer_AC" role="3clFbx">
             <node concept="3clFbF" id="3600dVer_AD" role="3cqZAp">
@@ -32723,35 +32780,39 @@
             </node>
           </node>
         </node>
-        <node concept="2Gpval" id="70mku7uE9Ss" role="3cqZAp">
-          <node concept="2GrKxI" id="70mku7uE9St" role="2Gsz3X">
-            <property role="TrG5h" value="child" />
-          </node>
-          <node concept="37vLTw" id="70mku7uE9Su" role="2GsD0m">
-            <ref role="3cqZAo" node="4MuW45D84xH" resolve="myHeaderChilds" />
-          </node>
-          <node concept="3clFbS" id="70mku7uE9Sv" role="2LFqv$">
-            <node concept="3clFbJ" id="5QVyGuW$g1b" role="3cqZAp">
-              <node concept="3clFbS" id="5QVyGuW$g1d" role="3clFbx">
-                <node concept="3clFbF" id="70mku7uE9Sw" role="3cqZAp">
-                  <node concept="2OqwBi" id="70mku7uE9Sx" role="3clFbG">
-                    <node concept="37vLTw" id="5QVyGuWo0MP" role="2Oq$k0">
-                      <ref role="3cqZAo" node="70mku7uD$BG" resolve="parentCell" />
-                    </node>
-                    <node concept="liA8E" id="70mku7uE9SA" role="2OqNvi">
-                      <ref role="37wK5l" to="f4zo:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
-                      <node concept="2GrUjf" id="70mku7uE9SB" role="37wK5m">
-                        <ref role="2Gs0qQ" node="70mku7uE9St" resolve="child" />
+        <node concept="1X3_iC" id="3mrQsPSQoEJ" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="2Gpval" id="70mku7uE9Ss" role="8Wnug">
+            <node concept="2GrKxI" id="70mku7uE9St" role="2Gsz3X">
+              <property role="TrG5h" value="child" />
+            </node>
+            <node concept="37vLTw" id="70mku7uE9Su" role="2GsD0m">
+              <ref role="3cqZAo" node="4MuW45D84xH" resolve="createdHeaderCells" />
+            </node>
+            <node concept="3clFbS" id="70mku7uE9Sv" role="2LFqv$">
+              <node concept="3clFbJ" id="5QVyGuW$g1b" role="3cqZAp">
+                <node concept="3clFbS" id="5QVyGuW$g1d" role="3clFbx">
+                  <node concept="3clFbF" id="70mku7uE9Sw" role="3cqZAp">
+                    <node concept="2OqwBi" id="70mku7uE9Sx" role="3clFbG">
+                      <node concept="37vLTw" id="5QVyGuWo0MP" role="2Oq$k0">
+                        <ref role="3cqZAo" node="70mku7uD$BG" resolve="parentCell" />
+                      </node>
+                      <node concept="liA8E" id="70mku7uE9SA" role="2OqNvi">
+                        <ref role="37wK5l" to="f4zo:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
+                        <node concept="2GrUjf" id="70mku7uE9SB" role="37wK5m">
+                          <ref role="2Gs0qQ" node="70mku7uE9St" resolve="child" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
-              </node>
-              <node concept="3fqX7Q" id="5QVyGuW_eAd" role="3clFbw">
-                <node concept="1rXfSq" id="5QVyGuW_eAf" role="3fr31v">
-                  <ref role="37wK5l" node="5QVyGuW$kTZ" resolve="isAlreadyInNextTree" />
-                  <node concept="2GrUjf" id="5QVyGuW_eAg" role="37wK5m">
-                    <ref role="2Gs0qQ" node="70mku7uE9St" resolve="child" />
+                <node concept="3fqX7Q" id="5QVyGuW_eAd" role="3clFbw">
+                  <node concept="1rXfSq" id="5QVyGuW_eAf" role="3fr31v">
+                    <ref role="37wK5l" node="5QVyGuW$kTZ" resolve="isAlreadyInNextTree" />
+                    <node concept="2GrUjf" id="5QVyGuW_eAg" role="37wK5m">
+                      <ref role="2Gs0qQ" node="70mku7uE9St" resolve="child" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -33177,8 +33238,8 @@
               <ref role="3uigEE" node="1362cT3bWqU" resolve="ChildsTracker" />
             </node>
             <node concept="2ShNRf" id="70mku7uDuQ8" role="33vP2m">
-              <node concept="HV5vD" id="70mku7uDuQ9" role="2ShVmc">
-                <ref role="HV5vE" node="1362cT3bWqU" resolve="ChildsTracker" />
+              <node concept="HV5vD" id="3mrQsPSQmRw" role="2ShVmc">
+                <ref role="HV5vE" node="1362cT3bWqU" resolve="OrphanCells" />
               </node>
             </node>
           </node>
@@ -33218,7 +33279,7 @@
           <ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
         </node>
         <node concept="2AHcQZ" id="70mku7ufdbi" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
         </node>
       </node>
       <node concept="3clFbS" id="4MuW45D9qZY" role="3clF47">
@@ -33242,39 +33303,49 @@
           </node>
         </node>
         <node concept="3clFbH" id="70mku7ufdDR" role="3cqZAp" />
-        <node concept="3clFbJ" id="70mku7uuA6a" role="3cqZAp">
-          <node concept="3clFbS" id="70mku7uuA6c" role="3clFbx">
-            <node concept="YS8fn" id="70mku7uuJ68" role="3cqZAp">
-              <node concept="2ShNRf" id="70mku7uuJEd" role="YScLw">
-                <node concept="1pGfFk" id="70mku7uuMuR" role="2ShVmc">
-                  <property role="373rjd" value="true" />
-                  <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;()" resolve="IllegalStateException" />
+        <node concept="3clFbJ" id="3mrQsPTfJvh" role="3cqZAp">
+          <node concept="3clFbS" id="3mrQsPTfJvj" role="3clFbx">
+            <node concept="3clFbJ" id="70mku7uuA6a" role="3cqZAp">
+              <node concept="3clFbS" id="70mku7uuA6c" role="3clFbx">
+                <node concept="YS8fn" id="70mku7uuJ68" role="3cqZAp">
+                  <node concept="2ShNRf" id="70mku7uuJEd" role="YScLw">
+                    <node concept="1pGfFk" id="70mku7uuMuR" role="2ShVmc">
+                      <property role="373rjd" value="true" />
+                      <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;()" resolve="IllegalStateException" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="70mku7uuHry" role="3clFbw">
+                <node concept="37vLTw" id="70mku7uuGMf" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4MuW45D9kKd" resolve="removed" />
+                </node>
+                <node concept="liA8E" id="70mku7uuHWr" role="2OqNvi">
+                  <ref role="37wK5l" node="4MuW45CWGkd" resolve="isRegistered" />
+                  <node concept="37vLTw" id="70mku7uuIx5" role="37wK5m">
+                    <ref role="3cqZAo" node="70mku7uf19P" resolve="parentCell" />
+                  </node>
                 </node>
               </node>
             </node>
-          </node>
-          <node concept="2OqwBi" id="70mku7uuHry" role="3clFbw">
-            <node concept="37vLTw" id="70mku7uuGMf" role="2Oq$k0">
-              <ref role="3cqZAo" node="4MuW45D9kKd" resolve="removed" />
-            </node>
-            <node concept="liA8E" id="70mku7uuHWr" role="2OqNvi">
-              <ref role="37wK5l" node="4MuW45CWGkd" resolve="isRegistered" />
-              <node concept="37vLTw" id="70mku7uuIx5" role="37wK5m">
-                <ref role="3cqZAo" node="70mku7uf19P" resolve="owner" />
+            <node concept="3clFbF" id="70mku7uEiff" role="3cqZAp">
+              <node concept="2OqwBi" id="70mku7uEj4d" role="3clFbG">
+                <node concept="37vLTw" id="70mku7uEifd" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4MuW45D9kKd" resolve="removed" />
+                </node>
+                <node concept="liA8E" id="70mku7uEjNu" role="2OqNvi">
+                  <ref role="37wK5l" node="70mku7uDyhk" resolve="parentCreated" />
+                  <node concept="37vLTw" id="70mku7uEkvv" role="37wK5m">
+                    <ref role="3cqZAo" node="70mku7uf19P" resolve="parentCell" />
+                  </node>
+                </node>
               </node>
             </node>
           </node>
-        </node>
-        <node concept="3clFbF" id="70mku7uEiff" role="3cqZAp">
-          <node concept="2OqwBi" id="70mku7uEj4d" role="3clFbG">
-            <node concept="37vLTw" id="70mku7uEifd" role="2Oq$k0">
-              <ref role="3cqZAo" node="4MuW45D9kKd" resolve="removed" />
-            </node>
-            <node concept="liA8E" id="70mku7uEjNu" role="2OqNvi">
-              <ref role="37wK5l" node="70mku7uDyhk" resolve="done" />
-              <node concept="37vLTw" id="70mku7uEkvv" role="37wK5m">
-                <ref role="3cqZAo" node="70mku7uf19P" resolve="owner" />
-              </node>
+          <node concept="3y3z36" id="3mrQsPTfKxn" role="3clFbw">
+            <node concept="10Nm6u" id="3mrQsPTfKYf" role="3uHU7w" />
+            <node concept="37vLTw" id="3mrQsPTfJMW" role="3uHU7B">
+              <ref role="3cqZAo" node="70mku7uf19P" resolve="parentCell" />
             </node>
           </node>
         </node>
diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps
index 995363bd2a..5fe7475f01 100644
--- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps
+++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps
@@ -5639,6 +5639,53 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="3mrQsPT7QLQ" role="3cqZAp" />
+        <node concept="3clFbJ" id="3mrQsPT1L_e" role="3cqZAp">
+          <node concept="3clFbS" id="3mrQsPT1L_g" role="3clFbx">
+            <node concept="3clFbF" id="3mrQsPT3vRc" role="3cqZAp">
+              <node concept="2OqwBi" id="3mrQsPT4Vw_" role="3clFbG">
+                <node concept="2OqwBi" id="3mrQsPT3Rv7" role="2Oq$k0">
+                  <node concept="1eOMI4" id="3mrQsPT3vR9" role="2Oq$k0">
+                    <node concept="10QFUN" id="3mrQsPT3vR6" role="1eOMHV">
+                      <node concept="3uibUv" id="3mrQsPT3vRb" role="10QFUM">
+                        <ref role="3uigEE" node="RywcYwuxY_" resolve="EditorCellGridLeaf" />
+                      </node>
+                      <node concept="37vLTw" id="3mrQsPT3LC9" role="10QFUP">
+                        <ref role="3cqZAo" node="4UkcdCtRaaK" resolve="element" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3mrQsPT4NVK" role="2OqNvi">
+                    <ref role="37wK5l" node="3mrQsPSUHfI" resolve="getGridCell" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="3mrQsPT5gxT" role="2OqNvi">
+                  <ref role="37wK5l" to="hm5v:4gCFRNz0sZU" resolve="setPosition" />
+                  <node concept="2ShNRf" id="3mrQsPT5ANc" role="37wK5m">
+                    <node concept="1pGfFk" id="3mrQsPT5XV1" role="2ShVmc">
+                      <property role="373rjd" value="true" />
+                      <ref role="37wK5l" to="sse1:20OswHE0h6W" resolve="GridPosition" />
+                      <node concept="37vLTw" id="3mrQsPT6keA" role="37wK5m">
+                        <ref role="3cqZAo" node="4UkcdCtQmkw" resolve="x" />
+                      </node>
+                      <node concept="37vLTw" id="3mrQsPT6A6O" role="37wK5m">
+                        <ref role="3cqZAo" node="4UkcdCtQK9t" resolve="y" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2ZW3vV" id="3mrQsPT2vjS" role="3clFbw">
+            <node concept="3uibUv" id="3mrQsPT2_19" role="2ZW6by">
+              <ref role="3uigEE" node="RywcYwuxY_" resolve="EditorCellGridLeaf" />
+            </node>
+            <node concept="37vLTw" id="3mrQsPT27Iq" role="2ZW6bz">
+              <ref role="3cqZAo" node="4UkcdCtRaaK" resolve="element" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="4UkcdCtQmkw" role="3clF46">
         <property role="TrG5h" value="x" />
@@ -23280,17 +23327,14 @@
           <node concept="9aQIb" id="RywcYy0YM8" role="9aQIa">
             <node concept="3clFbS" id="RywcYy0YM9" role="9aQI4">
               <node concept="3cpWs6" id="RywcYy0YSg" role="3cqZAp">
-                <node concept="1rXfSq" id="2c3czgq0FwQ" role="3cqZAk">
-                  <ref role="37wK5l" node="2c3czgq0rYU" resolve="trackCreatedCell" />
-                  <node concept="2YIFZM" id="70mku7u1ztf" role="37wK5m">
-                    <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
-                    <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
-                    <node concept="37vLTw" id="70mku7u1Fyi" role="37wK5m">
-                      <ref role="3cqZAo" node="RywcYwuxY0" resolve="myContext" />
-                    </node>
-                    <node concept="37vLTw" id="70mku7u1$WB" role="37wK5m">
-                      <ref role="3cqZAo" node="RywcYy0Y3X" resolve="node" />
-                    </node>
+                <node concept="2YIFZM" id="70mku7u1ztf" role="3cqZAk">
+                  <ref role="37wK5l" to="hm5v:3mrQsPSMCN1" resolve="createNodeCell" />
+                  <ref role="1Pybhc" to="hm5v:6tOcB$JKlIC" resolve="TableUtils" />
+                  <node concept="37vLTw" id="70mku7u1Fyi" role="37wK5m">
+                    <ref role="3cqZAo" node="RywcYwuxY0" resolve="myContext" />
+                  </node>
+                  <node concept="37vLTw" id="70mku7u1$WB" role="37wK5m">
+                    <ref role="3cqZAo" node="RywcYy0Y3X" resolve="node" />
                   </node>
                 </node>
               </node>
@@ -23346,12 +23390,9 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="2c3czgpQMtz" role="3cqZAp">
-          <node concept="1rXfSq" id="2c3czgq0GBS" role="3clFbG">
-            <ref role="37wK5l" node="2c3czgq0rYU" resolve="trackCreatedCell" />
-            <node concept="37vLTw" id="74LepNT2BQd" role="37wK5m">
-              <ref role="3cqZAo" node="74LepNT2BQ7" resolve="cell" />
-            </node>
+        <node concept="3clFbF" id="3mrQsPSOisN" role="3cqZAp">
+          <node concept="37vLTw" id="3mrQsPSOisL" role="3clFbG">
+            <ref role="3cqZAo" node="74LepNT2BQ7" resolve="cell" />
           </node>
         </node>
       </node>
@@ -23364,7 +23405,7 @@
       <property role="TrG5h" value="myCell" />
       <node concept="3Tm6S6" id="RywcYwuxYB" role="1B3o_S" />
       <node concept="3uibUv" id="RywcYwuxYC" role="1tU5fm">
-        <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+        <ref role="3uigEE" to="hm5v:20OswHE0eA6" resolve="EditorCell_GridCell" />
       </node>
     </node>
     <node concept="2tJIrI" id="RywcYwuxYI" role="jymVt" />
@@ -23433,12 +23474,47 @@
       <node concept="3clFbS" id="RywcYwuxYY" role="3clF47">
         <node concept="3clFbF" id="RywcYwuxYZ" role="3cqZAp">
           <node concept="37vLTI" id="RywcYwuxZ0" role="3clFbG">
-            <node concept="37vLTw" id="RywcYwuxZ1" role="37vLTx">
-              <ref role="3cqZAo" node="RywcYwuxYU" resolve="cell" />
-            </node>
             <node concept="37vLTw" id="RywcYwuxZ2" role="37vLTJ">
               <ref role="3cqZAo" node="RywcYwuxYA" resolve="myCell" />
             </node>
+            <node concept="2ShNRf" id="3mrQsPSTv14" role="37vLTx">
+              <node concept="1pGfFk" id="3mrQsPSTv15" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="hm5v:20OswHE0eFq" resolve="EditorCell_GridCell" />
+                <node concept="2OqwBi" id="3mrQsPSTv16" role="37wK5m">
+                  <node concept="37vLTw" id="3mrQsPSTv17" role="2Oq$k0">
+                    <ref role="3cqZAo" node="RywcYwuxYU" resolve="cell" />
+                  </node>
+                  <node concept="liA8E" id="3mrQsPSTv18" role="2OqNvi">
+                    <ref role="37wK5l" to="f4zo:~EditorCell.getContext()" resolve="getContext" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="3mrQsPSTv19" role="37wK5m">
+                  <node concept="37vLTw" id="3mrQsPSTv1a" role="2Oq$k0">
+                    <ref role="3cqZAo" node="RywcYwuxYU" resolve="cell" />
+                  </node>
+                  <node concept="liA8E" id="3mrQsPSTv1b" role="2OqNvi">
+                    <ref role="37wK5l" to="f4zo:~EditorCell.getSNode()" resolve="getSNode" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="3mrQsPSTv1c" role="37wK5m">
+                  <ref role="3cqZAo" node="RywcYwuxYU" resolve="cell" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3mrQsPSTwzW" role="3cqZAp">
+          <node concept="2OqwBi" id="3mrQsPSTyPc" role="3clFbG">
+            <node concept="37vLTw" id="3mrQsPSTwzU" role="2Oq$k0">
+              <ref role="3cqZAo" node="RywcYwuxYA" resolve="myCell" />
+            </node>
+            <node concept="liA8E" id="3mrQsPST$rE" role="2OqNvi">
+              <ref role="37wK5l" to="g51k:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell)" resolve="addEditorCell" />
+              <node concept="37vLTw" id="3mrQsPST$Vy" role="37wK5m">
+                <ref role="3cqZAo" node="RywcYwuxYU" resolve="cell" />
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbF" id="3mrQsPSIsEK" role="3cqZAp">
@@ -23450,7 +23526,7 @@
             <node concept="liA8E" id="3mrQsPSIurM" role="2OqNvi">
               <ref role="37wK5l" to="hm5v:1362cT3cM2o" resolve="registerChild" />
               <node concept="37vLTw" id="3mrQsPSIv7t" role="37wK5m">
-                <ref role="3cqZAo" node="RywcYwuxYU" resolve="cell" />
+                <ref role="3cqZAo" node="RywcYwuxYA" resolve="myCell" />
               </node>
             </node>
           </node>
@@ -23552,7 +23628,27 @@
       <node concept="3Tm1VV" id="RywcYwuxZ6" role="1B3o_S" />
       <node concept="3clFbS" id="RywcYwuxZ7" role="3clF47">
         <node concept="3clFbF" id="RywcYwuxZ8" role="3cqZAp">
-          <node concept="37vLTw" id="RywcYwuxZ9" role="3clFbG">
+          <node concept="2OqwBi" id="3mrQsPSUN2Z" role="3clFbG">
+            <node concept="37vLTw" id="RywcYwuxZ9" role="2Oq$k0">
+              <ref role="3cqZAo" node="RywcYwuxYA" resolve="myCell" />
+            </node>
+            <node concept="liA8E" id="3mrQsPSUP2l" role="2OqNvi">
+              <ref role="37wK5l" to="hm5v:20OswHE1rOJ" resolve="getWrappedCell" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3mrQsPSUG3v" role="jymVt" />
+    <node concept="3clFb_" id="3mrQsPSUHfI" role="jymVt">
+      <property role="TrG5h" value="getGridCell" />
+      <node concept="3uibUv" id="3mrQsPSUKc1" role="3clF45">
+        <ref role="3uigEE" to="hm5v:20OswHE0eA6" resolve="EditorCell_GridCell" />
+      </node>
+      <node concept="3Tm1VV" id="3mrQsPSUHfL" role="1B3o_S" />
+      <node concept="3clFbS" id="3mrQsPSUHfM" role="3clF47">
+        <node concept="3clFbF" id="3mrQsPSUKG7" role="3cqZAp">
+          <node concept="37vLTw" id="3mrQsPSUKG6" role="3clFbG">
             <ref role="3cqZAo" node="RywcYwuxYA" resolve="myCell" />
           </node>
         </node>
@@ -23575,7 +23671,7 @@
               <ref role="3cqZAo" node="RywcYwuxYA" resolve="myCell" />
             </node>
             <node concept="liA8E" id="1U60oYwfvY$" role="2OqNvi">
-              <ref role="37wK5l" to="f4zo:~EditorCell.getHeight()" resolve="getHeight" />
+              <ref role="37wK5l" to="g51k:~EditorCell_Basic.getHeight()" resolve="getHeight" />
             </node>
           </node>
         </node>
@@ -23596,7 +23692,7 @@
               <ref role="3cqZAo" node="RywcYwuxYA" resolve="myCell" />
             </node>
             <node concept="liA8E" id="1U60oYwfwfF" role="2OqNvi">
-              <ref role="37wK5l" to="f4zo:~EditorCell.getWidth()" resolve="getWidth" />
+              <ref role="37wK5l" to="g51k:~EditorCell_Basic.getWidth()" resolve="getWidth" />
             </node>
           </node>
         </node>
@@ -29895,8 +29991,8 @@
               <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
             </node>
             <node concept="2YIFZM" id="70mku7u1KZQ" role="33vP2m">
-              <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
-              <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+              <ref role="37wK5l" to="hm5v:3mrQsPSMCN1" resolve="createNodeCell" />
+              <ref role="1Pybhc" to="hm5v:6tOcB$JKlIC" resolve="TableUtils" />
               <node concept="37vLTw" id="70mku7u1O_h" role="37wK5m">
                 <ref role="3cqZAo" node="RywcYwAbVp" resolve="myEditorContext" />
               </node>
@@ -29906,20 +30002,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="36rxy05g5H" role="3cqZAp">
-          <node concept="2OqwBi" id="36rxy05gcT" role="3clFbG">
-            <node concept="2YIFZM" id="36rxy05ga3" role="2Oq$k0">
-              <ref role="37wK5l" to="hm5v:1362cT3c3wo" resolve="getInstance" />
-              <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
-            </node>
-            <node concept="liA8E" id="36rxy05gr5" role="2OqNvi">
-              <ref role="37wK5l" to="hm5v:1362cT3cM2o" resolve="registerChild" />
-              <node concept="37vLTw" id="36rxy05gsn" role="37wK5m">
-                <ref role="3cqZAo" node="36rxy05fSz" resolve="editorCell" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="1dAqnm8O0JT" role="3cqZAp">
           <node concept="1rXfSq" id="1dAqnm8O0JS" role="3clFbG">
             <ref role="37wK5l" node="1dAqnm8NZqz" resolve="create" />
@@ -30232,8 +30314,8 @@
                         <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
                       </node>
                       <node concept="2YIFZM" id="bMfgm9f0ho" role="33vP2m">
-                        <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
-                        <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+                        <ref role="37wK5l" to="hm5v:3mrQsPSMCN1" resolve="createNodeCell" />
+                        <ref role="1Pybhc" to="hm5v:6tOcB$JKlIC" resolve="TableUtils" />
                         <node concept="37vLTw" id="bMfgm9f0hp" role="37wK5m">
                           <ref role="3cqZAo" node="RywcYwAbVp" resolve="myEditorContext" />
                         </node>
@@ -30243,20 +30325,6 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="1362cT3jSjU" role="3cqZAp">
-                    <node concept="2OqwBi" id="1362cT3jSWA" role="3clFbG">
-                      <node concept="2YIFZM" id="1362cT3jSSV" role="2Oq$k0">
-                        <ref role="37wK5l" to="hm5v:1362cT3c3wo" resolve="getInstance" />
-                        <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
-                      </node>
-                      <node concept="liA8E" id="1362cT3jTaw" role="2OqNvi">
-                        <ref role="37wK5l" to="hm5v:1362cT3cM2o" resolve="registerChild" />
-                        <node concept="37vLTw" id="1362cT3jZ6P" role="37wK5m">
-                          <ref role="3cqZAo" node="1362cT3jWNu" resolve="nodeCell" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3clFbF" id="bMfgm9eqkZ" role="3cqZAp">
                     <node concept="2YIFZM" id="bMfgm9etY0" role="3clFbG">
                       <ref role="37wK5l" to="yj89:3Qp43e36wM3" resolve="addEditorCell" />
@@ -31402,8 +31470,8 @@
               <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
             </node>
             <node concept="2YIFZM" id="70mku7u1Wcz" role="33vP2m">
-              <ref role="37wK5l" to="yj89:bMfgm9eN3g" resolve="createNodeCell" />
-              <ref role="1Pybhc" to="yj89:3Qp43e36sGA" resolve="CellModificationLog" />
+              <ref role="37wK5l" to="hm5v:3mrQsPSMCN1" resolve="createNodeCell" />
+              <ref role="1Pybhc" to="hm5v:6tOcB$JKlIC" resolve="TableUtils" />
               <node concept="37vLTw" id="70mku7u20rW" role="37wK5m">
                 <ref role="3cqZAo" node="1dAqnm8Wxtd" resolve="myContext" />
               </node>
@@ -31413,20 +31481,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="1362cT3kiUd" role="3cqZAp">
-          <node concept="2OqwBi" id="1362cT3kj2d" role="3clFbG">
-            <node concept="2YIFZM" id="1362cT3kiZ1" role="2Oq$k0">
-              <ref role="37wK5l" to="hm5v:1362cT3c3wo" resolve="getInstance" />
-              <ref role="1Pybhc" to="hm5v:1362cT3bWqU" resolve="ChildsTracker" />
-            </node>
-            <node concept="liA8E" id="1362cT3kjaq" role="2OqNvi">
-              <ref role="37wK5l" to="hm5v:1362cT3cM2o" resolve="registerChild" />
-              <node concept="37vLTw" id="1362cT3kjbB" role="37wK5m">
-                <ref role="3cqZAo" node="1362cT3ki_c" resolve="cell" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="RywcYwKFd3" role="3cqZAp">
           <node concept="1rXfSq" id="RywcYwKFd2" role="3clFbG">
             <ref role="37wK5l" node="1dAqnm8WVUE" resolve="createFromEditorCell" />
diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/substitute.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/substitute.mps
index 51b9710ded..0ab5be3baa 100644
--- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/substitute.mps
+++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/substitute.mps
@@ -746,7 +746,7 @@
       <node concept="3Tm1VV" id="4381QB0yk4D" role="1B3o_S" />
       <node concept="3clFbS" id="4381QB0yk4E" role="3clF47">
         <node concept="3clFbF" id="4381QB0ynNt" role="3cqZAp">
-          <node concept="2OqwBi" id="4381QB0yuRT" role="3clFbG">
+          <node concept="2EnYce" id="7a_Gs75dd4m" role="3clFbG">
             <node concept="2OqwBi" id="4381QB0yoQ3" role="2Oq$k0">
               <node concept="37vLTw" id="4381QB0ynNs" role="2Oq$k0">
                 <ref role="3cqZAo" node="4381QB0ydkk" resolve="myGridCell" />
@@ -894,7 +894,7 @@
                 </node>
               </node>
               <node concept="3y3z36" id="40oIQyHX8k1" role="3clFbw">
-                <node concept="2OqwBi" id="40oIQyHXeV0" role="3uHU7w">
+                <node concept="2EnYce" id="7a_Gs75di9p" role="3uHU7w">
                   <node concept="2OqwBi" id="40oIQyHX982" role="2Oq$k0">
                     <node concept="37vLTw" id="40oIQyHX8kJ" role="2Oq$k0">
                       <ref role="3cqZAo" node="4381QB0ydkk" resolve="myGridCell" />
@@ -1214,8 +1214,8 @@
       <node concept="3clFbS" id="4381QB0uG0n" role="3clF47">
         <node concept="3clFbF" id="4381QB0vDt8" role="3cqZAp">
           <node concept="2EnYce" id="4381QB0vDYc" role="3clFbG">
-            <node concept="1rXfSq" id="4381QB0vDt7" role="2Oq$k0">
-              <ref role="37wK5l" node="4381QB0vp_j" resolve="getDelegate" />
+            <node concept="37vLTw" id="3mrQsPTgMJ5" role="2Oq$k0">
+              <ref role="3cqZAo" node="4381QB0uHEA" resolve="myDelegate" />
             </node>
             <node concept="liA8E" id="4381QB0vEqR" role="2OqNvi">
               <ref role="37wK5l" to="f4zo:~SubstituteInfo.setOriginalText(java.lang.String)" resolve="setOriginalText" />