diff --git a/packages/core/src/editor/actions.ts b/packages/core/src/editor/actions.ts
index 12ebdad48..b600a6f2c 100644
--- a/packages/core/src/editor/actions.ts
+++ b/packages/core/src/editor/actions.ts
@@ -104,8 +104,21 @@ export const Actions = (
         index > -1 && index <= parent.data.nodes.length,
         "AddTreeAtIndex: index must be between 0 and parentNodeLength inclusive"
       );
-
-      invariant(true, "not implemented yet");
+      const node = tree.nodes[tree.rootNodeId];
+      // first, add the node
+      this.addNodeAtIndex(node, parentId, index);
+      if (!node.data.nodes) {
+        return;
+      }
+      // then add all the children
+      const addChild = (childId, index) =>
+        this.addTreeAtIndex(
+          { rootNodeId: childId, nodes: tree.nodes },
+          node.id,
+          index
+        );
+      // we need to deep clone here...
+      [...node.data.nodes].forEach(addChild);
     },
 
     /**
diff --git a/packages/core/src/editor/query.tsx b/packages/core/src/editor/query.tsx
index 087618168..643f04624 100644
--- a/packages/core/src/editor/query.tsx
+++ b/packages/core/src/editor/query.tsx
@@ -34,8 +34,7 @@ import { getDeepNodes } from "../utils/getDeepNodes";
 import { transformJSXToNode } from "../utils/transformJSX";
 
 export function QueryMethods(state: EditorState) {
-  invariant(state, "you must have a state to be able to query");
-  const { options } = state;
+  const options = state && state.options;
 
   const _: () => QueryCallbacksFor<typeof QueryMethods> = () =>
     QueryMethods(state);
diff --git a/packages/core/src/editor/tests/actions.test.ts b/packages/core/src/editor/tests/actions.test.ts
index 144db8022..145ecb6dc 100644
--- a/packages/core/src/editor/tests/actions.test.ts
+++ b/packages/core/src/editor/tests/actions.test.ts
@@ -74,6 +74,43 @@ describe("actions.addNodeAtIndex", () => {
   });
 });
 
+describe("actions.addTreeAtIndex", () => {
+  it("should throw if we give a parentId that doesnt exist", () => {
+    expect(() =>
+      Actions(emptyState)((actions) => actions.addTreeAtIndex(leafNode))
+    ).toThrow();
+  });
+  it("should throw if we give an invalid index", () => {
+    const state = Actions(documentState);
+    expect(() =>
+      state((actions) => actions.addTreeAtIndex(leafNode, rootNode.id, -1))
+    ).toThrow();
+    expect(() =>
+      state((actions) => actions.addTreeAtIndex(leafNode, rootNode.id, 1))
+    ).toThrow();
+  });
+  it("should be able to add a single node at 0", () => {
+    const tree = {
+      rootNodeId: leafNode.id,
+      nodes: { [leafNode.id]: leafNode },
+    };
+    const newState = Actions(documentState)((actions) =>
+      actions.addTreeAtIndex(tree, rootNode.id, 0)
+    );
+    expect(newState).toEqual(documentWithLeafState);
+  });
+  it("should be able to add a larger tree", () => {
+    const tree = {
+      rootNodeId: card.id,
+      nodes: { ...documentWithCardState.nodes },
+    };
+    const newState = Actions(documentState)((actions) =>
+      actions.addTreeAtIndex(tree, rootNode.id, 0)
+    );
+    expect(newState).toEqual(documentWithCardState);
+  });
+});
+
 describe("actions.delete", () => {
   it("should throw if you try to a non existing node", () => {
     expect(() => Actions(emptyState)((actions) => actions.delete(leafNode.id)));
@@ -88,7 +125,7 @@ describe("actions.delete", () => {
 
     expect(newState).toEqual(documentState);
   });
-  it("should be able to delete a card", () => {
+  xit("should be able to delete a card", () => {
     const newState = Actions(documentWithCardState)((actions) =>
       actions.delete(card.id)
     );