From 23725a77d7f91e89dbc82edbd1595d13399aef2c Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Fri, 12 Mar 2021 13:07:22 -0700
Subject: [PATCH 01/56] temp co mmit

---
 .idea/jarRepositories.xml                     |  5 ++
 .idea/vcs.xml                                 |  6 ++
 core/pom.xml                                  |  1 +
 .../me/aurium/beetle/branch/CommandBase.java  |  5 +-
 .../me/aurium/beetle/branch/CommandNode.java  |  5 ++
 .../java/me/aurium/beetle/branch/Context.java | 13 ----
 .../aurium/beetle/branch/ContextHandler.java  |  8 ---
 .../aurium/beetle/branch/IndividualNode.java  |  7 ++
 .../beetle/branch/bases/CommandableBase.java  | 47 +++++++------
 .../beetle/branch/bases/SimpleBase.java       | 10 +--
 .../beetle/branch/builders/BaseBuilder.java   | 42 ++++++++++++
 .../branch/builders/CommandableBuilder.java   |  7 ++
 .../branch/builders/SplitBuilderFunction.java |  7 ++
 .../branch/builders/SplittableBuilder.java    | 49 ++++++++++++++
 .../beetle/branch/impl/CommonContext.java     | 31 ---------
 .../aurium/beetle/branch/nodes/BaseNode.java  | 67 +++++++++++++++++++
 .../branch/nodes/BranchingCommandNode.java    |  4 +-
 .../branch/nodes/SingleCommandNode.java       |  5 +-
 18 files changed, 239 insertions(+), 80 deletions(-)
 create mode 100644 .idea/vcs.xml
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/Context.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/ContextHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/IndividualNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/CommandableBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/SplittableBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/impl/CommonContext.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 5a6f4b1..348c245 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,6 +21,11 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="aurium" />
+      <option name="name" value="aurium" />
+      <option name="url" value="" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="solar-releases" />
       <option name="name" value="solar-releases" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index cede4cf..a690dee 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,4 +24,5 @@
         </dependency>
     </dependencies>
 
+
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/CommandBase.java b/core/src/main/java/me/aurium/beetle/branch/CommandBase.java
index f72961e..e60b797 100644
--- a/core/src/main/java/me/aurium/beetle/branch/CommandBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/CommandBase.java
@@ -1,8 +1,11 @@
 package me.aurium.beetle.branch;
 
+import me.aurium.beetle.api.command.Context;
+import me.aurium.beetle.api.command.ContextHandler;
+
 public interface CommandBase<T> {
 
     ContextHandler<T> getHandler(Context<T> context);
-    void handle(Context<T> context);
+    void handleContext(Context<T> context);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
index 0266dfe..262e784 100644
--- a/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
@@ -1,5 +1,6 @@
 package me.aurium.beetle.branch;
 
+import me.aurium.beetle.api.command.ContextHandler;
 import me.aurium.beetle.api.nodes.Node;
 
 public interface CommandNode<T> extends Node<CommandNode<T>> {
@@ -10,4 +11,8 @@ public interface CommandNode<T> extends Node<CommandNode<T>> {
      */
     ContextHandler<T> getContextHandler();
 
+    //TODO tabcompleteHandler
+    //TabContextHandler<T> getSpecificTabHandler(BlockPath path);
+    //TabContextHandler<T> getTabHandler(); //tabhandler (probably just return this.id)
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/Context.java b/core/src/main/java/me/aurium/beetle/branch/Context.java
deleted file mode 100644
index 3d3ccf6..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/Context.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch;
-
-/**
- * The context of a command
- * @param <T> the type of command source
- */
-public interface Context<T> {
-
-    T getSender();
-    String getAlias();
-    String[] getArgs();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/ContextHandler.java b/core/src/main/java/me/aurium/beetle/branch/ContextHandler.java
deleted file mode 100644
index 25d2701..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/ContextHandler.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package me.aurium.beetle.branch;
-
-@FunctionalInterface
-public interface ContextHandler<T> {
-
-    void consume(Context<T> consumed);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/IndividualNode.java b/core/src/main/java/me/aurium/beetle/branch/IndividualNode.java
new file mode 100644
index 0000000..8aed887
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/IndividualNode.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch;
+
+/**
+ * Represents something that is on it's own and has no other nodes after it
+ */
+public interface IndividualNode<T> extends CommandNode<T> {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/bases/CommandableBase.java b/core/src/main/java/me/aurium/beetle/branch/bases/CommandableBase.java
index ba9eb32..f6de8cf 100644
--- a/core/src/main/java/me/aurium/beetle/branch/bases/CommandableBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/bases/CommandableBase.java
@@ -1,50 +1,59 @@
 package me.aurium.beetle.branch.bases;
 
-import me.aurium.beetle.api.command.AbstractCommand;
-import me.aurium.beetle.branch.CommandBase;
+import me.aurium.beetle.api.command.Command;
+import me.aurium.beetle.api.command.ContextSource;
 import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.Context;
-import me.aurium.beetle.branch.ContextHandler;
-import me.aurium.beetle.branch.impl.CommonContext;
 
-public class CommandableBase<T> implements CommandBase<T>, AbstractCommand<T> {
+import java.util.Collection;
+
+public class CommandableBase<T> extends SimpleBase<T> implements Command<T> {
 
     private final String name;
     private final String permission;
-    private final CommandNode<T> node;
+    private final ContextSource<T> source;
 
-    public CommandableBase(String name, String permission, CommandNode<T> node) {
+    public CommandableBase(CommandNode<T> node, String name, String permission, ContextSource<T> source) {
+        super(node);
         this.name = name;
         this.permission = permission;
-        this.node = node;
+        this.source = source;
     }
 
     @Override
-    public ContextHandler<T> getHandler(Context<T> context) {
-        return null;
+    public String getName() {
+        return name;
     }
 
     @Override
-    public void handle(Context<T> context) {
+    public String getPermission() {
+        return permission;
+    }
 
+    @Override
+    public boolean execute(T t, String s, String[] strings) {
+
+        this.handleContext(source.context(t,s,strings));
+
+        return true;
     }
 
     @Override
-    public String getName() {
+    public Collection<String> getAliases() {
         return null;
     }
 
     @Override
-    public String getPermission() {
+    public Collection<String> tabComplete(T sender, String alias, String[] args) {
         return null;
     }
 
     @Override
-    public boolean execute(T t, String alias, String[] strings) {
-        Context<T> context = new CommonContext<>(t,alias,strings);
-
-        handle(context);
+    public String getUsage() {
+        return null;
+    }
 
-        return true;
+    @Override
+    public String getDescription() {
+        return null;
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/bases/SimpleBase.java b/core/src/main/java/me/aurium/beetle/branch/bases/SimpleBase.java
index 2e63830..287e7dc 100644
--- a/core/src/main/java/me/aurium/beetle/branch/bases/SimpleBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/bases/SimpleBase.java
@@ -1,11 +1,11 @@
 package me.aurium.beetle.branch.bases;
 
+import me.aurium.beetle.api.command.Context;
+import me.aurium.beetle.api.command.ContextHandler;
 import me.aurium.beetle.api.nodes.impl.StringBlockPath;
 import me.aurium.beetle.api.nodes.path.BlockPath;
 import me.aurium.beetle.branch.CommandBase;
 import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.Context;
-import me.aurium.beetle.branch.ContextHandler;
 
 import java.util.Optional;
 
@@ -31,7 +31,9 @@ public ContextHandler<T> getHandler(Context<T> context) {
     }
 
     @Override
-    public void handle(Context<T> context) {
-        getHandler(context).consume(context);
+    public void handleContext(Context<T> context) {
+        getHandler(context).handle(context);
+
+        return;
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java
new file mode 100644
index 0000000..af27b34
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java
@@ -0,0 +1,42 @@
+package me.aurium.beetle.branch.builders;
+
+import me.aurium.beetle.api.command.ContextSource;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IndividualNode;
+import me.aurium.beetle.branch.bases.SimpleBase;
+import me.aurium.beetle.branch.nodes.BaseNode;
+import me.aurium.beetle.branch.nodes.BranchingCommandNode;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class BaseBuilder<T>{
+
+    private final ContextSource<T> contextSource;
+    private BaseNode<T> baseNode;
+
+    public BaseBuilder(ContextSource<T> contextSource) {
+        this.contextSource = contextSource;
+        this.baseNode = new BaseNode<>(contextSource);
+    }
+
+    public SplitMode<T> baseSplit(SplitBuilderFunction<T> function) {
+
+        SplittableBuilder<T> builder = new SplittableBuilder<>(base,base,contextSource);
+
+        function.consume(builder);
+
+        return new SplitMode<>(builder.build());
+    }
+
+    public static class SplitMode<T> {
+
+        private final BranchingCommandNode<T> baseNode;
+
+        public SplitMode(BranchingCommandNode<T> baseNode) {
+            this.baseNode = baseNode;
+        }
+
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/CommandableBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/CommandableBuilder.java
new file mode 100644
index 0000000..285a492
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/CommandableBuilder.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.builders;
+
+/**
+ * Wraps the BaseBuilder
+ */
+public class CommandableBuilder {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java b/core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java
new file mode 100644
index 0000000..25d3220
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.builders;
+
+public interface SplitBuilderFunction<T> {
+
+    void consume(SplittableBuilder<T> builder);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SplittableBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/SplittableBuilder.java
new file mode 100644
index 0000000..1c22d25
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/SplittableBuilder.java
@@ -0,0 +1,49 @@
+package me.aurium.beetle.branch.builders;
+
+import me.aurium.beetle.api.command.ContextSource;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IndividualNode;
+import me.aurium.beetle.branch.nodes.BaseNode;
+import me.aurium.beetle.branch.nodes.BranchingCommandNode;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class SplittableBuilder<T> {
+
+    private final ContextSource<T> source;
+    private final Set<CommandNode<T>> nodesToInsert;
+
+    private final BaseNode<T> base;
+    private final CommandNode<T> parent;
+
+    private IndividualNode<T> singleFunctionNode;
+
+    public SplittableBuilder(BaseNode<T> base, CommandNode<T> parent, ContextSource<T> source) {
+        this.source = source;
+        this.nodesToInsert = new HashSet<>();
+
+        this.base = base;
+        this.parent = parent;
+    }
+
+
+    public void addCustomNode(CommandNode<T> node) {
+        this.nodesToInsert.add(node);
+    }
+
+    public BranchingCommandNode<T> build() {
+
+        if (base == null || parent == null) {
+
+        } else {
+            new BranchingCommandNode<T>()
+        }
+
+
+
+
+        return null;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/impl/CommonContext.java b/core/src/main/java/me/aurium/beetle/branch/impl/CommonContext.java
deleted file mode 100644
index ad88be8..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/impl/CommonContext.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package me.aurium.beetle.branch.impl;
-
-import me.aurium.beetle.branch.Context;
-
-public class CommonContext<T> implements Context<T> {
-
-    private final T sender;
-    private final String alias;
-    private final String[] args;
-
-    public CommonContext(T sender, String alias, String[] args) {
-        this.sender = sender;
-        this.alias = alias;
-        this.args = args;
-    }
-
-    @Override
-    public T getSender() {
-        return sender;
-    }
-
-    @Override
-    public String getAlias() {
-        return alias;
-    }
-
-    @Override
-    public String[] getArgs() {
-        return args;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java
new file mode 100644
index 0000000..bd172ce
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java
@@ -0,0 +1,67 @@
+package me.aurium.beetle.branch.nodes;
+
+import me.aurium.beetle.api.command.ContextHandler;
+import me.aurium.beetle.api.command.ContextSource;
+import me.aurium.beetle.api.nodes.path.Block;
+import me.aurium.beetle.api.nodes.path.BlockPath;
+import me.aurium.beetle.branch.AlreadyStoredHashSet;
+import me.aurium.beetle.branch.CommandNode;
+
+import java.util.Collection;
+import java.util.Optional;
+
+public class BaseNode<T> implements CommandNode<T> {
+
+    private final AlreadyStoredHashSet<CommandNode<T>> set;
+    private final ContextSource<T> source;
+
+    public BaseNode(ContextSource<T> source, AlreadyStoredHashSet<CommandNode<T>> nodes)  {
+        this.set = nodes;
+        this.source = source;
+    }
+
+    @Override
+    public ContextHandler<T> getContextHandler() {
+        return null;
+    }
+
+    @Override
+    public BlockPath getAbsolutePath() {
+        return null;
+    }
+
+    @Override
+    public Block getShortPath() {
+        return null;
+    }
+
+    @Override
+    public CommandNode<T> getRoot() {
+        return this;
+    }
+
+    @Override
+    public CommandNode<T> getParent() {
+        return this;
+    }
+
+    @Override
+    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
+        return getSpecificNode(blockPath);
+    }
+
+    @Override
+    public Collection<CommandNode<T>> getLinkedNodes() {
+        return null;
+    }
+
+    public static class Assembly {
+        public static <T> BaseNode<T> of(ContextSource<T> source, AlreadyStoredHashSet<CommandNode<T>> nodes) {
+            return new BaseNode<>(source,nodes);
+        }
+
+        public static <T> BaseNode<T> of(ContextSource<T> source, CommandNode<T> singleNode) {
+            return new BaseNode<>(source,new AlreadyStoredHashSet<>(singleNode));
+        }
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingCommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingCommandNode.java
index c0a5dbd..d69b2e0 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingCommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingCommandNode.java
@@ -1,10 +1,10 @@
 package me.aurium.beetle.branch.nodes;
 
+import me.aurium.beetle.api.command.ContextHandler;
 import me.aurium.beetle.api.nodes.path.Block;
 import me.aurium.beetle.api.nodes.path.BlockPath;
 import me.aurium.beetle.branch.AlreadyStoredHashSet;
 import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.ContextHandler;
 
 import java.util.Collection;
 import java.util.Optional;
@@ -16,7 +16,7 @@ public class BranchingCommandNode<T> implements CommandNode<T> {
     private final CommandNode<T> parent;
     private final Block path;
 
-    public BranchingCommandNode(AlreadyStoredHashSet<CommandNode<T>> nodes, CommandNode<T> root, CommandNode<T> parent, Block path, ContextHandler<T> handler) {
+    public BranchingCommandNode(AlreadyStoredHashSet<CommandNode<T>> nodes, CommandNode<T> root, CommandNode<T> parent, Block path) {
         this.nodes = nodes;
         this.root = root;
         this.parent = parent;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleCommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleCommandNode.java
index bda8afb..c0195a3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleCommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleCommandNode.java
@@ -1,15 +1,16 @@
 package me.aurium.beetle.branch.nodes;
 
+import me.aurium.beetle.api.command.ContextHandler;
 import me.aurium.beetle.api.nodes.path.Block;
 import me.aurium.beetle.api.nodes.path.BlockPath;
 import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.ContextHandler;
+import me.aurium.beetle.branch.IndividualNode;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
 
-public class SingleCommandNode<T> implements CommandNode<T> {
+public class SingleCommandNode<T> implements IndividualNode<T> {
 
     private final CommandNode<T> root;
     private final CommandNode<T> parent;

From 70fc32f2bc302e8975f1af427925cc722d9f0696 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Fri, 12 Mar 2021 17:20:47 -0700
Subject: [PATCH 02/56] pre delete commit

---
 ...oredHashSet.java => PreStoredHashSet.java} | 33 +++++---
 .../beetle/branch/builders/BaseBuilder.java   | 40 +---------
 .../branch/builders/BuilderFunction.java      |  7 ++
 .../branch/builders/CentralBuilder.java       | 27 +++++++
 .../branch/builders/CommandableBuilder.java   |  7 --
 .../beetle/branch/builders/FrameBuilder.java  |  9 +++
 .../beetle/branch/builders/NodeBuilder.java   |  9 +++
 .../branch/builders/SplitBuilderFunction.java |  2 +-
 .../branch/builders/SplittableBuilder.java    | 49 ------------
 .../builders/SplittableFrameBuilder.java      | 75 ++++++++++++++++++
 .../builders/SplittableLaunchPoint.java       | 51 ++++++++++++
 .../beetle/branch/newnode/NewBaseMap.java     |  7 ++
 .../branch/newnode/NewBranchingBuilder.java   |  7 ++
 .../branch/newnode/NewBranchingNode.java      | 66 ++++++++++++++++
 .../aurium/beetle/branch/nodes/BaseNode.java  | 33 ++++----
 .../beetle/branch/nodes/BranchingFrame.java   | 78 +++++++++++++++++++
 .../beetle/branch/nodes/BranchingFunc.java    |  7 ++
 ...ingCommandNode.java => BranchingNode.java} |  8 +-
 .../me/aurium/beetle/branch/nodes/Frame.java  |  4 +
 .../beetle/branch/nodes/SingleFrame.java      |  9 +++
 .../beetle/branch/nodes/SingleFunc.java       |  7 ++
 ...SingleCommandNode.java => SingleNode.java} |  4 +-
 22 files changed, 409 insertions(+), 130 deletions(-)
 rename core/src/main/java/me/aurium/beetle/branch/{AlreadyStoredHashSet.java => PreStoredHashSet.java} (53%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/BuilderFunction.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/CentralBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/CommandableBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/FrameBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/NodeBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/SplittableBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/SplittableFrameBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/SplittableLaunchPoint.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/newnode/NewBaseMap.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFrame.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFunc.java
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{BranchingCommandNode.java => BranchingNode.java} (82%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/Frame.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/SingleFrame.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/SingleFunc.java
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{SingleCommandNode.java => SingleNode.java} (87%)

diff --git a/core/src/main/java/me/aurium/beetle/branch/AlreadyStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/PreStoredHashSet.java
similarity index 53%
rename from core/src/main/java/me/aurium/beetle/branch/AlreadyStoredHashSet.java
rename to core/src/main/java/me/aurium/beetle/branch/PreStoredHashSet.java
index e6f8771..49fb2cf 100644
--- a/core/src/main/java/me/aurium/beetle/branch/AlreadyStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/PreStoredHashSet.java
@@ -6,24 +6,29 @@
 /**
  * Represents a set that already has an element in it
  */
-public class AlreadyStoredHashSet<T> {
+public class PreStoredHashSet<T> {
 
     private T alreadyStored;
     private final Set<T> otherThingsInTheSet;
+    private final boolean linked;
 
     //fuck code in the constructor rules
     //i don't care
-    public AlreadyStoredHashSet(T alreadyStored) {
+    public PreStoredHashSet(T alreadyStored, boolean linked) {
         this.alreadyStored = alreadyStored;
         this.otherThingsInTheSet = new HashSet<>();
+        this.linked = linked;
     }
-
-    public AlreadyStoredHashSet(Set<T> set) {
+    public PreStoredHashSet(T alreadyStored, Set<T> set, boolean linked) {
+        this.alreadyStored = alreadyStored;
         this.otherThingsInTheSet = set;
+        this.linked = linked;
     }
 
-    public AlreadyStoredHashSet() {
-        this.otherThingsInTheSet = new HashSet<>();
+    public PreStoredHashSet(Set<T> set, boolean linked) {
+        this.alreadyStored = null;
+        this.otherThingsInTheSet = set;
+        this.linked = linked;
     }
 
     /**
@@ -31,14 +36,18 @@ public AlreadyStoredHashSet() {
      * @return an immutable collection of T
      */
     public Set<T> getContents() {
-        if (alreadyStored == null) {
-            return Set.copyOf(otherThingsInTheSet);
-        } else {
-            Set<T> set = new HashSet<>(otherThingsInTheSet);
+        if (linked) {
+            if (alreadyStored == null) {
+                return Set.copyOf(otherThingsInTheSet);
+            } else {
+                Set<T> set = new HashSet<>(otherThingsInTheSet);
 
-            set.add(alreadyStored);
+                set.add(alreadyStored);
 
-            return Set.copyOf(set);
+                return Set.copyOf(set);
+            }
+        } else {
+            return Set.copyOf(otherThingsInTheSet);
         }
     }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java
index af27b34..39f1fd7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java
@@ -1,42 +1,4 @@
 package me.aurium.beetle.branch.builders;
 
-import me.aurium.beetle.api.command.ContextSource;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.IndividualNode;
-import me.aurium.beetle.branch.bases.SimpleBase;
-import me.aurium.beetle.branch.nodes.BaseNode;
-import me.aurium.beetle.branch.nodes.BranchingCommandNode;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class BaseBuilder<T>{
-
-    private final ContextSource<T> contextSource;
-    private BaseNode<T> baseNode;
-
-    public BaseBuilder(ContextSource<T> contextSource) {
-        this.contextSource = contextSource;
-        this.baseNode = new BaseNode<>(contextSource);
-    }
-
-    public SplitMode<T> baseSplit(SplitBuilderFunction<T> function) {
-
-        SplittableBuilder<T> builder = new SplittableBuilder<>(base,base,contextSource);
-
-        function.consume(builder);
-
-        return new SplitMode<>(builder.build());
-    }
-
-    public static class SplitMode<T> {
-
-        private final BranchingCommandNode<T> baseNode;
-
-        public SplitMode(BranchingCommandNode<T> baseNode) {
-            this.baseNode = baseNode;
-        }
-
-    }
-
+public class BaseBuilder {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/BuilderFunction.java b/core/src/main/java/me/aurium/beetle/branch/builders/BuilderFunction.java
new file mode 100644
index 0000000..7b3eb8b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/BuilderFunction.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.builders;
+
+public interface BuilderFunction<T extends FrameBuilder<C>, C> {
+
+    void consume(T builder);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/CentralBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/CentralBuilder.java
new file mode 100644
index 0000000..cfb9372
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/CentralBuilder.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.builders;
+
+import me.aurium.beetle.api.command.ContextSource;
+import me.aurium.beetle.api.nodes.path.Block;
+import me.aurium.beetle.branch.nodes.BaseNode;
+
+public class CentralBuilder<T>  {
+
+    private final ContextSource<T> contextSource;
+    private final Block commandName;
+
+    public CentralBuilder(ContextSource<T> contextSource, Block commandName) {
+        this.contextSource = contextSource;
+        this.commandName = commandName;
+    }
+
+    public SplittableLaunchPoint<T> split(SplitBuilderFunction<T> function) {
+
+        SplittableFrameBuilder<T> builder = new SplittableFrameBuilder<T>(this,this,contextSource);
+
+        function.consume(builder);
+
+        return new SplittableLaunchPoint<T>(new BaseNode<T>(contextSource, builder.build(), commandName));
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/CommandableBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/CommandableBuilder.java
deleted file mode 100644
index 285a492..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/CommandableBuilder.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-/**
- * Wraps the BaseBuilder
- */
-public class CommandableBuilder {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/FrameBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/FrameBuilder.java
new file mode 100644
index 0000000..7c6ae7b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/FrameBuilder.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.builders;
+
+public interface FrameBuilder<T> {
+
+    FrameBuilder<T> getBase();
+    FrameBuilder<T> getParent();
+    FrameBuilder<T> getLinkedFrames();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/NodeBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/NodeBuilder.java
new file mode 100644
index 0000000..80db210
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/NodeBuilder.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.builders;
+
+import me.aurium.beetle.branch.CommandNode;
+
+public interface NodeBuilder<C extends CommandNode<T>, T> {
+
+    C build();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java b/core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java
index 25d3220..0327232 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java
@@ -2,6 +2,6 @@
 
 public interface SplitBuilderFunction<T> {
 
-    void consume(SplittableBuilder<T> builder);
+    void consume(SplittableFrameBuilder<T> builder);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SplittableBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/SplittableBuilder.java
deleted file mode 100644
index 1c22d25..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/SplittableBuilder.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-import me.aurium.beetle.api.command.ContextSource;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.IndividualNode;
-import me.aurium.beetle.branch.nodes.BaseNode;
-import me.aurium.beetle.branch.nodes.BranchingCommandNode;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class SplittableBuilder<T> {
-
-    private final ContextSource<T> source;
-    private final Set<CommandNode<T>> nodesToInsert;
-
-    private final BaseNode<T> base;
-    private final CommandNode<T> parent;
-
-    private IndividualNode<T> singleFunctionNode;
-
-    public SplittableBuilder(BaseNode<T> base, CommandNode<T> parent, ContextSource<T> source) {
-        this.source = source;
-        this.nodesToInsert = new HashSet<>();
-
-        this.base = base;
-        this.parent = parent;
-    }
-
-
-    public void addCustomNode(CommandNode<T> node) {
-        this.nodesToInsert.add(node);
-    }
-
-    public BranchingCommandNode<T> build() {
-
-        if (base == null || parent == null) {
-
-        } else {
-            new BranchingCommandNode<T>()
-        }
-
-
-
-
-        return null;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SplittableFrameBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/SplittableFrameBuilder.java
new file mode 100644
index 0000000..ac7cb3c
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/SplittableFrameBuilder.java
@@ -0,0 +1,75 @@
+package me.aurium.beetle.branch.builders;
+
+import me.aurium.beetle.api.command.ContextSource;
+import me.aurium.beetle.branch.PreStoredHashSet;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IndividualNode;
+import me.aurium.beetle.branch.nodes.BranchingNode;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class SplittableFrameBuilder<T> implements FrameBuilder<T> {
+
+    private final ContextSource<T> source;
+    private final Set<CommandNode<T>> nodesToInsert;
+
+    private final FrameBuilder<T> base;
+    private final FrameBuilder<T> parent;
+
+    private IndividualNode<T> singleFunctionNode;
+
+    private final Set<FrameBuilder<T>> frames = new HashSet<>();
+
+    public SplittableFrameBuilder(FrameBuilder<T> base, FrameBuilder<T> parent, ContextSource<T> source) {
+        this.source = source;
+        this.nodesToInsert = new HashSet<>();
+
+        this.base = base;
+        this.parent = parent;
+    }
+
+
+    public void addCustomNode(CommandNode<T> node) {
+        this.nodesToInsert.add(node);
+    }
+
+    public void addSplit(BuilderFunction<SplittableFrameBuilder<T>,T> function) {
+        SplittableFrameBuilder<T> builder = new SplittableFrameBuilder<T>(base,this,source);
+
+        function.consume(builder);
+
+        nodesToInsert.add(builder.build());
+    }
+
+    public BranchingNode<T> build() {
+
+        PreStoredHashSet<CommandNode<T>> set;
+
+        if (singleFunctionNode == null) {
+            set = new PreStoredHashSet<>(nodesToInsert);
+        } else {
+            set = new PreStoredHashSet<>(singleFunctionNode,nodesToInsert);
+        }
+
+
+        new BranchingNode<T>(set,fr)
+
+        return null;
+    }
+
+    @Override
+    public FrameBuilder<T> getBase() {
+        return base;
+    }
+
+    @Override
+    public FrameBuilder<T> getParent() {
+        return parent;
+    }
+
+    @Override
+    public FrameBuilder<T> getLinkedFrames() {
+        return null;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SplittableLaunchPoint.java b/core/src/main/java/me/aurium/beetle/branch/builders/SplittableLaunchPoint.java
new file mode 100644
index 0000000..bee417c
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/SplittableLaunchPoint.java
@@ -0,0 +1,51 @@
+package me.aurium.beetle.branch.builders;
+
+import me.aurium.beetle.api.command.ContextSource;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.nodes.BaseNode;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class SplittableLaunchPoint<T> implements FrameBuilder<T> {
+
+    private final BaseNode<T> baseNode;
+    private final Set<FrameBuilder<T>> builderSet;
+    private final ContextSource<T> contextSource;
+
+    public SplittableLaunchPoint(BaseNode<T> baseNode, ContextSource<T> source) {
+        this.baseNode = baseNode;
+        this.builderSet = new HashSet<>();
+        this.contextSource = source;
+    }
+
+    public SplittableLaunchPoint<T> split(BuilderFunction<SplittableFrameBuilder<T>,T> function) {
+        SplittableFrameBuilder<T> builder = new SplittableFrameBuilder<>(this,this,contextSource);
+
+        function.consume(builder);
+
+        builderSet.add(builder);
+
+        return this;
+    }
+
+    //public SplittableLaunchPoint<T> single(BuilderFunction<>)
+
+    public CommandNode<T> build() {
+
+
+
+
+    }
+
+
+    @Override
+    public FrameBuilder<T> getBase() {
+        return this;
+    }
+
+    @Override
+    public FrameBuilder<T> getParent() {
+        return this;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/newnode/NewBaseMap.java b/core/src/main/java/me/aurium/beetle/branch/newnode/NewBaseMap.java
new file mode 100644
index 0000000..2de7b34
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/newnode/NewBaseMap.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.newnode;
+
+public class NewBaseMap {
+
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingBuilder.java
new file mode 100644
index 0000000..8ae93d0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingBuilder.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.newnode;
+
+public class NewBranchingBuilder {
+
+    public NewBranchingBuilder()
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingNode.java
new file mode 100644
index 0000000..1ff4fef
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingNode.java
@@ -0,0 +1,66 @@
+package me.aurium.beetle.branch.newnode;
+
+import me.aurium.beetle.api.command.ContextHandler;
+import me.aurium.beetle.api.nodes.path.Block;
+import me.aurium.beetle.api.nodes.path.BlockPath;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.PreStoredHashSet;
+
+import java.util.Collection;
+import java.util.Optional;
+
+public class NewBranchingNode<T> implements CommandNode<T> {
+
+    private PreStoredHashSet<CommandNode<T>> nodes;
+    private final CommandNode<T> root;
+    private final CommandNode<T> parent;
+    private final Block path;
+
+    public NewBranchingNode(CommandNode<T> root, CommandNode<T> parent, Block path) {
+        this.root = root;
+        this.parent = parent;
+        this.path = path;
+    }
+
+    @Override
+    public BlockPath getAbsolutePath() {
+        return parent.getAbsolutePath().resolve(path);
+    }
+
+    @Override
+    public Block getShortPath() {
+        return path;
+    }
+
+    @Override
+    public CommandNode<T> getRoot() {
+        return root;
+    }
+
+    @Override
+    public CommandNode<T> getParent() {
+        return parent;
+    }
+
+    @Override
+    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
+        for (CommandNode<T> node : this.getLinkedNodes()) {
+            if (blockPath.startsWith(node.getShortPath())) {
+                return node.getSpecificNode(blockPath);
+            }
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    public Collection<CommandNode<T>> getLinkedNodes() {
+        return nodes.getContents();
+    }
+
+    @Override
+    public ContextHandler<T> getContextHandler() {
+        return nodes.getAlreadyStored().getContextHandler();
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java
index bd172ce..d2fea43 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java
@@ -4,20 +4,27 @@
 import me.aurium.beetle.api.command.ContextSource;
 import me.aurium.beetle.api.nodes.path.Block;
 import me.aurium.beetle.api.nodes.path.BlockPath;
-import me.aurium.beetle.branch.AlreadyStoredHashSet;
 import me.aurium.beetle.branch.CommandNode;
 
 import java.util.Collection;
 import java.util.Optional;
 
+/**
+ * Node representing literally the command itself
+ *
+ * If you were to lay it out, it would be like
+ * /kitpvp join
+ *
+ * @param <T>
+ */
 public class BaseNode<T> implements CommandNode<T> {
 
-    private final AlreadyStoredHashSet<CommandNode<T>> set;
     private final ContextSource<T> source;
+    private final Block commandIdentifier;
 
-    public BaseNode(ContextSource<T> source, AlreadyStoredHashSet<CommandNode<T>> nodes)  {
-        this.set = nodes;
+    public BaseNode(ContextSource<T> source, CommandNode<T> delegate, Block commandIdentifier)  {
         this.source = source;
+        this.commandIdentifier = commandIdentifier;
     }
 
     @Override
@@ -27,12 +34,15 @@ public ContextHandler<T> getContextHandler() {
 
     @Override
     public BlockPath getAbsolutePath() {
-        return null;
+        // FIXME: 3/12/21 This entire class will not work because the
+        // FIXME: 3/12/21 utils produce a blockpath from the args **ALONE**. The utils must produce a blockpath from command
+        // FIXME: 3/12/21 NOT ALIAS + args
+        return getShortPath().asSingleBlockpath();
     }
 
     @Override
     public Block getShortPath() {
-        return null;
+        return commandIdentifier;
     }
 
     @Override
@@ -47,7 +57,7 @@ public CommandNode<T> getParent() {
 
     @Override
     public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
-        return getSpecificNode(blockPath);
+        return null
     }
 
     @Override
@@ -55,13 +65,4 @@ public Collection<CommandNode<T>> getLinkedNodes() {
         return null;
     }
 
-    public static class Assembly {
-        public static <T> BaseNode<T> of(ContextSource<T> source, AlreadyStoredHashSet<CommandNode<T>> nodes) {
-            return new BaseNode<>(source,nodes);
-        }
-
-        public static <T> BaseNode<T> of(ContextSource<T> source, CommandNode<T> singleNode) {
-            return new BaseNode<>(source,new AlreadyStoredHashSet<>(singleNode));
-        }
-    }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFrame.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFrame.java
new file mode 100644
index 0000000..6195b2f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFrame.java
@@ -0,0 +1,78 @@
+package me.aurium.beetle.branch.nodes;
+
+import me.aurium.beetle.api.nodes.path.Block;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.PreStoredHashSet;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class BranchingFrame<T> implements Frame<T> {
+
+    private boolean linked;
+    private final Set<Frame<T>> builders;
+    private SingleFrame<T> noArgs;
+
+    private final Frame<T> parent;
+    private final Frame<T> root;
+
+    public BranchingFrame(Frame<T> parent, Frame<T> root) {
+        linked = true;
+        builders = new HashSet<>();
+        noArgs = null;
+
+        this.root = root;
+        this.parent = parent;
+    }
+
+    public BranchingFrame<T> branch(Block identifier, BranchingFunc<T> func) {
+        BranchingFrame<T> frame = new BranchingFrame<T>(parent,root); //this doesnt work because the real parent (or what will be built from **this** builder doesn't exist yet (hasn't been built).
+
+        func.accept(frame);
+
+        this.builders.add(frame);
+
+        return this;
+    }
+
+    public BranchingFrame<T> single(Block identifier, SingleFunc<T> func) {
+        SingleFrame<T> frame = new SingleFrame<>();
+
+        func.accept(frame);
+
+        this.builders.add(frame);
+
+        return this;
+    }
+
+    public BranchingFrame<T> noArgs(Block identifier, SingleFunc<T> func, boolean linked) {
+        SingleFrame<T> frame = new SingleFrame<>();
+
+        func.accept(frame);
+
+        if (linked) {
+
+        }
+
+        return this;
+    }
+
+    public BranchingNode<T> build() {
+
+        //maybe something like having all the above factories built instantly on initialize?
+        // but then the problem of branchingnode requiring its nodes on construction still remains
+
+        PreStoredHashSet<CommandNode<T>> set;
+
+        if (noArgs == null) {
+            set = new PreStoredHashSet<>(nodes, false);
+        } else {
+            set = new PreStoredHashSet<>(noArgs,nodes,linked);
+        }
+
+        new BranchingNode<T>()
+
+        return new BranchingNode<>(set,root,parent,par)
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFunc.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFunc.java
new file mode 100644
index 0000000..8cfb32f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFunc.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.nodes;
+
+public interface BranchingFunc<T> {
+
+    void accept(BranchingFrame<T> frame);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingCommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
similarity index 82%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/BranchingCommandNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index d69b2e0..34b842a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingCommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -3,20 +3,20 @@
 import me.aurium.beetle.api.command.ContextHandler;
 import me.aurium.beetle.api.nodes.path.Block;
 import me.aurium.beetle.api.nodes.path.BlockPath;
-import me.aurium.beetle.branch.AlreadyStoredHashSet;
+import me.aurium.beetle.branch.PreStoredHashSet;
 import me.aurium.beetle.branch.CommandNode;
 
 import java.util.Collection;
 import java.util.Optional;
 
-public class BranchingCommandNode<T> implements CommandNode<T> {
+public class BranchingNode<T> implements CommandNode<T> {
 
-    private final AlreadyStoredHashSet<CommandNode<T>> nodes;
+    private final PreStoredHashSet<CommandNode<T>> nodes;
     private final CommandNode<T> root;
     private final CommandNode<T> parent;
     private final Block path;
 
-    public BranchingCommandNode(AlreadyStoredHashSet<CommandNode<T>> nodes, CommandNode<T> root, CommandNode<T> parent, Block path) {
+    public BranchingNode(PreStoredHashSet<CommandNode<T>> nodes, CommandNode<T> root, CommandNode<T> parent, Block path) {
         this.nodes = nodes;
         this.root = root;
         this.parent = parent;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/Frame.java b/core/src/main/java/me/aurium/beetle/branch/nodes/Frame.java
new file mode 100644
index 0000000..a66821d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/Frame.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes;
+
+public interface Frame<T> {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFrame.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFrame.java
new file mode 100644
index 0000000..4f0edb2
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFrame.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.nodes;
+
+public class SingleFrame<T> implements Frame<T> {
+
+    public SingleNode<T> build() {
+        return null;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFunc.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFunc.java
new file mode 100644
index 0000000..fe7402b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFunc.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.nodes;
+
+public interface SingleFunc<T> {
+
+    void accept(SingleFrame<T> frame);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleCommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/SingleCommandNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index c0195a3..81ad05c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleCommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -10,14 +10,14 @@
 import java.util.Collections;
 import java.util.Optional;
 
-public class SingleCommandNode<T> implements IndividualNode<T> {
+public class SingleNode<T> implements IndividualNode<T> {
 
     private final CommandNode<T> root;
     private final CommandNode<T> parent;
     private final Block identifier;
     private final ContextHandler<T> handler;
 
-    public SingleCommandNode(CommandNode<T> root, CommandNode<T> parent, Block identifier, ContextHandler<T> contextHandler) {
+    public SingleNode(CommandNode<T> root, CommandNode<T> parent, Block identifier, ContextHandler<T> contextHandler) {
         this.root = root;
         this.parent = parent;
         this.identifier = identifier;

From be05173e9c1e8223212660ceb447f7f138956929 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Fri, 12 Mar 2021 18:28:23 -0700
Subject: [PATCH 03/56] prechanges commit

---
 .../me/aurium/beetle/branch/CommandNode.java  | 20 +++--
 .../beetle/branch/bases/CommandableBase.java  | 59 --------------
 .../aurium/beetle/branch/bases/Example.java   | 19 +++++
 .../beetle/branch/bases/SimpleBase.java       | 39 ----------
 .../beetle/branch/builders/BaseBuilder.java   |  4 -
 .../branch/builders/BuilderFunction.java      |  7 --
 .../branch/builders/CentralBuilder.java       | 27 -------
 .../beetle/branch/builders/FrameBuilder.java  |  9 ---
 .../beetle/branch/builders/NodeBuilder.java   |  9 ---
 .../branch/builders/SplitBuilderFunction.java |  7 --
 .../builders/SplittableFrameBuilder.java      | 75 ------------------
 .../builders/SplittableLaunchPoint.java       | 51 ------------
 .../beetle/branch/newnode/NewBaseMap.java     |  7 --
 .../branch/newnode/NewBranchingBuilder.java   |  7 --
 .../branch/newnode/NewBranchingNode.java      | 66 ----------------
 .../aurium/beetle/branch/nodes/BaseNode.java  | 26 ++++++-
 .../beetle/branch/nodes/BranchingFrame.java   | 78 -------------------
 .../beetle/branch/nodes/BranchingFunc.java    |  7 --
 .../beetle/branch/nodes/BranchingNode.java    | 37 +++++++++
 .../me/aurium/beetle/branch/nodes/Frame.java  |  4 -
 .../beetle/branch/nodes/SingleFrame.java      |  9 ---
 .../beetle/branch/nodes/SingleFunc.java       |  7 --
 .../beetle/branch/nodes/SingleNode.java       | 54 +++++++++----
 23 files changed, 135 insertions(+), 493 deletions(-)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/bases/CommandableBase.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/bases/Example.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/bases/SimpleBase.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/BuilderFunction.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/CentralBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/FrameBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/NodeBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/SplittableFrameBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/SplittableLaunchPoint.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/newnode/NewBaseMap.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFrame.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFunc.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/Frame.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/SingleFrame.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/SingleFunc.java

diff --git a/core/src/main/java/me/aurium/beetle/branch/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
index 262e784..98f6121 100644
--- a/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
@@ -1,9 +1,19 @@
 package me.aurium.beetle.branch;
 
+import me.aurium.beetle.api.block.path.Block;
+import me.aurium.beetle.api.block.path.BlockPath;
 import me.aurium.beetle.api.command.ContextHandler;
-import me.aurium.beetle.api.nodes.Node;
 
-public interface CommandNode<T> extends Node<CommandNode<T>> {
+import java.util.Collection;
+import java.util.Optional;
+
+public interface CommandNode<T> {
+
+    Block getIdentifier();
+
+    Optional<T> getSpecificNode(BlockPath path);
+
+    Collection<T> getLinkedNodes();
 
     /**
      * Represents the context handler to be used if there are no args or args are incorrect
@@ -11,8 +21,8 @@ public interface CommandNode<T> extends Node<CommandNode<T>> {
      */
     ContextHandler<T> getContextHandler();
 
-    //TODO tabcompleteHandler
-    //TabContextHandler<T> getSpecificTabHandler(BlockPath path);
-    //TabContextHandler<T> getTabHandler(); //tabhandler (probably just return this.id)
+    /*TODO tabcompleteHandler
+    TabContextHandler<T> getSpecificTabHandler(BlockPath path);
+    TabContextHandler<T> getTabHandler(); //tabhandler (probably just return this.id)*/
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/bases/CommandableBase.java b/core/src/main/java/me/aurium/beetle/branch/bases/CommandableBase.java
deleted file mode 100644
index f6de8cf..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/bases/CommandableBase.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package me.aurium.beetle.branch.bases;
-
-import me.aurium.beetle.api.command.Command;
-import me.aurium.beetle.api.command.ContextSource;
-import me.aurium.beetle.branch.CommandNode;
-
-import java.util.Collection;
-
-public class CommandableBase<T> extends SimpleBase<T> implements Command<T> {
-
-    private final String name;
-    private final String permission;
-    private final ContextSource<T> source;
-
-    public CommandableBase(CommandNode<T> node, String name, String permission, ContextSource<T> source) {
-        super(node);
-        this.name = name;
-        this.permission = permission;
-        this.source = source;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public String getPermission() {
-        return permission;
-    }
-
-    @Override
-    public boolean execute(T t, String s, String[] strings) {
-
-        this.handleContext(source.context(t,s,strings));
-
-        return true;
-    }
-
-    @Override
-    public Collection<String> getAliases() {
-        return null;
-    }
-
-    @Override
-    public Collection<String> tabComplete(T sender, String alias, String[] args) {
-        return null;
-    }
-
-    @Override
-    public String getUsage() {
-        return null;
-    }
-
-    @Override
-    public String getDescription() {
-        return null;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/bases/Example.java b/core/src/main/java/me/aurium/beetle/branch/bases/Example.java
new file mode 100644
index 0000000..3ed8d7e
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/bases/Example.java
@@ -0,0 +1,19 @@
+package me.aurium.beetle.branch.bases;
+
+import me.aurium.beetle.api.nodes.impl.StringBlock;
+import me.aurium.beetle.branch.nodes.BaseNode;
+
+public class Example {
+
+    void s() {
+        new BaseNode<String>(null, StringBlock.of("kitpvp"))
+                .singleNode(builder -> {
+                    builder.setIdentifier(StringBlock.of("help"));
+                    builder.setHandler(content -> {
+                       System.out.println(content.getSender());
+                       return true;
+                    });
+                });
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/bases/SimpleBase.java b/core/src/main/java/me/aurium/beetle/branch/bases/SimpleBase.java
deleted file mode 100644
index 287e7dc..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/bases/SimpleBase.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package me.aurium.beetle.branch.bases;
-
-import me.aurium.beetle.api.command.Context;
-import me.aurium.beetle.api.command.ContextHandler;
-import me.aurium.beetle.api.nodes.impl.StringBlockPath;
-import me.aurium.beetle.api.nodes.path.BlockPath;
-import me.aurium.beetle.branch.CommandBase;
-import me.aurium.beetle.branch.CommandNode;
-
-import java.util.Optional;
-
-/// FIXME: 3/10/21 I've discovered that a nodemap cannot be built with both it's parent and contents being set up correctly
-public class SimpleBase<T> implements CommandBase<T> {
-
-    private final CommandNode<T> baseNode;
-
-    public SimpleBase(CommandNode<T> baseNode) {
-        this.baseNode = baseNode;
-    }
-
-    @Override
-    public ContextHandler<T> getHandler(Context<T> context) {
-        BlockPath correctPath = StringBlockPath.of(context.getArgs());
-        Optional<CommandNode<T>> node = baseNode.getSpecificNode(correctPath);
-
-        if (node.isPresent()) {
-            return node.get().getContextHandler();
-        } else {
-            return baseNode.getContextHandler();
-        }
-    }
-
-    @Override
-    public void handleContext(Context<T> context) {
-        getHandler(context).handle(context);
-
-        return;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java
deleted file mode 100644
index 39f1fd7..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/BaseBuilder.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-public class BaseBuilder {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/BuilderFunction.java b/core/src/main/java/me/aurium/beetle/branch/builders/BuilderFunction.java
deleted file mode 100644
index 7b3eb8b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/BuilderFunction.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-public interface BuilderFunction<T extends FrameBuilder<C>, C> {
-
-    void consume(T builder);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/CentralBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/CentralBuilder.java
deleted file mode 100644
index cfb9372..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/CentralBuilder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-import me.aurium.beetle.api.command.ContextSource;
-import me.aurium.beetle.api.nodes.path.Block;
-import me.aurium.beetle.branch.nodes.BaseNode;
-
-public class CentralBuilder<T>  {
-
-    private final ContextSource<T> contextSource;
-    private final Block commandName;
-
-    public CentralBuilder(ContextSource<T> contextSource, Block commandName) {
-        this.contextSource = contextSource;
-        this.commandName = commandName;
-    }
-
-    public SplittableLaunchPoint<T> split(SplitBuilderFunction<T> function) {
-
-        SplittableFrameBuilder<T> builder = new SplittableFrameBuilder<T>(this,this,contextSource);
-
-        function.consume(builder);
-
-        return new SplittableLaunchPoint<T>(new BaseNode<T>(contextSource, builder.build(), commandName));
-    }
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/FrameBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/FrameBuilder.java
deleted file mode 100644
index 7c6ae7b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/FrameBuilder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-public interface FrameBuilder<T> {
-
-    FrameBuilder<T> getBase();
-    FrameBuilder<T> getParent();
-    FrameBuilder<T> getLinkedFrames();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/NodeBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/NodeBuilder.java
deleted file mode 100644
index 80db210..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/NodeBuilder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-import me.aurium.beetle.branch.CommandNode;
-
-public interface NodeBuilder<C extends CommandNode<T>, T> {
-
-    C build();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java b/core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java
deleted file mode 100644
index 0327232..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/SplitBuilderFunction.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-public interface SplitBuilderFunction<T> {
-
-    void consume(SplittableFrameBuilder<T> builder);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SplittableFrameBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/SplittableFrameBuilder.java
deleted file mode 100644
index ac7cb3c..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/SplittableFrameBuilder.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-import me.aurium.beetle.api.command.ContextSource;
-import me.aurium.beetle.branch.PreStoredHashSet;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.IndividualNode;
-import me.aurium.beetle.branch.nodes.BranchingNode;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class SplittableFrameBuilder<T> implements FrameBuilder<T> {
-
-    private final ContextSource<T> source;
-    private final Set<CommandNode<T>> nodesToInsert;
-
-    private final FrameBuilder<T> base;
-    private final FrameBuilder<T> parent;
-
-    private IndividualNode<T> singleFunctionNode;
-
-    private final Set<FrameBuilder<T>> frames = new HashSet<>();
-
-    public SplittableFrameBuilder(FrameBuilder<T> base, FrameBuilder<T> parent, ContextSource<T> source) {
-        this.source = source;
-        this.nodesToInsert = new HashSet<>();
-
-        this.base = base;
-        this.parent = parent;
-    }
-
-
-    public void addCustomNode(CommandNode<T> node) {
-        this.nodesToInsert.add(node);
-    }
-
-    public void addSplit(BuilderFunction<SplittableFrameBuilder<T>,T> function) {
-        SplittableFrameBuilder<T> builder = new SplittableFrameBuilder<T>(base,this,source);
-
-        function.consume(builder);
-
-        nodesToInsert.add(builder.build());
-    }
-
-    public BranchingNode<T> build() {
-
-        PreStoredHashSet<CommandNode<T>> set;
-
-        if (singleFunctionNode == null) {
-            set = new PreStoredHashSet<>(nodesToInsert);
-        } else {
-            set = new PreStoredHashSet<>(singleFunctionNode,nodesToInsert);
-        }
-
-
-        new BranchingNode<T>(set,fr)
-
-        return null;
-    }
-
-    @Override
-    public FrameBuilder<T> getBase() {
-        return base;
-    }
-
-    @Override
-    public FrameBuilder<T> getParent() {
-        return parent;
-    }
-
-    @Override
-    public FrameBuilder<T> getLinkedFrames() {
-        return null;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SplittableLaunchPoint.java b/core/src/main/java/me/aurium/beetle/branch/builders/SplittableLaunchPoint.java
deleted file mode 100644
index bee417c..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/SplittableLaunchPoint.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-import me.aurium.beetle.api.command.ContextSource;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.nodes.BaseNode;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class SplittableLaunchPoint<T> implements FrameBuilder<T> {
-
-    private final BaseNode<T> baseNode;
-    private final Set<FrameBuilder<T>> builderSet;
-    private final ContextSource<T> contextSource;
-
-    public SplittableLaunchPoint(BaseNode<T> baseNode, ContextSource<T> source) {
-        this.baseNode = baseNode;
-        this.builderSet = new HashSet<>();
-        this.contextSource = source;
-    }
-
-    public SplittableLaunchPoint<T> split(BuilderFunction<SplittableFrameBuilder<T>,T> function) {
-        SplittableFrameBuilder<T> builder = new SplittableFrameBuilder<>(this,this,contextSource);
-
-        function.consume(builder);
-
-        builderSet.add(builder);
-
-        return this;
-    }
-
-    //public SplittableLaunchPoint<T> single(BuilderFunction<>)
-
-    public CommandNode<T> build() {
-
-
-
-
-    }
-
-
-    @Override
-    public FrameBuilder<T> getBase() {
-        return this;
-    }
-
-    @Override
-    public FrameBuilder<T> getParent() {
-        return this;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/newnode/NewBaseMap.java b/core/src/main/java/me/aurium/beetle/branch/newnode/NewBaseMap.java
deleted file mode 100644
index 2de7b34..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/newnode/NewBaseMap.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.newnode;
-
-public class NewBaseMap {
-
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingBuilder.java
deleted file mode 100644
index 8ae93d0..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingBuilder.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.newnode;
-
-public class NewBranchingBuilder {
-
-    public NewBranchingBuilder()
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingNode.java
deleted file mode 100644
index 1ff4fef..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/newnode/NewBranchingNode.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package me.aurium.beetle.branch.newnode;
-
-import me.aurium.beetle.api.command.ContextHandler;
-import me.aurium.beetle.api.nodes.path.Block;
-import me.aurium.beetle.api.nodes.path.BlockPath;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.PreStoredHashSet;
-
-import java.util.Collection;
-import java.util.Optional;
-
-public class NewBranchingNode<T> implements CommandNode<T> {
-
-    private PreStoredHashSet<CommandNode<T>> nodes;
-    private final CommandNode<T> root;
-    private final CommandNode<T> parent;
-    private final Block path;
-
-    public NewBranchingNode(CommandNode<T> root, CommandNode<T> parent, Block path) {
-        this.root = root;
-        this.parent = parent;
-        this.path = path;
-    }
-
-    @Override
-    public BlockPath getAbsolutePath() {
-        return parent.getAbsolutePath().resolve(path);
-    }
-
-    @Override
-    public Block getShortPath() {
-        return path;
-    }
-
-    @Override
-    public CommandNode<T> getRoot() {
-        return root;
-    }
-
-    @Override
-    public CommandNode<T> getParent() {
-        return parent;
-    }
-
-    @Override
-    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
-        for (CommandNode<T> node : this.getLinkedNodes()) {
-            if (blockPath.startsWith(node.getShortPath())) {
-                return node.getSpecificNode(blockPath);
-            }
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    public Collection<CommandNode<T>> getLinkedNodes() {
-        return nodes.getContents();
-    }
-
-    @Override
-    public ContextHandler<T> getContextHandler() {
-        return nodes.getAlreadyStored().getContextHandler();
-    }
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java
index d2fea43..a0874ac 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java
@@ -5,6 +5,7 @@
 import me.aurium.beetle.api.nodes.path.Block;
 import me.aurium.beetle.api.nodes.path.BlockPath;
 import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.PreStoredHashSet;
 
 import java.util.Collection;
 import java.util.Optional;
@@ -13,7 +14,9 @@
  * Node representing literally the command itself
  *
  * If you were to lay it out, it would be like
- * /kitpvp join
+ * /kitpvp join val val
+ *
+ * BaseNode ValueSelectorNode ValueNode ValueNode
  *
  * @param <T>
  */
@@ -21,8 +24,9 @@ public class BaseNode<T> implements CommandNode<T> {
 
     private final ContextSource<T> source;
     private final Block commandIdentifier;
+    private CommandNode<T> delegate;
 
-    public BaseNode(ContextSource<T> source, CommandNode<T> delegate, Block commandIdentifier)  {
+    public BaseNode(ContextSource<T> source, Block commandIdentifier)  {
         this.source = source;
         this.commandIdentifier = commandIdentifier;
     }
@@ -57,7 +61,7 @@ public CommandNode<T> getParent() {
 
     @Override
     public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
-        return null
+        return null;
     }
 
     @Override
@@ -65,4 +69,20 @@ public Collection<CommandNode<T>> getLinkedNodes() {
         return null;
     }
 
+    //TODO move to builder style shit
+
+    public void setDelegate(SingleNode.BuilderConsumer<T> consumer) {
+        if (delegate != null) throw new IllegalStateException("Delegate already exists!");
+
+        SingleNode.Builder<T> builder = new SingleNode.Builder<>(this,this);
+
+        consumer.consume(builder);
+
+        delegate = builder.build();
+    }
+
+    public void setDelegate() {
+
+    }
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFrame.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFrame.java
deleted file mode 100644
index 6195b2f..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFrame.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-import me.aurium.beetle.api.nodes.path.Block;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.PreStoredHashSet;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class BranchingFrame<T> implements Frame<T> {
-
-    private boolean linked;
-    private final Set<Frame<T>> builders;
-    private SingleFrame<T> noArgs;
-
-    private final Frame<T> parent;
-    private final Frame<T> root;
-
-    public BranchingFrame(Frame<T> parent, Frame<T> root) {
-        linked = true;
-        builders = new HashSet<>();
-        noArgs = null;
-
-        this.root = root;
-        this.parent = parent;
-    }
-
-    public BranchingFrame<T> branch(Block identifier, BranchingFunc<T> func) {
-        BranchingFrame<T> frame = new BranchingFrame<T>(parent,root); //this doesnt work because the real parent (or what will be built from **this** builder doesn't exist yet (hasn't been built).
-
-        func.accept(frame);
-
-        this.builders.add(frame);
-
-        return this;
-    }
-
-    public BranchingFrame<T> single(Block identifier, SingleFunc<T> func) {
-        SingleFrame<T> frame = new SingleFrame<>();
-
-        func.accept(frame);
-
-        this.builders.add(frame);
-
-        return this;
-    }
-
-    public BranchingFrame<T> noArgs(Block identifier, SingleFunc<T> func, boolean linked) {
-        SingleFrame<T> frame = new SingleFrame<>();
-
-        func.accept(frame);
-
-        if (linked) {
-
-        }
-
-        return this;
-    }
-
-    public BranchingNode<T> build() {
-
-        //maybe something like having all the above factories built instantly on initialize?
-        // but then the problem of branchingnode requiring its nodes on construction still remains
-
-        PreStoredHashSet<CommandNode<T>> set;
-
-        if (noArgs == null) {
-            set = new PreStoredHashSet<>(nodes, false);
-        } else {
-            set = new PreStoredHashSet<>(noArgs,nodes,linked);
-        }
-
-        new BranchingNode<T>()
-
-        return new BranchingNode<>(set,root,parent,par)
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFunc.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFunc.java
deleted file mode 100644
index 8cfb32f..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingFunc.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-public interface BranchingFunc<T> {
-
-    void accept(BranchingFrame<T> frame);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 34b842a..670c0e7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -7,7 +7,9 @@
 import me.aurium.beetle.branch.CommandNode;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Optional;
+import java.util.Set;
 
 public class BranchingNode<T> implements CommandNode<T> {
 
@@ -62,4 +64,39 @@ public Collection<CommandNode<T>> getLinkedNodes() {
     public ContextHandler<T> getContextHandler() {
         return nodes.getAlreadyStored().getContextHandler();
     }
+
+    public static class Builder<T> {
+        private final CommandNode<T> root;
+        private final CommandNode<T> parent;
+
+        private Block block;
+
+        private Set<CommandNode<T>> commands;
+        private CommandNode<T> noArgs;
+
+        private boolean linked = false;
+
+        public Builder(CommandNode<T> root, CommandNode<T> parent) {
+            this.root = root;
+            this.parent = parent;
+            this.commands = new HashSet<>();
+        }
+
+        public BranchingNode<T> build() {
+
+            if (linked) {
+                if (noArgs == null) {
+                    throw new IllegalStateException("Cannot be linked with no noargs handler!");
+                } else {
+                    PreStoredHashSet<CommandNode<T>> set = new PreStoredHashSet<>(noArgs, commands, true);
+                }
+            } else {
+
+            }
+
+
+
+            return new BranchingNode<>()
+        }
+    }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/Frame.java b/core/src/main/java/me/aurium/beetle/branch/nodes/Frame.java
deleted file mode 100644
index a66821d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/Frame.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-public interface Frame<T> {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFrame.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFrame.java
deleted file mode 100644
index 4f0edb2..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFrame.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-public class SingleFrame<T> implements Frame<T> {
-
-    public SingleNode<T> build() {
-        return null;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFunc.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFunc.java
deleted file mode 100644
index fe7402b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleFunc.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-public interface SingleFunc<T> {
-
-    void accept(SingleFrame<T> frame);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index 81ad05c..5b5ed82 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -1,8 +1,8 @@
 package me.aurium.beetle.branch.nodes;
 
+import me.aurium.beetle.api.block.path.Block;
+import me.aurium.beetle.api.block.path.BlockPath;
 import me.aurium.beetle.api.command.ContextHandler;
-import me.aurium.beetle.api.nodes.path.Block;
-import me.aurium.beetle.api.nodes.path.BlockPath;
 import me.aurium.beetle.branch.CommandNode;
 import me.aurium.beetle.branch.IndividualNode;
 
@@ -12,28 +12,20 @@
 
 public class SingleNode<T> implements IndividualNode<T> {
 
-    private final CommandNode<T> root;
-    private final CommandNode<T> parent;
     private final Block identifier;
     private final ContextHandler<T> handler;
 
-    public SingleNode(CommandNode<T> root, CommandNode<T> parent, Block identifier, ContextHandler<T> contextHandler) {
-        this.root = root;
-        this.parent = parent;
+    public SingleNode(Block identifier, ContextHandler<T> contextHandler) {
         this.identifier = identifier;
         this.handler = contextHandler;
     }
 
     @Override
-    public BlockPath getAbsolutePath() {
-        return parent.getAbsolutePath().resolve(identifier);
-    }
-
-    @Override
-    public Block getShortPath() {
+    public Block getIdentifier() {
         return identifier;
     }
 
+/*
     @Override
     public CommandNode<T> getRoot() {
         return root;
@@ -43,6 +35,7 @@ public CommandNode<T> getRoot() {
     public CommandNode<T> getParent() {
         return parent;
     }
+*/
 
     @Override
     public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
@@ -58,4 +51,39 @@ public Collection<CommandNode<T>> getLinkedNodes() {
     public ContextHandler<T> getContextHandler() {
         return handler;
     }
+
+    public static class Builder<T> {
+
+        private final CommandNode<T> root;
+        private final CommandNode<T> parent;
+
+        private Block block;
+        private ContextHandler<T> contextHandler;
+
+        public Builder(CommandNode<T> root, CommandNode<T> parent) {
+            this.root = root;
+            this.parent = parent;
+        }
+
+        public Builder<T> setIdentifier(Block identifier) {
+            this.block = identifier;
+
+            return this;
+        }
+
+        public Builder<T> setHandler(ContextHandler<T> handler) {
+            this.contextHandler = handler;
+
+            return this;
+        }
+
+        public SingleNode<T> build() {
+            return new SingleNode<>(root,parent,block,contextHandler);
+        }
+
+    }
+
+    public interface BuilderConsumer<T> {
+        void consume(Builder<T> builder);
+    }
 }

From 1ccb51a6e6396f2e60ec9e961eb9fb39bbfb421e Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Wed, 17 Mar 2021 01:45:55 -0700
Subject: [PATCH 04/56] begin work on user friendliness

---
 .idea/jarRepositories.xml                     |   5 +
 core/pom.xml                                  |  18 +-
 .../aurium/beetle/branch/BranchCommand.java   |  18 ++
 .../java/me/aurium/beetle/branch/Builder.java |   9 +
 .../me/aurium/beetle/branch/CommandNode.java  |  20 +--
 .../aurium/beetle/branch/IndividualNode.java  |   7 -
 .../me/aurium/beetle/branch/TabCompleter.java |   4 +
 .../beetle/branch/adapter/ContextAdapter.java |  27 +++
 .../branch/adapter/ContextAdapterFactory.java |  15 ++
 .../branch/adapter/ContextHandlerAdapter.java |   7 +
 .../beetle/branch/adapter/ContextWrapper.java |  55 ++++++
 .../DelegatingContextAdapterFactory.java      |  33 ++++
 .../aurium/beetle/branch/base/BaseNode.java   |  40 +++++
 .../aurium/beetle/branch/bases/Example.java   |  19 --
 .../me/aurium/beetle/branch/block/Block.java  |  10 ++
 .../aurium/beetle/branch/block/BlockPath.java |  60 +++++++
 .../beetle/branch/block/StringBlock.java      |  36 ++++
 .../beetle/branch/block/StringBlockPath.java  | 170 ++++++++++++++++++
 .../examples/ExampleAbstractCommand.java      |  31 ++++
 .../launchpoints/AbstractBranchCommand.java   |  34 ++++
 .../aurium/beetle/branch/nodes/BaseNode.java  |  88 ---------
 .../beetle/branch/nodes/BranchingNode.java    | 102 -----------
 .../beetle/branch/nodes/SingleNode.java       |  89 ---------
 .../aurium/beetle/branch/nodes/ValueNode.java |   4 -
 .../branch/nodes/ValueSelectorNode.java       |   4 -
 .../nodes/branching/BranchingBuilder.java     |  89 +++++++++
 .../branch/nodes/branching/BranchingNode.java |  46 +++++
 .../branch/nodes/branching/CoolSumer.java     |   9 +
 .../branch/nodes/single/SingleBuilder.java    |  38 ++++
 .../branch/nodes/single/SingleNode.java       |  43 +++++
 .../beetle/branch/nodes/value/ValueNode.java  |   4 +
 .../branch/nodes/value/ValueSelectorNode.java |   4 +
 .../branch/{ => util}/PreStoredHashSet.java   |   2 +-
 33 files changed, 815 insertions(+), 325 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/BranchCommand.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/Builder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/IndividualNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/TabCompleter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/ContextHandlerAdapter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/base/BaseNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/bases/Example.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/block/Block.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/block/StringBlockPath.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/branching/CoolSumer.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueSelectorNode.java
 rename core/src/main/java/me/aurium/beetle/branch/{ => util}/PreStoredHashSet.java (97%)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 348c245..fb47437 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -31,5 +31,10 @@
       <option name="name" value="solar-releases" />
       <option name="url" value="https://mvn-repo.platinum-mc.com/releases" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="repsy" />
+      <option name="name" value="repsy" />
+      <option name="url" value="https://repo.repsy.io/mvn/elytraforce/default" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index a690dee..cf1aef2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,9 +20,25 @@
         <dependency>
             <groupId>me.aurium</groupId>
             <artifactId>beetle-core</artifactId>
-            <version>${core.version}</version>
+            <version>0.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.7.0</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/BranchCommand.java b/core/src/main/java/me/aurium/beetle/branch/BranchCommand.java
new file mode 100644
index 0000000..37e5c51
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/BranchCommand.java
@@ -0,0 +1,18 @@
+package me.aurium.beetle.branch;
+
+import me.aurium.beetle.api.command.Command;
+import me.aurium.beetle.api.command.ContextHandler;
+
+public interface BranchCommand<T> extends Command<T> {
+
+    CommandNode<T> getBaseNode();
+
+    default ContextHandler<T> noArgsMissingOrError() {
+        return (context) -> {
+            context.debugString("An error occurred while executing this command!");
+
+            return false;
+        };
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/Builder.java b/core/src/main/java/me/aurium/beetle/branch/Builder.java
new file mode 100644
index 0000000..de7ae82
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/Builder.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch;
+
+import me.aurium.beetle.branch.CommandNode;
+
+public interface Builder<C>{
+
+    CommandNode<C> build();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
index 98f6121..971133c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
@@ -1,8 +1,9 @@
 package me.aurium.beetle.branch;
 
-import me.aurium.beetle.api.block.path.Block;
-import me.aurium.beetle.api.block.path.BlockPath;
 import me.aurium.beetle.api.command.ContextHandler;
+import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
+import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.block.BlockPath;
 
 import java.util.Collection;
 import java.util.Optional;
@@ -10,18 +11,17 @@
 public interface CommandNode<T> {
 
     Block getIdentifier();
+    ContextHandlerAdapter<T> getContextHandler();
 
-    Optional<T> getSpecificNode(BlockPath path);
+    Optional<CommandNode<T>> getSpecificNode(BlockPath path);
+    Collection<CommandNode<T>> getLinkedNodes();
 
-    Collection<T> getLinkedNodes();
 
-    /**
-     * Represents the context handler to be used if there are no args or args are incorrect
-     * @return said contexthandler...
-     */
-    ContextHandler<T> getContextHandler();
 
-    /*TODO tabcompleteHandler
+
+
+
+    /* TODO tabcompleteHandler
     TabContextHandler<T> getSpecificTabHandler(BlockPath path);
     TabContextHandler<T> getTabHandler(); //tabhandler (probably just return this.id)*/
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/IndividualNode.java b/core/src/main/java/me/aurium/beetle/branch/IndividualNode.java
deleted file mode 100644
index 8aed887..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/IndividualNode.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch;
-
-/**
- * Represents something that is on it's own and has no other nodes after it
- */
-public interface IndividualNode<T> extends CommandNode<T> {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/TabCompleter.java b/core/src/main/java/me/aurium/beetle/branch/TabCompleter.java
new file mode 100644
index 0000000..5c6fa9f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/TabCompleter.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch;
+
+public interface TabCompleter {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
new file mode 100644
index 0000000..2016769
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.adapter;
+
+import me.aurium.beetle.api.command.Context;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.block.BlockPath;
+
+/**
+ * cum eternal
+ * @param <T> cum
+ */
+public interface ContextAdapter<T> {
+
+    CommandNode<T> getExecutedNode();
+    CommandNode<T> getBaseExecutedNode();
+
+    BlockPath executedPath();
+
+    //adapter
+
+    T getSender();
+    String getAlias();
+    String[] getArgs();
+    void debugString(String var1);
+
+    boolean equals(Object var1);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java
new file mode 100644
index 0000000..f1e1a6c
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java
@@ -0,0 +1,15 @@
+package me.aurium.beetle.branch.adapter;
+
+import me.aurium.beetle.api.command.Context;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.block.BlockPath;
+
+/**
+ * Produces context adapters, like the stock ContextSource for contexts.
+ */
+public interface ContextAdapterFactory<T> {
+
+    ContextAdapter<T> produce(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath path);
+    Context<T> context(T t, String alias, String[] strings);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextHandlerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextHandlerAdapter.java
new file mode 100644
index 0000000..4d0221c
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextHandlerAdapter.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.adapter;
+
+public interface ContextHandlerAdapter<T> {
+
+    void handle(ContextAdapter<T> adapter);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
new file mode 100644
index 0000000..20a36b4
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
@@ -0,0 +1,55 @@
+package me.aurium.beetle.branch.adapter;
+
+import me.aurium.beetle.api.command.Context;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.block.BlockPath;
+
+public class ContextWrapper<T> implements ContextAdapter<T> {
+
+    private final Context<T> context;
+    private final CommandNode<T> executedNode;
+    private final CommandNode<T> baseNode;
+    private final BlockPath executedPath;
+
+    public ContextWrapper(Context<T> context, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath) {
+        this.context = context;
+        this.executedNode = executedNode;
+        this.baseNode = baseNode;
+        this.executedPath = executedPath;
+    }
+
+    @Override
+    public CommandNode<T> getExecutedNode() {
+        return executedNode;
+    }
+
+    @Override
+    public CommandNode<T> getBaseExecutedNode() {
+        return baseNode;
+    }
+
+    @Override
+    public BlockPath executedPath() {
+        return executedPath;
+    }
+
+    @Override
+    public T getSender() {
+        return context.getSender();
+    }
+
+    @Override
+    public String getAlias() {
+        return context.getAlias();
+    }
+
+    @Override
+    public String[] getArgs() {
+        return context.getArgs();
+    }
+
+    @Override
+    public void debugString(String var1) {
+        context.debugString(var1);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java b/core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java
new file mode 100644
index 0000000..c44ccab
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java
@@ -0,0 +1,33 @@
+package me.aurium.beetle.branch.adapter;
+
+import me.aurium.beetle.api.command.Context;
+import me.aurium.beetle.api.command.ContextSource;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.block.BlockPath;
+
+/**
+ * UndeterministicImmutableModifiableContextAdapterFactoryPatternSelectorNodeContainerSource!
+ *
+ * I feel like a real dev now! /s
+ */
+public class DelegatingContextAdapterFactory<T> implements ContextAdapterFactory<T> {
+
+    public DelegatingContextAdapterFactory(ContextSource<T> delegate) {
+        this.delegate = delegate;
+    }
+
+    public final ContextSource<T> delegate;
+
+    @Override
+    public ContextAdapter<T> produce(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath path) {
+
+        Context<T> context = context(t,alias,strings);
+
+        return new ContextWrapper<>(context,executedNode,baseNode,path);
+    }
+
+    @Override
+    public Context<T> context(T t, String alias, String[] strings) {
+        return delegate.context(t,alias,strings);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/base/BaseNode.java b/core/src/main/java/me/aurium/beetle/branch/base/BaseNode.java
new file mode 100644
index 0000000..4cf84ef
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/base/BaseNode.java
@@ -0,0 +1,40 @@
+package me.aurium.beetle.branch.base;
+
+import me.aurium.beetle.api.command.ContextHandler;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.block.BlockPath;
+
+import java.util.Collection;
+import java.util.Optional;
+
+public class BaseNode<T> implements CommandNode<T> {
+
+    private final CommandNode<T> delegatingNode;
+    private final Block commandName;
+
+    public BaseNode(Block commandName, CommandNode<T> delegatingNode) {
+        this.delegatingNode = delegatingNode;
+        this.commandName = commandName;
+    }
+
+    @Override
+    public Block getIdentifier() {
+        return commandName;
+    }
+
+    @Override
+    public Optional<CommandNode<T>> getSpecificNode(BlockPath path) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Collection<CommandNode<T>> getLinkedNodes() {
+        return null;
+    }
+
+    @Override
+    public ContextHandler<T> getContextHandler() {
+        return null;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/bases/Example.java b/core/src/main/java/me/aurium/beetle/branch/bases/Example.java
deleted file mode 100644
index 3ed8d7e..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/bases/Example.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package me.aurium.beetle.branch.bases;
-
-import me.aurium.beetle.api.nodes.impl.StringBlock;
-import me.aurium.beetle.branch.nodes.BaseNode;
-
-public class Example {
-
-    void s() {
-        new BaseNode<String>(null, StringBlock.of("kitpvp"))
-                .singleNode(builder -> {
-                    builder.setIdentifier(StringBlock.of("help"));
-                    builder.setHandler(content -> {
-                       System.out.println(content.getSender());
-                       return true;
-                    });
-                });
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/Block.java b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
new file mode 100644
index 0000000..c5e74ab
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
@@ -0,0 +1,10 @@
+package me.aurium.beetle.branch.block;
+
+public interface Block {
+
+    String getIdentifier();
+    BlockPath asSingleBlockpath();
+
+    boolean equals(Object object);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
new file mode 100644
index 0000000..3b77335
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
@@ -0,0 +1,60 @@
+package me.aurium.beetle.branch.block;
+
+import java.util.List;
+
+public interface BlockPath {
+
+    boolean isSevered();
+    boolean endsWith(Block path);
+    boolean startsWith(Block path);
+
+    /**
+     * Gets a severed root blockpath at the base
+     * @return the severed root.
+     */
+    BlockPath getRoot();
+
+    /**
+     * Get a blockpath one above this path
+     * @return a cloned blockpath one above this
+     */
+    BlockPath getParent();
+
+    /**
+     * Adds all the blocks from a path
+     * @param path the path to add
+     * @return a cloned path plus all the blocks from that path
+     */
+    BlockPath resolve(BlockPath path);
+
+    /**
+     * Adds the block to this path
+     * @param block the block to add
+     * @return a cloned path plus that block
+     */
+    BlockPath resolve(Block block);
+
+    BlockPath withoutBase();
+
+    /**
+     * Starts at an index
+     * @param index the index to start from.
+     *
+     * Example: We are at some.cool.string and the fromIndex is 0
+     * Now the cloned path is cool.string
+     *
+     * @return the subpath
+     */
+    BlockPath fromIndex(int index);
+
+    int length();
+
+    /**
+     * Returns an ordered set of blocks
+     * @return ordered set of blocks
+     */
+    List<Block> getAllBlocks();
+
+    String toString();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
new file mode 100644
index 0000000..2ba9202
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
@@ -0,0 +1,36 @@
+package me.aurium.beetle.branch.block;
+public class StringBlock implements Block {
+
+    private final String identifier;
+
+    public StringBlock(String identifier) {
+        this.identifier = identifier;
+    }
+
+    @Override
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    @Override
+    public BlockPath asSingleBlockpath() {
+        return StringBlockPath.of(this);
+    }
+
+    public static Block of(String string) {
+        return new StringBlock(string);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        StringBlock that = (StringBlock) o;
+        return identifier.equalsIgnoreCase(that.identifier);
+    }
+
+    @Override
+    public int hashCode() {
+        return identifier.hashCode();
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/StringBlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/StringBlockPath.java
new file mode 100644
index 0000000..14429c5
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/block/StringBlockPath.java
@@ -0,0 +1,170 @@
+package me.aurium.beetle.branch.block;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class StringBlockPath implements BlockPath {
+
+    public final static String COMMON_SPLITTER = "-";
+
+    private final BlockPath root;
+    private final BlockPath parent;
+    private final LinkedList<Block> blocks;
+    private final boolean isSevered;
+    private final String splitter;
+
+    public StringBlockPath(BlockPath root, BlockPath parent, LinkedList<Block> blocks, boolean isSevered, String splitter) {
+        this.root = root;
+        this.parent = parent;
+        this.blocks = blocks;
+        this.isSevered = isSevered;
+        this.splitter = splitter;
+    }
+
+    public StringBlockPath(LinkedList<Block> list, boolean isSevered, String splitter) {
+        this.root = this;
+        this.parent = this;
+        this.blocks = list;
+        this.isSevered = isSevered;
+        this.splitter = splitter;
+    }
+
+    public StringBlockPath(String splitter) {
+        this.root = this;
+        this.parent = this;
+        this.blocks = new LinkedList<>();
+        this.isSevered = true;
+        this.splitter = splitter;
+    }
+
+    @Override
+    public boolean isSevered() {
+        return isSevered;
+    }
+
+    @Override
+    public boolean endsWith(Block path) {
+        return blocks.getLast().equals(path);
+    }
+
+    @Override
+    public boolean startsWith(Block path) {
+        return blocks.getFirst().equals(path);
+    }
+
+    @Override
+    public BlockPath getRoot() {
+        return root;
+    }
+
+    @Override
+    public BlockPath getParent() {
+        return parent;
+    }
+
+    @Override
+    public BlockPath resolve(BlockPath path) {
+
+        LinkedList<Block> pathblocks = this.blocks;
+
+        for (Block block : path.getAllBlocks()) {
+            pathblocks.addLast(block);
+        }
+
+        return new StringBlockPath(root,this,pathblocks,false,this.splitter);
+    }
+
+    @Override
+    public BlockPath resolve(Block block) {
+
+        LinkedList<Block> pathBlocks = this.blocks;
+
+        pathBlocks.addLast(block);
+
+        return new StringBlockPath(root,this,pathBlocks,false,this.splitter);
+    }
+
+    @Override
+    public BlockPath withoutBase() {
+        return fromIndex(0);
+    }
+
+    @Override
+    public BlockPath fromIndex(int index) {
+        LinkedList<Block> clone = new LinkedList<>(blocks.subList(index, blocks.size()));
+
+        return new StringBlockPath(clone.get(0).asSingleBlockpath(),this.parent,clone,clone.size() > 1,splitter);
+    }
+
+    @Override
+    public int length() {
+        return blocks.size();
+    }
+
+    @Override
+    public List<Block> getAllBlocks() {
+        return this.blocks;
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder base = new StringBuilder();
+
+        for (Block block : this.blocks) {
+            base.append(splitter).append(block.getIdentifier());
+        }
+
+
+        //TODO: fix this:
+        return base.toString();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        StringBlockPath that = (StringBlockPath) o;
+        return blocks.equals(that.blocks);
+    }
+
+    @Override
+    public int hashCode() {
+        return blocks.hashCode();
+    }
+
+
+    public static BlockPath of(String string, String splitter) {
+        String[] subparts = string.split(splitter);
+
+        return of(subparts,splitter);
+    }
+
+    public static BlockPath of(String[] commandArguments, String splitter) {
+        LinkedList<Block> blocklist = new LinkedList<>();
+
+        for (String s : commandArguments) {
+            blocklist.addLast(StringBlock.of(s));
+        }
+
+        return new StringBlockPath(blocklist,commandArguments.length > 1,splitter);
+    }
+
+    public static BlockPath of(Block block, String splitter) {
+        LinkedList<Block> send = new LinkedList<>();
+        send.addLast(block);
+        return new StringBlockPath(send,true,splitter);
+    }
+
+    public static BlockPath of(String string) {
+        return of(string,COMMON_SPLITTER);
+    }
+
+    public static BlockPath of(String[] commandArguments) {
+        return of(commandArguments,COMMON_SPLITTER);
+    }
+
+    public static BlockPath of(Block block) {
+        return of(block,COMMON_SPLITTER);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java b/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
new file mode 100644
index 0000000..56d3454
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
@@ -0,0 +1,31 @@
+package me.aurium.beetle.branch.examples;
+
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
+import me.aurium.beetle.branch.block.StringBlock;
+import me.aurium.beetle.branch.launchpoints.AbstractBranchCommand;
+import me.aurium.beetle.branch.nodes.branching.BranchingBuilder;
+import me.aurium.beetle.branch.nodes.single.SingleBuilder;
+
+public class ExampleAbstractCommand extends AbstractBranchCommand<String> {
+
+    public ExampleAbstractCommand(ContextAdapterFactory<String> factory) {
+        super(factory);
+    }
+
+    @Override
+    public CommandNode<String> getBaseNode() {
+        return new BranchingBuilder<String>()
+                .withBuilder(BranchingBuilder.make()).build();
+    }
+
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public String getPermission() {
+        return null;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
new file mode 100644
index 0000000..73f5fa3
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
@@ -0,0 +1,34 @@
+package me.aurium.beetle.branch.launchpoints;
+
+import me.aurium.beetle.branch.BranchCommand;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.adapter.ContextAdapter;
+import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.block.StringBlockPath;
+
+public abstract class AbstractBranchCommand<T> implements BranchCommand<T> {
+
+    private final ContextAdapterFactory<T> factory;
+
+    protected AbstractBranchCommand(ContextAdapterFactory<T> factory) {
+        this.factory = factory;
+    }
+
+    @Override
+    public boolean execute(T t, String s, String[] strings) {
+
+        BlockPath path = StringBlockPath.of(strings);
+        CommandNode<T> baseNode = getBaseNode();
+
+        baseNode.getSpecificNode(path).ifPresentOrElse(node -> {
+            ContextAdapter<T> adapter = factory.produce(t,s,strings,node,baseNode,path);
+
+            node.getContextHandler().handle(adapter);
+        }, () -> {
+            noArgsMissingOrError().handle(factory.context(t,s,strings));
+        });
+
+        return true;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java
deleted file mode 100644
index a0874ac..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BaseNode.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-import me.aurium.beetle.api.command.ContextHandler;
-import me.aurium.beetle.api.command.ContextSource;
-import me.aurium.beetle.api.nodes.path.Block;
-import me.aurium.beetle.api.nodes.path.BlockPath;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.PreStoredHashSet;
-
-import java.util.Collection;
-import java.util.Optional;
-
-/**
- * Node representing literally the command itself
- *
- * If you were to lay it out, it would be like
- * /kitpvp join val val
- *
- * BaseNode ValueSelectorNode ValueNode ValueNode
- *
- * @param <T>
- */
-public class BaseNode<T> implements CommandNode<T> {
-
-    private final ContextSource<T> source;
-    private final Block commandIdentifier;
-    private CommandNode<T> delegate;
-
-    public BaseNode(ContextSource<T> source, Block commandIdentifier)  {
-        this.source = source;
-        this.commandIdentifier = commandIdentifier;
-    }
-
-    @Override
-    public ContextHandler<T> getContextHandler() {
-        return null;
-    }
-
-    @Override
-    public BlockPath getAbsolutePath() {
-        // FIXME: 3/12/21 This entire class will not work because the
-        // FIXME: 3/12/21 utils produce a blockpath from the args **ALONE**. The utils must produce a blockpath from command
-        // FIXME: 3/12/21 NOT ALIAS + args
-        return getShortPath().asSingleBlockpath();
-    }
-
-    @Override
-    public Block getShortPath() {
-        return commandIdentifier;
-    }
-
-    @Override
-    public CommandNode<T> getRoot() {
-        return this;
-    }
-
-    @Override
-    public CommandNode<T> getParent() {
-        return this;
-    }
-
-    @Override
-    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
-        return null;
-    }
-
-    @Override
-    public Collection<CommandNode<T>> getLinkedNodes() {
-        return null;
-    }
-
-    //TODO move to builder style shit
-
-    public void setDelegate(SingleNode.BuilderConsumer<T> consumer) {
-        if (delegate != null) throw new IllegalStateException("Delegate already exists!");
-
-        SingleNode.Builder<T> builder = new SingleNode.Builder<>(this,this);
-
-        consumer.consume(builder);
-
-        delegate = builder.build();
-    }
-
-    public void setDelegate() {
-
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
deleted file mode 100644
index 670c0e7..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-import me.aurium.beetle.api.command.ContextHandler;
-import me.aurium.beetle.api.nodes.path.Block;
-import me.aurium.beetle.api.nodes.path.BlockPath;
-import me.aurium.beetle.branch.PreStoredHashSet;
-import me.aurium.beetle.branch.CommandNode;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-
-public class BranchingNode<T> implements CommandNode<T> {
-
-    private final PreStoredHashSet<CommandNode<T>> nodes;
-    private final CommandNode<T> root;
-    private final CommandNode<T> parent;
-    private final Block path;
-
-    public BranchingNode(PreStoredHashSet<CommandNode<T>> nodes, CommandNode<T> root, CommandNode<T> parent, Block path) {
-        this.nodes = nodes;
-        this.root = root;
-        this.parent = parent;
-        this.path = path;
-    }
-
-    @Override
-    public BlockPath getAbsolutePath() {
-        return parent.getAbsolutePath().resolve(path);
-    }
-
-    @Override
-    public Block getShortPath() {
-        return path;
-    }
-
-    @Override
-    public CommandNode<T> getRoot() {
-        return root;
-    }
-
-    @Override
-    public CommandNode<T> getParent() {
-        return parent;
-    }
-
-    @Override
-    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
-        for (CommandNode<T> node : this.getLinkedNodes()) {
-            if (blockPath.startsWith(node.getShortPath())) {
-                return node.getSpecificNode(blockPath);
-            }
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    public Collection<CommandNode<T>> getLinkedNodes() {
-        return nodes.getContents();
-    }
-
-    @Override
-    public ContextHandler<T> getContextHandler() {
-        return nodes.getAlreadyStored().getContextHandler();
-    }
-
-    public static class Builder<T> {
-        private final CommandNode<T> root;
-        private final CommandNode<T> parent;
-
-        private Block block;
-
-        private Set<CommandNode<T>> commands;
-        private CommandNode<T> noArgs;
-
-        private boolean linked = false;
-
-        public Builder(CommandNode<T> root, CommandNode<T> parent) {
-            this.root = root;
-            this.parent = parent;
-            this.commands = new HashSet<>();
-        }
-
-        public BranchingNode<T> build() {
-
-            if (linked) {
-                if (noArgs == null) {
-                    throw new IllegalStateException("Cannot be linked with no noargs handler!");
-                } else {
-                    PreStoredHashSet<CommandNode<T>> set = new PreStoredHashSet<>(noArgs, commands, true);
-                }
-            } else {
-
-            }
-
-
-
-            return new BranchingNode<>()
-        }
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
deleted file mode 100644
index 5b5ed82..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-import me.aurium.beetle.api.block.path.Block;
-import me.aurium.beetle.api.block.path.BlockPath;
-import me.aurium.beetle.api.command.ContextHandler;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.IndividualNode;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-
-public class SingleNode<T> implements IndividualNode<T> {
-
-    private final Block identifier;
-    private final ContextHandler<T> handler;
-
-    public SingleNode(Block identifier, ContextHandler<T> contextHandler) {
-        this.identifier = identifier;
-        this.handler = contextHandler;
-    }
-
-    @Override
-    public Block getIdentifier() {
-        return identifier;
-    }
-
-/*
-    @Override
-    public CommandNode<T> getRoot() {
-        return root;
-    }
-
-    @Override
-    public CommandNode<T> getParent() {
-        return parent;
-    }
-*/
-
-    @Override
-    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
-        return Optional.of(this);
-    }
-
-    @Override
-    public Collection<CommandNode<T>> getLinkedNodes() {
-        return Collections.emptySet();
-    }
-
-    @Override
-    public ContextHandler<T> getContextHandler() {
-        return handler;
-    }
-
-    public static class Builder<T> {
-
-        private final CommandNode<T> root;
-        private final CommandNode<T> parent;
-
-        private Block block;
-        private ContextHandler<T> contextHandler;
-
-        public Builder(CommandNode<T> root, CommandNode<T> parent) {
-            this.root = root;
-            this.parent = parent;
-        }
-
-        public Builder<T> setIdentifier(Block identifier) {
-            this.block = identifier;
-
-            return this;
-        }
-
-        public Builder<T> setHandler(ContextHandler<T> handler) {
-            this.contextHandler = handler;
-
-            return this;
-        }
-
-        public SingleNode<T> build() {
-            return new SingleNode<>(root,parent,block,contextHandler);
-        }
-
-    }
-
-    public interface BuilderConsumer<T> {
-        void consume(Builder<T> builder);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java
deleted file mode 100644
index db460b9..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-public class ValueNode {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java
deleted file mode 100644
index 8b5cf78..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-public class ValueSelectorNode {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java
new file mode 100644
index 0000000..ae50aca
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java
@@ -0,0 +1,89 @@
+package me.aurium.beetle.branch.nodes.branching;
+
+import me.aurium.beetle.branch.Builder;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.nodes.single.SingleBuilder;
+import me.aurium.beetle.branch.util.PreStoredHashSet;
+import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.nodes.single.SingleNode;
+
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Consumer;
+
+public class BranchingBuilder<T> implements Builder<T> {
+
+    private final Set<CommandNode<T>> commands = new HashSet<>();
+
+    private Block block;
+    private CommandNode<T> noArgs;
+    private boolean linked;
+
+    public BranchingBuilder<T> withIdentifier(Block block) {
+        this.block = block;
+
+        return this;
+    }
+
+    public BranchingBuilder<T> single(Consumer<SingleBuilder<T>> consumer) {
+        SingleBuilder<T> builder = new SingleBuilder<>();
+
+        consumer.accept(builder);
+
+        this.commands.add(builder);
+
+        return null;
+    }
+
+    public <C extends Builder<T>> BranchingBuilder<T> withBuilder(Consumer<C> consumer) {
+        return null;
+    }
+
+
+    @Deprecated
+    public BranchingBuilder<T> withNode(CommandNode<T> commandNode) {
+        this.commands.add(commandNode);
+
+        return this;
+    }
+
+    @Deprecated
+    public BranchingBuilder<T> withBuilder(Builder<T> builder) {
+        this.commands.add(builder.build());
+
+        return this;
+    }
+
+    @Deprecated
+    public BranchingBuilder<T> withNoArgs(SingleNode<T> node, boolean linked) {
+        this.noArgs = node;
+        this.linked = linked;
+
+        return this;
+    }
+
+    @Override
+    public BranchingNode<T> build() {
+
+        Objects.requireNonNull(block);
+
+        PreStoredHashSet<CommandNode<T>> set;
+
+        if (noArgs == null) {
+            if (linked) {
+                throw new IllegalStateException("Attempted link without no-arguments handler!");
+            } else {
+                set = new PreStoredHashSet<>(commands,false);
+            }
+        } else {
+            set = new PreStoredHashSet<>(noArgs,commands,linked);
+        }
+
+        return new BranchingNode<>(set,block);
+    }
+
+    public static <C> BranchingBuilder<C> make() {
+        return new BranchingBuilder<>();
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingNode.java
new file mode 100644
index 0000000..1680486
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingNode.java
@@ -0,0 +1,46 @@
+package me.aurium.beetle.branch.nodes.branching;
+
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.util.PreStoredHashSet;
+import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
+import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.block.BlockPath;
+
+import java.util.*;
+
+public class BranchingNode<T> implements CommandNode<T> {
+
+    private final PreStoredHashSet<CommandNode<T>> nodes;
+    private final Block path;
+
+    public BranchingNode(PreStoredHashSet<CommandNode<T>> nodes, Block path) {
+        this.nodes = nodes;
+        this.path = path;
+    }
+
+    @Override
+    public Block getIdentifier() {
+        return path;
+    }
+
+    @Override
+    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
+        for (CommandNode<T> node : this.getLinkedNodes()) {
+            if (blockPath.startsWith(node.getIdentifier())) {
+                return node.getSpecificNode(blockPath.withoutBase());
+            }
+        }
+        return Optional.ofNullable(nodes.getAlreadyStored());
+    }
+
+    @Override
+    public Collection<CommandNode<T>> getLinkedNodes() {
+        return nodes.getContents();
+    }
+
+    @Override
+    public ContextHandlerAdapter<T> getContextHandler() {
+        return nodes.getAlreadyStored().getContextHandler();
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/CoolSumer.java b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/CoolSumer.java
new file mode 100644
index 0000000..d6ac2e2
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/CoolSumer.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.nodes.branching;
+
+import me.aurium.beetle.branch.Builder;
+
+public interface CoolSumer<T> {
+
+    <C extends Builder<T>> void cool(C builder);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java
new file mode 100644
index 0000000..b4a0210
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java
@@ -0,0 +1,38 @@
+package me.aurium.beetle.branch.nodes.single;
+
+import me.aurium.beetle.api.command.ContextHandler;
+import me.aurium.beetle.branch.Builder;
+import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
+import me.aurium.beetle.branch.block.Block;
+
+import java.util.Objects;
+
+public class SingleBuilder<T> implements Builder<T> {
+
+    private Block block;
+    private ContextHandlerAdapter<T> contextHandler;
+
+    public SingleBuilder<T> withIdentifier(Block identifier) {
+        this.block = identifier;
+
+        return this;
+    }
+
+    public SingleBuilder<T> withHandler(ContextHandlerAdapter<T> handler) {
+        this.contextHandler = handler;
+
+        return this;
+    }
+
+    public SingleNode<T> build() {
+        Objects.requireNonNull(block);
+        Objects.requireNonNull(contextHandler);
+
+        return new SingleNode<>(block, contextHandler);
+    }
+
+    public static SingleBuilder<?> of(boolean fancyBuilder) {
+        return null;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleNode.java
new file mode 100644
index 0000000..0c0c7f2
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleNode.java
@@ -0,0 +1,43 @@
+package me.aurium.beetle.branch.nodes.single;
+
+import me.aurium.beetle.api.command.ContextHandler;
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
+import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.block.BlockPath;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+
+public class SingleNode<T> implements CommandNode<T> {
+
+    private final Block identifier;
+    private final ContextHandlerAdapter<T> handler;
+
+    public SingleNode(Block identifier, ContextHandlerAdapter<T> contextHandler) {
+        this.identifier = identifier;
+        this.handler = contextHandler;
+    }
+
+    @Override
+    public Block getIdentifier() {
+        return identifier;
+    }
+
+    @Override
+    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
+        return Optional.of(this);
+    }
+
+    @Override
+    public Collection<CommandNode<T>> getLinkedNodes() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public ContextHandlerAdapter<T> getContextHandler() {
+        return handler;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueNode.java
new file mode 100644
index 0000000..06c0559
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueNode.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes.value;
+
+public class ValueNode {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueSelectorNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueSelectorNode.java
new file mode 100644
index 0000000..06fab3f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueSelectorNode.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes.value;
+
+public class ValueSelectorNode {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/PreStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
similarity index 97%
rename from core/src/main/java/me/aurium/beetle/branch/PreStoredHashSet.java
rename to core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
index 49fb2cf..1708058 100644
--- a/core/src/main/java/me/aurium/beetle/branch/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch;
+package me.aurium.beetle.branch.util;
 
 import java.util.HashSet;
 import java.util.Set;

From 8e6cbfe213f256227a83ddc27c89044c2ec0935b Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Wed, 17 Mar 2021 17:28:36 -0700
Subject: [PATCH 05/56] stupid type guaruntees through consumers :eye_roll:

---
 .../beetle/branch/adapter/BuilderFactory.java | 12 ++++
 .../beetle/branch/block/StringBlock.java      |  4 +-
 .../beetle/branch/{ => builder}/Builder.java  |  2 +-
 .../beetle/branch/builder/BuilderPair.java    |  7 +++
 .../examples/ExampleAbstractCommand.java      | 13 ++++-
 .../nodes/branching/BranchingBuilder.java     | 56 +++++++------------
 .../branch/nodes/branching/CoolSumer.java     |  9 ---
 .../beetle/branch/nodes/branching/Test.java   | 11 ++++
 .../branch/nodes/single/SingleBuilder.java    |  7 +--
 9 files changed, 67 insertions(+), 54 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java
 rename core/src/main/java/me/aurium/beetle/branch/{ => builder}/Builder.java (72%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builder/BuilderPair.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/branching/CoolSumer.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/branching/Test.java

diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java b/core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java
new file mode 100644
index 0000000..fd74411
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java
@@ -0,0 +1,12 @@
+package me.aurium.beetle.branch.adapter;
+
+import me.aurium.beetle.branch.nodes.branching.BranchingBuilder;
+import me.aurium.beetle.branch.nodes.single.SingleBuilder;
+
+public interface BuilderFactory<T> {
+
+    SingleBuilder<T> single();
+    BranchingBuilder<T> branching();
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
index 2ba9202..5f0c674 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
@@ -3,7 +3,7 @@ public class StringBlock implements Block {
 
     private final String identifier;
 
-    public StringBlock(String identifier) {
+    StringBlock(String identifier) {
         this.identifier = identifier;
     }
 
@@ -18,6 +18,8 @@ public BlockPath asSingleBlockpath() {
     }
 
     public static Block of(String string) {
+        if (string.contains(" ")) throw new IllegalStateException("Identifier cannot have spaces!");
+
         return new StringBlock(string);
     }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/Builder.java b/core/src/main/java/me/aurium/beetle/branch/builder/Builder.java
similarity index 72%
rename from core/src/main/java/me/aurium/beetle/branch/Builder.java
rename to core/src/main/java/me/aurium/beetle/branch/builder/Builder.java
index de7ae82..0182fbd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/Builder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builder/Builder.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch;
+package me.aurium.beetle.branch.builder;
 
 import me.aurium.beetle.branch.CommandNode;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/builder/BuilderPair.java b/core/src/main/java/me/aurium/beetle/branch/builder/BuilderPair.java
new file mode 100644
index 0000000..d0dc573
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builder/BuilderPair.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.builder;
+
+public interface BuilderPair<T extends Builder<?>> {
+
+    <C> T newBuilder();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java b/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
index 56d3454..09efdf1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
+++ b/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
@@ -1,6 +1,7 @@
 package me.aurium.beetle.branch.examples;
 
 import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.adapter.ContextAdapter;
 import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
 import me.aurium.beetle.branch.block.StringBlock;
 import me.aurium.beetle.branch.launchpoints.AbstractBranchCommand;
@@ -15,8 +16,16 @@ public ExampleAbstractCommand(ContextAdapterFactory<String> factory) {
 
     @Override
     public CommandNode<String> getBaseNode() {
-        return new BranchingBuilder<String>()
-                .withBuilder(BranchingBuilder.make()).build();
+        new BranchingBuilder<String>().something(new SingleBuilder<>(),shit -> {
+            shit.withIdentifier(StringBlock.of("Sup"));
+            shit.withHandler(context -> {
+                ContextAdapter<String> s = context;
+                //as you can see it's actually typed correctly now (s is a ContextAdapter<String>)
+            });
+        });
+
+
+        return null;
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java
index ae50aca..21e273f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java
@@ -1,11 +1,10 @@
 package me.aurium.beetle.branch.nodes.branching;
 
-import me.aurium.beetle.branch.Builder;
+import me.aurium.beetle.branch.builder.Builder;
 import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.nodes.single.SingleBuilder;
-import me.aurium.beetle.branch.util.PreStoredHashSet;
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.nodes.single.SingleNode;
+import me.aurium.beetle.branch.builder.BuilderPair;
+import me.aurium.beetle.branch.util.PreStoredHashSet;
 
 import java.util.HashSet;
 import java.util.Objects;
@@ -26,41 +25,18 @@ public BranchingBuilder<T> withIdentifier(Block block) {
         return this;
     }
 
-    public BranchingBuilder<T> single(Consumer<SingleBuilder<T>> consumer) {
-        SingleBuilder<T> builder = new SingleBuilder<>();
+    public <C extends Builder<T>> void coolShit(BuilderPair<C> key, Consumer<C> consumer) {
+        C builder = key.newBuilder();
 
         consumer.accept(builder);
 
-        this.commands.add(builder);
-
-        return null;
-    }
-
-    public <C extends Builder<T>> BranchingBuilder<T> withBuilder(Consumer<C> consumer) {
-        return null;
-    }
-
-
-    @Deprecated
-    public BranchingBuilder<T> withNode(CommandNode<T> commandNode) {
-        this.commands.add(commandNode);
-
-        return this;
+        commands.add(builder.build());
     }
 
-    @Deprecated
-    public BranchingBuilder<T> withBuilder(Builder<T> builder) {
-        this.commands.add(builder.build());
+    public <C extends Builder<T>> void something(C key, Consumer<C> consumer) {
+        consumer.accept(key);
 
-        return this;
-    }
-
-    @Deprecated
-    public BranchingBuilder<T> withNoArgs(SingleNode<T> node, boolean linked) {
-        this.noArgs = node;
-        this.linked = linked;
-
-        return this;
+        commands.add(key.build());
     }
 
     @Override
@@ -83,7 +59,17 @@ public BranchingNode<T> build() {
         return new BranchingNode<>(set,block);
     }
 
-    public static <C> BranchingBuilder<C> make() {
-        return new BranchingBuilder<>();
+    public BranchingBuilder<T> add(Builder<T> builder) {
+        this.commands.add(builder.build());
+
+        return this;
+    }
+
+    public BranchingBuilder<T> wiff(Builder<T> builder) {
+        return new BranchingBuilder<T>().add(builder);
+    }
+
+    public static <T> BranchingBuilder<T> with(Builder<T> builder) {
+        return new BranchingBuilder<T>().add(builder);
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/CoolSumer.java b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/CoolSumer.java
deleted file mode 100644
index d6ac2e2..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/CoolSumer.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.nodes.branching;
-
-import me.aurium.beetle.branch.Builder;
-
-public interface CoolSumer<T> {
-
-    <C extends Builder<T>> void cool(C builder);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/Test.java b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/Test.java
new file mode 100644
index 0000000..14e5a8e
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/Test.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.nodes.branching;
+
+import me.aurium.beetle.branch.builder.BuilderPair;
+import me.aurium.beetle.branch.nodes.single.SingleBuilder;
+
+public class Test<T> implements BuilderPair<SingleBuilder<T>,T> {
+    @Override
+    public SingleBuilder<T> newBuilder() {
+        return new SingleBuilder<>();
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java
index b4a0210..f58db47 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java
@@ -1,7 +1,6 @@
 package me.aurium.beetle.branch.nodes.single;
 
-import me.aurium.beetle.api.command.ContextHandler;
-import me.aurium.beetle.branch.Builder;
+import me.aurium.beetle.branch.builder.Builder;
 import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
 import me.aurium.beetle.branch.block.Block;
 
@@ -31,8 +30,4 @@ public SingleNode<T> build() {
         return new SingleNode<>(block, contextHandler);
     }
 
-    public static SingleBuilder<?> of(boolean fancyBuilder) {
-        return null;
-    }
-
 }

From bd75aaaaa0ff6d0a5e3a9dfbfa49faebe45f4fba Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Wed, 17 Mar 2021 17:58:07 -0700
Subject: [PATCH 06/56] finish up command stuff, start work on value stuff

---
 .../beetle/branch/builder/AloneBuilder.java   |  8 +++++
 .../aurium/beetle/branch/nodes/AloneNode.java |  9 ++++++
 .../nodes/branching/BranchingBuilder.java     | 32 +++++--------------
 .../beetle/branch/nodes/branching/Test.java   | 11 -------
 .../branch/nodes/single/SingleBuilder.java    | 12 +++----
 .../branch/nodes/single/SingleNode.java       |  4 +--
 .../branch/nodes/value/ValueContext.java      |  7 ++++
 7 files changed, 38 insertions(+), 45 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builder/AloneBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/branching/Test.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueContext.java

diff --git a/core/src/main/java/me/aurium/beetle/branch/builder/AloneBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builder/AloneBuilder.java
new file mode 100644
index 0000000..5c128a6
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builder/AloneBuilder.java
@@ -0,0 +1,8 @@
+package me.aurium.beetle.branch.builder;
+
+/**
+ * yet another marker interface
+ * @param <C>
+ */
+public interface AloneBuilder<C> extends Builder<C> {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java
new file mode 100644
index 0000000..f3fcce9
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.nodes;
+
+import me.aurium.beetle.branch.CommandNode;
+
+/**
+ * Marker interface for a node that is alone (so not branching, but not merging either)
+ */
+public interface AloneNode<T> extends CommandNode<T> {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java
index 21e273f..4c005a0 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java
@@ -4,6 +4,7 @@
 import me.aurium.beetle.branch.CommandNode;
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.builder.BuilderPair;
+import me.aurium.beetle.branch.nodes.single.SingleBuilder;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
 import java.util.HashSet;
@@ -19,24 +20,21 @@ public class BranchingBuilder<T> implements Builder<T> {
     private CommandNode<T> noArgs;
     private boolean linked;
 
-    public BranchingBuilder<T> withIdentifier(Block block) {
+    public void withIdentifier(Block block) {
         this.block = block;
-
-        return this;
     }
 
-    public <C extends Builder<T>> void coolShit(BuilderPair<C> key, Consumer<C> consumer) {
-        C builder = key.newBuilder();
-
-        consumer.accept(builder);
+    public <C extends Builder<T>> void withNode(C key, Consumer<C> consumer) {
+        consumer.accept(key);
 
-        commands.add(builder.build());
+        commands.add(key.build());
     }
 
-    public <C extends Builder<T>> void something(C key, Consumer<C> consumer) {
+    public <C extends SingleBuilder<T>> void withNoArgs(C key, Consumer<C> consumer, boolean linked) {
         consumer.accept(key);
 
-        commands.add(key.build());
+        this.noArgs = key.build();
+        this.linked = linked;
     }
 
     @Override
@@ -58,18 +56,4 @@ public BranchingNode<T> build() {
 
         return new BranchingNode<>(set,block);
     }
-
-    public BranchingBuilder<T> add(Builder<T> builder) {
-        this.commands.add(builder.build());
-
-        return this;
-    }
-
-    public BranchingBuilder<T> wiff(Builder<T> builder) {
-        return new BranchingBuilder<T>().add(builder);
-    }
-
-    public static <T> BranchingBuilder<T> with(Builder<T> builder) {
-        return new BranchingBuilder<T>().add(builder);
-    }
 }
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/Test.java b/core/src/main/java/me/aurium/beetle/branch/nodes/branching/Test.java
deleted file mode 100644
index 14e5a8e..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/Test.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch.nodes.branching;
-
-import me.aurium.beetle.branch.builder.BuilderPair;
-import me.aurium.beetle.branch.nodes.single.SingleBuilder;
-
-public class Test<T> implements BuilderPair<SingleBuilder<T>,T> {
-    @Override
-    public SingleBuilder<T> newBuilder() {
-        return new SingleBuilder<>();
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java
index f58db47..cabb5ad 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java
@@ -1,26 +1,22 @@
 package me.aurium.beetle.branch.nodes.single;
 
-import me.aurium.beetle.branch.builder.Builder;
 import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
 import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.builder.AloneBuilder;
 
 import java.util.Objects;
 
-public class SingleBuilder<T> implements Builder<T> {
+public class SingleBuilder<T> implements AloneBuilder<T> {
 
     private Block block;
     private ContextHandlerAdapter<T> contextHandler;
 
-    public SingleBuilder<T> withIdentifier(Block identifier) {
+    public void withIdentifier(Block identifier) {
         this.block = identifier;
-
-        return this;
     }
 
-    public SingleBuilder<T> withHandler(ContextHandlerAdapter<T> handler) {
+    public void withHandler(ContextHandlerAdapter<T> handler) {
         this.contextHandler = handler;
-
-        return this;
     }
 
     public SingleNode<T> build() {
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleNode.java
index 0c0c7f2..e6bc49f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleNode.java
@@ -1,16 +1,16 @@
 package me.aurium.beetle.branch.nodes.single;
 
-import me.aurium.beetle.api.command.ContextHandler;
 import me.aurium.beetle.branch.CommandNode;
 import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.nodes.AloneNode;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
 
-public class SingleNode<T> implements CommandNode<T> {
+public class SingleNode<T> implements AloneNode<T> {
 
     private final Block identifier;
     private final ContextHandlerAdapter<T> handler;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueContext.java b/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueContext.java
new file mode 100644
index 0000000..5ac26a6
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueContext.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.nodes.value;
+
+/**
+ * MORE FUCKING WRAPPERS
+ */
+public class ValueContext {
+}

From 80cc5400f8dd285120d2d5a08dcd1095bf0611ed Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Wed, 17 Mar 2021 19:56:32 -0700
Subject: [PATCH 07/56] update all the garbage

---
 core/pom.xml                                  |  2 +-
 .../me/aurium/beetle/branch/CommandNode.java  | 16 +-------
 .../beetle/branch/IdentifiableNode.java       | 13 ++++++
 .../beetle/branch/adapter/BuilderFactory.java |  4 +-
 .../beetle/branch/adapter/ContextAdapter.java |  4 +-
 .../branch/adapter/ContextAdapterFactory.java |  3 +-
 .../beetle/branch/adapter/ContextWrapper.java |  7 ++--
 .../DelegatingContextAdapterFactory.java      |  3 +-
 .../aurium/beetle/branch/base/BaseNode.java   | 40 -------------------
 .../me/aurium/beetle/branch/block/Block.java  |  9 +++++
 .../aurium/beetle/branch/block/BlockPath.java |  4 ++
 .../beetle/branch/block/EmptyBlock.java       | 34 ++++++++++++++++
 .../beetle/branch/block/StringBlockPath.java  | 15 ++++---
 .../aurium/beetle/branch/builder/Builder.java |  9 -----
 .../{builder => builders}/AloneBuilder.java   |  2 +-
 .../aurium/beetle/branch/builders/Base.java   | 15 +++++++
 .../BranchingBuilder.java                     | 32 +++++++++++----
 .../beetle/branch/builders/Builder.java       | 11 +++++
 .../{builder => builders}/BuilderPair.java    |  2 +-
 .../single => builders}/SingleBuilder.java    | 13 +++++-
 .../examples/ExampleAbstractCommand.java      | 17 +++-----
 .../launchpoints/AbstractBranchCommand.java   |  1 +
 .../aurium/beetle/branch/nodes/AloneNode.java |  4 +-
 .../nodes/{branching => }/BranchingNode.java  | 16 ++++----
 .../branch/nodes/{single => }/SingleNode.java |  9 ++---
 .../nodes/{value => }/ValueContext.java       |  2 +-
 .../aurium/beetle/branch/nodes/ValueNode.java |  4 ++
 .../branch/nodes/ValueSelectorNode.java       |  4 ++
 .../beetle/branch/nodes/value/ValueNode.java  |  4 --
 .../branch/nodes/value/ValueSelectorNode.java |  4 --
 30 files changed, 177 insertions(+), 126 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/IdentifiableNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/base/BaseNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builder/Builder.java
 rename core/src/main/java/me/aurium/beetle/branch/{builder => builders}/AloneBuilder.java (72%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/Base.java
 rename core/src/main/java/me/aurium/beetle/branch/{nodes/branching => builders}/BranchingBuilder.java (59%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
 rename core/src/main/java/me/aurium/beetle/branch/{builder => builders}/BuilderPair.java (66%)
 rename core/src/main/java/me/aurium/beetle/branch/{nodes/single => builders}/SingleBuilder.java (64%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{branching => }/BranchingNode.java (62%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{single => }/SingleNode.java (76%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{value => }/ValueContext.java (58%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueSelectorNode.java

diff --git a/core/pom.xml b/core/pom.xml
index cf1aef2..67afde0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>me.aurium</groupId>
             <artifactId>beetle-core</artifactId>
-            <version>0.4.0</version>
+            <version>0.4.1</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/core/src/main/java/me/aurium/beetle/branch/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
index 971133c..6dff926 100644
--- a/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
@@ -1,8 +1,6 @@
 package me.aurium.beetle.branch;
 
-import me.aurium.beetle.api.command.ContextHandler;
 import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
-import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.BlockPath;
 
 import java.util.Collection;
@@ -10,19 +8,9 @@
 
 public interface CommandNode<T> {
 
-    Block getIdentifier();
     ContextHandlerAdapter<T> getContextHandler();
 
-    Optional<CommandNode<T>> getSpecificNode(BlockPath path);
-    Collection<CommandNode<T>> getLinkedNodes();
-
-
-
-
-
-
-    /* TODO tabcompleteHandler
-    TabContextHandler<T> getSpecificTabHandler(BlockPath path);
-    TabContextHandler<T> getTabHandler(); //tabhandler (probably just return this.id)*/
+    Optional<IdentifiableNode<T>> getSpecificNode(BlockPath path);
+    Collection<IdentifiableNode<T>> getLinkedNodes();
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/IdentifiableNode.java b/core/src/main/java/me/aurium/beetle/branch/IdentifiableNode.java
new file mode 100644
index 0000000..be923d6
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/IdentifiableNode.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch;
+
+import me.aurium.beetle.branch.block.Block;
+
+public interface IdentifiableNode<T> extends CommandNode<T> {
+
+    Block getIdentifier();
+
+    /* TODO tabcompleteHandler
+    TabContextHandler<T> getSpecificTabHandler(BlockPath path);
+    TabContextHandler<T> getTabHandler(); //tabhandler (probably just return this.id)*/
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java b/core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java
index fd74411..567617d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.adapter;
 
-import me.aurium.beetle.branch.nodes.branching.BranchingBuilder;
-import me.aurium.beetle.branch.nodes.single.SingleBuilder;
+import me.aurium.beetle.branch.builders.BranchingBuilder;
+import me.aurium.beetle.branch.builders.SingleBuilder;
 
 public interface BuilderFactory<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
index 2016769..e63f4c6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.adapter;
 
-import me.aurium.beetle.api.command.Context;
 import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IdentifiableNode;
 import me.aurium.beetle.branch.block.BlockPath;
 
 /**
@@ -10,7 +10,7 @@
  */
 public interface ContextAdapter<T> {
 
-    CommandNode<T> getExecutedNode();
+    IdentifiableNode<T> getExecutedNode();
     CommandNode<T> getBaseExecutedNode();
 
     BlockPath executedPath();
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java
index f1e1a6c..4743e35 100644
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java
@@ -2,6 +2,7 @@
 
 import me.aurium.beetle.api.command.Context;
 import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IdentifiableNode;
 import me.aurium.beetle.branch.block.BlockPath;
 
 /**
@@ -9,7 +10,7 @@
  */
 public interface ContextAdapterFactory<T> {
 
-    ContextAdapter<T> produce(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath path);
+    ContextAdapter<T> produce(T t, String alias, String[] strings, IdentifiableNode<T> executedNode, CommandNode<T> baseNode, BlockPath path);
     Context<T> context(T t, String alias, String[] strings);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
index 20a36b4..1a9d7b4 100644
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
@@ -2,16 +2,17 @@
 
 import me.aurium.beetle.api.command.Context;
 import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IdentifiableNode;
 import me.aurium.beetle.branch.block.BlockPath;
 
 public class ContextWrapper<T> implements ContextAdapter<T> {
 
     private final Context<T> context;
-    private final CommandNode<T> executedNode;
+    private final IdentifiableNode<T> executedNode;
     private final CommandNode<T> baseNode;
     private final BlockPath executedPath;
 
-    public ContextWrapper(Context<T> context, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath) {
+    public ContextWrapper(Context<T> context, IdentifiableNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath) {
         this.context = context;
         this.executedNode = executedNode;
         this.baseNode = baseNode;
@@ -19,7 +20,7 @@ public ContextWrapper(Context<T> context, CommandNode<T> executedNode, CommandNo
     }
 
     @Override
-    public CommandNode<T> getExecutedNode() {
+    public IdentifiableNode<T> getExecutedNode() {
         return executedNode;
     }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java b/core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java
index c44ccab..bd876e1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java
@@ -3,6 +3,7 @@
 import me.aurium.beetle.api.command.Context;
 import me.aurium.beetle.api.command.ContextSource;
 import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IdentifiableNode;
 import me.aurium.beetle.branch.block.BlockPath;
 
 /**
@@ -19,7 +20,7 @@ public DelegatingContextAdapterFactory(ContextSource<T> delegate) {
     public final ContextSource<T> delegate;
 
     @Override
-    public ContextAdapter<T> produce(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath path) {
+    public ContextAdapter<T> produce(T t, String alias, String[] strings, IdentifiableNode<T> executedNode, CommandNode<T> baseNode, BlockPath path) {
 
         Context<T> context = context(t,alias,strings);
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/base/BaseNode.java b/core/src/main/java/me/aurium/beetle/branch/base/BaseNode.java
deleted file mode 100644
index 4cf84ef..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/base/BaseNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package me.aurium.beetle.branch.base;
-
-import me.aurium.beetle.api.command.ContextHandler;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.BlockPath;
-
-import java.util.Collection;
-import java.util.Optional;
-
-public class BaseNode<T> implements CommandNode<T> {
-
-    private final CommandNode<T> delegatingNode;
-    private final Block commandName;
-
-    public BaseNode(Block commandName, CommandNode<T> delegatingNode) {
-        this.delegatingNode = delegatingNode;
-        this.commandName = commandName;
-    }
-
-    @Override
-    public Block getIdentifier() {
-        return commandName;
-    }
-
-    @Override
-    public Optional<CommandNode<T>> getSpecificNode(BlockPath path) {
-        return Optional.empty();
-    }
-
-    @Override
-    public Collection<CommandNode<T>> getLinkedNodes() {
-        return null;
-    }
-
-    @Override
-    public ContextHandler<T> getContextHandler() {
-        return null;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/Block.java b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
index c5e74ab..5148c52 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/Block.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
@@ -1,5 +1,7 @@
 package me.aurium.beetle.branch.block;
 
+import java.util.LinkedList;
+
 public interface Block {
 
     String getIdentifier();
@@ -7,4 +9,11 @@ public interface Block {
 
     boolean equals(Object object);
 
+    default void addLast(LinkedList<Block> list) {
+        list.addLast(this);
+    }
+    default void addFirst(LinkedList<Block> list) {
+        list.addFirst(this);
+    }
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
index 3b77335..ba17a4d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
@@ -55,6 +55,10 @@ public interface BlockPath {
      */
     List<Block> getAllBlocks();
 
+    /**
+     * DO NOT USE THIS FOR COMPARISONS. THIS IS FOR DEBUGGING ONLY.
+     * @return
+     */
     String toString();
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
new file mode 100644
index 0000000..ff935e3
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
@@ -0,0 +1,34 @@
+package me.aurium.beetle.branch.block;
+
+import me.aurium.beetle.api.util.NotImplementedException;
+
+import java.util.LinkedList;
+
+public class EmptyBlock implements Block{
+
+    @Override
+    public String getIdentifier() {
+        throw new NotImplementedException("Empty block should not exist in path!");
+    }
+
+    @Override
+    public BlockPath asSingleBlockpath() {
+        return StringBlockPath.ofEmpty();
+    }
+
+    @Override
+    public void addFirst(LinkedList<Block> list) {
+        //nooops
+    }
+
+    @Override
+    public void addLast(LinkedList<Block> list) {
+        //noops
+    }
+
+    public static EmptyBlock of() {
+        return new EmptyBlock();
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/StringBlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/StringBlockPath.java
index 14429c5..c42ff3c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/StringBlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/StringBlockPath.java
@@ -65,13 +65,13 @@ public BlockPath getParent() {
     @Override
     public BlockPath resolve(BlockPath path) {
 
-        LinkedList<Block> pathblocks = this.blocks;
+        LinkedList<Block> pathBlocks = this.blocks;
 
         for (Block block : path.getAllBlocks()) {
-            pathblocks.addLast(block);
+            block.addLast(pathBlocks);
         }
 
-        return new StringBlockPath(root,this,pathblocks,false,this.splitter);
+        return new StringBlockPath(root,this,pathBlocks,pathBlocks.size() > 1,this.splitter);
     }
 
     @Override
@@ -79,9 +79,9 @@ public BlockPath resolve(Block block) {
 
         LinkedList<Block> pathBlocks = this.blocks;
 
-        pathBlocks.addLast(block);
+        block.addLast(pathBlocks);
 
-        return new StringBlockPath(root,this,pathBlocks,false,this.splitter);
+        return new StringBlockPath(root,this,pathBlocks,pathBlocks.size() > 1,this.splitter);
     }
 
     @Override
@@ -112,7 +112,7 @@ public String toString() {
         StringBuilder base = new StringBuilder();
 
         for (Block block : this.blocks) {
-            base.append(splitter).append(block.getIdentifier());
+            base.append('{').append(block.getIdentifier()).append('}').append(splitter);
         }
 
 
@@ -133,6 +133,9 @@ public int hashCode() {
         return blocks.hashCode();
     }
 
+    public static BlockPath ofEmpty() {
+        return new StringBlockPath(COMMON_SPLITTER);
+    }
 
     public static BlockPath of(String string, String splitter) {
         String[] subparts = string.split(splitter);
diff --git a/core/src/main/java/me/aurium/beetle/branch/builder/Builder.java b/core/src/main/java/me/aurium/beetle/branch/builder/Builder.java
deleted file mode 100644
index 0182fbd..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builder/Builder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.builder;
-
-import me.aurium.beetle.branch.CommandNode;
-
-public interface Builder<C>{
-
-    CommandNode<C> build();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builder/AloneBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/AloneBuilder.java
similarity index 72%
rename from core/src/main/java/me/aurium/beetle/branch/builder/AloneBuilder.java
rename to core/src/main/java/me/aurium/beetle/branch/builders/AloneBuilder.java
index 5c128a6..f957f56 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builder/AloneBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/AloneBuilder.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.builder;
+package me.aurium.beetle.branch.builders;
 
 /**
  * yet another marker interface
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/Base.java b/core/src/main/java/me/aurium/beetle/branch/builders/Base.java
new file mode 100644
index 0000000..7a47c70
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/Base.java
@@ -0,0 +1,15 @@
+package me.aurium.beetle.branch.builders;
+
+import me.aurium.beetle.branch.CommandNode;
+
+import java.util.function.Consumer;
+
+public class Base {
+
+    public static <E, C extends Builder<E>> CommandNode<E> base(C key, Consumer<C> consumer) {
+        consumer.accept(key);
+
+        return key.buildWithoutIdentifier();
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
similarity index 59%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java
rename to core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
index 4c005a0..f17850c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
@@ -1,10 +1,10 @@
-package me.aurium.beetle.branch.nodes.branching;
+package me.aurium.beetle.branch.builders;
 
-import me.aurium.beetle.branch.builder.Builder;
 import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.block.EmptyBlock;
+import me.aurium.beetle.branch.IdentifiableNode;
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.builder.BuilderPair;
-import me.aurium.beetle.branch.nodes.single.SingleBuilder;
+import me.aurium.beetle.branch.nodes.BranchingNode;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
 import java.util.HashSet;
@@ -14,10 +14,10 @@
 
 public class BranchingBuilder<T> implements Builder<T> {
 
-    private final Set<CommandNode<T>> commands = new HashSet<>();
+    private final Set<IdentifiableNode<T>> commands = new HashSet<>();
 
     private Block block;
-    private CommandNode<T> noArgs;
+    private IdentifiableNode<T> noArgs;
     private boolean linked;
 
     public void withIdentifier(Block block) {
@@ -42,7 +42,7 @@ public BranchingNode<T> build() {
 
         Objects.requireNonNull(block);
 
-        PreStoredHashSet<CommandNode<T>> set;
+        PreStoredHashSet<IdentifiableNode<T>> set;
 
         if (noArgs == null) {
             if (linked) {
@@ -56,4 +56,22 @@ public BranchingNode<T> build() {
 
         return new BranchingNode<>(set,block);
     }
+
+    @Override
+    public CommandNode<T> buildWithoutIdentifier() {
+
+        PreStoredHashSet<IdentifiableNode<T>> set;
+
+        if (noArgs == null) {
+            if (linked) {
+                throw new IllegalStateException("Attempted link without no-arguments handler!");
+            } else {
+                set = new PreStoredHashSet<>(commands,false);
+            }
+        } else {
+            set = new PreStoredHashSet<>(noArgs,commands,linked);
+        }
+
+        return new BranchingNode<>(set, EmptyBlock.of());
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java b/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
new file mode 100644
index 0000000..8947e55
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.builders;
+
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IdentifiableNode;
+
+public interface Builder<C>{
+
+    IdentifiableNode<C> build();
+    CommandNode<C> buildWithoutIdentifier();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builder/BuilderPair.java b/core/src/main/java/me/aurium/beetle/branch/builders/BuilderPair.java
similarity index 66%
rename from core/src/main/java/me/aurium/beetle/branch/builder/BuilderPair.java
rename to core/src/main/java/me/aurium/beetle/branch/builders/BuilderPair.java
index d0dc573..efee680 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builder/BuilderPair.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/BuilderPair.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.builder;
+package me.aurium.beetle.branch.builders;
 
 public interface BuilderPair<T extends Builder<?>> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
similarity index 64%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java
rename to core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
index cabb5ad..eee60f4 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
@@ -1,8 +1,10 @@
-package me.aurium.beetle.branch.nodes.single;
+package me.aurium.beetle.branch.builders;
 
+import me.aurium.beetle.branch.CommandNode;
 import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.builder.AloneBuilder;
+import me.aurium.beetle.branch.block.EmptyBlock;
+import me.aurium.beetle.branch.nodes.SingleNode;
 
 import java.util.Objects;
 
@@ -26,4 +28,11 @@ public SingleNode<T> build() {
         return new SingleNode<>(block, contextHandler);
     }
 
+    @Override
+    public CommandNode<T> buildWithoutIdentifier() {
+        Objects.requireNonNull(contextHandler);
+
+        return new SingleNode<>(EmptyBlock.of(),contextHandler);
+    }
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java b/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
index 09efdf1..e02bafa 100644
--- a/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
+++ b/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
@@ -1,12 +1,10 @@
 package me.aurium.beetle.branch.examples;
 
 import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.adapter.ContextAdapter;
 import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
-import me.aurium.beetle.branch.block.StringBlock;
+import me.aurium.beetle.branch.builders.Base;
 import me.aurium.beetle.branch.launchpoints.AbstractBranchCommand;
-import me.aurium.beetle.branch.nodes.branching.BranchingBuilder;
-import me.aurium.beetle.branch.nodes.single.SingleBuilder;
+import me.aurium.beetle.branch.builders.SingleBuilder;
 
 public class ExampleAbstractCommand extends AbstractBranchCommand<String> {
 
@@ -16,16 +14,11 @@ public ExampleAbstractCommand(ContextAdapterFactory<String> factory) {
 
     @Override
     public CommandNode<String> getBaseNode() {
-        new BranchingBuilder<String>().something(new SingleBuilder<>(),shit -> {
-            shit.withIdentifier(StringBlock.of("Sup"));
-            shit.withHandler(context -> {
-                ContextAdapter<String> s = context;
-                //as you can see it's actually typed correctly now (s is a ContextAdapter<String>)
+        return Base.base(new SingleBuilder<>(), baseNode -> {
+            baseNode.withHandler(context -> {
+
             });
         });
-
-
-        return null;
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
index 73f5fa3..4f95137 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
@@ -2,6 +2,7 @@
 
 import me.aurium.beetle.branch.BranchCommand;
 import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IdentifiableNode;
 import me.aurium.beetle.branch.adapter.ContextAdapter;
 import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
 import me.aurium.beetle.branch.block.BlockPath;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java
index f3fcce9..3b297c4 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java
@@ -1,9 +1,9 @@
 package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IdentifiableNode;
 
 /**
  * Marker interface for a node that is alone (so not branching, but not merging either)
  */
-public interface AloneNode<T> extends CommandNode<T> {
+public interface AloneNode<T> extends IdentifiableNode<T> {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
similarity index 62%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 1680486..21d85ce 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/branching/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -1,6 +1,6 @@
-package me.aurium.beetle.branch.nodes.branching;
+package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IdentifiableNode;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
 import me.aurium.beetle.branch.block.Block;
@@ -8,12 +8,12 @@
 
 import java.util.*;
 
-public class BranchingNode<T> implements CommandNode<T> {
+public class BranchingNode<T> implements IdentifiableNode<T> {
 
-    private final PreStoredHashSet<CommandNode<T>> nodes;
+    private final PreStoredHashSet<IdentifiableNode<T>> nodes;
     private final Block path;
 
-    public BranchingNode(PreStoredHashSet<CommandNode<T>> nodes, Block path) {
+    public BranchingNode(PreStoredHashSet<IdentifiableNode<T>> nodes, Block path) {
         this.nodes = nodes;
         this.path = path;
     }
@@ -24,8 +24,8 @@ public Block getIdentifier() {
     }
 
     @Override
-    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
-        for (CommandNode<T> node : this.getLinkedNodes()) {
+    public Optional<IdentifiableNode<T>> getSpecificNode(BlockPath blockPath) {
+        for (IdentifiableNode<T> node : this.getLinkedNodes()) {
             if (blockPath.startsWith(node.getIdentifier())) {
                 return node.getSpecificNode(blockPath.withoutBase());
             }
@@ -34,7 +34,7 @@ public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
     }
 
     @Override
-    public Collection<CommandNode<T>> getLinkedNodes() {
+    public Collection<IdentifiableNode<T>> getLinkedNodes() {
         return nodes.getContents();
     }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
similarity index 76%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index e6bc49f..d016ee1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/single/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -1,10 +1,9 @@
-package me.aurium.beetle.branch.nodes.single;
+package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.IdentifiableNode;
 import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.AloneNode;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -26,12 +25,12 @@ public Block getIdentifier() {
     }
 
     @Override
-    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
+    public Optional<IdentifiableNode<T>> getSpecificNode(BlockPath blockPath) {
         return Optional.of(this);
     }
 
     @Override
-    public Collection<CommandNode<T>> getLinkedNodes() {
+    public Collection<IdentifiableNode<T>> getLinkedNodes() {
         return Collections.emptySet();
     }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueContext.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java
similarity index 58%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueContext.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java
index 5ac26a6..05abc88 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.value;
+package me.aurium.beetle.branch.nodes;
 
 /**
  * MORE FUCKING WRAPPERS
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java
new file mode 100644
index 0000000..db460b9
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes;
+
+public class ValueNode {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java
new file mode 100644
index 0000000..8b5cf78
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes;
+
+public class ValueSelectorNode {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueNode.java
deleted file mode 100644
index 06c0559..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueNode.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.nodes.value;
-
-public class ValueNode {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueSelectorNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueSelectorNode.java
deleted file mode 100644
index 06fab3f..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/value/ValueSelectorNode.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.nodes.value;
-
-public class ValueSelectorNode {
-}

From a18fcfa800b6d82950cccf0a8f91f5baa1fd7116 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Wed, 17 Mar 2021 23:49:17 -0700
Subject: [PATCH 08/56] add default tests

---
 .idea/compiler.xml                            |  6 ++-
 .idea/encodings.xml                           |  2 +
 core/pom.xml                                  |  8 +---
 .../launchpoints/AbstractBranchCommand.java   |  1 -
 pom.xml                                       |  1 +
 tests/pom.xml                                 | 43 +++++++++++++++++++
 .../beetle/branch/tests/CommandTests.java     | 30 +++++++++++++
 .../beetle/branch/tests/TestCommand.java      | 34 +++++++++++++++
 .../branch/tests/mockups/MockupContext.java   | 36 ++++++++++++++++
 .../tests/mockups/MockupContextSource.java    | 11 +++++
 tests/tests.iml                               |  2 +
 11 files changed, 165 insertions(+), 9 deletions(-)
 create mode 100644 tests/pom.xml
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/CommandTests.java
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/TestCommand.java
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java
 create mode 100644 tests/tests.iml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b67d6a5..1556c7f 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,8 +6,12 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="core" />
+        <module name="tests" />
+        <module name="branch-core" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="core" target="11" />
+    </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 8dcf5b9..9217cc7 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -3,5 +3,7 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/tests/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/tests/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 67afde0..cde80ba 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>core</artifactId>
+    <artifactId>branch-core</artifactId>
 
     <properties>
         <maven.compiler.source>${compiler.version}</maven.compiler.source>
@@ -22,12 +22,6 @@
             <artifactId>beetle-core</artifactId>
             <version>0.4.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.7.0</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
index 4f95137..73f5fa3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
@@ -2,7 +2,6 @@
 
 import me.aurium.beetle.branch.BranchCommand;
 import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.IdentifiableNode;
 import me.aurium.beetle.branch.adapter.ContextAdapter;
 import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
 import me.aurium.beetle.branch.block.BlockPath;
diff --git a/pom.xml b/pom.xml
index 630011f..689932b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,7 @@
     <version>0.1.0</version>
     <modules>
         <module>core</module>
+        <module>tests</module>
     </modules>
 
     <parent>
diff --git a/tests/pom.xml b/tests/pom.xml
new file mode 100644
index 0000000..91393ad
--- /dev/null
+++ b/tests/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>branch</artifactId>
+        <groupId>me.aurium</groupId>
+        <version>0.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>branch-tests</artifactId>
+
+    <properties>
+        <maven.compiler.source>${compiler.version}</maven.compiler.source>
+        <maven.compiler.target>${compiler.version}</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>me.aurium</groupId>
+            <artifactId>spigot-impl</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>me.aurium</groupId>
+            <artifactId>branch-core</artifactId>
+            <version>0.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.7.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/CommandTests.java b/tests/src/test/java/me/aurium/beetle/branch/tests/CommandTests.java
new file mode 100644
index 0000000..746590e
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/CommandTests.java
@@ -0,0 +1,30 @@
+package me.aurium.beetle.branch.tests;
+
+import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
+import me.aurium.beetle.branch.adapter.DelegatingContextAdapterFactory;
+import me.aurium.beetle.branch.tests.mockups.MockupContextSource;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class CommandTests {
+
+    private final ContextAdapterFactory<String> adapter = new DelegatingContextAdapterFactory<>(new MockupContextSource());
+    private final TestCommand command = new TestCommand(adapter);
+
+    @BeforeAll
+    static void defineTestingVars() {
+
+    }
+
+    @Test
+    public void testSingleVarExecution() {
+        String[] args = of("test");
+
+        command.execute("sender","testCommand",args);
+    }
+
+    protected String[] of(String... strings) {
+        return strings;
+    }
+
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/TestCommand.java b/tests/src/test/java/me/aurium/beetle/branch/tests/TestCommand.java
new file mode 100644
index 0000000..5e01371
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/TestCommand.java
@@ -0,0 +1,34 @@
+package me.aurium.beetle.branch.tests;
+
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
+import me.aurium.beetle.branch.builders.Base;
+import me.aurium.beetle.branch.builders.SingleBuilder;
+import me.aurium.beetle.branch.launchpoints.AbstractBranchCommand;
+
+public class TestCommand extends AbstractBranchCommand<String> {
+    protected TestCommand(ContextAdapterFactory<String> factory) {
+        super(factory);
+    }
+
+    @Override
+    public CommandNode<String> getBaseNode() {
+        return Base.base(new SingleBuilder<>(),builder -> {
+            builder.withHandler(context -> {
+                context.getSender();
+
+                System.out.println(context.getSender());
+            });
+        });
+    }
+
+    @Override
+    public String getName() {
+        return "testCommand";
+    }
+
+    @Override
+    public String getPermission() {
+        return "testPermission";
+    }
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java
new file mode 100644
index 0000000..2bedfc3
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java
@@ -0,0 +1,36 @@
+package me.aurium.beetle.branch.tests.mockups;
+
+import me.aurium.beetle.api.command.Context;
+
+public class MockupContext implements Context<String> {
+
+    public MockupContext(String string, String alias, String[] args) {
+        this.string = string;
+        this.alias = alias;
+        this.args = args;
+    }
+
+    private final String string;
+    private final String alias;
+    private final String[] args;
+
+    @Override
+    public String getSender() {
+        return string;
+    }
+
+    @Override
+    public String getAlias() {
+        return alias;
+    }
+
+    @Override
+    public String[] getArgs() {
+        return args;
+    }
+
+    @Override
+    public void debugString(String s) {
+        System.out.println(s);
+    }
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java
new file mode 100644
index 0000000..f5ed001
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.tests.mockups;
+
+import me.aurium.beetle.api.command.Context;
+import me.aurium.beetle.api.command.ContextSource;
+
+public class MockupContextSource implements ContextSource<String> {
+    @Override
+    public Context<String> context(String s, String s2, String[] strings) {
+        return new MockupContext(s,s2,strings);
+    }
+}
diff --git a/tests/tests.iml b/tests/tests.iml
new file mode 100644
index 0000000..78b2cc5
--- /dev/null
+++ b/tests/tests.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />
\ No newline at end of file

From 2f768557c51cd4ef62a4cb4672e64413a42f9c06 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Thu, 18 Mar 2021 01:00:02 -0700
Subject: [PATCH 09/56] add more tests, start work on annotation parsing

---
 .../branch/annotate/AnnotatedCommand.java     |  7 ++
 .../branch/annotate/AnnotatedParser.java      | 10 +++
 .../beetle/branch/annotate/BranchCommand.java | 11 +++
 .../beetle/branch/annotate/BranchingNode.java | 14 ++++
 .../beetle/branch/annotate/NoArgsNode.java    |  4 +
 .../beetle/branch/annotate/ParserOptions.java | 10 +++
 .../beetle/branch/annotate/SingleNode.java    | 14 ++++
 .../branch/builders/BranchingBuilder.java     |  7 +-
 .../beetle/branch/builders/SingleBuilder.java |  5 ++
 .../examples/ExampleAbstractCommand.java      | 33 --------
 .../beetle/branch/tests/AbstractTests.java    | 26 ++++++
 .../branch/tests/BranchingNodeTests.java      | 44 ++++++++++
 .../beetle/branch/tests/CommandTests.java     | 30 -------
 .../beetle/branch/tests/SingleNodeTests.java  | 36 ++++++++
 .../beetle/branch/tests/TestCommand.java      | 34 --------
 .../tests/mockups/BranchingCommand.java       | 84 +++++++++++++++++++
 .../BranchingImproperAnnotatedCommand.java    | 40 +++++++++
 .../mockups/ImproperAnnotatedCommand.java     | 14 ++++
 .../branch/tests/mockups/MockupContext.java   | 11 ++-
 .../tests/mockups/MockupContextSource.java    | 10 ++-
 .../tests/mockups/ProperAnnotatedCommand.java |  4 +
 .../branch/tests/mockups/SingleCommand.java   | 48 +++++++++++
 22 files changed, 395 insertions(+), 101 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/BranchCommand.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/BranchingNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/NoArgsNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/SingleNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
 delete mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/CommandTests.java
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
 delete mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/TestCommand.java
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
 create mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java

diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
new file mode 100644
index 0000000..36f0258
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.annotate;
+
+/**
+ * Marker interface for annotated commands: TODO: move this to beetle
+ */
+public interface AnnotatedCommand {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
new file mode 100644
index 0000000..d692619
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
@@ -0,0 +1,10 @@
+package me.aurium.beetle.branch.annotate;
+
+import me.aurium.beetle.branch.CommandNode;
+
+public interface AnnotatedParser<T> {
+
+    CommandNode<T> parse(AnnotatedCommand command);
+    CommandNode<T> parser(AnnotatedCommand command, ParserOptions options);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/BranchCommand.java b/core/src/main/java/me/aurium/beetle/branch/annotate/BranchCommand.java
new file mode 100644
index 0000000..c5b1a3d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/BranchCommand.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.annotate;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE) //TOOD fix this
+public @interface BranchCommand {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/BranchingNode.java
new file mode 100644
index 0000000..f0815fc
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/BranchingNode.java
@@ -0,0 +1,14 @@
+package me.aurium.beetle.branch.annotate;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE) //refer to dazzleconf for interesting ideas
+public @interface BranchingNode {
+
+    String identifier();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/NoArgsNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/NoArgsNode.java
new file mode 100644
index 0000000..b65b635
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/NoArgsNode.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.annotate;
+
+public @interface NoArgsNode {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java b/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java
new file mode 100644
index 0000000..7319836
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java
@@ -0,0 +1,10 @@
+package me.aurium.beetle.branch.annotate;
+
+/**
+ * This exists solely so we can register new Arguments
+ */
+public interface ParserOptions {
+
+    void registerArgument(String aaaaaaa);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/SingleNode.java
new file mode 100644
index 0000000..ef4a9a6
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/SingleNode.java
@@ -0,0 +1,14 @@
+package me.aurium.beetle.branch.annotate;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface SingleNode {
+
+    String identifier();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
index f17850c..d753908 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
@@ -4,6 +4,7 @@
 import me.aurium.beetle.branch.block.EmptyBlock;
 import me.aurium.beetle.branch.IdentifiableNode;
 import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.block.StringBlock;
 import me.aurium.beetle.branch.nodes.BranchingNode;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
@@ -24,13 +25,17 @@ public void withIdentifier(Block block) {
         this.block = block;
     }
 
+    public void withIdentifier(String string) {
+        this.block = StringBlock.of(string);
+    }
+
     public <C extends Builder<T>> void withNode(C key, Consumer<C> consumer) {
         consumer.accept(key);
 
         commands.add(key.build());
     }
 
-    public <C extends SingleBuilder<T>> void withNoArgs(C key, Consumer<C> consumer, boolean linked) {
+    public <C extends SingleBuilder<T>> void withNoArgs(C key, boolean linked, Consumer<C> consumer) {
         consumer.accept(key);
 
         this.noArgs = key.build();
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
index eee60f4..fa47c1c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
@@ -4,6 +4,7 @@
 import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.EmptyBlock;
+import me.aurium.beetle.branch.block.StringBlock;
 import me.aurium.beetle.branch.nodes.SingleNode;
 
 import java.util.Objects;
@@ -17,6 +18,10 @@ public void withIdentifier(Block identifier) {
         this.block = identifier;
     }
 
+    public void withIdentifier(String string) {
+        this.block = StringBlock.of(string);
+    }
+
     public void withHandler(ContextHandlerAdapter<T> handler) {
         this.contextHandler = handler;
     }
diff --git a/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java b/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
deleted file mode 100644
index e02bafa..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/examples/ExampleAbstractCommand.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package me.aurium.beetle.branch.examples;
-
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
-import me.aurium.beetle.branch.builders.Base;
-import me.aurium.beetle.branch.launchpoints.AbstractBranchCommand;
-import me.aurium.beetle.branch.builders.SingleBuilder;
-
-public class ExampleAbstractCommand extends AbstractBranchCommand<String> {
-
-    public ExampleAbstractCommand(ContextAdapterFactory<String> factory) {
-        super(factory);
-    }
-
-    @Override
-    public CommandNode<String> getBaseNode() {
-        return Base.base(new SingleBuilder<>(), baseNode -> {
-            baseNode.withHandler(context -> {
-
-            });
-        });
-    }
-
-    @Override
-    public String getName() {
-        return null;
-    }
-
-    @Override
-    public String getPermission() {
-        return null;
-    }
-}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java b/tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
new file mode 100644
index 0000000..9d36221
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
@@ -0,0 +1,26 @@
+package me.aurium.beetle.branch.tests;
+
+import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
+import me.aurium.beetle.branch.adapter.DelegatingContextAdapterFactory;
+import me.aurium.beetle.branch.tests.mockups.MockupContextSource;
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
+
+public abstract class AbstractTests {
+
+    protected final Logger logger = LoggerFactory.getLogger(BranchingNodeTests.class);
+
+    protected final ContextAdapterFactory<String> adapter = new DelegatingContextAdapterFactory<>(new MockupContextSource(logger));
+
+    protected final static String SENDER = "Tester";
+    protected final static String ALIAS = "TestCommand";
+
+    protected String[] of(String... strings) {
+        return strings;
+    }
+
+    protected void beginTest(String name) {
+        logger.info(() -> "(BRANCH) Beginning test: " + name);
+    }
+
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java b/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
new file mode 100644
index 0000000..09d710b
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
@@ -0,0 +1,44 @@
+package me.aurium.beetle.branch.tests;
+
+import me.aurium.beetle.branch.tests.mockups.BranchingCommand;
+import org.junit.jupiter.api.Test;
+
+public class BranchingNodeTests extends AbstractTests {
+
+    private final BranchingCommand command = new BranchingCommand(adapter,logger);
+
+    @Test
+    public void testNoArgsExecution() {
+        beginTest("BranchingNode: NoArgs");
+
+        command.execute(SENDER,ALIAS,of());
+    }
+
+    @Test
+    public void testLinkedNodeExecution() {
+        beginTest("BranchingNode: Linked Node Execution");
+
+        command.execute(SENDER,ALIAS,of("help"));
+    }
+
+    public void testNotLinkedNodeExecution() {
+        beginTest("BranchingNode: Unlinked Node Execution");
+
+        command.execute(SENDER,ALIAS,of("invites","unrinked"));
+    }
+
+    public void testBranchingExecution() {
+        beginTest("BranchingNode: Branching Execution");
+
+        command.execute(SENDER,ALIAS,of("join"));
+    }
+
+    public void testBranchInBranchExecution() {
+        beginTest("BranchingNode: Branch in Branch Execution");
+
+        command.execute(SENDER,ALIAS,of("invites","on"));
+    }
+
+
+
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/CommandTests.java b/tests/src/test/java/me/aurium/beetle/branch/tests/CommandTests.java
deleted file mode 100644
index 746590e..0000000
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/CommandTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package me.aurium.beetle.branch.tests;
-
-import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
-import me.aurium.beetle.branch.adapter.DelegatingContextAdapterFactory;
-import me.aurium.beetle.branch.tests.mockups.MockupContextSource;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-public class CommandTests {
-
-    private final ContextAdapterFactory<String> adapter = new DelegatingContextAdapterFactory<>(new MockupContextSource());
-    private final TestCommand command = new TestCommand(adapter);
-
-    @BeforeAll
-    static void defineTestingVars() {
-
-    }
-
-    @Test
-    public void testSingleVarExecution() {
-        String[] args = of("test");
-
-        command.execute("sender","testCommand",args);
-    }
-
-    protected String[] of(String... strings) {
-        return strings;
-    }
-
-}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java b/tests/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
new file mode 100644
index 0000000..f74c0dd
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
@@ -0,0 +1,36 @@
+package me.aurium.beetle.branch.tests;
+
+import me.aurium.beetle.branch.tests.mockups.SingleCommand;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+public class SingleNodeTests extends AbstractTests {
+
+    private final SingleCommand command = new SingleCommand(adapter,logger);
+
+    @DisplayName("Test command with single variable, single node")
+    @Test
+    public void testSingleVarExecution() {
+        beginTest("SingleNode: Single argument execution");
+
+        command.execute(SENDER,ALIAS,of("arg1"));
+    }
+
+    @DisplayName("Test command with no arguments, single node")
+    @Test
+    public void testNoArgsExecution() {
+        beginTest("SingleNode: No arguments execution");
+
+        command.execute(SENDER,ALIAS,of());
+    }
+
+    @DisplayName("Test command with two arguments, single node")
+    @Test
+    public void testMultiArgsExecution() {
+        beginTest("SingleNode: Argument overflow execution");
+
+        command.execute(SENDER,ALIAS,of("arg1","arg2"));
+    }
+
+
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/TestCommand.java b/tests/src/test/java/me/aurium/beetle/branch/tests/TestCommand.java
deleted file mode 100644
index 5e01371..0000000
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/TestCommand.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package me.aurium.beetle.branch.tests;
-
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
-import me.aurium.beetle.branch.builders.Base;
-import me.aurium.beetle.branch.builders.SingleBuilder;
-import me.aurium.beetle.branch.launchpoints.AbstractBranchCommand;
-
-public class TestCommand extends AbstractBranchCommand<String> {
-    protected TestCommand(ContextAdapterFactory<String> factory) {
-        super(factory);
-    }
-
-    @Override
-    public CommandNode<String> getBaseNode() {
-        return Base.base(new SingleBuilder<>(),builder -> {
-            builder.withHandler(context -> {
-                context.getSender();
-
-                System.out.println(context.getSender());
-            });
-        });
-    }
-
-    @Override
-    public String getName() {
-        return "testCommand";
-    }
-
-    @Override
-    public String getPermission() {
-        return "testPermission";
-    }
-}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
new file mode 100644
index 0000000..26edbb6
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
@@ -0,0 +1,84 @@
+package me.aurium.beetle.branch.tests.mockups;
+
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
+import me.aurium.beetle.branch.builders.Base;
+import me.aurium.beetle.branch.builders.BranchingBuilder;
+import me.aurium.beetle.branch.builders.SingleBuilder;
+import me.aurium.beetle.branch.launchpoints.AbstractBranchCommand;
+import org.junit.platform.commons.logging.Logger;
+
+/**
+ * A fake command pretending to be a kitpvp plugin command
+ */
+public class BranchingCommand extends AbstractBranchCommand<String> {
+    private final Logger logger;
+
+    public BranchingCommand(ContextAdapterFactory<String> factory, Logger logger) {
+        super(factory);
+
+        this.logger = logger;
+    }
+
+    @Override
+    public CommandNode<String> getBaseNode() {
+        return Base.base(new BranchingBuilder<>(),kitpvp -> {
+
+            //argument /kitpvp join, which always prints that they joined the match
+            kitpvp.withNode(new SingleBuilder<>(), join -> {
+                join.withIdentifier("join");
+                join.withHandler(handler -> {
+                    logger.info(() -> handler.getSender() + " joined the kitpvp match!");
+                    //logic
+                });
+            });
+
+            //argument /kitpvp invites <on/off>
+            kitpvp.withNode(new BranchingBuilder<>(), invites -> {
+                invites.withIdentifier("invites");
+                invites.withNode(new SingleBuilder<>(), on -> {
+                    on.withIdentifier("on");
+                    on.withHandler(text -> {
+                        logger.info(() -> "Invites toggled on!");
+                    });
+
+                });
+                invites.withNode(new SingleBuilder<>(), off -> {
+                    off.withIdentifier("on");
+                    off.withHandler(text -> {
+                        logger.info(() -> "Invites toggled on!");
+                    });
+                });
+                invites.withNoArgs(new SingleBuilder<>(), false, noArgs -> {
+                    noArgs.withIdentifier("unlinked");
+                    noArgs.withHandler(handler -> {
+                        logger.info(() -> "You must specify either on or off!");
+                    });
+                });
+            });
+
+            //argument /kitpvp help, which is the default
+            kitpvp.withNoArgs(new SingleBuilder<>(), true, help -> {
+                help.withIdentifier("help");
+                help.withHandler(handler -> {
+                    logger.info(() -> "Hey, " + handler.getSender() + ", here is some help from KitPVP!");
+                    logger.info(() -> "/kitpvp help");
+                    logger.info(() -> "/kitpvp join");
+                    logger.info(() -> "/kitpvp invites <on/off>");
+                });
+            });
+
+
+        });
+    }
+
+    @Override
+    public String getName() {
+        return "kitpvp";
+    }
+
+    @Override
+    public String getPermission() {
+        return "testPermission";
+    }
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
new file mode 100644
index 0000000..0a3ebb2
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
@@ -0,0 +1,40 @@
+package me.aurium.beetle.branch.tests.mockups;
+
+import me.aurium.beetle.branch.adapter.ContextAdapter;
+import me.aurium.beetle.branch.annotate.BranchCommand;
+import me.aurium.beetle.branch.annotate.BranchingNode;
+import me.aurium.beetle.branch.annotate.SingleNode;
+
+//rule of thumb: If 1 alonenode is found in the class, it is considered an alone-node based class.
+//if more than 1 commandnode is found in the class, it is considered a branching node based class
+//if there is one branching node in the class, it is considered a branching node based class sans that branching node (it's identifier doesn't matter)
+
+@BranchCommand
+public class BranchingImproperAnnotatedCommand {
+
+    @SingleNode(identifier = "branch1")
+    public void branch1(ContextAdapter<String> context) {
+        context.getSender();
+    }
+
+    @SingleNode(identifier = "branch2")
+    public void branch2(ContextAdapter<String> context) {
+        context.getSender();
+    }
+
+    @BranchingNode(identifier = "branching1")
+    public static class branching1 {
+
+        @SingleNode(identifier = "fuckOffPissBoy")
+        public void lol() {
+
+        }
+
+        @SingleNode(identifier = "cringe")
+        public void haha() {
+
+        }
+
+    }
+
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
new file mode 100644
index 0000000..df93439
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
@@ -0,0 +1,14 @@
+package me.aurium.beetle.branch.tests.mockups;
+
+import me.aurium.beetle.branch.annotate.BranchCommand;
+import me.aurium.beetle.branch.annotate.SingleNode;
+
+@BranchCommand
+public class ImproperAnnotatedCommand {
+
+    @SingleNode(identifier = "test")
+    public void someShit() {
+
+    }
+
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java
index 2bedfc3..12e9459 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java
@@ -1,13 +1,20 @@
 package me.aurium.beetle.branch.tests.mockups;
 
 import me.aurium.beetle.api.command.Context;
+import me.aurium.beetle.core.logger.SLFLogger;
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
 
 public class MockupContext implements Context<String> {
 
-    public MockupContext(String string, String alias, String[] args) {
+    private final Logger logger;
+
+    public MockupContext(String string, String alias, String[] args, Logger logger) {
         this.string = string;
         this.alias = alias;
         this.args = args;
+
+        this.logger = logger;
     }
 
     private final String string;
@@ -31,6 +38,6 @@ public String[] getArgs() {
 
     @Override
     public void debugString(String s) {
-        System.out.println(s);
+        logger.info(() -> "DEBUG: " + s);
     }
 }
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java
index f5ed001..0e7dea4 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java
@@ -2,10 +2,18 @@
 
 import me.aurium.beetle.api.command.Context;
 import me.aurium.beetle.api.command.ContextSource;
+import org.junit.platform.commons.logging.Logger;
 
 public class MockupContextSource implements ContextSource<String> {
+
+    private final Logger logger;
+
+    public MockupContextSource(Logger logger) {
+        this.logger = logger;
+    }
+
     @Override
     public Context<String> context(String s, String s2, String[] strings) {
-        return new MockupContext(s,s2,strings);
+        return new MockupContext(s,s2,strings,logger);
     }
 }
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
new file mode 100644
index 0000000..a7abd6e
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.tests.mockups;
+
+public class ProperAnnotatedCommand {
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
new file mode 100644
index 0000000..e75b60c
--- /dev/null
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
@@ -0,0 +1,48 @@
+package me.aurium.beetle.branch.tests.mockups;
+
+import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
+import me.aurium.beetle.branch.builders.Base;
+import me.aurium.beetle.branch.builders.SingleBuilder;
+import me.aurium.beetle.branch.launchpoints.AbstractBranchCommand;
+import me.aurium.beetle.branch.tests.mockups.MockupContext;
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
+
+import java.util.Arrays;
+
+/**
+ * Fake command representing something like /helloworld that always says helloworld
+ */
+public class SingleCommand extends AbstractBranchCommand<String> {
+    private final Logger log;
+
+    public SingleCommand(ContextAdapterFactory<String> factory, Logger logger) {
+        super(factory);
+
+        this.log = logger;
+    }
+
+    @Override
+    public CommandNode<String> getBaseNode() {
+        return Base.base(new SingleBuilder<>(),builder -> {
+            builder.withHandler(context -> {
+                log.info(() -> "hello world!");
+
+                log.info(() -> "The sender is: " + context.getSender());
+                log.info(() -> "The arguments were: " + Arrays.toString(context.getArgs()));
+                log.info(() -> "The path was: " + context.executedPath());
+            });
+        });
+    }
+
+    @Override
+    public String getName() {
+        return "helloworld";
+    }
+
+    @Override
+    public String getPermission() {
+        return "testPermission";
+    }
+}

From b6dc83ab92729474fe9ac09c36e87c37a38f5e0a Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Thu, 18 Mar 2021 15:33:54 -0700
Subject: [PATCH 10/56] fix some branchnode stuff

---
 .../aurium/beetle/branch/block/BlockPath.java |  2 ++
 ...ingBlockPath.java => CommonBlockPath.java} | 29 +++++++++++--------
 .../beetle/branch/block/EmptyBlock.java       |  2 +-
 .../beetle/branch/block/StringBlock.java      |  2 +-
 .../launchpoints/AbstractBranchCommand.java   |  5 ++--
 .../beetle/branch/nodes/BranchingNode.java    |  3 ++
 .../branch/tests/BranchingNodeTests.java      |  3 ++
 .../tests/mockups/BranchingCommand.java       |  2 --
 8 files changed, 30 insertions(+), 18 deletions(-)
 rename core/src/main/java/me/aurium/beetle/branch/block/{StringBlockPath.java => CommonBlockPath.java} (83%)

diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
index ba17a4d..ab540ec 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
@@ -4,6 +4,8 @@
 
 public interface BlockPath {
 
+    boolean isEmpty();
+
     boolean isSevered();
     boolean endsWith(Block path);
     boolean startsWith(Block path);
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/StringBlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
similarity index 83%
rename from core/src/main/java/me/aurium/beetle/branch/block/StringBlockPath.java
rename to core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
index c42ff3c..aa115c2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/StringBlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
@@ -3,7 +3,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-public class StringBlockPath implements BlockPath {
+public class CommonBlockPath implements BlockPath {
 
     public final static String COMMON_SPLITTER = "-";
 
@@ -13,7 +13,7 @@ public class StringBlockPath implements BlockPath {
     private final boolean isSevered;
     private final String splitter;
 
-    public StringBlockPath(BlockPath root, BlockPath parent, LinkedList<Block> blocks, boolean isSevered, String splitter) {
+    public CommonBlockPath(BlockPath root, BlockPath parent, LinkedList<Block> blocks, boolean isSevered, String splitter) {
         this.root = root;
         this.parent = parent;
         this.blocks = blocks;
@@ -21,7 +21,7 @@ public StringBlockPath(BlockPath root, BlockPath parent, LinkedList<Block> block
         this.splitter = splitter;
     }
 
-    public StringBlockPath(LinkedList<Block> list, boolean isSevered, String splitter) {
+    public CommonBlockPath(LinkedList<Block> list, boolean isSevered, String splitter) {
         this.root = this;
         this.parent = this;
         this.blocks = list;
@@ -29,7 +29,7 @@ public StringBlockPath(LinkedList<Block> list, boolean isSevered, String splitte
         this.splitter = splitter;
     }
 
-    public StringBlockPath(String splitter) {
+    public CommonBlockPath(String splitter) {
         this.root = this;
         this.parent = this;
         this.blocks = new LinkedList<>();
@@ -37,6 +37,11 @@ public StringBlockPath(String splitter) {
         this.splitter = splitter;
     }
 
+    @Override
+    public boolean isEmpty() {
+        return blocks.isEmpty();
+    }
+
     @Override
     public boolean isSevered() {
         return isSevered;
@@ -71,7 +76,7 @@ public BlockPath resolve(BlockPath path) {
             block.addLast(pathBlocks);
         }
 
-        return new StringBlockPath(root,this,pathBlocks,pathBlocks.size() > 1,this.splitter);
+        return new CommonBlockPath(root,this,pathBlocks,pathBlocks.size() > 1,this.splitter);
     }
 
     @Override
@@ -81,7 +86,7 @@ public BlockPath resolve(Block block) {
 
         block.addLast(pathBlocks);
 
-        return new StringBlockPath(root,this,pathBlocks,pathBlocks.size() > 1,this.splitter);
+        return new CommonBlockPath(root,this,pathBlocks,pathBlocks.size() > 1,this.splitter);
     }
 
     @Override
@@ -93,7 +98,7 @@ public BlockPath withoutBase() {
     public BlockPath fromIndex(int index) {
         LinkedList<Block> clone = new LinkedList<>(blocks.subList(index, blocks.size()));
 
-        return new StringBlockPath(clone.get(0).asSingleBlockpath(),this.parent,clone,clone.size() > 1,splitter);
+        return new CommonBlockPath(clone.get(0).asSingleBlockpath(),this.parent,clone,clone.size() > 1,splitter);
     }
 
     @Override
@@ -112,7 +117,7 @@ public String toString() {
         StringBuilder base = new StringBuilder();
 
         for (Block block : this.blocks) {
-            base.append('{').append(block.getIdentifier()).append('}').append(splitter);
+            base.append('{').append(block.getIdentifier()).append('}');
         }
 
 
@@ -124,7 +129,7 @@ public String toString() {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        StringBlockPath that = (StringBlockPath) o;
+        CommonBlockPath that = (CommonBlockPath) o;
         return blocks.equals(that.blocks);
     }
 
@@ -134,7 +139,7 @@ public int hashCode() {
     }
 
     public static BlockPath ofEmpty() {
-        return new StringBlockPath(COMMON_SPLITTER);
+        return new CommonBlockPath(COMMON_SPLITTER);
     }
 
     public static BlockPath of(String string, String splitter) {
@@ -150,13 +155,13 @@ public static BlockPath of(String[] commandArguments, String splitter) {
             blocklist.addLast(StringBlock.of(s));
         }
 
-        return new StringBlockPath(blocklist,commandArguments.length > 1,splitter);
+        return new CommonBlockPath(blocklist,commandArguments.length > 1,splitter);
     }
 
     public static BlockPath of(Block block, String splitter) {
         LinkedList<Block> send = new LinkedList<>();
         send.addLast(block);
-        return new StringBlockPath(send,true,splitter);
+        return new CommonBlockPath(send,true,splitter);
     }
 
     public static BlockPath of(String string) {
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
index ff935e3..0ed8483 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
@@ -13,7 +13,7 @@ public String getIdentifier() {
 
     @Override
     public BlockPath asSingleBlockpath() {
-        return StringBlockPath.ofEmpty();
+        return CommonBlockPath.ofEmpty();
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
index 5f0c674..712954c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
@@ -14,7 +14,7 @@ public String getIdentifier() {
 
     @Override
     public BlockPath asSingleBlockpath() {
-        return StringBlockPath.of(this);
+        return CommonBlockPath.of(this);
     }
 
     public static Block of(String string) {
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
index 73f5fa3..673e8f7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
@@ -5,7 +5,7 @@
 import me.aurium.beetle.branch.adapter.ContextAdapter;
 import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.block.StringBlockPath;
+import me.aurium.beetle.branch.block.CommonBlockPath;
 
 public abstract class AbstractBranchCommand<T> implements BranchCommand<T> {
 
@@ -18,7 +18,8 @@ protected AbstractBranchCommand(ContextAdapterFactory<T> factory) {
     @Override
     public boolean execute(T t, String s, String[] strings) {
 
-        BlockPath path = StringBlockPath.of(strings);
+        BlockPath path = CommonBlockPath.of(strings);
+
         CommandNode<T> baseNode = getBaseNode();
 
         baseNode.getSpecificNode(path).ifPresentOrElse(node -> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 21d85ce..ba027ba 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -25,6 +25,9 @@ public Block getIdentifier() {
 
     @Override
     public Optional<IdentifiableNode<T>> getSpecificNode(BlockPath blockPath) {
+        if (blockPath.isEmpty()) return Optional.ofNullable(nodes.getAlreadyStored());
+        //TODO aurium - maybe we need some kind of guaruntee that it isn't empty? probably not since we can never really know
+
         for (IdentifiableNode<T> node : this.getLinkedNodes()) {
             if (blockPath.startsWith(node.getIdentifier())) {
                 return node.getSpecificNode(blockPath.withoutBase());
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java b/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
index 09d710b..402d0f0 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
@@ -21,18 +21,21 @@ public void testLinkedNodeExecution() {
         command.execute(SENDER,ALIAS,of("help"));
     }
 
+    @Test
     public void testNotLinkedNodeExecution() {
         beginTest("BranchingNode: Unlinked Node Execution");
 
         command.execute(SENDER,ALIAS,of("invites","unrinked"));
     }
 
+    @Test
     public void testBranchingExecution() {
         beginTest("BranchingNode: Branching Execution");
 
         command.execute(SENDER,ALIAS,of("join"));
     }
 
+    @Test
     public void testBranchInBranchExecution() {
         beginTest("BranchingNode: Branch in Branch Execution");
 
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
index 26edbb6..46b6c9f 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
@@ -32,7 +32,6 @@ public CommandNode<String> getBaseNode() {
                     //logic
                 });
             });
-
             //argument /kitpvp invites <on/off>
             kitpvp.withNode(new BranchingBuilder<>(), invites -> {
                 invites.withIdentifier("invites");
@@ -56,7 +55,6 @@ public CommandNode<String> getBaseNode() {
                     });
                 });
             });
-
             //argument /kitpvp help, which is the default
             kitpvp.withNoArgs(new SingleBuilder<>(), true, help -> {
                 help.withIdentifier("help");

From 427d9b2e576552c07c65ee5696aa1a8cdf493f43 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Thu, 18 Mar 2021 15:35:52 -0700
Subject: [PATCH 11/56] add readme.md

---
 readme.md     | 7 +++++++
 tests/pom.xml | 2 ++
 2 files changed, 9 insertions(+)
 create mode 100644 readme.md

diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..6c569dc
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,7 @@
+# Branch
+
+An opinionated command framework based around the concept of an argument handling node
+
+Has support for both builder format and annotation format
+
+Built for use with Beetle but can be used independently 
\ No newline at end of file
diff --git a/tests/pom.xml b/tests/pom.xml
index 91393ad..396ec77 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -21,11 +21,13 @@
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
             <version>1.16.5-R0.1-SNAPSHOT</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>me.aurium</groupId>
             <artifactId>spigot-impl</artifactId>
             <version>0.1.0-SNAPSHOT</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>me.aurium</groupId>

From 7be9a518485a5026b037f86e160e0dcd1348203a Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Thu, 18 Mar 2021 19:22:50 -0700
Subject: [PATCH 12/56] update readme.md

---
 readme.md | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 6c569dc..9ec4aaa 100644
--- a/readme.md
+++ b/readme.md
@@ -4,4 +4,32 @@ An opinionated command framework based around the concept of an argument handlin
 
 Has support for both builder format and annotation format
 
-Built for use with Beetle but can be used independently 
\ No newline at end of file
+Built for use with Beetle but can be used independently 
+
+# How can I ask for support?
+
+DM **Aesthetik#9784** on discord!
+
+# Contributing
+
+Make pull requests that arent bad and I accept them. It's about that simple!
+
+# Repositories
+
+```
+    <dependencies>
+        <dependency>
+            <groupId>me.aurium</groupId>
+            <artifactId>branch-core</artifactId>
+            <version>0.1.0</version>
+        </dependency>
+    </dependencies>
+```
+```
+    <repositories>
+        <repository>
+            <id>aurium</id>
+            <url>https://repo.repsy.io/mvn/elytraforce/default</url>
+        </repository>
+    </repositories>
+```

From 771e065c48539e7f069d6cd3d07ee738e48f1800 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Fri, 19 Mar 2021 18:30:24 -0700
Subject: [PATCH 13/56] Fix a variety of issues outlines in the PR

---
 .gitignore                                    |   1 +
 .idea/compiler.xml                            |   2 +
 .idea/jarRepositories.xml                     |   5 +
 .../beetle/branch/adapter/ContextAdapter.java |   2 +-
 .../beetle/branch/adapter/ContextWrapper.java |   2 +-
 .../branch/annotate/AnnotateConstants.java    |   7 +
 .../branch/annotate/AnnotatedCommand.java     |   2 +-
 .../branch/annotate/AnnotatedParser.java      |   6 +-
 .../beetle/branch/annotate/NoArgsNode.java    |   4 -
 .../annotate/{ => marker}/BranchingNode.java  |   2 +-
 .../branch/annotate/marker/NoArgsNode.java    |   4 +
 .../annotate/{ => marker}/SingleNode.java     |   6 +-
 .../beetle/branch/block/ArrayBlockList.java   | 151 ++++++++++++++++++
 .../me/aurium/beetle/branch/block/Block.java  |   4 +-
 .../aurium/beetle/branch/block/BlockList.java |  13 ++
 .../aurium/beetle/branch/block/BlockPath.java |   4 +-
 .../beetle/branch/block/CommonBlockPath.java  |  21 ++-
 .../beetle/branch/block/EmptyBlock.java       |   4 +-
 .../beetle/branch/tests/AbstractTests.java    |   7 +-
 .../branch/tests/BranchingNodeTests.java      |  20 +--
 .../beetle/branch/tests/SingleNodeTests.java  |  12 +-
 .../BranchingImproperAnnotatedCommand.java    |   4 +-
 .../mockups/ImproperAnnotatedCommand.java     |   2 +-
 23 files changed, 230 insertions(+), 55 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/NoArgsNode.java
 rename core/src/main/java/me/aurium/beetle/branch/annotate/{ => marker}/BranchingNode.java (87%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java
 rename core/src/main/java/me/aurium/beetle/branch/annotate/{ => marker}/SingleNode.java (59%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/block/ArrayBlockList.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/block/BlockList.java

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..85e7c1d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.idea/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1556c7f..cfbff8a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -8,10 +8,12 @@
         <outputRelativeToContentRoot value="true" />
         <module name="tests" />
         <module name="branch-core" />
+        <module name="branch-tests" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="core" target="11" />
+      <module name="tests" target="11" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index fb47437..57772c7 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,6 +21,11 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="snapshots" />
+      <option name="name" value="snapshots" />
+      <option name="url" value="https://repo.repsy.io/mvn/elytraforce/snapshots" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="aurium" />
       <option name="name" value="aurium" />
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
index e63f4c6..9b5459b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
@@ -20,7 +20,7 @@ public interface ContextAdapter<T> {
     T getSender();
     String getAlias();
     String[] getArgs();
-    void debugString(String var1);
+    void messageSender(String var1);
 
     boolean equals(Object var1);
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
index 1a9d7b4..0fd1f7a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
+++ b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
@@ -50,7 +50,7 @@ public String[] getArgs() {
     }
 
     @Override
-    public void debugString(String var1) {
+    public void messageSender(String var1) {
         context.debugString(var1);
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java
new file mode 100644
index 0000000..06f573e
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.annotate;
+
+public class AnnotateConstants {
+
+    public static final String EMPTY_IDENTIFIER_NODE = "NONE";
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
index 36f0258..757c480 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.annotate;
 
 /**
- * Marker interface for annotated commands: TODO: move this to beetle
+ * Marker interface for annotated commands:
  */
 public interface AnnotatedCommand {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
index d692619..df93333 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
@@ -1,10 +1,10 @@
 package me.aurium.beetle.branch.annotate;
 
-import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.api.command.Command;
 
 public interface AnnotatedParser<T> {
 
-    CommandNode<T> parse(AnnotatedCommand command);
-    CommandNode<T> parser(AnnotatedCommand command, ParserOptions options);
+    Command<T> parse(AnnotatedCommand command);
+    Command<T> parser(AnnotatedCommand command, ParserOptions options);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/NoArgsNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/NoArgsNode.java
deleted file mode 100644
index b65b635..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/NoArgsNode.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.annotate;
-
-public @interface NoArgsNode {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/BranchingNode.java
rename to core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java
index f0815fc..0138275 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.annotate;
+package me.aurium.beetle.branch.annotate.marker;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java
new file mode 100644
index 0000000..2d4e704
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.annotate.marker;
+
+public @interface NoArgsNode {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java
similarity index 59%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/SingleNode.java
rename to core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java
index ef4a9a6..108b53e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java
@@ -1,4 +1,6 @@
-package me.aurium.beetle.branch.annotate;
+package me.aurium.beetle.branch.annotate.marker;
+
+import me.aurium.beetle.branch.annotate.AnnotateConstants;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -9,6 +11,6 @@
 @Target(ElementType.METHOD)
 public @interface SingleNode {
 
-    String identifier();
+    String identifier() default AnnotateConstants.EMPTY_IDENTIFIER_NODE;
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/ArrayBlockList.java b/core/src/main/java/me/aurium/beetle/branch/block/ArrayBlockList.java
new file mode 100644
index 0000000..a49c4e1
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/block/ArrayBlockList.java
@@ -0,0 +1,151 @@
+package me.aurium.beetle.branch.block;
+
+import java.util.*;
+
+public class ArrayBlockList implements BlockList{
+
+    private final List<Block> delegatingList;
+
+    public ArrayBlockList() {
+        this.delegatingList = new ArrayList<>();
+    }
+
+    public ArrayBlockList(List<Block> subList) {
+        this.delegatingList = subList;
+    }
+
+    @Override
+    public void addFirst(Block block) {
+        delegatingList.add(0,block);
+    }
+
+    @Override
+    public void addLast(Block block) {
+        delegatingList.add(block);
+    }
+
+    @Override
+    public Block getFirst() {
+        return delegatingList.get(0);
+    }
+
+    @Override
+    public Block getLast() {
+        return delegatingList.get(delegatingList.size()-1);
+    }
+
+    @Override
+    public int size() {
+        return delegatingList.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return delegatingList.isEmpty();
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return delegatingList.contains(o);
+    }
+
+    @Override
+    public Iterator<Block> iterator() {
+        return delegatingList.iterator();
+    }
+
+    @Override
+    public Object[] toArray() {
+        return delegatingList.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(T[] a) {
+        return delegatingList.toArray(a);
+    }
+
+    @Override
+    public boolean add(Block block) {
+        return delegatingList.add(block);
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return delegatingList.remove(o);
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c) {
+        return delegatingList.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends Block> c) {
+        return delegatingList.addAll(c);
+    }
+
+    @Override
+    public boolean addAll(int index, Collection<? extends Block> c) {
+        return delegatingList.addAll(c);
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        return delegatingList.removeAll(c);
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        return delegatingList.retainAll(c);
+    }
+
+    @Override
+    public void clear() {
+        delegatingList.clear();
+    }
+
+    @Override
+    public Block get(int index) {
+        return delegatingList.get(index);
+    }
+
+    @Override
+    public Block set(int index, Block element) {
+        return delegatingList.set(index,element);
+    }
+
+    @Override
+    public void add(int index, Block element) {
+        delegatingList.add(index,element);
+    }
+
+    @Override
+    public Block remove(int index) {
+        return delegatingList.remove(index);
+    }
+
+    @Override
+    public int indexOf(Object o) {
+        return delegatingList.indexOf(o);
+    }
+
+    @Override
+    public int lastIndexOf(Object o) {
+        return delegatingList.lastIndexOf(o);
+    }
+
+    @Override
+    public ListIterator<Block> listIterator() {
+        return delegatingList.listIterator();
+    }
+
+    @Override
+    public ListIterator<Block> listIterator(int index) {
+        return delegatingList.listIterator(index);
+    }
+
+    @Override
+    public List<Block> subList(int fromIndex, int toIndex) {
+        return delegatingList.subList(fromIndex, toIndex);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/Block.java b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
index 5148c52..06f640d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/Block.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
@@ -9,10 +9,10 @@ public interface Block {
 
     boolean equals(Object object);
 
-    default void addLast(LinkedList<Block> list) {
+    default void addLast(BlockList list) {
         list.addLast(this);
     }
-    default void addFirst(LinkedList<Block> list) {
+    default void addFirst(BlockList list) {
         list.addFirst(this);
     }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
new file mode 100644
index 0000000..61fcd51
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.block;
+
+import java.util.List;
+
+public interface BlockList extends List<Block>{
+
+    void addFirst(Block block);
+    void addLast(Block block);
+
+    Block getFirst();
+    Block getLast();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
index ab540ec..6abc06d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
@@ -1,7 +1,5 @@
 package me.aurium.beetle.branch.block;
 
-import java.util.List;
-
 public interface BlockPath {
 
     boolean isEmpty();
@@ -55,7 +53,7 @@ public interface BlockPath {
      * Returns an ordered set of blocks
      * @return ordered set of blocks
      */
-    List<Block> getAllBlocks();
+    BlockList getAllBlocks();
 
     /**
      * DO NOT USE THIS FOR COMPARISONS. THIS IS FOR DEBUGGING ONLY.
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
index aa115c2..a873e06 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
@@ -1,7 +1,6 @@
 package me.aurium.beetle.branch.block;
 
 import java.util.LinkedList;
-import java.util.List;
 
 public class CommonBlockPath implements BlockPath {
 
@@ -9,11 +8,11 @@ public class CommonBlockPath implements BlockPath {
 
     private final BlockPath root;
     private final BlockPath parent;
-    private final LinkedList<Block> blocks;
+    private final BlockList blocks;
     private final boolean isSevered;
     private final String splitter;
 
-    public CommonBlockPath(BlockPath root, BlockPath parent, LinkedList<Block> blocks, boolean isSevered, String splitter) {
+    public CommonBlockPath(BlockPath root, BlockPath parent, BlockList blocks, boolean isSevered, String splitter) {
         this.root = root;
         this.parent = parent;
         this.blocks = blocks;
@@ -21,7 +20,7 @@ public CommonBlockPath(BlockPath root, BlockPath parent, LinkedList<Block> block
         this.splitter = splitter;
     }
 
-    public CommonBlockPath(LinkedList<Block> list, boolean isSevered, String splitter) {
+    public CommonBlockPath(BlockList list, boolean isSevered, String splitter) {
         this.root = this;
         this.parent = this;
         this.blocks = list;
@@ -32,7 +31,7 @@ public CommonBlockPath(LinkedList<Block> list, boolean isSevered, String splitte
     public CommonBlockPath(String splitter) {
         this.root = this;
         this.parent = this;
-        this.blocks = new LinkedList<>();
+        this.blocks = new ArrayBlockList();
         this.isSevered = true;
         this.splitter = splitter;
     }
@@ -70,7 +69,7 @@ public BlockPath getParent() {
     @Override
     public BlockPath resolve(BlockPath path) {
 
-        LinkedList<Block> pathBlocks = this.blocks;
+        BlockList pathBlocks = this.blocks;
 
         for (Block block : path.getAllBlocks()) {
             block.addLast(pathBlocks);
@@ -82,7 +81,7 @@ public BlockPath resolve(BlockPath path) {
     @Override
     public BlockPath resolve(Block block) {
 
-        LinkedList<Block> pathBlocks = this.blocks;
+        BlockList pathBlocks = this.blocks;
 
         block.addLast(pathBlocks);
 
@@ -96,7 +95,7 @@ public BlockPath withoutBase() {
 
     @Override
     public BlockPath fromIndex(int index) {
-        LinkedList<Block> clone = new LinkedList<>(blocks.subList(index, blocks.size()));
+        BlockList clone = new ArrayBlockList(blocks.subList(index,blocks.size()));
 
         return new CommonBlockPath(clone.get(0).asSingleBlockpath(),this.parent,clone,clone.size() > 1,splitter);
     }
@@ -107,7 +106,7 @@ public int length() {
     }
 
     @Override
-    public List<Block> getAllBlocks() {
+    public BlockList getAllBlocks() {
         return this.blocks;
     }
 
@@ -149,7 +148,7 @@ public static BlockPath of(String string, String splitter) {
     }
 
     public static BlockPath of(String[] commandArguments, String splitter) {
-        LinkedList<Block> blocklist = new LinkedList<>();
+        BlockList blocklist = new ArrayBlockList();
 
         for (String s : commandArguments) {
             blocklist.addLast(StringBlock.of(s));
@@ -159,7 +158,7 @@ public static BlockPath of(String[] commandArguments, String splitter) {
     }
 
     public static BlockPath of(Block block, String splitter) {
-        LinkedList<Block> send = new LinkedList<>();
+        BlockList send = new ArrayBlockList();
         send.addLast(block);
         return new CommonBlockPath(send,true,splitter);
     }
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
index 0ed8483..786e667 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
@@ -17,12 +17,12 @@ public BlockPath asSingleBlockpath() {
     }
 
     @Override
-    public void addFirst(LinkedList<Block> list) {
+    public void addFirst(BlockList list) {
         //nooops
     }
 
     @Override
-    public void addLast(LinkedList<Block> list) {
+    public void addLast(BlockList list) {
         //noops
     }
 
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java b/tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
index 9d36221..ae488b0 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
@@ -15,11 +15,8 @@ public abstract class AbstractTests {
     protected final static String SENDER = "Tester";
     protected final static String ALIAS = "TestCommand";
 
-    protected String[] of(String... strings) {
-        return strings;
-    }
-
-    protected void beginTest(String name) {
+    //@A248 is there a better way to do this with junit5? i'm not used to it. Is ther also a way to make the logger messages less ugly? They look shitty compared to juni4
+    protected void logTestStarting(String name) {
         logger.info(() -> "(BRANCH) Beginning test: " + name);
     }
 
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java b/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
index 402d0f0..539ca70 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
@@ -9,37 +9,37 @@ public class BranchingNodeTests extends AbstractTests {
 
     @Test
     public void testNoArgsExecution() {
-        beginTest("BranchingNode: NoArgs");
+        logTestStarting("BranchingNode: NoArgs");
 
-        command.execute(SENDER,ALIAS,of());
+        command.execute(SENDER,ALIAS,new String[]{""});
     }
 
     @Test
     public void testLinkedNodeExecution() {
-        beginTest("BranchingNode: Linked Node Execution");
+        logTestStarting("BranchingNode: Linked Node Execution");
 
-        command.execute(SENDER,ALIAS,of("help"));
+        command.execute(SENDER,ALIAS,new String[]{"help"});
     }
 
     @Test
     public void testNotLinkedNodeExecution() {
-        beginTest("BranchingNode: Unlinked Node Execution");
+        logTestStarting("BranchingNode: Unlinked Node Execution");
 
-        command.execute(SENDER,ALIAS,of("invites","unrinked"));
+        command.execute(SENDER,ALIAS,new String[]{"invites","nonexistent"});
     }
 
     @Test
     public void testBranchingExecution() {
-        beginTest("BranchingNode: Branching Execution");
+        logTestStarting("BranchingNode: Branching Execution");
 
-        command.execute(SENDER,ALIAS,of("join"));
+        command.execute(SENDER,ALIAS,new String[]{"join"});
     }
 
     @Test
     public void testBranchInBranchExecution() {
-        beginTest("BranchingNode: Branch in Branch Execution");
+        logTestStarting("BranchingNode: Branch in Branch Execution");
 
-        command.execute(SENDER,ALIAS,of("invites","on"));
+        command.execute(SENDER,ALIAS,new String[]{"invites","on"});
     }
 
 
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java b/tests/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
index f74c0dd..292f917 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
@@ -11,25 +11,25 @@ public class SingleNodeTests extends AbstractTests {
     @DisplayName("Test command with single variable, single node")
     @Test
     public void testSingleVarExecution() {
-        beginTest("SingleNode: Single argument execution");
+        logTestStarting("SingleNode: Single argument execution");
 
-        command.execute(SENDER,ALIAS,of("arg1"));
+        command.execute(SENDER,ALIAS,new String[]{"arg1"});
     }
 
     @DisplayName("Test command with no arguments, single node")
     @Test
     public void testNoArgsExecution() {
-        beginTest("SingleNode: No arguments execution");
+        logTestStarting("SingleNode: No arguments execution");
 
-        command.execute(SENDER,ALIAS,of());
+        command.execute(SENDER,ALIAS,new String[]{"join"});
     }
 
     @DisplayName("Test command with two arguments, single node")
     @Test
     public void testMultiArgsExecution() {
-        beginTest("SingleNode: Argument overflow execution");
+        logTestStarting("SingleNode: Argument overflow execution");
 
-        command.execute(SENDER,ALIAS,of("arg1","arg2"));
+        command.execute(SENDER,ALIAS,new String[]{"arg1","arg2"});
     }
 
 
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
index 0a3ebb2..f6d4e3c 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
@@ -2,8 +2,8 @@
 
 import me.aurium.beetle.branch.adapter.ContextAdapter;
 import me.aurium.beetle.branch.annotate.BranchCommand;
-import me.aurium.beetle.branch.annotate.BranchingNode;
-import me.aurium.beetle.branch.annotate.SingleNode;
+import me.aurium.beetle.branch.annotate.marker.BranchingNode;
+import me.aurium.beetle.branch.annotate.marker.SingleNode;
 
 //rule of thumb: If 1 alonenode is found in the class, it is considered an alone-node based class.
 //if more than 1 commandnode is found in the class, it is considered a branching node based class
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
index df93439..7446aac 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
+++ b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.tests.mockups;
 
 import me.aurium.beetle.branch.annotate.BranchCommand;
-import me.aurium.beetle.branch.annotate.SingleNode;
+import me.aurium.beetle.branch.annotate.marker.SingleNode;
 
 @BranchCommand
 public class ImproperAnnotatedCommand {

From 70fbc971f196da601fabe310dd514e5c678d0a4d Mon Sep 17 00:00:00 2001
From: "Aurium_ @ElytraForce" <aukrais@gmail.com>
Date: Sat, 20 Mar 2021 18:04:54 -0700
Subject: [PATCH 14/56] Update core/pom.xml

Co-authored-by: A248 <anandebeh@gmail.com>
---
 core/pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index cde80ba..a6dfb19 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -30,9 +30,12 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M5</version>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                </configuration>
             </plugin>
         </plugins>
     </build>
 
 
-</project>
\ No newline at end of file
+</project>

From 0e75f19e74c0b1412928a3be3f6ae6c25c67b585 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Mon, 22 Mar 2021 17:50:56 -0700
Subject: [PATCH 15/56] big fucking update

---
 .idea/compiler.xml                            |   3 +-
 .idea/encodings.xml                           |   4 +-
 .idea/misc.xml                                |   5 +
 .../tests.iml => beetle-impl/beetle-impl.iml  |   0
 {tests => beetle-impl}/pom.xml                |  44 +++--
 .../branch/converted/BranchCommand.java       |  15 ++
 .../launchpoints/AbstractBranchCommand.java   |  36 +++++
 .../beetle/branch/tests/AbstractTests.java    |  18 +++
 .../branch/tests/BranchingNodeTests.java      |  25 +--
 .../beetle/branch/tests/SingleNodeTests.java  |  15 +-
 .../branch/tests/context/TestContext.java     |  21 +++
 .../tests/context/TestContextProducer.java    |  21 +++
 .../tests/mockups/BranchingCommand.java       |  34 ++--
 .../BranchingImproperAnnotatedCommand.java    |  10 +-
 .../mockups/ImproperAnnotatedCommand.java     |   0
 .../tests/mockups/ProperAnnotatedCommand.java |   0
 .../branch/tests/mockups/SingleCommand.java   |  45 ++++++
 core/pom.xml                                  |  11 +-
 .../aurium/beetle/branch/BranchCommand.java   |  18 ---
 .../me/aurium/beetle/branch/CommandBase.java  |  11 --
 .../me/aurium/beetle/branch/CommandNode.java  |  16 --
 .../beetle/branch/IdentifiableNode.java       |  13 --
 .../beetle/branch/adapter/BuilderFactory.java |  12 --
 .../beetle/branch/adapter/ContextAdapter.java |  27 ----
 .../branch/adapter/ContextAdapterFactory.java |  16 --
 .../branch/adapter/ContextHandlerAdapter.java |   7 -
 .../beetle/branch/adapter/ContextWrapper.java |  56 -------
 .../DelegatingContextAdapterFactory.java      |  34 ----
 .../branch/annotate/AnnotatedParser.java      |   6 +-
 .../beetle/branch/block/ArrayBlockList.java   | 151 ------------------
 .../me/aurium/beetle/branch/block/Block.java  |   2 -
 .../aurium/beetle/branch/block/BlockList.java |   7 +-
 .../aurium/beetle/branch/block/BlockPath.java |  20 +--
 .../beetle/branch/block/CommonBlockPath.java  |  18 ++-
 .../branch/block/DelegatingBlockList.java     |  47 ++++++
 .../beetle/branch/block/EmptyBlock.java       |   6 +-
 .../beetle/branch/block/StringBlock.java      |   1 +
 .../aurium/beetle/branch/builders/Base.java   |   7 +-
 .../branch/builders/BranchingBuilder.java     |   6 +-
 .../beetle/branch/builders/Builder.java       |   4 +-
 .../beetle/branch/builders/BuilderPair.java   |   7 -
 .../beetle/branch/builders/SingleBuilder.java |   8 +-
 .../branch/context/AbstractContext.java       |  30 ++++
 .../branch/context/AbstractNodeContext.java   |  33 ++++
 .../aurium/beetle/branch/context/Context.java |  11 ++
 .../branch/context/ContextProducer.java       |  15 ++
 .../beetle/branch/context/NodeContext.java    |  16 ++
 .../handlers/EmptyExecutionHandler.java       |  11 ++
 .../handlers/EmptySuggestionHandler.java      |  17 ++
 .../branch/handlers/api/ExecutionHandler.java |   9 ++
 .../handlers/api/SuggestionHandler.java       |  11 ++
 .../launchpoints/AbstractBranchCommand.java   |  35 ----
 .../aurium/beetle/branch/nodes/AloneNode.java |   9 --
 .../beetle/branch/nodes/ArgumentNode.java     |  72 +++++++++
 .../beetle/branch/nodes/BranchingNode.java    |  31 ++--
 .../beetle/branch/nodes/SingleNode.java       |  33 ++--
 .../aurium/beetle/branch/nodes/ValueNode.java |   4 -
 .../branch/nodes/ValueSelectorNode.java       |   4 -
 .../beetle/branch/nodes/api/CommandNode.java  |  21 +++
 .../beetle/branch/nodes/api/EndpointNode.java |   9 ++
 .../branch/nodes/api/IdentifiableNode.java    |   9 ++
 .../branch/nodes/argument/Argument.java       |  24 +++
 .../nodes/argument/ArgumentContext.java       |   9 ++
 .../argument/ArgumentContextHandler.java      |   7 +
 .../branch/nodes/argument/Arguments.java      |   4 +
 .../argument/DelegatingArgumentContext.java   |  56 +++++++
 .../beetle/branch/permission/Permission.java  |  11 ++
 pom.xml                                       |   2 +-
 .../beetle/branch/tests/AbstractTests.java    |  23 ---
 .../branch/tests/mockups/MockupContext.java   |  43 -----
 .../tests/mockups/MockupContextSource.java    |  19 ---
 .../branch/tests/mockups/SingleCommand.java   |  48 ------
 72 files changed, 743 insertions(+), 690 deletions(-)
 rename tests/tests.iml => beetle-impl/beetle-impl.iml (100%)
 rename {tests => beetle-impl}/pom.xml (56%)
 create mode 100644 beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
 create mode 100644 beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
 create mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
 rename {tests => beetle-impl}/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java (61%)
 rename {tests => beetle-impl}/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java (79%)
 create mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
 create mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
 rename {tests => beetle-impl}/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java (67%)
 rename {tests => beetle-impl}/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java (80%)
 rename {tests => beetle-impl}/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java (100%)
 rename {tests => beetle-impl}/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java (100%)
 create mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/BranchCommand.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/CommandBase.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/CommandNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/IdentifiableNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/ContextHandlerAdapter.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/ArrayBlockList.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/BuilderPair.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/context/AbstractContext.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/context/Context.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/argument/DelegatingArgumentContext.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
 delete mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
 delete mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java
 delete mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java
 delete mode 100644 tests/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index cfbff8a..c21bcba 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,12 +6,13 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="beetle-impl" />
         <module name="tests" />
         <module name="branch-core" />
-        <module name="branch-tests" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
+      <module name="branch-tests" target="11" />
       <module name="core" target="11" />
       <module name="tests" target="11" />
     </bytecodeTargetLevel>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 9217cc7..2748eec 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/beetle-impl/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/beetle-impl/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/tests/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/tests/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5f3e0f8..2f9aca2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,6 +7,11 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="ignoredFiles">
+      <set>
+        <option value="$PROJECT_DIR$/tests/pom.xml" />
+      </set>
+    </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
diff --git a/tests/tests.iml b/beetle-impl/beetle-impl.iml
similarity index 100%
rename from tests/tests.iml
rename to beetle-impl/beetle-impl.iml
diff --git a/tests/pom.xml b/beetle-impl/pom.xml
similarity index 56%
rename from tests/pom.xml
rename to beetle-impl/pom.xml
index 396ec77..1c81d99 100644
--- a/tests/pom.xml
+++ b/beetle-impl/pom.xml
@@ -9,7 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>branch-tests</artifactId>
+    <version>0.1.0</version>
+
+    <artifactId>branch-beetle-impl</artifactId>
 
     <properties>
         <maven.compiler.source>${compiler.version}</maven.compiler.source>
@@ -17,29 +19,47 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>me.aurium</groupId>
-            <artifactId>spigot-impl</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
-            <scope>test</scope>
+            <artifactId>branch-core</artifactId>
+            <version>0.1.1</version>
         </dependency>
         <dependency>
             <groupId>me.aurium</groupId>
-            <artifactId>branch-core</artifactId>
-            <version>0.1.0</version>
+            <artifactId>beetle-core</artifactId>
+            <version>0.4.1</version>
         </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
             <version>5.7.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.0-alpha1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.0.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.0.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.0.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
new file mode 100644
index 0000000..678a1a4
--- /dev/null
+++ b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
@@ -0,0 +1,15 @@
+package me.aurium.beetle.branch.converted;
+
+import me.aurium.beetle.api.command.Command;
+import me.aurium.beetle.branch.context.Context;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+public interface BranchCommand<T> extends Command<T> {
+
+    CommandNode<T> getBaseNode();
+
+    default void noArgsMissingOrError(Context<T> context) {
+        context.messageSender("An error occurred while executing this command!");
+    }
+
+}
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
new file mode 100644
index 0000000..e14a9ad
--- /dev/null
+++ b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
@@ -0,0 +1,36 @@
+package me.aurium.beetle.branch.converted.launchpoints;
+
+import me.aurium.beetle.branch.converted.BranchCommand;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.block.CommonBlockPath;
+
+public abstract class AbstractBranchCommand<T> implements BranchCommand<T> {
+
+    private final ContextProducer<T> factory;
+
+    protected AbstractBranchCommand(ContextProducer<T> factory) {
+        this.factory = factory;
+    }
+
+    @Override
+    public boolean execute(T t, String s, String[] strings) {
+
+        BlockPath path = CommonBlockPath.of(strings);
+
+        CommandNode<T> baseNode = getBaseNode();
+
+        baseNode.getSpecificNode(path).ifPresentOrElse(node -> {
+            //TODO some kind of thing here
+            NodeContext<T> adapter = factory.produce(t,s,strings,node,baseNode,path);
+
+            node.getExecutionHandler(adapter).handle(adapter);
+        }, () -> {
+            noArgsMissingOrError(factory.produce(t,s,strings));
+        });
+
+        return true;
+    }
+}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
new file mode 100644
index 0000000..b0147c7
--- /dev/null
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
@@ -0,0 +1,18 @@
+package me.aurium.beetle.branch.tests;
+
+import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.tests.context.TestContextProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractTests {
+
+    protected final Logger logger = LoggerFactory.getLogger(AbstractTests.class);
+
+    protected final ContextProducer<String> adapter = new TestContextProducer();
+
+    protected final static String SENDER = "Tester";
+    protected final static String ALIAS = "TestCommand";
+
+
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
similarity index 61%
rename from tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
rename to beetle-impl/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
index 539ca70..631daba 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
@@ -1,44 +1,47 @@
 package me.aurium.beetle.branch.tests;
 
 import me.aurium.beetle.branch.tests.mockups.BranchingCommand;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 
 public class BranchingNodeTests extends AbstractTests {
 
-    private final BranchingCommand command = new BranchingCommand(adapter,logger);
+    private final BranchingCommand command = new BranchingCommand(adapter);
 
+    @BeforeEach
+    public void logTestStarting(TestInfo info) {
+        logger.info("Starting test {}", info.getDisplayName());
+    }
+
+    @DisplayName("Test with no arguments")
     @Test
     public void testNoArgsExecution() {
-        logTestStarting("BranchingNode: NoArgs");
-
         command.execute(SENDER,ALIAS,new String[]{""});
     }
 
+    @DisplayName("Test targetting the linked no-args node of a command")
     @Test
     public void testLinkedNodeExecution() {
-        logTestStarting("BranchingNode: Linked Node Execution");
-
         command.execute(SENDER,ALIAS,new String[]{"help"});
     }
 
+    @DisplayName("Test targeting an unlinked no-args node")
     @Test
     public void testNotLinkedNodeExecution() {
-        logTestStarting("BranchingNode: Unlinked Node Execution");
-
         command.execute(SENDER,ALIAS,new String[]{"invites","nonexistent"});
     }
 
+    @DisplayName("Test targetting a branching node")
     @Test
     public void testBranchingExecution() {
-        logTestStarting("BranchingNode: Branching Execution");
-
         command.execute(SENDER,ALIAS,new String[]{"join"});
     }
 
+    @DisplayName("Test branch node inside of branch node")
     @Test
     public void testBranchInBranchExecution() {
-        logTestStarting("BranchingNode: Branch in Branch Execution");
-
         command.execute(SENDER,ALIAS,new String[]{"invites","on"});
     }
 
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
similarity index 79%
rename from tests/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
rename to beetle-impl/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
index 292f917..403df29 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
@@ -1,34 +1,35 @@
 package me.aurium.beetle.branch.tests;
 
 import me.aurium.beetle.branch.tests.mockups.SingleCommand;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 
 public class SingleNodeTests extends AbstractTests {
 
-    private final SingleCommand command = new SingleCommand(adapter,logger);
+    private final SingleCommand command = new SingleCommand(adapter);
+
+    @BeforeEach
+    public void logTestStarting(TestInfo info) {
+        logger.info("Starting test {}", info.getDisplayName());
+    }
 
     @DisplayName("Test command with single variable, single node")
     @Test
     public void testSingleVarExecution() {
-        logTestStarting("SingleNode: Single argument execution");
-
         command.execute(SENDER,ALIAS,new String[]{"arg1"});
     }
 
     @DisplayName("Test command with no arguments, single node")
     @Test
     public void testNoArgsExecution() {
-        logTestStarting("SingleNode: No arguments execution");
-
         command.execute(SENDER,ALIAS,new String[]{"join"});
     }
 
     @DisplayName("Test command with two arguments, single node")
     @Test
     public void testMultiArgsExecution() {
-        logTestStarting("SingleNode: Argument overflow execution");
-
         command.execute(SENDER,ALIAS,new String[]{"arg1","arg2"});
     }
 
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
new file mode 100644
index 0000000..6f94dac
--- /dev/null
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
@@ -0,0 +1,21 @@
+package me.aurium.beetle.branch.tests.context;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.context.AbstractNodeContext;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestContext extends AbstractNodeContext<String> {
+
+    private final Logger logger = LoggerFactory.getLogger(TestContext.class);
+
+    protected TestContext(String s, String alias, String[] args, CommandNode<String> executed, CommandNode<String> base, BlockPath path) {
+        super(s, alias, args, executed, base, path);
+    }
+
+    @Override
+    public void messageSender(String string) {
+        logger.info(string);
+    }
+}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
new file mode 100644
index 0000000..452dfcb
--- /dev/null
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
@@ -0,0 +1,21 @@
+package me.aurium.beetle.branch.tests.context;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.context.Context;
+import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+public class TestContextProducer implements ContextProducer<String> {
+
+
+    @Override
+    public NodeContext<String> produce(String s, String alias, String[] strings, CommandNode<String> executedNode, CommandNode<String> baseNode, BlockPath path) {
+        return new TestContext(s,alias,strings,executedNode,baseNode,path);
+    }
+
+    @Override
+    public Context<String> produce(String s, String alias, String[] strings) {
+        return new TestContext(s,alias,strings,null,null,null);
+    }
+}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
similarity index 67%
rename from tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
rename to beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
index 46b6c9f..7748c88 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
@@ -1,23 +1,23 @@
 package me.aurium.beetle.branch.tests.mockups;
 
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.context.ContextProducer;
 import me.aurium.beetle.branch.builders.Base;
 import me.aurium.beetle.branch.builders.BranchingBuilder;
 import me.aurium.beetle.branch.builders.SingleBuilder;
-import me.aurium.beetle.branch.launchpoints.AbstractBranchCommand;
-import org.junit.platform.commons.logging.Logger;
+import me.aurium.beetle.branch.converted.launchpoints.AbstractBranchCommand;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A fake command pretending to be a kitpvp plugin command
  */
 public class BranchingCommand extends AbstractBranchCommand<String> {
-    private final Logger logger;
 
-    public BranchingCommand(ContextAdapterFactory<String> factory, Logger logger) {
-        super(factory);
+    private final Logger logger = LoggerFactory.getLogger(BranchingCommand.class);
 
-        this.logger = logger;
+    public BranchingCommand(ContextProducer<String> factory) {
+        super(factory);
     }
 
     @Override
@@ -28,7 +28,7 @@ public CommandNode<String> getBaseNode() {
             kitpvp.withNode(new SingleBuilder<>(), join -> {
                 join.withIdentifier("join");
                 join.withHandler(handler -> {
-                    logger.info(() -> handler.getSender() + " joined the kitpvp match!");
+                    logger.info(handler.getSender() + " joined the kitpvp match!");
                     //logic
                 });
             });
@@ -38,20 +38,20 @@ public CommandNode<String> getBaseNode() {
                 invites.withNode(new SingleBuilder<>(), on -> {
                     on.withIdentifier("on");
                     on.withHandler(text -> {
-                        logger.info(() -> "Invites toggled on!");
+                        logger.info("Invites toggled on!");
                     });
 
                 });
                 invites.withNode(new SingleBuilder<>(), off -> {
                     off.withIdentifier("on");
                     off.withHandler(text -> {
-                        logger.info(() -> "Invites toggled on!");
+                        logger.info("Invites toggled on!");
                     });
                 });
                 invites.withNoArgs(new SingleBuilder<>(), false, noArgs -> {
                     noArgs.withIdentifier("unlinked");
                     noArgs.withHandler(handler -> {
-                        logger.info(() -> "You must specify either on or off!");
+                        logger.info("You must specify either on or off!");
                     });
                 });
             });
@@ -59,10 +59,10 @@ public CommandNode<String> getBaseNode() {
             kitpvp.withNoArgs(new SingleBuilder<>(), true, help -> {
                 help.withIdentifier("help");
                 help.withHandler(handler -> {
-                    logger.info(() -> "Hey, " + handler.getSender() + ", here is some help from KitPVP!");
-                    logger.info(() -> "/kitpvp help");
-                    logger.info(() -> "/kitpvp join");
-                    logger.info(() -> "/kitpvp invites <on/off>");
+                    logger.info("Hey, " + handler.getSender() + ", here is some help from KitPVP!");
+                    logger.info("/kitpvp help");
+                    logger.info("/kitpvp join");
+                    logger.info("/kitpvp invites <on/off>");
                 });
             });
 
@@ -77,6 +77,6 @@ public String getName() {
 
     @Override
     public String getPermission() {
-        return "testPermission";
+        return "none";
     }
 }
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
similarity index 80%
rename from tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
rename to beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
index f6d4e3c..27a2a29 100644
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.tests.mockups;
 
-import me.aurium.beetle.branch.adapter.ContextAdapter;
+import me.aurium.beetle.branch.context.NodeContext;
 import me.aurium.beetle.branch.annotate.BranchCommand;
 import me.aurium.beetle.branch.annotate.marker.BranchingNode;
 import me.aurium.beetle.branch.annotate.marker.SingleNode;
@@ -13,13 +13,13 @@
 public class BranchingImproperAnnotatedCommand {
 
     @SingleNode(identifier = "branch1")
-    public void branch1(ContextAdapter<String> context) {
-        context.getSender();
+    public void branch1(NodeContext<String> nodeContext) {
+        nodeContext.getSender();
     }
 
     @SingleNode(identifier = "branch2")
-    public void branch2(ContextAdapter<String> context) {
-        context.getSender();
+    public void branch2(NodeContext<String> nodeContext) {
+        nodeContext.getSender();
     }
 
     @BranchingNode(identifier = "branching1")
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
similarity index 100%
rename from tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
rename to beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
similarity index 100%
rename from tests/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
rename to beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
new file mode 100644
index 0000000..58b2aaf
--- /dev/null
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
@@ -0,0 +1,45 @@
+package me.aurium.beetle.branch.tests.mockups;
+
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.builders.Base;
+import me.aurium.beetle.branch.builders.SingleBuilder;
+import me.aurium.beetle.branch.converted.launchpoints.AbstractBranchCommand;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+
+/**
+ * Fake command representing something like /helloworld that always says helloworld
+ */
+public class SingleCommand extends AbstractBranchCommand<String> {
+    private final Logger log = LoggerFactory.getLogger(SingleCommand.class);
+
+    public SingleCommand(ContextProducer<String> factory) {
+        super(factory);
+    }
+
+    @Override
+    public CommandNode<String> getBaseNode() {
+        return Base.base(new SingleBuilder<>(),builder -> {
+            builder.withHandler(context -> {
+                log.info("hello world!");
+
+                log.info("The sender is: " + context.getSender());
+                log.info("The arguments were: " + Arrays.toString(context.getArgs()));
+                log.info("The path was: " + context.executedPath());
+            });
+        });
+    }
+
+    @Override
+    public String getName() {
+        return "helloworld";
+    }
+
+    @Override
+    public String getPermission() {
+        return "testPermission";
+    }
+}
diff --git a/core/pom.xml b/core/pom.xml
index cde80ba..94eb858 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -11,19 +11,13 @@
 
     <artifactId>branch-core</artifactId>
 
+    <version>0.1.1</version>
+
     <properties>
         <maven.compiler.source>${compiler.version}</maven.compiler.source>
         <maven.compiler.target>${compiler.version}</maven.compiler.target>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>me.aurium</groupId>
-            <artifactId>beetle-core</artifactId>
-            <version>0.4.1</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -34,5 +28,4 @@
         </plugins>
     </build>
 
-
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/BranchCommand.java b/core/src/main/java/me/aurium/beetle/branch/BranchCommand.java
deleted file mode 100644
index 37e5c51..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/BranchCommand.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.aurium.beetle.branch;
-
-import me.aurium.beetle.api.command.Command;
-import me.aurium.beetle.api.command.ContextHandler;
-
-public interface BranchCommand<T> extends Command<T> {
-
-    CommandNode<T> getBaseNode();
-
-    default ContextHandler<T> noArgsMissingOrError() {
-        return (context) -> {
-            context.debugString("An error occurred while executing this command!");
-
-            return false;
-        };
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/CommandBase.java b/core/src/main/java/me/aurium/beetle/branch/CommandBase.java
deleted file mode 100644
index e60b797..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/CommandBase.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch;
-
-import me.aurium.beetle.api.command.Context;
-import me.aurium.beetle.api.command.ContextHandler;
-
-public interface CommandBase<T> {
-
-    ContextHandler<T> getHandler(Context<T> context);
-    void handleContext(Context<T> context);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
deleted file mode 100644
index 6dff926..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/CommandNode.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package me.aurium.beetle.branch;
-
-import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
-import me.aurium.beetle.branch.block.BlockPath;
-
-import java.util.Collection;
-import java.util.Optional;
-
-public interface CommandNode<T> {
-
-    ContextHandlerAdapter<T> getContextHandler();
-
-    Optional<IdentifiableNode<T>> getSpecificNode(BlockPath path);
-    Collection<IdentifiableNode<T>> getLinkedNodes();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/IdentifiableNode.java b/core/src/main/java/me/aurium/beetle/branch/IdentifiableNode.java
deleted file mode 100644
index be923d6..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/IdentifiableNode.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch;
-
-import me.aurium.beetle.branch.block.Block;
-
-public interface IdentifiableNode<T> extends CommandNode<T> {
-
-    Block getIdentifier();
-
-    /* TODO tabcompleteHandler
-    TabContextHandler<T> getSpecificTabHandler(BlockPath path);
-    TabContextHandler<T> getTabHandler(); //tabhandler (probably just return this.id)*/
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java b/core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java
deleted file mode 100644
index 567617d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/BuilderFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package me.aurium.beetle.branch.adapter;
-
-import me.aurium.beetle.branch.builders.BranchingBuilder;
-import me.aurium.beetle.branch.builders.SingleBuilder;
-
-public interface BuilderFactory<T> {
-
-    SingleBuilder<T> single();
-    BranchingBuilder<T> branching();
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
deleted file mode 100644
index 9b5459b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.adapter;
-
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.IdentifiableNode;
-import me.aurium.beetle.branch.block.BlockPath;
-
-/**
- * cum eternal
- * @param <T> cum
- */
-public interface ContextAdapter<T> {
-
-    IdentifiableNode<T> getExecutedNode();
-    CommandNode<T> getBaseExecutedNode();
-
-    BlockPath executedPath();
-
-    //adapter
-
-    T getSender();
-    String getAlias();
-    String[] getArgs();
-    void messageSender(String var1);
-
-    boolean equals(Object var1);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java
deleted file mode 100644
index 4743e35..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextAdapterFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package me.aurium.beetle.branch.adapter;
-
-import me.aurium.beetle.api.command.Context;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.IdentifiableNode;
-import me.aurium.beetle.branch.block.BlockPath;
-
-/**
- * Produces context adapters, like the stock ContextSource for contexts.
- */
-public interface ContextAdapterFactory<T> {
-
-    ContextAdapter<T> produce(T t, String alias, String[] strings, IdentifiableNode<T> executedNode, CommandNode<T> baseNode, BlockPath path);
-    Context<T> context(T t, String alias, String[] strings);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextHandlerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextHandlerAdapter.java
deleted file mode 100644
index 4d0221c..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextHandlerAdapter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.adapter;
-
-public interface ContextHandlerAdapter<T> {
-
-    void handle(ContextAdapter<T> adapter);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java b/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
deleted file mode 100644
index 0fd1f7a..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/ContextWrapper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package me.aurium.beetle.branch.adapter;
-
-import me.aurium.beetle.api.command.Context;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.IdentifiableNode;
-import me.aurium.beetle.branch.block.BlockPath;
-
-public class ContextWrapper<T> implements ContextAdapter<T> {
-
-    private final Context<T> context;
-    private final IdentifiableNode<T> executedNode;
-    private final CommandNode<T> baseNode;
-    private final BlockPath executedPath;
-
-    public ContextWrapper(Context<T> context, IdentifiableNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath) {
-        this.context = context;
-        this.executedNode = executedNode;
-        this.baseNode = baseNode;
-        this.executedPath = executedPath;
-    }
-
-    @Override
-    public IdentifiableNode<T> getExecutedNode() {
-        return executedNode;
-    }
-
-    @Override
-    public CommandNode<T> getBaseExecutedNode() {
-        return baseNode;
-    }
-
-    @Override
-    public BlockPath executedPath() {
-        return executedPath;
-    }
-
-    @Override
-    public T getSender() {
-        return context.getSender();
-    }
-
-    @Override
-    public String getAlias() {
-        return context.getAlias();
-    }
-
-    @Override
-    public String[] getArgs() {
-        return context.getArgs();
-    }
-
-    @Override
-    public void messageSender(String var1) {
-        context.debugString(var1);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java b/core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java
deleted file mode 100644
index bd876e1..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/adapter/DelegatingContextAdapterFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package me.aurium.beetle.branch.adapter;
-
-import me.aurium.beetle.api.command.Context;
-import me.aurium.beetle.api.command.ContextSource;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.IdentifiableNode;
-import me.aurium.beetle.branch.block.BlockPath;
-
-/**
- * UndeterministicImmutableModifiableContextAdapterFactoryPatternSelectorNodeContainerSource!
- *
- * I feel like a real dev now! /s
- */
-public class DelegatingContextAdapterFactory<T> implements ContextAdapterFactory<T> {
-
-    public DelegatingContextAdapterFactory(ContextSource<T> delegate) {
-        this.delegate = delegate;
-    }
-
-    public final ContextSource<T> delegate;
-
-    @Override
-    public ContextAdapter<T> produce(T t, String alias, String[] strings, IdentifiableNode<T> executedNode, CommandNode<T> baseNode, BlockPath path) {
-
-        Context<T> context = context(t,alias,strings);
-
-        return new ContextWrapper<>(context,executedNode,baseNode,path);
-    }
-
-    @Override
-    public Context<T> context(T t, String alias, String[] strings) {
-        return delegate.context(t,alias,strings);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
index df93333..c39f358 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
@@ -1,10 +1,10 @@
 package me.aurium.beetle.branch.annotate;
 
-import me.aurium.beetle.api.command.Command;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 public interface AnnotatedParser<T> {
 
-    Command<T> parse(AnnotatedCommand command);
-    Command<T> parser(AnnotatedCommand command, ParserOptions options);
+    CommandNode<T> parse(Class<AnnotatedCommand> command);
+    CommandNode<T> parser(Class<AnnotatedCommand> command, ParserOptions options);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/ArrayBlockList.java b/core/src/main/java/me/aurium/beetle/branch/block/ArrayBlockList.java
deleted file mode 100644
index a49c4e1..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/ArrayBlockList.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-import java.util.*;
-
-public class ArrayBlockList implements BlockList{
-
-    private final List<Block> delegatingList;
-
-    public ArrayBlockList() {
-        this.delegatingList = new ArrayList<>();
-    }
-
-    public ArrayBlockList(List<Block> subList) {
-        this.delegatingList = subList;
-    }
-
-    @Override
-    public void addFirst(Block block) {
-        delegatingList.add(0,block);
-    }
-
-    @Override
-    public void addLast(Block block) {
-        delegatingList.add(block);
-    }
-
-    @Override
-    public Block getFirst() {
-        return delegatingList.get(0);
-    }
-
-    @Override
-    public Block getLast() {
-        return delegatingList.get(delegatingList.size()-1);
-    }
-
-    @Override
-    public int size() {
-        return delegatingList.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return delegatingList.isEmpty();
-    }
-
-    @Override
-    public boolean contains(Object o) {
-        return delegatingList.contains(o);
-    }
-
-    @Override
-    public Iterator<Block> iterator() {
-        return delegatingList.iterator();
-    }
-
-    @Override
-    public Object[] toArray() {
-        return delegatingList.toArray();
-    }
-
-    @Override
-    public <T> T[] toArray(T[] a) {
-        return delegatingList.toArray(a);
-    }
-
-    @Override
-    public boolean add(Block block) {
-        return delegatingList.add(block);
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        return delegatingList.remove(o);
-    }
-
-    @Override
-    public boolean containsAll(Collection<?> c) {
-        return delegatingList.containsAll(c);
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends Block> c) {
-        return delegatingList.addAll(c);
-    }
-
-    @Override
-    public boolean addAll(int index, Collection<? extends Block> c) {
-        return delegatingList.addAll(c);
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> c) {
-        return delegatingList.removeAll(c);
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> c) {
-        return delegatingList.retainAll(c);
-    }
-
-    @Override
-    public void clear() {
-        delegatingList.clear();
-    }
-
-    @Override
-    public Block get(int index) {
-        return delegatingList.get(index);
-    }
-
-    @Override
-    public Block set(int index, Block element) {
-        return delegatingList.set(index,element);
-    }
-
-    @Override
-    public void add(int index, Block element) {
-        delegatingList.add(index,element);
-    }
-
-    @Override
-    public Block remove(int index) {
-        return delegatingList.remove(index);
-    }
-
-    @Override
-    public int indexOf(Object o) {
-        return delegatingList.indexOf(o);
-    }
-
-    @Override
-    public int lastIndexOf(Object o) {
-        return delegatingList.lastIndexOf(o);
-    }
-
-    @Override
-    public ListIterator<Block> listIterator() {
-        return delegatingList.listIterator();
-    }
-
-    @Override
-    public ListIterator<Block> listIterator(int index) {
-        return delegatingList.listIterator(index);
-    }
-
-    @Override
-    public List<Block> subList(int fromIndex, int toIndex) {
-        return delegatingList.subList(fromIndex, toIndex);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/Block.java b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
index 06f640d..aef4888 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/Block.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
@@ -1,7 +1,5 @@
 package me.aurium.beetle.branch.block;
 
-import java.util.LinkedList;
-
 public interface Block {
 
     String getIdentifier();
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
index 61fcd51..9673233 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-public interface BlockList extends List<Block>{
+public interface BlockList{
 
     void addFirst(Block block);
     void addLast(Block block);
@@ -10,4 +10,9 @@ public interface BlockList extends List<Block>{
     Block getFirst();
     Block getLast();
 
+    boolean isEmpty();
+    int size();
+
+    List<Block> getBackingList();
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
index 6abc06d..3e03457 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
@@ -8,16 +8,8 @@ public interface BlockPath {
     boolean endsWith(Block path);
     boolean startsWith(Block path);
 
-    /**
-     * Gets a severed root blockpath at the base
-     * @return the severed root.
-     */
-    BlockPath getRoot();
 
-    /**
-     * Get a blockpath one above this path
-     * @return a cloned blockpath one above this
-     */
+    BlockPath getRoot();
     BlockPath getParent();
 
     /**
@@ -33,18 +25,8 @@ public interface BlockPath {
      * @return a cloned path plus that block
      */
     BlockPath resolve(Block block);
-
     BlockPath withoutBase();
 
-    /**
-     * Starts at an index
-     * @param index the index to start from.
-     *
-     * Example: We are at some.cool.string and the fromIndex is 0
-     * Now the cloned path is cool.string
-     *
-     * @return the subpath
-     */
     BlockPath fromIndex(int index);
 
     int length();
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
index a873e06..94177df 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.block;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
 
 public class CommonBlockPath implements BlockPath {
 
@@ -31,7 +31,7 @@ public CommonBlockPath(BlockList list, boolean isSevered, String splitter) {
     public CommonBlockPath(String splitter) {
         this.root = this;
         this.parent = this;
-        this.blocks = new ArrayBlockList();
+        this.blocks = new DelegatingBlockList(new ArrayList<>());
         this.isSevered = true;
         this.splitter = splitter;
     }
@@ -71,7 +71,7 @@ public BlockPath resolve(BlockPath path) {
 
         BlockList pathBlocks = this.blocks;
 
-        for (Block block : path.getAllBlocks()) {
+        for (Block block : path.getAllBlocks().getBackingList()) {
             block.addLast(pathBlocks);
         }
 
@@ -95,9 +95,11 @@ public BlockPath withoutBase() {
 
     @Override
     public BlockPath fromIndex(int index) {
-        BlockList clone = new ArrayBlockList(blocks.subList(index,blocks.size()));
+        BlockList clone = new DelegatingBlockList(new ArrayList<>(
+                blocks.getBackingList().subList(index,blocks.size())
+        ));
 
-        return new CommonBlockPath(clone.get(0).asSingleBlockpath(),this.parent,clone,clone.size() > 1,splitter);
+        return new CommonBlockPath(clone.getBackingList().get(0).asSingleBlockpath(),this.parent,clone,clone.size() > 1,splitter);
     }
 
     @Override
@@ -115,7 +117,7 @@ public String toString() {
 
         StringBuilder base = new StringBuilder();
 
-        for (Block block : this.blocks) {
+        for (Block block : this.blocks.getBackingList()) {
             base.append('{').append(block.getIdentifier()).append('}');
         }
 
@@ -148,7 +150,7 @@ public static BlockPath of(String string, String splitter) {
     }
 
     public static BlockPath of(String[] commandArguments, String splitter) {
-        BlockList blocklist = new ArrayBlockList();
+        BlockList blocklist = new DelegatingBlockList(new ArrayList<>());
 
         for (String s : commandArguments) {
             blocklist.addLast(StringBlock.of(s));
@@ -158,7 +160,7 @@ public static BlockPath of(String[] commandArguments, String splitter) {
     }
 
     public static BlockPath of(Block block, String splitter) {
-        BlockList send = new ArrayBlockList();
+        BlockList send = new DelegatingBlockList(new ArrayList<>());
         send.addLast(block);
         return new CommonBlockPath(send,true,splitter);
     }
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java b/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
new file mode 100644
index 0000000..8b3f184
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
@@ -0,0 +1,47 @@
+package me.aurium.beetle.branch.block;
+
+import java.util.List;
+
+public class DelegatingBlockList implements BlockList{
+
+    private final List<Block> blocks;
+
+    public DelegatingBlockList(List<Block> blocks) {
+        this.blocks = blocks;
+    }
+
+    @Override
+    public void addFirst(Block block) {
+        blocks.add(0,block);
+    }
+
+    @Override
+    public void addLast(Block block) {
+        blocks.add(block);
+    }
+
+    @Override
+    public Block getFirst() {
+        return blocks.get(0);
+    }
+
+    @Override
+    public Block getLast() {
+        return blocks.get(blocks.size()-1);
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return blocks.isEmpty();
+    }
+
+    @Override
+    public int size() {
+        return blocks.size();
+    }
+
+    @Override
+    public List<Block> getBackingList() {
+        return blocks;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
index 786e667..8b5558c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
@@ -1,14 +1,10 @@
 package me.aurium.beetle.branch.block;
 
-import me.aurium.beetle.api.util.NotImplementedException;
-
-import java.util.LinkedList;
-
 public class EmptyBlock implements Block{
 
     @Override
     public String getIdentifier() {
-        throw new NotImplementedException("Empty block should not exist in path!");
+        throw new UnsupportedOperationException("Empty block should not exist in path!");
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
index 712954c..1cc122a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
@@ -1,4 +1,5 @@
 package me.aurium.beetle.branch.block;
+
 public class StringBlock implements Block {
 
     private final String identifier;
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/Base.java b/core/src/main/java/me/aurium/beetle/branch/builders/Base.java
index 7a47c70..4060ed3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/Base.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/Base.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.builders;
 
-import me.aurium.beetle.branch.CommandNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 import java.util.function.Consumer;
 
@@ -12,4 +12,9 @@ public static <E, C extends Builder<E>> CommandNode<E> base(C key, Consumer<C> c
         return key.buildWithoutIdentifier();
     }
 
+    //TODO a separate base logic to consume a ClassParser and turn it into a command :)
+    public static <T> CommandNode<T> base() {
+        return null;
+    }
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
index d753908..56290ef 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
@@ -1,11 +1,11 @@
 package me.aurium.beetle.branch.builders;
 
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.block.EmptyBlock;
-import me.aurium.beetle.branch.IdentifiableNode;
 import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.block.EmptyBlock;
 import me.aurium.beetle.branch.block.StringBlock;
 import me.aurium.beetle.branch.nodes.BranchingNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
 import java.util.HashSet;
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java b/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
index 8947e55..73db179 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.builders;
 
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.IdentifiableNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
 
 public interface Builder<C>{
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/BuilderPair.java b/core/src/main/java/me/aurium/beetle/branch/builders/BuilderPair.java
deleted file mode 100644
index efee680..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/BuilderPair.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-public interface BuilderPair<T extends Builder<?>> {
-
-    <C> T newBuilder();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
index fa47c1c..89888a3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
@@ -1,18 +1,18 @@
 package me.aurium.beetle.branch.builders;
 
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.EmptyBlock;
 import me.aurium.beetle.branch.block.StringBlock;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.nodes.SingleNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 import java.util.Objects;
 
 public class SingleBuilder<T> implements AloneBuilder<T> {
 
     private Block block;
-    private ContextHandlerAdapter<T> contextHandler;
+    private ExecutionHandler<T> contextHandler;
 
     public void withIdentifier(Block identifier) {
         this.block = identifier;
@@ -22,7 +22,7 @@ public void withIdentifier(String string) {
         this.block = StringBlock.of(string);
     }
 
-    public void withHandler(ContextHandlerAdapter<T> handler) {
+    public void withHandler(ExecutionHandler<T> handler) {
         this.contextHandler = handler;
     }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/AbstractContext.java b/core/src/main/java/me/aurium/beetle/branch/context/AbstractContext.java
new file mode 100644
index 0000000..f3b80ac
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/context/AbstractContext.java
@@ -0,0 +1,30 @@
+package me.aurium.beetle.branch.context;
+
+public abstract class AbstractContext<T> implements Context<T> {
+
+    private final T t;
+    private final String alias;
+    private final String[] args;
+
+    protected AbstractContext(T t, String alias, String[] args) {
+        this.t = t;
+        this.alias = alias;
+        this.args = args;
+    }
+
+    @Override
+    public T getSender() {
+        return t;
+    }
+
+    @Override
+    public String getAlias() {
+        return alias;
+    }
+
+    @Override
+    public String[] getArgs() {
+        return args;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java
new file mode 100644
index 0000000..393f168
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java
@@ -0,0 +1,33 @@
+package me.aurium.beetle.branch.context;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+public abstract class AbstractNodeContext<T> extends AbstractContext<T> implements NodeContext<T> {
+
+    private final CommandNode<T> executed;
+    private final CommandNode<T> base;
+    private final BlockPath path;
+
+    protected AbstractNodeContext(T t, String alias, String[] args, CommandNode<T> executed, CommandNode<T> base, BlockPath path) {
+        super(t, alias, args);
+        this.executed = executed;
+        this.base = base;
+        this.path = path;
+    }
+
+    @Override
+    public CommandNode<T> getExecutedNode() {
+        return executed;
+    }
+
+    @Override
+    public CommandNode<T> getBaseExecutedNode() {
+        return base;
+    }
+
+    @Override
+    public BlockPath executedPath() {
+        return path;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/Context.java b/core/src/main/java/me/aurium/beetle/branch/context/Context.java
new file mode 100644
index 0000000..f1670ad
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/context/Context.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.context;
+
+public interface Context<T> {
+
+    T getSender();
+    String getAlias();
+    String[] getArgs();
+
+    void messageSender(String string);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java b/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
new file mode 100644
index 0000000..0daf4f6
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
@@ -0,0 +1,15 @@
+package me.aurium.beetle.branch.context;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+/**
+ * Produces context adapters, like the stock ContextSource for contexts.
+ */
+public interface ContextProducer<T> {
+
+    NodeContext<T> produce(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath path);
+
+    Context<T> produce(T t, String alias, String[] strings);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
new file mode 100644
index 0000000..3477038
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
@@ -0,0 +1,16 @@
+package me.aurium.beetle.branch.context;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+
+public interface NodeContext<T> extends Context<T> {
+
+    CommandNode<T> getExecutedNode();
+    CommandNode<T> getBaseExecutedNode();
+
+    BlockPath executedPath();
+
+    boolean equals(Object comparison);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
new file mode 100644
index 0000000..28ebc8a
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.handlers;
+
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+
+public class EmptyExecutionHandler<T> implements ExecutionHandler<T> {
+    @Override
+    public void handle(NodeContext<T> adapter) {
+
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
new file mode 100644
index 0000000..85a1ee9
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
@@ -0,0 +1,17 @@
+package me.aurium.beetle.branch.handlers;
+
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EmptySuggestionHandler<T> implements SuggestionHandler<T> {
+
+    private final List<String> emptyList = new ArrayList<>();
+
+    @Override
+    public List<String> handle(NodeContext<T> adapter) {
+        return emptyList;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
new file mode 100644
index 0000000..3445b1e
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.handlers.api;
+
+import me.aurium.beetle.branch.context.NodeContext;
+
+public interface ExecutionHandler<T> {
+
+    void handle(NodeContext<T> adapter);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
new file mode 100644
index 0000000..9c26790
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.handlers.api;
+
+import me.aurium.beetle.branch.context.NodeContext;
+
+import java.util.List;
+
+public interface SuggestionHandler<T> {
+
+    List<String> handle(NodeContext<T> adapter);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
deleted file mode 100644
index 673e8f7..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/AbstractBranchCommand.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package me.aurium.beetle.branch.launchpoints;
-
-import me.aurium.beetle.branch.BranchCommand;
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.adapter.ContextAdapter;
-import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.block.CommonBlockPath;
-
-public abstract class AbstractBranchCommand<T> implements BranchCommand<T> {
-
-    private final ContextAdapterFactory<T> factory;
-
-    protected AbstractBranchCommand(ContextAdapterFactory<T> factory) {
-        this.factory = factory;
-    }
-
-    @Override
-    public boolean execute(T t, String s, String[] strings) {
-
-        BlockPath path = CommonBlockPath.of(strings);
-
-        CommandNode<T> baseNode = getBaseNode();
-
-        baseNode.getSpecificNode(path).ifPresentOrElse(node -> {
-            ContextAdapter<T> adapter = factory.produce(t,s,strings,node,baseNode,path);
-
-            node.getContextHandler().handle(adapter);
-        }, () -> {
-            noArgsMissingOrError().handle(factory.context(t,s,strings));
-        });
-
-        return true;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java
deleted file mode 100644
index 3b297c4..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/AloneNode.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-import me.aurium.beetle.branch.IdentifiableNode;
-
-/**
- * Marker interface for a node that is alone (so not branching, but not merging either)
- */
-public interface AloneNode<T> extends IdentifiableNode<T> {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
new file mode 100644
index 0000000..788b21a
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
@@ -0,0 +1,72 @@
+package me.aurium.beetle.branch.nodes;
+
+import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
+import me.aurium.beetle.branch.nodes.argument.Argument;
+
+import java.util.List;
+import java.util.Optional;
+
+//kinda like a branching node except it throws forward and not to the sides
+public class ArgumentNode<T> implements IdentifiableNode<T> {
+
+    private final Block identifier;
+    private final List<Argument<?>> sequentialValueNodes; //the nodes in order from here on out
+    private final SingleNode<T> noArgs;
+
+    public ArgumentNode(Block identifier, List<Argument<?>> sequentialValueNodes, SingleNode<T> noArgs) {
+        this.identifier = identifier;
+        this.sequentialValueNodes = sequentialValueNodes;
+        this.noArgs = noArgs;
+    }
+
+
+    // - These two methods can remain unimplemented because this node will never be used for contexthandlers and suggestionhandlers -
+    // - The actual contextHandler and Suggestionhandler are provided by the getSpecificNode method returning an anonymous basenode -
+    // - This is because the contexthandler and suggestion handler here always depend on the blockpath, and in order to respect -
+    // - the node map object model, we must do this.
+
+
+    @Override
+    public Optional<CommandNode<T>> getSpecificNode(BlockPath path) {
+        return Optional.of(this);
+    }
+
+    /*if (path.isEmpty()) return Optional.of(noArgs);
+
+        return Optional.of(this);*/
+
+        /* This was pointless, see below note
+
+        //we can either do this shit, or we can return **THIS** no matter what and let the context handler be variable, since the context handler delegates
+        //to another adapter anyways
+
+        int position = path.length() - 1; //wow real throwback to LEAF framework huh
+        int size = sequentialValueNodes.size();
+
+        //check the length
+        if (position == size) return Optional.of(sequentialValueNodes.get(size - 1));
+
+        return Optional.of(sequentialValueNodes.get(position));
+        */
+
+    @Override
+    public ExecutionHandler<T> getExecutionHandler(NodeContext<T> adapter) {
+        return null;
+    }
+
+    @Override
+    public SuggestionHandler<T> getSuggestionHandler(NodeContext<T> adapter) {
+        return null;
+    }
+
+    @Override
+    public Block getIdentifier() {
+        return identifier;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index ba027ba..cb9a458 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -1,12 +1,15 @@
 package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.IdentifiableNode;
-import me.aurium.beetle.branch.util.PreStoredHashSet;
-import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
+import me.aurium.beetle.branch.util.PreStoredHashSet;
 
-import java.util.*;
+import java.util.Optional;
 
 public class BranchingNode<T> implements IdentifiableNode<T> {
 
@@ -24,11 +27,10 @@ public Block getIdentifier() {
     }
 
     @Override
-    public Optional<IdentifiableNode<T>> getSpecificNode(BlockPath blockPath) {
+    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
         if (blockPath.isEmpty()) return Optional.ofNullable(nodes.getAlreadyStored());
-        //TODO aurium - maybe we need some kind of guaruntee that it isn't empty? probably not since we can never really know
 
-        for (IdentifiableNode<T> node : this.getLinkedNodes()) {
+        for (IdentifiableNode<T> node : nodes.getContents()) {
             if (blockPath.startsWith(node.getIdentifier())) {
                 return node.getSpecificNode(blockPath.withoutBase());
             }
@@ -37,13 +39,20 @@ public Optional<IdentifiableNode<T>> getSpecificNode(BlockPath blockPath) {
     }
 
     @Override
-    public Collection<IdentifiableNode<T>> getLinkedNodes() {
-        return nodes.getContents();
+    public ExecutionHandler<T> getExecutionHandler(NodeContext<T> adapter) {
+        return nodes.getAlreadyStored().getExecutionHandler(adapter);
     }
 
     @Override
-    public ContextHandlerAdapter<T> getContextHandler() {
-        return nodes.getAlreadyStored().getContextHandler();
+    public SuggestionHandler<T> getSuggestionHandler(NodeContext<T> adapter) {
+        //TODO sort this out
+
+        return (context) -> {
+            //this works because this suggestion handler only gets called if we are on this object lmfao
+            Block matchableBlock = context.executedPath().getAllBlocks().getLast();
+
+            return null;
+        };
     }
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index d016ee1..acefd3a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -1,22 +1,28 @@
 package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.IdentifiableNode;
-import me.aurium.beetle.branch.adapter.ContextHandlerAdapter;
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.EmptySuggestionHandler;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.api.EndpointNode;
 
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Optional;
 
-public class SingleNode<T> implements AloneNode<T> {
+public class SingleNode<T> implements EndpointNode<T> {
 
     private final Block identifier;
-    private final ContextHandlerAdapter<T> handler;
 
-    public SingleNode(Block identifier, ContextHandlerAdapter<T> contextHandler) {
+    private final ExecutionHandler<T> executionHandler;
+    private final SuggestionHandler<T> suggestionHandler;
+
+    public SingleNode(Block identifier, ExecutionHandler<T> executionHandler) {
         this.identifier = identifier;
-        this.handler = contextHandler;
+
+        this.executionHandler = executionHandler;
+        this.suggestionHandler = new EmptySuggestionHandler<>();
     }
 
     @Override
@@ -25,18 +31,19 @@ public Block getIdentifier() {
     }
 
     @Override
-    public Optional<IdentifiableNode<T>> getSpecificNode(BlockPath blockPath) {
+    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
         return Optional.of(this);
     }
 
     @Override
-    public Collection<IdentifiableNode<T>> getLinkedNodes() {
-        return Collections.emptySet();
+    public ExecutionHandler<T> getExecutionHandler(NodeContext<T> adapter) {
+        return executionHandler;
     }
 
     @Override
-    public ContextHandlerAdapter<T> getContextHandler() {
-        return handler;
+    public SuggestionHandler<T> getSuggestionHandler(NodeContext<T> adapter) {
+        return suggestionHandler;
     }
 
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java
deleted file mode 100644
index db460b9..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueNode.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-public class ValueNode {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java
deleted file mode 100644
index 8b5cf78..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueSelectorNode.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.nodes;
-
-public class ValueSelectorNode {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
new file mode 100644
index 0000000..be56e32
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
@@ -0,0 +1,21 @@
+package me.aurium.beetle.branch.nodes.api;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+
+import java.util.Optional;
+
+/**
+ * Base object
+ * @param <T> fuck
+ */
+public interface CommandNode<T> {
+
+    Optional<CommandNode<T>> getSpecificNode(BlockPath path);
+
+    ExecutionHandler<T> getExecutionHandler(NodeContext<T> adapter);
+    SuggestionHandler<T> getSuggestionHandler(NodeContext<T> adapter);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
new file mode 100644
index 0000000..c15cf37
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.nodes.api;
+
+/**
+ * Marker interface for a node that is alone (so not branching, but not merging either)
+ *
+ * This usually means the end of whatever branch it is connected to.
+ */
+public interface EndpointNode<T> extends IdentifiableNode<T> {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
new file mode 100644
index 0000000..ce79bb6
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.nodes.api;
+
+import me.aurium.beetle.branch.block.Block;
+
+public interface IdentifiableNode<T> extends CommandNode<T> {
+
+    Block getIdentifier();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
new file mode 100644
index 0000000..1b26ffb
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
@@ -0,0 +1,24 @@
+package me.aurium.beetle.branch.nodes.argument;
+
+import me.aurium.beetle.branch.block.Block;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Represents a kind of parser that converts blocks into a typed argument.
+ * @param <T>
+ *
+ *     TODO: maybe let arguments consume more than one Block.
+ */
+public interface Argument<T> {
+
+    String getLabel();
+    List<String> getBounds();
+
+    boolean check(Block toParse);
+    T parse(Block block);
+
+    Optional<T> getDefault();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
new file mode 100644
index 0000000..324dc15
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.nodes.argument;
+
+import me.aurium.beetle.branch.context.NodeContext;
+
+public interface ArgumentContext<T> extends NodeContext<T> {
+
+    Arguments getArgumentContainer();
+    
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
new file mode 100644
index 0000000..70dd276
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.nodes.argument;
+
+public interface ArgumentContextHandler<T> {
+
+    void handle(ArgumentContext<T> context);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
new file mode 100644
index 0000000..f8b17e0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes.argument;
+
+public class Arguments {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/DelegatingArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/DelegatingArgumentContext.java
new file mode 100644
index 0000000..4f91c8d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/DelegatingArgumentContext.java
@@ -0,0 +1,56 @@
+package me.aurium.beetle.branch.nodes.argument;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+public class DelegatingArgumentContext<T> implements ArgumentContext<T>{
+
+    private final NodeContext<T> delegate;
+    private final Arguments arguments;
+
+    public DelegatingArgumentContext(NodeContext<T> delegate, Arguments arguments) {
+        this.delegate = delegate;
+        this.arguments = arguments;
+    }
+
+    @Override
+    public T getSender() {
+        return delegate.getSender();
+    }
+
+    @Override
+    public String getAlias() {
+        return delegate.getAlias();
+    }
+
+    @Override
+    public String[] getArgs() {
+        return delegate.getArgs();
+    }
+
+    @Override
+    public void messageSender(String string) {
+        delegate.messageSender(string);
+    }
+
+    @Override
+    public CommandNode<T> getExecutedNode() {
+        return delegate.getExecutedNode();
+    }
+
+    @Override
+    public CommandNode<T> getBaseExecutedNode() {
+        return delegate.getBaseExecutedNode();
+    }
+
+    @Override
+    public BlockPath executedPath() {
+        return delegate.executedPath();
+    }
+
+    @Override
+    public Arguments getArgumentContainer() {
+        return arguments;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
new file mode 100644
index 0000000..492e4bb
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.permission;
+
+/**
+ * Representing something that you can have that determines the accessibility of a command
+ */
+public interface Permission<T> {
+
+    boolean hasAccessToUse(T user);
+    boolean hasAccessToSee(T user);
+
+}
diff --git a/pom.xml b/pom.xml
index 689932b..db1d5d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <version>0.1.0</version>
     <modules>
         <module>core</module>
-        <module>tests</module>
+        <module>beetle-impl</module>
     </modules>
 
     <parent>
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java b/tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
deleted file mode 100644
index ae488b0..0000000
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package me.aurium.beetle.branch.tests;
-
-import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
-import me.aurium.beetle.branch.adapter.DelegatingContextAdapterFactory;
-import me.aurium.beetle.branch.tests.mockups.MockupContextSource;
-import org.junit.platform.commons.logging.Logger;
-import org.junit.platform.commons.logging.LoggerFactory;
-
-public abstract class AbstractTests {
-
-    protected final Logger logger = LoggerFactory.getLogger(BranchingNodeTests.class);
-
-    protected final ContextAdapterFactory<String> adapter = new DelegatingContextAdapterFactory<>(new MockupContextSource(logger));
-
-    protected final static String SENDER = "Tester";
-    protected final static String ALIAS = "TestCommand";
-
-    //@A248 is there a better way to do this with junit5? i'm not used to it. Is ther also a way to make the logger messages less ugly? They look shitty compared to juni4
-    protected void logTestStarting(String name) {
-        logger.info(() -> "(BRANCH) Beginning test: " + name);
-    }
-
-}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java
deleted file mode 100644
index 12e9459..0000000
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContext.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-import me.aurium.beetle.api.command.Context;
-import me.aurium.beetle.core.logger.SLFLogger;
-import org.junit.platform.commons.logging.Logger;
-import org.junit.platform.commons.logging.LoggerFactory;
-
-public class MockupContext implements Context<String> {
-
-    private final Logger logger;
-
-    public MockupContext(String string, String alias, String[] args, Logger logger) {
-        this.string = string;
-        this.alias = alias;
-        this.args = args;
-
-        this.logger = logger;
-    }
-
-    private final String string;
-    private final String alias;
-    private final String[] args;
-
-    @Override
-    public String getSender() {
-        return string;
-    }
-
-    @Override
-    public String getAlias() {
-        return alias;
-    }
-
-    @Override
-    public String[] getArgs() {
-        return args;
-    }
-
-    @Override
-    public void debugString(String s) {
-        logger.info(() -> "DEBUG: " + s);
-    }
-}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java
deleted file mode 100644
index 0e7dea4..0000000
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/MockupContextSource.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-import me.aurium.beetle.api.command.Context;
-import me.aurium.beetle.api.command.ContextSource;
-import org.junit.platform.commons.logging.Logger;
-
-public class MockupContextSource implements ContextSource<String> {
-
-    private final Logger logger;
-
-    public MockupContextSource(Logger logger) {
-        this.logger = logger;
-    }
-
-    @Override
-    public Context<String> context(String s, String s2, String[] strings) {
-        return new MockupContext(s,s2,strings,logger);
-    }
-}
diff --git a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java b/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
deleted file mode 100644
index e75b60c..0000000
--- a/tests/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-import me.aurium.beetle.branch.CommandNode;
-import me.aurium.beetle.branch.adapter.ContextAdapterFactory;
-import me.aurium.beetle.branch.builders.Base;
-import me.aurium.beetle.branch.builders.SingleBuilder;
-import me.aurium.beetle.branch.launchpoints.AbstractBranchCommand;
-import me.aurium.beetle.branch.tests.mockups.MockupContext;
-import org.junit.platform.commons.logging.Logger;
-import org.junit.platform.commons.logging.LoggerFactory;
-
-import java.util.Arrays;
-
-/**
- * Fake command representing something like /helloworld that always says helloworld
- */
-public class SingleCommand extends AbstractBranchCommand<String> {
-    private final Logger log;
-
-    public SingleCommand(ContextAdapterFactory<String> factory, Logger logger) {
-        super(factory);
-
-        this.log = logger;
-    }
-
-    @Override
-    public CommandNode<String> getBaseNode() {
-        return Base.base(new SingleBuilder<>(),builder -> {
-            builder.withHandler(context -> {
-                log.info(() -> "hello world!");
-
-                log.info(() -> "The sender is: " + context.getSender());
-                log.info(() -> "The arguments were: " + Arrays.toString(context.getArgs()));
-                log.info(() -> "The path was: " + context.executedPath());
-            });
-        });
-    }
-
-    @Override
-    public String getName() {
-        return "helloworld";
-    }
-
-    @Override
-    public String getPermission() {
-        return "testPermission";
-    }
-}

From c6c85a1ee6840277b21bd118e8c7a4f81ac9f40b Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Mon, 22 Mar 2021 18:29:07 -0700
Subject: [PATCH 16/56] adjust some stuff

---
 .../beetle/branch/permission/Permissible.java   |  7 +++++++
 .../branch/permission/impl/EmptyPermission.java | 17 +++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/Permissible.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermission.java

diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/Permissible.java b/core/src/main/java/me/aurium/beetle/branch/permission/Permissible.java
new file mode 100644
index 0000000..c886c4d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/Permissible.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.permission;
+
+public interface Permissible<T> {
+
+    Permission<T> getPermission();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermission.java
new file mode 100644
index 0000000..a368aae
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermission.java
@@ -0,0 +1,17 @@
+package me.aurium.beetle.branch.permission.impl;
+
+import me.aurium.beetle.branch.permission.Permission;
+
+public class EmptyPermission<T> implements Permission<T> {
+
+    @Override
+    public boolean hasAccessToUse(T user) {
+        return true;
+    }
+
+    @Override
+    public boolean hasAccessToSee(T user) {
+        return true;
+    }
+
+}

From 8dd5e2a0710f42eda9eedcf1a06c1afbf491711c Mon Sep 17 00:00:00 2001
From: "Aurium_ @ElytraForce" <aukrais@gmail.com>
Date: Mon, 22 Mar 2021 18:33:12 -0700
Subject: [PATCH 17/56] Create maven.yml

---
 .github/workflows/maven.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..c8aeb3a
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,24 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

From 91f6b813a5be21cb64d51f93eb18b2581a269c52 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Tue, 23 Mar 2021 14:08:43 -0700
Subject: [PATCH 18/56] start work on the permission stuff

---
 beetle-impl/pom.xml                           | 18 ++---
 .../launchpoints/AbstractBaseCommand.java     | 13 ++++
 .../launchpoints/AbstractBranchCommand.java   | 18 +++--
 .../converted/launchpoints/Implement.java     | 69 +++++++++++++++++++
 .../aurium/beetle/branch/tests/TestBase.java  |  7 ++
 .../branch/tests/context/TestContext.java     |  4 +-
 .../tests/context/TestContextProducer.java    |  7 +-
 .../BranchingImproperAnnotatedCommand.java    | 12 ++--
 .../branch/{nodes => }/argument/Argument.java |  6 +-
 .../{nodes => }/argument/ArgumentContext.java |  2 +-
 .../argument/ArgumentContextHandler.java      |  2 +-
 .../beetle/branch/argument/Arguments.java     |  4 ++
 .../argument/DelegatingArgumentContext.java   |  2 +-
 .../aurium/beetle/branch/block/BlockPath.java |  3 +
 .../beetle/branch/block/CommonBlockPath.java  |  2 +
 .../beetle/branch/builders/SingleBuilder.java | 10 +--
 .../branch/context/AbstractNodeContext.java   | 15 ++--
 .../branch/context/ContextProducer.java       |  2 +-
 .../beetle/branch/context/NodeContext.java    |  1 +
 .../branch/handlers/api/FallbackHandler.java  | 12 ++++
 .../beetle/branch/nodes/ArgumentNode.java     | 27 +++++---
 .../beetle/branch/nodes/BranchingNode.java    | 27 +++++---
 .../beetle/branch/nodes/SingleNode.java       | 20 +++---
 .../beetle/branch/nodes/api/CommandNode.java  | 10 +--
 .../branch/nodes/argument/Arguments.java      |  4 --
 .../beetle/branch/nodes/base/NodeBase.java    | 17 +++++
 .../branch/nodes/base/NodeBaseBuilder.java    |  9 +++
 .../branch/nodes/base/SimpleNodeBase.java     | 58 ++++++++++++++++
 .../branch/nodes/result/EmptyNodeResult.java  | 25 +++++++
 .../branch/nodes/result/GetNodeResult.java    | 13 ++++
 .../nodes/result/NullableNodeResult.java      | 27 ++++++++
 .../permission/FallbackOneStrategy.java       |  7 ++
 .../branch/permission/PermAccessor.java       | 11 +++
 .../beetle/branch/permission/Permissible.java |  7 --
 .../beetle/branch/permission/Permission.java  |  9 ++-
 .../branch/permission/PermissionStrategy.java |  4 ++
 .../permission/impl/EmptyPermAccessor.java    | 17 +++++
 .../permission/impl/EmptyPermission.java      | 17 -----
 38 files changed, 415 insertions(+), 103 deletions(-)
 create mode 100644 beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
 create mode 100644 beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java
 create mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java
 rename core/src/main/java/me/aurium/beetle/branch/{nodes => }/argument/Argument.java (73%)
 rename core/src/main/java/me/aurium/beetle/branch/{nodes => }/argument/ArgumentContext.java (77%)
 rename core/src/main/java/me/aurium/beetle/branch/{nodes => }/argument/ArgumentContextHandler.java (66%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java
 rename core/src/main/java/me/aurium/beetle/branch/{nodes => }/argument/DelegatingArgumentContext.java (96%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBase.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/result/EmptyNodeResult.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/result/GetNodeResult.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/result/NullableNodeResult.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/FallbackOneStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/PermAccessor.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/Permissible.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/PermissionStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermAccessor.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermission.java

diff --git a/beetle-impl/pom.xml b/beetle-impl/pom.xml
index 1c81d99..482dfb5 100644
--- a/beetle-impl/pom.xml
+++ b/beetle-impl/pom.xml
@@ -43,21 +43,15 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.0.1</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.3.0-alpha5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.0.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.0.1</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
new file mode 100644
index 0000000..9867d17
--- /dev/null
+++ b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.converted.launchpoints;
+
+import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.nodes.base.NodeBase;
+
+public abstract class AbstractBaseCommand<T> extends AbstractBranchCommand<T> {
+
+    protected AbstractBaseCommand(ContextProducer<T> factory) {
+        super(factory);
+    }
+
+    public abstract NodeBase<T,?> getBase();
+}
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
index e14a9ad..ec5fa44 100644
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
+++ b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
@@ -1,11 +1,12 @@
 package me.aurium.beetle.branch.converted.launchpoints;
 
+import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.converted.BranchCommand;
 import me.aurium.beetle.branch.nodes.api.CommandNode;
 import me.aurium.beetle.branch.context.NodeContext;
 import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.block.CommonBlockPath;
+import me.aurium.beetle.branch.nodes.result.GetNodeResult;
 
 public abstract class AbstractBranchCommand<T> implements BranchCommand<T> {
 
@@ -22,14 +23,17 @@ public boolean execute(T t, String s, String[] strings) {
 
         CommandNode<T> baseNode = getBaseNode();
 
-        baseNode.getSpecificNode(path).ifPresentOrElse(node -> {
+        //this logic should be in a Base
+        GetNodeResult<T> result = baseNode.getSpecificNode(path);
+
+        result.resultingNode().ifPresentOrElse(node -> {
+
             //TODO some kind of thing here
-            NodeContext<T> adapter = factory.produce(t,s,strings,node,baseNode,path);
+            NodeContext<T> adapter = factory.produce(t,s,strings,node,baseNode,path, result.resultingPath());
+
+            node.getExecutionHandler().handle(adapter);
 
-            node.getExecutionHandler(adapter).handle(adapter);
-        }, () -> {
-            noArgsMissingOrError(factory.produce(t,s,strings));
-        });
+        }, () -> noArgsMissingOrError(factory.produce(t,s,strings)));
 
         return true;
     }
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java
new file mode 100644
index 0000000..2cf0fc1
--- /dev/null
+++ b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java
@@ -0,0 +1,69 @@
+package me.aurium.beetle.branch.converted.launchpoints;
+
+import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.nodes.base.SimpleNodeBase;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.base.NodeBase;
+import me.aurium.beetle.branch.permission.PermAccessor;
+import me.aurium.beetle.branch.permission.Permission;
+
+public class Implement extends AbstractBaseCommand<String> {
+    private final ContextProducer<String> factory;
+
+    protected Implement(ContextProducer<String> factory) {
+        super(factory);
+
+        this.factory = factory;
+    }
+
+    @Override
+    public CommandNode<String> getBaseNode() {
+        return null;
+    }
+
+    @Override
+    public NodeBase<String, ?> getBase() {
+
+        return new SimpleNodeBase<>(getBaseNode(), factory, new PermAccessor<String>() {
+            @Override
+            public boolean hasAccessToUse(String user, Permission permission) {
+
+                return permission.attempt().test()
+
+                return false;
+            }
+
+            @Override
+            public boolean hasAccessToSee(String user, Permission permission) {
+                return false;
+            }
+
+
+
+        }, null, null);
+
+        /*return new SimpleNodeBase<>(baseNode, factory, new StringPermAccessor<String>() {
+
+            @Override
+            public boolean hasAccessToUse(String user, String permission) {
+                return user.equalsIgnoreCase(permission);
+            }
+
+            @Override
+            public boolean hasAccessToSee(String user, String permission) {
+                return user.equalsIgnoreCase(permission);
+            }
+
+        }, strategy, fallbackHandler);*/
+    }
+
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public String getPermission() {
+        return null;
+    }
+}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java
new file mode 100644
index 0000000..1e2c434
--- /dev/null
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.tests;
+
+public class TestBase {
+
+
+
+}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
index 6f94dac..a45607d 100644
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
@@ -10,8 +10,8 @@ public class TestContext extends AbstractNodeContext<String> {
 
     private final Logger logger = LoggerFactory.getLogger(TestContext.class);
 
-    protected TestContext(String s, String alias, String[] args, CommandNode<String> executed, CommandNode<String> base, BlockPath path) {
-        super(s, alias, args, executed, base, path);
+    protected TestContext(String s, String alias, String[] args, CommandNode<String> executed, CommandNode<String> base, BlockPath executedPath, BlockPath fullPath) {
+        super(s, alias, args, executed, base, executedPath, fullPath);
     }
 
     @Override
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
index 452dfcb..85d117a 100644
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
@@ -8,14 +8,13 @@
 
 public class TestContextProducer implements ContextProducer<String> {
 
-
     @Override
-    public NodeContext<String> produce(String s, String alias, String[] strings, CommandNode<String> executedNode, CommandNode<String> baseNode, BlockPath path) {
-        return new TestContext(s,alias,strings,executedNode,baseNode,path);
+    public NodeContext<String> produce(String s, String alias, String[] strings, CommandNode<String> executedNode, CommandNode<String> baseNode, BlockPath executedPath, BlockPath fullPath) {
+        return new TestContext(s,alias,strings,executedNode,baseNode, executedPath, fullPath);
     }
 
     @Override
     public Context<String> produce(String s, String alias, String[] strings) {
-        return new TestContext(s,alias,strings,null,null,null);
+        return new TestContext(s,alias,strings,null,null,null,null);
     }
 }
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
index 27a2a29..04b4faf 100644
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
@@ -15,24 +15,28 @@ public class BranchingImproperAnnotatedCommand {
     @SingleNode(identifier = "branch1")
     public void branch1(NodeContext<String> nodeContext) {
         nodeContext.getSender();
+
+        //do some action, command looks like this: /command branch1
     }
 
     @SingleNode(identifier = "branch2")
     public void branch2(NodeContext<String> nodeContext) {
         nodeContext.getSender();
+
+        //do some action here, command looks like this: /command branch2
     }
 
     @BranchingNode(identifier = "branching1")
     public static class branching1 {
 
-        @SingleNode(identifier = "fuckOffPissBoy")
+        @SingleNode(identifier = "mee")
         public void lol() {
-
+            //do some action here, command looks like this: /command branching1 mee
         }
 
         @SingleNode(identifier = "cringe")
-        public void haha() {
-
+        public void haha(NodeContext<String> context) {
+            //do some action here, command looks like this /command branching1 cringe
         }
 
     }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java b/core/src/main/java/me/aurium/beetle/branch/argument/Argument.java
similarity index 73%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
rename to core/src/main/java/me/aurium/beetle/branch/argument/Argument.java
index 1b26ffb..5c77469 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
+++ b/core/src/main/java/me/aurium/beetle/branch/argument/Argument.java
@@ -1,6 +1,7 @@
-package me.aurium.beetle.branch.nodes.argument;
+package me.aurium.beetle.branch.argument;
 
 import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.context.NodeContext;
 
 import java.util.List;
 import java.util.Optional;
@@ -14,7 +15,8 @@
 public interface Argument<T> {
 
     String getLabel();
-    List<String> getBounds();
+
+    List<String> getBounds(NodeContext<T> context);
 
     boolean check(Block toParse);
     T parse(Block block);
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java
similarity index 77%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
rename to core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java
index 324dc15..433c180 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.argument;
+package me.aurium.beetle.branch.argument;
 
 import me.aurium.beetle.branch.context.NodeContext;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java b/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContextHandler.java
similarity index 66%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
rename to core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContextHandler.java
index 70dd276..0af2801 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContextHandler.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.argument;
+package me.aurium.beetle.branch.argument;
 
 public interface ArgumentContextHandler<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java b/core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java
new file mode 100644
index 0000000..487a980
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.argument;
+
+public class Arguments {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/DelegatingArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
similarity index 96%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/argument/DelegatingArgumentContext.java
rename to core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
index 4f91c8d..97cc5e2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/DelegatingArgumentContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.argument;
+package me.aurium.beetle.branch.argument;
 
 import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.context.NodeContext;
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
index 3e03457..07072fb 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
@@ -1,5 +1,7 @@
 package me.aurium.beetle.branch.block;
 
+import me.aurium.beetle.branch.context.NodeContext;
+
 public interface BlockPath {
 
     boolean isEmpty();
@@ -25,6 +27,7 @@ public interface BlockPath {
      * @return a cloned path plus that block
      */
     BlockPath resolve(Block block);
+
     BlockPath withoutBase();
 
     BlockPath fromIndex(int index);
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
index 94177df..ed39ef0 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
@@ -1,5 +1,7 @@
 package me.aurium.beetle.branch.block;
 
+import me.aurium.beetle.branch.context.NodeContext;
+
 import java.util.ArrayList;
 
 public class CommonBlockPath implements BlockPath {
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
index 89888a3..3cad466 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
@@ -9,10 +9,10 @@
 
 import java.util.Objects;
 
-public class SingleBuilder<T> implements AloneBuilder<T> {
+public class SingleBuilder<C> implements AloneBuilder<C> {
 
     private Block block;
-    private ExecutionHandler<T> contextHandler;
+    private ExecutionHandler<C> contextHandler;
 
     public void withIdentifier(Block identifier) {
         this.block = identifier;
@@ -22,11 +22,11 @@ public void withIdentifier(String string) {
         this.block = StringBlock.of(string);
     }
 
-    public void withHandler(ExecutionHandler<T> handler) {
+    public void withHandler(ExecutionHandler<C> handler) {
         this.contextHandler = handler;
     }
 
-    public SingleNode<T> build() {
+    public SingleNode<C> build() {
         Objects.requireNonNull(block);
         Objects.requireNonNull(contextHandler);
 
@@ -34,7 +34,7 @@ public SingleNode<T> build() {
     }
 
     @Override
-    public CommandNode<T> buildWithoutIdentifier() {
+    public CommandNode<C> buildWithoutIdentifier() {
         Objects.requireNonNull(contextHandler);
 
         return new SingleNode<>(EmptyBlock.of(),contextHandler);
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java
index 393f168..6813f62 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java
@@ -7,13 +7,15 @@ public abstract class AbstractNodeContext<T> extends AbstractContext<T> implemen
 
     private final CommandNode<T> executed;
     private final CommandNode<T> base;
-    private final BlockPath path;
+    private final BlockPath executedPath;
+    private final BlockPath fullPath;
 
-    protected AbstractNodeContext(T t, String alias, String[] args, CommandNode<T> executed, CommandNode<T> base, BlockPath path) {
+    protected AbstractNodeContext(T t, String alias, String[] args, CommandNode<T> executed, CommandNode<T> base, BlockPath executedPath, BlockPath fullPath) {
         super(t, alias, args);
         this.executed = executed;
         this.base = base;
-        this.path = path;
+        this.executedPath = executedPath;
+        this.fullPath = fullPath;
     }
 
     @Override
@@ -28,6 +30,11 @@ public CommandNode<T> getBaseExecutedNode() {
 
     @Override
     public BlockPath executedPath() {
-        return path;
+        return executedPath;
+    }
+
+    @Override
+    public BlockPath fullPath() {
+        return fullPath;
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java b/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
index 0daf4f6..b809691 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
+++ b/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
@@ -8,7 +8,7 @@
  */
 public interface ContextProducer<T> {
 
-    NodeContext<T> produce(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath path);
+    NodeContext<T> produce(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath fullPath);
 
     Context<T> produce(T t, String alias, String[] strings);
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
index 3477038..7fbeb24 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
@@ -10,6 +10,7 @@ public interface NodeContext<T> extends Context<T> {
     CommandNode<T> getBaseExecutedNode();
 
     BlockPath executedPath();
+    BlockPath fullPath();
 
     boolean equals(Object comparison);
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
new file mode 100644
index 0000000..7db22b2
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
@@ -0,0 +1,12 @@
+package me.aurium.beetle.branch.handlers.api;
+
+import me.aurium.beetle.branch.context.Context;
+
+/**
+ * Represents the fallback handler of a base that manages what happens when everything goes wrong
+ */
+public interface FallbackHandler<T> {
+
+    void handle(Context<T> context);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
index 788b21a..36e2a71 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
@@ -2,12 +2,12 @@
 
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.context.NodeContext;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
 import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
-import me.aurium.beetle.branch.nodes.argument.Argument;
+import me.aurium.beetle.branch.argument.Argument;
+import me.aurium.beetle.branch.nodes.result.GetNodeResult;
+import me.aurium.beetle.branch.permission.Permission;
 
 import java.util.List;
 import java.util.Optional;
@@ -33,8 +33,8 @@ public ArgumentNode(Block identifier, List<Argument<?>> sequentialValueNodes, Si
 
 
     @Override
-    public Optional<CommandNode<T>> getSpecificNode(BlockPath path) {
-        return Optional.of(this);
+    public GetNodeResult<T> getSpecificNode(BlockPath path) {
+        return null;
     }
 
     /*if (path.isEmpty()) return Optional.of(noArgs);
@@ -56,12 +56,23 @@ public Optional<CommandNode<T>> getSpecificNode(BlockPath path) {
         */
 
     @Override
-    public ExecutionHandler<T> getExecutionHandler(NodeContext<T> adapter) {
-        return null;
+    public ExecutionHandler<T> getExecutionHandler() {
+        return (context) -> {
+            BlockPath path = context.executedPath();
+
+            //sort
+        };
+    }
+
+    @Override
+    public SuggestionHandler<T> getSuggestionHandler() {
+        return (context) -> {
+            return null;
+        };
     }
 
     @Override
-    public SuggestionHandler<T> getSuggestionHandler(NodeContext<T> adapter) {
+    public Permission<T> getPermission() {
         return null;
     }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index cb9a458..e0d9f23 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -2,11 +2,12 @@
 
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.context.NodeContext;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
 import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
+import me.aurium.beetle.branch.nodes.result.GetNodeResult;
+import me.aurium.beetle.branch.nodes.result.NullableNodeResult;
+import me.aurium.beetle.branch.permission.Permission;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
 import java.util.Optional;
@@ -27,24 +28,28 @@ public Block getIdentifier() {
     }
 
     @Override
-    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
-        if (blockPath.isEmpty()) return Optional.ofNullable(nodes.getAlreadyStored());
+    public GetNodeResult<T> getSpecificNode(BlockPath blockPath) {
+
+        if (blockPath.isEmpty()) return new NullableNodeResult<>(nodes.getAlreadyStored(),blockPath);
 
         for (IdentifiableNode<T> node : nodes.getContents()) {
+
+            BlockPath subPath = blockPath.withoutBase(); //get everything after the index
+
             if (blockPath.startsWith(node.getIdentifier())) {
                 return node.getSpecificNode(blockPath.withoutBase());
             }
         }
-        return Optional.ofNullable(nodes.getAlreadyStored());
+        return new NullableNodeResult<>(nodes.getAlreadyStored(), blockPath);
     }
 
     @Override
-    public ExecutionHandler<T> getExecutionHandler(NodeContext<T> adapter) {
-        return nodes.getAlreadyStored().getExecutionHandler(adapter);
+    public ExecutionHandler<T> getExecutionHandler() {
+        return nodes.getAlreadyStored().getExecutionHandler();
     }
 
     @Override
-    public SuggestionHandler<T> getSuggestionHandler(NodeContext<T> adapter) {
+    public SuggestionHandler<T> getSuggestionHandler() {
         //TODO sort this out
 
         return (context) -> {
@@ -55,4 +60,10 @@ public SuggestionHandler<T> getSuggestionHandler(NodeContext<T> adapter) {
         };
     }
 
+    @Override
+    public Permission<T> getPermission() {
+        return null;
+    }
+
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index acefd3a..fc86358 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -2,14 +2,13 @@
 
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.context.NodeContext;
 import me.aurium.beetle.branch.handlers.EmptySuggestionHandler;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
 import me.aurium.beetle.branch.nodes.api.EndpointNode;
-
-import java.util.Optional;
+import me.aurium.beetle.branch.nodes.result.GetNodeResult;
+import me.aurium.beetle.branch.nodes.result.NullableNodeResult;
+import me.aurium.beetle.branch.permission.Permission;
 
 public class SingleNode<T> implements EndpointNode<T> {
 
@@ -31,19 +30,24 @@ public Block getIdentifier() {
     }
 
     @Override
-    public Optional<CommandNode<T>> getSpecificNode(BlockPath blockPath) {
-        return Optional.of(this);
+    public GetNodeResult<T> getSpecificNode(BlockPath blockPath) {
+        return new NullableNodeResult<>(this,blockPath);
     }
 
     @Override
-    public ExecutionHandler<T> getExecutionHandler(NodeContext<T> adapter) {
+    public ExecutionHandler<T> getExecutionHandler() {
         return executionHandler;
     }
 
     @Override
-    public SuggestionHandler<T> getSuggestionHandler(NodeContext<T> adapter) {
+    public SuggestionHandler<T> getSuggestionHandler() {
         return suggestionHandler;
     }
 
+    @Override
+    public Permission<T> getPermission() {
+        return null;
+    }
+
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
index be56e32..63b27cd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
@@ -1,9 +1,10 @@
 package me.aurium.beetle.branch.nodes.api;
 
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.context.NodeContext;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+import me.aurium.beetle.branch.nodes.result.GetNodeResult;
+import me.aurium.beetle.branch.permission.Permission;
 
 import java.util.Optional;
 
@@ -13,9 +14,10 @@
  */
 public interface CommandNode<T> {
 
-    Optional<CommandNode<T>> getSpecificNode(BlockPath path);
+    GetNodeResult<T> getSpecificNode(BlockPath path);
 
-    ExecutionHandler<T> getExecutionHandler(NodeContext<T> adapter);
-    SuggestionHandler<T> getSuggestionHandler(NodeContext<T> adapter);
+    ExecutionHandler<T> getExecutionHandler();
+    SuggestionHandler<T> getSuggestionHandler();
 
+    Permission<T> getPermission();
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
deleted file mode 100644
index f8b17e0..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.nodes.argument;
-
-public class Arguments {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBase.java
new file mode 100644
index 0000000..ae469a3
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBase.java
@@ -0,0 +1,17 @@
+package me.aurium.beetle.branch.nodes.base;
+
+import me.aurium.beetle.branch.permission.PermAccessor;
+
+import java.util.List;
+
+public interface NodeBase<T,C extends PermAccessor<T>> {
+
+    C getAccessor();
+
+    void execute(T t, String alias, String[] args);
+
+    List<String> suggest(T t, String alias, String[] args);
+
+    //void setAccessor(C c);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java
new file mode 100644
index 0000000..51beea7
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.nodes.base;
+
+import me.aurium.beetle.branch.permission.PermAccessor;
+
+public class NodeBaseBuilder<T> {
+
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java
new file mode 100644
index 0000000..247a5c0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java
@@ -0,0 +1,58 @@
+package me.aurium.beetle.branch.nodes.base;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.block.CommonBlockPath;
+import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.result.GetNodeResult;
+import me.aurium.beetle.branch.permission.PermAccessor;
+import me.aurium.beetle.branch.permission.PermissionStrategy;
+
+import java.util.List;
+
+public class SimpleNodeBase<T,C extends PermAccessor<T>> implements NodeBase<T, C> {
+
+    private final CommandNode<T> baseNode;
+    private final ContextProducer<T> factory;
+
+    private final C accessor;
+    private final PermissionStrategy strategy;
+
+    private final FallbackHandler<T> fallbackHandler;
+
+    public <X> SimpleNodeBase(CommandNode<T> baseNode, ContextProducer<T> factory, C accessor, PermissionStrategy strategy, FallbackHandler<T> fallbackHandler) {
+        this.baseNode = baseNode;
+        this.factory = factory;
+        this.accessor = accessor;
+        this.strategy = strategy;
+        this.fallbackHandler = fallbackHandler;
+    }
+
+    @Override
+    public C getAccessor() {
+        return accessor;
+    }
+
+    @Override
+    public void execute(T t, String alias, String[] args) {
+        BlockPath path = CommonBlockPath.of(args);
+
+        GetNodeResult<T> result = baseNode.getSpecificNode(path);
+
+        result.resultingNode().ifPresentOrElse(node -> {
+
+            //TODO some kind of thing here
+            NodeContext<T> adapter = factory.produce(t,alias,args,node,baseNode,path, result.resultingPath());
+
+            node.getExecutionHandler().handle(adapter);
+
+        }, () -> fallbackHandler.handle(factory.produce(t, alias, args)));
+    }
+
+    @Override
+    public List<String> suggest(T t, String alias, String[] args) {
+        return null;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/EmptyNodeResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/result/EmptyNodeResult.java
new file mode 100644
index 0000000..775491f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/result/EmptyNodeResult.java
@@ -0,0 +1,25 @@
+package me.aurium.beetle.branch.nodes.result;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+import java.util.Optional;
+
+public class EmptyNodeResult<T> implements GetNodeResult<T> {
+
+    private final BlockPath path;
+
+    public EmptyNodeResult(BlockPath path) {
+        this.path = path;
+    }
+
+    @Override
+    public Optional<CommandNode<T>> resultingNode() {
+        return Optional.empty();
+    }
+
+    @Override
+    public BlockPath resultingPath() {
+        return path;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/GetNodeResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/result/GetNodeResult.java
new file mode 100644
index 0000000..f78b878
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/result/GetNodeResult.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.nodes.result;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+import java.util.Optional;
+
+public interface GetNodeResult<T> {
+
+    Optional<CommandNode<T>> resultingNode();
+    BlockPath resultingPath();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/NullableNodeResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/result/NullableNodeResult.java
new file mode 100644
index 0000000..6ae80bd
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/result/NullableNodeResult.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.nodes.result;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+import java.util.Optional;
+
+public class NullableNodeResult<T> implements GetNodeResult<T> {
+
+    private final CommandNode<T> calculatedNode;
+    private final BlockPath calculatedPath;
+
+    public NullableNodeResult(CommandNode<T> calculatedNode, BlockPath calculatedPath) {
+        this.calculatedNode = calculatedNode;
+        this.calculatedPath = calculatedPath;
+    }
+
+    @Override
+    public Optional<CommandNode<T>> resultingNode() {
+        return Optional.ofNullable(calculatedNode);
+    }
+
+    @Override
+    public BlockPath resultingPath() {
+        return calculatedPath;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/FallbackOneStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/FallbackOneStrategy.java
new file mode 100644
index 0000000..02c1722
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/FallbackOneStrategy.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.permission;
+
+/**
+ * Falls back to the at-execution-time parent node
+ */
+public class FallbackOneStrategy {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/PermAccessor.java b/core/src/main/java/me/aurium/beetle/branch/permission/PermAccessor.java
new file mode 100644
index 0000000..e923fc4
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/PermAccessor.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.permission;
+
+/**
+ * Representing something that you can have that determines the accessibility of a command
+ */
+public interface PermAccessor<T> {
+
+    boolean hasAccessToUse(T user, Permission permission);
+    boolean hasAccessToSee(T user, Permission permission);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/Permissible.java b/core/src/main/java/me/aurium/beetle/branch/permission/Permissible.java
deleted file mode 100644
index c886c4d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/Permissible.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.permission;
-
-public interface Permissible<T> {
-
-    Permission<T> getPermission();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
index 492e4bb..c5fc8a3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
@@ -1,11 +1,14 @@
 package me.aurium.beetle.branch.permission;
 
+import me.aurium.beetle.branch.context.NodeContext;
+
+import java.util.function.Predicate;
+
 /**
- * Representing something that you can have that determines the accessibility of a command
+ *
  */
 public interface Permission<T> {
 
-    boolean hasAccessToUse(T user);
-    boolean hasAccessToSee(T user);
+   Predicate<NodeContext<T>> attempt();
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/PermissionStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/PermissionStrategy.java
new file mode 100644
index 0000000..b28f57c
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/PermissionStrategy.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.permission;
+
+public interface PermissionStrategy {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermAccessor.java b/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermAccessor.java
new file mode 100644
index 0000000..34219c2
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermAccessor.java
@@ -0,0 +1,17 @@
+package me.aurium.beetle.branch.permission.impl;
+
+import me.aurium.beetle.branch.permission.PermAccessor;
+import me.aurium.beetle.branch.permission.Permission;
+
+public class EmptyPermAccessor<T> implements PermAccessor<T> {
+
+    @Override
+    public boolean hasAccessToUse(T user, Permission permission) {
+        return true;
+    }
+
+    @Override
+    public boolean hasAccessToSee(T user, Permission permission) {
+        return true;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermission.java
deleted file mode 100644
index a368aae..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermission.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package me.aurium.beetle.branch.permission.impl;
-
-import me.aurium.beetle.branch.permission.Permission;
-
-public class EmptyPermission<T> implements Permission<T> {
-
-    @Override
-    public boolean hasAccessToUse(T user) {
-        return true;
-    }
-
-    @Override
-    public boolean hasAccessToSee(T user) {
-        return true;
-    }
-
-}

From f6d9416068f73a7bb1a3931e975be9cc6381302e Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Tue, 23 Mar 2021 15:59:51 -0700
Subject: [PATCH 19/56] add perms and strategies. probably need some
 implementations for spergot

---
 .../converted/launchpoints/Implement.java     |  1 -
 .../tests/context/TestContextProducer.java    |  8 +-
 .../aurium/beetle/branch/block/BlockList.java |  2 +
 .../aurium/beetle/branch/block/BlockPath.java |  1 +
 .../beetle/branch/block/CommonBlockPath.java  | 11 +++
 .../branch/block/DelegatingBlockList.java     |  5 ++
 .../branch/builders/BranchingBuilder.java     | 12 ++-
 .../beetle/branch/builders/SingleBuilder.java | 11 ++-
 .../branch/context/ContextProducer.java       |  4 +-
 .../beetle/branch/context/NodeContext.java    |  3 +
 .../beetle/branch/context/StagedContext.java  | 28 +++++++
 .../branch/context/StagedContextImpl.java     | 73 +++++++++++++++++++
 .../beetle/branch/nodes/ArgumentNode.java     | 11 ++-
 .../beetle/branch/nodes/BranchingNode.java    |  9 ++-
 .../beetle/branch/nodes/SingleNode.java       |  8 +-
 .../beetle/branch/nodes/api/CommandNode.java  |  4 +
 .../beetle/branch/nodes/base/NodeBase.java    |  7 +-
 .../branch/nodes/base/NodeBaseBuilder.java    |  2 -
 .../branch/nodes/base/SimpleNodeBase.java     | 27 +++----
 .../permission/FallbackOneStrategy.java       |  7 --
 .../branch/permission/FallbackStrategy.java   | 12 +++
 .../branch/permission/PermAccessor.java       | 11 ---
 .../beetle/branch/permission/Permission.java  |  6 +-
 .../branch/permission/PermissionStrategy.java |  4 -
 .../permission/impl/EmptyPermAccessor.java    | 17 -----
 .../permissions/EmptyPermission.java          | 11 +++
 .../permissions/StringPermission.java         | 21 ++++++
 .../strategies/FallbackBaseStrategy.java      | 26 +++++++
 .../strategies/FallbackOneStrategy.java       | 27 +++++++
 .../strategies/IgnoredStrategy.java           | 13 ++++
 30 files changed, 292 insertions(+), 90 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/context/StagedContext.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/context/StagedContextImpl.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/FallbackOneStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/FallbackStrategy.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/PermAccessor.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/PermissionStrategy.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermAccessor.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/permissions/EmptyPermission.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/permissions/StringPermission.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackBaseStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/IgnoredStrategy.java

diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java
index 2cf0fc1..15b1094 100644
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java
+++ b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java
@@ -4,7 +4,6 @@
 import me.aurium.beetle.branch.nodes.base.SimpleNodeBase;
 import me.aurium.beetle.branch.nodes.api.CommandNode;
 import me.aurium.beetle.branch.nodes.base.NodeBase;
-import me.aurium.beetle.branch.permission.PermAccessor;
 import me.aurium.beetle.branch.permission.Permission;
 
 public class Implement extends AbstractBaseCommand<String> {
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
index 85d117a..e5755dd 100644
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
@@ -9,12 +9,12 @@
 public class TestContextProducer implements ContextProducer<String> {
 
     @Override
-    public NodeContext<String> produce(String s, String alias, String[] strings, CommandNode<String> executedNode, CommandNode<String> baseNode, BlockPath executedPath, BlockPath fullPath) {
-        return new TestContext(s,alias,strings,executedNode,baseNode, executedPath, fullPath);
+    public NodeContext<String> produce(String sender, String alias, String[] strings, CommandNode<String> executedNode, CommandNode<String> baseNode, BlockPath executedPath, BlockPath basePath) {
+        return new TestContext(sender,alias,strings,executedNode,baseNode, executedPath, basePath);
     }
 
     @Override
-    public Context<String> produce(String s, String alias, String[] strings) {
-        return new TestContext(s,alias,strings,null,null,null,null);
+    public Context<String> produce(String sender, String alias, String[] strings) {
+        return new TestContext(sender,alias,strings,null,null,null,null);
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
index 9673233..1fcd238 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
@@ -7,6 +7,8 @@ public interface BlockList{
     void addFirst(Block block);
     void addLast(Block block);
 
+    void removeLast();
+
     Block getFirst();
     Block getLast();
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
index 07072fb..d3447df 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
@@ -29,6 +29,7 @@ public interface BlockPath {
     BlockPath resolve(Block block);
 
     BlockPath withoutBase();
+    BlockPath withoutTop();
 
     BlockPath fromIndex(int index);
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
index ed39ef0..0533915 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
@@ -95,6 +95,17 @@ public BlockPath withoutBase() {
         return fromIndex(0);
     }
 
+    @Override
+    public BlockPath withoutTop() {
+        BlockList clone = new DelegatingBlockList(new ArrayList<>(
+                blocks.getBackingList()
+        ));;
+
+        clone.removeLast();
+
+        return new CommonBlockPath(root,parent.getParent(),clone,clone.size() > 1, splitter);
+    }
+
     @Override
     public BlockPath fromIndex(int index) {
         BlockList clone = new DelegatingBlockList(new ArrayList<>(
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java b/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
index 8b3f184..0422516 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
@@ -20,6 +20,11 @@ public void addLast(Block block) {
         blocks.add(block);
     }
 
+    @Override
+    public void removeLast() {
+        blocks.remove(blocks.size()-1);
+    }
+
     @Override
     public Block getFirst() {
         return blocks.get(0);
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
index 56290ef..8ff48b6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
@@ -6,6 +6,8 @@
 import me.aurium.beetle.branch.nodes.BranchingNode;
 import me.aurium.beetle.branch.nodes.api.CommandNode;
 import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
+import me.aurium.beetle.branch.permission.Permission;
+import me.aurium.beetle.branch.permission.permissions.EmptyPermission;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
 import java.util.HashSet;
@@ -21,6 +23,8 @@ public class BranchingBuilder<T> implements Builder<T> {
     private IdentifiableNode<T> noArgs;
     private boolean linked;
 
+    private Permission<T> permission = new EmptyPermission<>();
+
     public void withIdentifier(Block block) {
         this.block = block;
     }
@@ -29,6 +33,10 @@ public void withIdentifier(String string) {
         this.block = StringBlock.of(string);
     }
 
+    public void withPermission(Permission<T> permission) {
+        this.permission = permission;
+    }
+
     public <C extends Builder<T>> void withNode(C key, Consumer<C> consumer) {
         consumer.accept(key);
 
@@ -59,7 +67,7 @@ public BranchingNode<T> build() {
             set = new PreStoredHashSet<>(noArgs,commands,linked);
         }
 
-        return new BranchingNode<>(set,block);
+        return new BranchingNode<>(set,block, permission);
     }
 
     @Override
@@ -77,6 +85,6 @@ public CommandNode<T> buildWithoutIdentifier() {
             set = new PreStoredHashSet<>(noArgs,commands,linked);
         }
 
-        return new BranchingNode<>(set, EmptyBlock.of());
+        return new BranchingNode<>(set, EmptyBlock.of(), permission);
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
index 3cad466..6c2ad5c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
@@ -6,6 +6,8 @@
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.nodes.SingleNode;
 import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.permission.Permission;
+import me.aurium.beetle.branch.permission.permissions.EmptyPermission;
 
 import java.util.Objects;
 
@@ -13,6 +15,7 @@ public class SingleBuilder<C> implements AloneBuilder<C> {
 
     private Block block;
     private ExecutionHandler<C> contextHandler;
+    private Permission<C> permission = new EmptyPermission<>();
 
     public void withIdentifier(Block identifier) {
         this.block = identifier;
@@ -26,18 +29,22 @@ public void withHandler(ExecutionHandler<C> handler) {
         this.contextHandler = handler;
     }
 
+    public void withPermission(Permission<C> permission) {
+        this.permission = permission;
+    }
+
     public SingleNode<C> build() {
         Objects.requireNonNull(block);
         Objects.requireNonNull(contextHandler);
 
-        return new SingleNode<>(block, contextHandler);
+        return new SingleNode<>(block, contextHandler, permission);
     }
 
     @Override
     public CommandNode<C> buildWithoutIdentifier() {
         Objects.requireNonNull(contextHandler);
 
-        return new SingleNode<>(EmptyBlock.of(),contextHandler);
+        return new SingleNode<>(EmptyBlock.of(),contextHandler, permission);
     }
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java b/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
index b809691..a130575 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
+++ b/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
@@ -8,8 +8,8 @@
  */
 public interface ContextProducer<T> {
 
-    NodeContext<T> produce(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath fullPath);
+    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath);
 
-    Context<T> produce(T t, String alias, String[] strings);
+    Context<T> produce(T sender, String alias, String[] strings);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
index 7fbeb24..fe22c0d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
@@ -14,4 +14,7 @@ public interface NodeContext<T> extends Context<T> {
 
     boolean equals(Object comparison);
 
+    //TODO add more cool features like the debug message sender,
+    // because NodeContext should be a collection of both context and context-specific actions? /review a248
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/StagedContext.java b/core/src/main/java/me/aurium/beetle/branch/context/StagedContext.java
new file mode 100644
index 0000000..6928fc3
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/context/StagedContext.java
@@ -0,0 +1,28 @@
+package me.aurium.beetle.branch.context;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+/**
+ * Something like a nodecontext that hasn't been activated yet
+ */
+public interface StagedContext<T> {
+
+    T getSender();
+    String getAlias();
+    String[] getArgs();
+
+    CommandNode<T> getExecutedNode();
+    CommandNode<T> getBaseExecutedNode();
+
+    BlockPath executedPath();
+    BlockPath fullPath();
+
+    boolean equals(Object comparison);
+
+    NodeContext<T> stage(ContextProducer<T> producer);
+
+    FallbackHandler<T> getFallbackAction();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/StagedContextImpl.java b/core/src/main/java/me/aurium/beetle/branch/context/StagedContextImpl.java
new file mode 100644
index 0000000..6fa3e71
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/context/StagedContextImpl.java
@@ -0,0 +1,73 @@
+package me.aurium.beetle.branch.context;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+public class StagedContextImpl<T> implements StagedContext<T> {
+
+    private final T sender;
+    private final String alias;
+    private final String[] args;
+    private final CommandNode<T> executedNode;
+    private final CommandNode<T> baseNode;
+    private final BlockPath executedPath;
+    private final BlockPath basePath;
+    private final FallbackHandler<T> fallbackHandler;
+
+    public StagedContextImpl(T sender, String alias, String[] args, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<T> fallbackHandler) {
+        this.sender = sender;
+        this.alias = alias;
+        this.args = args;
+        this.executedNode = executedNode;
+        this.baseNode = baseNode;
+        this.executedPath = executedPath;
+        this.basePath = basePath;
+        this.fallbackHandler = fallbackHandler;
+    }
+
+    @Override
+    public T getSender() {
+        return sender;
+    }
+
+    @Override
+    public String getAlias() {
+        return alias;
+    }
+
+    @Override
+    public String[] getArgs() {
+        return args;
+    }
+
+    @Override
+    public CommandNode<T> getExecutedNode() {
+        return executedNode;
+    }
+
+    @Override
+    public CommandNode<T> getBaseExecutedNode() {
+        return baseNode;
+    }
+
+    @Override
+    public BlockPath executedPath() {
+        return executedPath;
+    }
+
+    @Override
+    public BlockPath fullPath() {
+        return basePath;
+    }
+
+    @Override
+    public NodeContext<T> stage(ContextProducer<T> producer) {
+        return producer.produce(sender,alias,args,executedNode,baseNode,executedPath,basePath);
+    }
+
+    @Override
+    public FallbackHandler<T> getFallbackAction() {
+        return fallbackHandler;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
index 36e2a71..54e06ec 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
@@ -7,10 +7,10 @@
 import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
 import me.aurium.beetle.branch.argument.Argument;
 import me.aurium.beetle.branch.nodes.result.GetNodeResult;
+import me.aurium.beetle.branch.nodes.result.NullableNodeResult;
 import me.aurium.beetle.branch.permission.Permission;
 
 import java.util.List;
-import java.util.Optional;
 
 //kinda like a branching node except it throws forward and not to the sides
 public class ArgumentNode<T> implements IdentifiableNode<T> {
@@ -19,10 +19,13 @@ public class ArgumentNode<T> implements IdentifiableNode<T> {
     private final List<Argument<?>> sequentialValueNodes; //the nodes in order from here on out
     private final SingleNode<T> noArgs;
 
-    public ArgumentNode(Block identifier, List<Argument<?>> sequentialValueNodes, SingleNode<T> noArgs) {
+    private final Permission<T> permission;
+
+    public ArgumentNode(Block identifier, List<Argument<?>> sequentialValueNodes, SingleNode<T> noArgs, Permission<T> permission) {
         this.identifier = identifier;
         this.sequentialValueNodes = sequentialValueNodes;
         this.noArgs = noArgs;
+        this.permission = permission;
     }
 
 
@@ -34,7 +37,7 @@ public ArgumentNode(Block identifier, List<Argument<?>> sequentialValueNodes, Si
 
     @Override
     public GetNodeResult<T> getSpecificNode(BlockPath path) {
-        return null;
+        return new NullableNodeResult<>(this,path);
     }
 
     /*if (path.isEmpty()) return Optional.of(noArgs);
@@ -73,7 +76,7 @@ public SuggestionHandler<T> getSuggestionHandler() {
 
     @Override
     public Permission<T> getPermission() {
-        return null;
+        return permission;
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index e0d9f23..c3bd9cf 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -10,16 +10,17 @@
 import me.aurium.beetle.branch.permission.Permission;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
-import java.util.Optional;
-
 public class BranchingNode<T> implements IdentifiableNode<T> {
 
     private final PreStoredHashSet<IdentifiableNode<T>> nodes;
     private final Block path;
 
-    public BranchingNode(PreStoredHashSet<IdentifiableNode<T>> nodes, Block path) {
+    private final Permission<T> permission;
+
+    public BranchingNode(PreStoredHashSet<IdentifiableNode<T>> nodes, Block path, Permission<T> permission) {
         this.nodes = nodes;
         this.path = path;
+        this.permission = permission;
     }
 
     @Override
@@ -62,7 +63,7 @@ public SuggestionHandler<T> getSuggestionHandler() {
 
     @Override
     public Permission<T> getPermission() {
-        return null;
+        return permission;
     }
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index fc86358..ea5127a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -17,10 +17,14 @@ public class SingleNode<T> implements EndpointNode<T> {
     private final ExecutionHandler<T> executionHandler;
     private final SuggestionHandler<T> suggestionHandler;
 
-    public SingleNode(Block identifier, ExecutionHandler<T> executionHandler) {
+    private final Permission<T> permission;
+
+    public SingleNode(Block identifier, ExecutionHandler<T> executionHandler, Permission<T> permission) {
         this.identifier = identifier;
 
         this.executionHandler = executionHandler;
+        this.permission = permission;
+
         this.suggestionHandler = new EmptySuggestionHandler<>();
     }
 
@@ -46,7 +50,7 @@ public SuggestionHandler<T> getSuggestionHandler() {
 
     @Override
     public Permission<T> getPermission() {
-        return null;
+        return permission;
     }
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
index 63b27cd..1e9a563 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
@@ -19,5 +19,9 @@ public interface CommandNode<T> {
     ExecutionHandler<T> getExecutionHandler();
     SuggestionHandler<T> getSuggestionHandler();
 
+    /**
+     * Gets the permission required to execute and interact with this node. Depending on the base, this may cause the node to become locked, or just completely be ignored.
+     * @return the permission binding
+     */
     Permission<T> getPermission();
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBase.java
index ae469a3..0478c18 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBase.java
@@ -1,17 +1,12 @@
 package me.aurium.beetle.branch.nodes.base;
 
-import me.aurium.beetle.branch.permission.PermAccessor;
-
 import java.util.List;
 
-public interface NodeBase<T,C extends PermAccessor<T>> {
-
-    C getAccessor();
+public interface NodeBase<T> {
 
     void execute(T t, String alias, String[] args);
 
     List<String> suggest(T t, String alias, String[] args);
 
-    //void setAccessor(C c);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java
index 51beea7..44a804e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java
@@ -1,7 +1,5 @@
 package me.aurium.beetle.branch.nodes.base;
 
-import me.aurium.beetle.branch.permission.PermAccessor;
-
 public class NodeBaseBuilder<T> {
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java
index 247a5c0..ebcd173 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java
@@ -3,50 +3,41 @@
 import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.block.CommonBlockPath;
 import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.context.StagedContext;
+import me.aurium.beetle.branch.context.StagedContextImpl;
 import me.aurium.beetle.branch.handlers.api.FallbackHandler;
 import me.aurium.beetle.branch.nodes.api.CommandNode;
 import me.aurium.beetle.branch.nodes.result.GetNodeResult;
-import me.aurium.beetle.branch.permission.PermAccessor;
-import me.aurium.beetle.branch.permission.PermissionStrategy;
+import me.aurium.beetle.branch.permission.FallbackStrategy;
 
 import java.util.List;
 
-public class SimpleNodeBase<T,C extends PermAccessor<T>> implements NodeBase<T, C> {
+public class SimpleNodeBase<T> implements NodeBase<T> {
 
     private final CommandNode<T> baseNode;
     private final ContextProducer<T> factory;
 
-    private final C accessor;
-    private final PermissionStrategy strategy;
-
+    private final FallbackStrategy<T> strategy;
     private final FallbackHandler<T> fallbackHandler;
 
-    public <X> SimpleNodeBase(CommandNode<T> baseNode, ContextProducer<T> factory, C accessor, PermissionStrategy strategy, FallbackHandler<T> fallbackHandler) {
+    public <X> SimpleNodeBase(CommandNode<T> baseNode, ContextProducer<T> factory, FallbackStrategy<T> strategy, FallbackHandler<T> fallbackHandler) {
         this.baseNode = baseNode;
         this.factory = factory;
-        this.accessor = accessor;
         this.strategy = strategy;
         this.fallbackHandler = fallbackHandler;
     }
 
-    @Override
-    public C getAccessor() {
-        return accessor;
-    }
-
     @Override
     public void execute(T t, String alias, String[] args) {
         BlockPath path = CommonBlockPath.of(args);
 
         GetNodeResult<T> result = baseNode.getSpecificNode(path);
 
-        result.resultingNode().ifPresentOrElse(node -> {
+        result.resultingNode().ifPresentOrElse(node -> { //this should always be present, if it isn't that means something went wrong, so fallback!
 
-            //TODO some kind of thing here
-            NodeContext<T> adapter = factory.produce(t,alias,args,node,baseNode,path, result.resultingPath());
+            StagedContext<T> context = new StagedContextImpl<>(t,alias,args,node,baseNode,path,result.resultingPath(), fallbackHandler);
 
-            node.getExecutionHandler().handle(adapter);
+            strategy.strategy(context).handle(context.stage(factory));
 
         }, () -> fallbackHandler.handle(factory.produce(t, alias, args)));
     }
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/FallbackOneStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/FallbackOneStrategy.java
deleted file mode 100644
index 02c1722..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/FallbackOneStrategy.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.permission;
-
-/**
- * Falls back to the at-execution-time parent node
- */
-public class FallbackOneStrategy {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/FallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/FallbackStrategy.java
new file mode 100644
index 0000000..03e8546
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/FallbackStrategy.java
@@ -0,0 +1,12 @@
+package me.aurium.beetle.branch.permission;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.context.StagedContext;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+public interface FallbackStrategy<T> {
+
+    ExecutionHandler<T> strategy(StagedContext<T> stagedContext);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/PermAccessor.java b/core/src/main/java/me/aurium/beetle/branch/permission/PermAccessor.java
deleted file mode 100644
index e923fc4..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/PermAccessor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch.permission;
-
-/**
- * Representing something that you can have that determines the accessibility of a command
- */
-public interface PermAccessor<T> {
-
-    boolean hasAccessToUse(T user, Permission permission);
-    boolean hasAccessToSee(T user, Permission permission);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
index c5fc8a3..e586055 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
@@ -1,14 +1,12 @@
 package me.aurium.beetle.branch.permission;
 
-import me.aurium.beetle.branch.context.NodeContext;
-
-import java.util.function.Predicate;
+import me.aurium.beetle.branch.context.StagedContext;
 
 /**
  *
  */
 public interface Permission<T> {
 
-   Predicate<NodeContext<T>> attempt();
+   boolean attempt(StagedContext<T> context);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/PermissionStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/PermissionStrategy.java
deleted file mode 100644
index b28f57c..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/PermissionStrategy.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.permission;
-
-public interface PermissionStrategy {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermAccessor.java b/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermAccessor.java
deleted file mode 100644
index 34219c2..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/impl/EmptyPermAccessor.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package me.aurium.beetle.branch.permission.impl;
-
-import me.aurium.beetle.branch.permission.PermAccessor;
-import me.aurium.beetle.branch.permission.Permission;
-
-public class EmptyPermAccessor<T> implements PermAccessor<T> {
-
-    @Override
-    public boolean hasAccessToUse(T user, Permission permission) {
-        return true;
-    }
-
-    @Override
-    public boolean hasAccessToSee(T user, Permission permission) {
-        return true;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/permission/permissions/EmptyPermission.java
new file mode 100644
index 0000000..fc83922
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/permissions/EmptyPermission.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.permission.permissions;
+
+import me.aurium.beetle.branch.context.StagedContext;
+import me.aurium.beetle.branch.permission.Permission;
+
+public class EmptyPermission<T> implements Permission<T> {
+    @Override
+    public boolean attempt(StagedContext<T> context) {
+        return true;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/permissions/StringPermission.java b/core/src/main/java/me/aurium/beetle/branch/permission/permissions/StringPermission.java
new file mode 100644
index 0000000..8a7539d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/permissions/StringPermission.java
@@ -0,0 +1,21 @@
+package me.aurium.beetle.branch.permission.permissions;
+
+import me.aurium.beetle.branch.context.StagedContext;
+import me.aurium.beetle.branch.permission.Permission;
+
+/**
+ * example permission i'm using for testing because i'm so godfucking bored
+ */
+public class StringPermission implements Permission<String> {
+
+    private final String string;
+
+    public StringPermission(String string) {
+        this.string = string;
+    }
+
+    @Override
+    public boolean attempt(StagedContext<String> context) {
+        return context.getSender().equals(string);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackBaseStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackBaseStrategy.java
new file mode 100644
index 0000000..ee9c9aa
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackBaseStrategy.java
@@ -0,0 +1,26 @@
+package me.aurium.beetle.branch.permission.strategies;
+
+import me.aurium.beetle.branch.context.StagedContext;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.permission.FallbackStrategy;
+
+public class FallbackBaseStrategy<T> implements FallbackStrategy<T> {
+
+    @Override
+    public ExecutionHandler<T> strategy(StagedContext<T> stagedContext) {
+        //this strategy should: if base node, fall back to fallback-strategy. If not, fall back to base node's executor.
+
+        CommandNode<T> executed = stagedContext.getExecutedNode();
+        CommandNode<T> baseNode = stagedContext.getBaseExecutedNode();
+
+        if (executed.equals(baseNode)) {
+            //todo remove this
+            return (s) -> {
+                stagedContext.getFallbackAction().handle(s);
+            };
+        }
+
+        return null;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java
new file mode 100644
index 0000000..e291e32
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.permission.strategies;
+
+import me.aurium.beetle.branch.context.StagedContext;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.permission.FallbackStrategy;
+
+/**
+ * Falls back to the at-execution-time parent node
+ */
+public class FallbackOneStrategy<T> implements FallbackStrategy<T> {
+
+    @Override
+    public ExecutionHandler<T> strategy(StagedContext<T> stagedContext) {
+
+        CommandNode<T> toBeExecuted = stagedContext.getExecutedNode();
+
+        if (!toBeExecuted.getPermission().attempt(stagedContext)) {
+            //NO PERMISSIONS! fall back to the node above it. However, if toBeExecuted is the base node, fall back to the fallbackhandler
+
+            return null;
+        } else {
+            //the user is authorized
+            return toBeExecuted.getExecutionHandler();
+        }
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/IgnoredStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/IgnoredStrategy.java
new file mode 100644
index 0000000..23573a3
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/IgnoredStrategy.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.permission.strategies;
+
+import me.aurium.beetle.branch.context.StagedContext;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.permission.FallbackStrategy;
+
+public class IgnoredStrategy<T> implements FallbackStrategy<T> {
+
+    @Override
+    public ExecutionHandler<T> strategy(StagedContext<T> stagedContext) {
+        return stagedContext.getExecutedNode().getExecutionHandler();
+    }
+}

From cb760cbf98482d90da1e94f76a0a1e6afbf21a42 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Tue, 23 Mar 2021 16:08:11 -0700
Subject: [PATCH 20/56] sick of fucking branch its tick time

---
 .../converted/launchpoints/Implement.java     | 68 -------------------
 .../me/aurium/beetle/branch/TabCompleter.java |  4 --
 .../beetle/branch/nodes/BranchingNode.java    |  4 ++
 .../strategies/AngryMessageStrategy.java      | 32 +++++++++
 .../strategies/FallbackOneStrategy.java       |  1 +
 5 files changed, 37 insertions(+), 72 deletions(-)
 delete mode 100644 beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/TabCompleter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/AngryMessageStrategy.java

diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java
deleted file mode 100644
index 15b1094..0000000
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/Implement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package me.aurium.beetle.branch.converted.launchpoints;
-
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.nodes.base.SimpleNodeBase;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.base.NodeBase;
-import me.aurium.beetle.branch.permission.Permission;
-
-public class Implement extends AbstractBaseCommand<String> {
-    private final ContextProducer<String> factory;
-
-    protected Implement(ContextProducer<String> factory) {
-        super(factory);
-
-        this.factory = factory;
-    }
-
-    @Override
-    public CommandNode<String> getBaseNode() {
-        return null;
-    }
-
-    @Override
-    public NodeBase<String, ?> getBase() {
-
-        return new SimpleNodeBase<>(getBaseNode(), factory, new PermAccessor<String>() {
-            @Override
-            public boolean hasAccessToUse(String user, Permission permission) {
-
-                return permission.attempt().test()
-
-                return false;
-            }
-
-            @Override
-            public boolean hasAccessToSee(String user, Permission permission) {
-                return false;
-            }
-
-
-
-        }, null, null);
-
-        /*return new SimpleNodeBase<>(baseNode, factory, new StringPermAccessor<String>() {
-
-            @Override
-            public boolean hasAccessToUse(String user, String permission) {
-                return user.equalsIgnoreCase(permission);
-            }
-
-            @Override
-            public boolean hasAccessToSee(String user, String permission) {
-                return user.equalsIgnoreCase(permission);
-            }
-
-        }, strategy, fallbackHandler);*/
-    }
-
-    @Override
-    public String getName() {
-        return null;
-    }
-
-    @Override
-    public String getPermission() {
-        return null;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/TabCompleter.java b/core/src/main/java/me/aurium/beetle/branch/TabCompleter.java
deleted file mode 100644
index 5c6fa9f..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/TabCompleter.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch;
-
-public interface TabCompleter {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index c3bd9cf..79fcbf9 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -10,6 +10,10 @@
 import me.aurium.beetle.branch.permission.Permission;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
+/**
+ * TODO: missing a Node for noargs will cause it to rely on fallback rather than throwning exceptions and being bad
+ * @param <T>
+ */
 public class BranchingNode<T> implements IdentifiableNode<T> {
 
     private final PreStoredHashSet<IdentifiableNode<T>> nodes;
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/AngryMessageStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/AngryMessageStrategy.java
new file mode 100644
index 0000000..aaf0a00
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/AngryMessageStrategy.java
@@ -0,0 +1,32 @@
+package me.aurium.beetle.branch.permission.strategies;
+
+import me.aurium.beetle.branch.context.StagedContext;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.permission.FallbackStrategy;
+
+/**
+ * does what it says on the tin (really just an example)
+ */
+public class AngryMessageStrategy<T> implements FallbackStrategy<T> {
+
+    private final String antiPermissionMessage; //something like "You cannot run that!" or "Unknown command. Type /help for help!"
+
+    public AngryMessageStrategy(String antiPermissionMessage) {
+        this.antiPermissionMessage = antiPermissionMessage;
+    }
+
+    @Override
+    public ExecutionHandler<T> strategy(StagedContext<T> stagedContext) {
+        CommandNode<T> executedNode = stagedContext.getExecutedNode();
+
+        if (!executedNode.getPermission().attempt(stagedContext)) {
+            return (contex) -> {
+              contex.messageSender(antiPermissionMessage);
+            };
+        } else {
+            return executedNode.getExecutionHandler();
+        }
+
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java
index e291e32..0d6c642 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java
@@ -16,6 +16,7 @@ public ExecutionHandler<T> strategy(StagedContext<T> stagedContext) {
         CommandNode<T> toBeExecuted = stagedContext.getExecutedNode();
 
         if (!toBeExecuted.getPermission().attempt(stagedContext)) {
+
             //NO PERMISSIONS! fall back to the node above it. However, if toBeExecuted is the base node, fall back to the fallbackhandler
 
             return null;

From 8e7c984a1bf99e4ad0f05e1ce8d72665f12f1252 Mon Sep 17 00:00:00 2001
From: "Aurium_ @ElytraForce" <aukrais@gmail.com>
Date: Tue, 23 Mar 2021 17:43:27 -0700
Subject: [PATCH 21/56] Update
 core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java

Co-authored-by: A248 <anandebeh@gmail.com>
---
 .../aurium/beetle/branch/handlers/EmptySuggestionHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
index 85a1ee9..e1ff624 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
@@ -12,6 +12,6 @@ public class EmptySuggestionHandler<T> implements SuggestionHandler<T> {
 
     @Override
     public List<String> handle(NodeContext<T> adapter) {
-        return emptyList;
+        return List.of();
     }
 }

From 5c312144577476798ceb10415b6fbfd334a97d5a Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Fri, 26 Mar 2021 23:47:09 -0700
Subject: [PATCH 22/56] lots of changes

---
 .idea/compiler.xml                            |  2 +-
 .idea/misc.xml                                |  1 +
 .../branch/converted/BranchCommand.java       |  2 +-
 .../launchpoints/AbstractBaseCommand.java     |  4 +-
 .../launchpoints/AbstractBranchCommand.java   |  5 +-
 .../branch/tests/context/TestContext.java     | 12 +--
 .../tests/context/TestContextProducer.java    |  2 +-
 .../tests/mockups/BranchingCommand.java       |  6 +-
 .../BranchingImproperAnnotatedCommand.java    |  2 +-
 .../mockups/ImproperAnnotatedCommand.java     |  2 +-
 .../branch/tests/mockups/SingleCommand.java   |  4 +-
 .../branch/annotate/AnnotatedParser.java      |  2 +-
 .../branch/annotate/ParsingException.java     |  4 +
 .../beetle/branch/annotate/TypeToken.java     | 15 ++++
 .../UncheckedInvocationException.java         |  9 +++
 .../annotate/{ => marker}/BranchCommand.java  |  2 +-
 .../marker/permission/Permission.java         |  9 +++
 .../marker/permission/StringPermChecker.java  |  9 +++
 .../parsers/BranchingAnnotatedParser.java     |  4 +
 .../parsers/PermissionAnnotationParser.java   | 34 +++++++++
 .../parsers/SingleAnnotatedParser.java        | 72 ++++++++++++++++++
 .../argument/DelegatingArgumentContext.java   | 13 +++-
 .../beetle/branch/block/CommonBlockPath.java  |  4 +-
 .../aurium/beetle/branch/builders/Base.java   |  2 +-
 .../beetle/branch/builders/Builder.java       |  4 +-
 .../branch/context/AbstractNodeContext.java   |  2 +-
 .../branch/context/ContextProducer.java       |  2 +-
 .../beetle/branch/context/NodeContext.java    |  5 +-
 .../beetle/branch/context/StagedContext.java  | 28 -------
 .../branch/context/StagedContextImpl.java     | 73 -------------------
 .../staging/InitialLocatorContext.java        | 16 ++++
 .../staging/MutableLocatorContext.java        | 46 ++++++++++++
 .../branch/handlers/api/ExecutionHandler.java |  2 +-
 .../branch/handlers/api/FallbackHandler.java  |  5 +-
 .../handlers/api/SuggestionHandler.java       |  2 +-
 .../launchpoints/CentralizedManager.java      | 14 ++++
 .../CentralizedManagerBinder.java             |  4 +
 .../base/NodeBase.java                        |  2 +-
 .../launchpoints/base/NodeBaseBuilder.java    |  7 ++
 .../launchpoints/base/SimpleNodeBase.java     | 35 +++++++++
 .../beetle/branch/nodes/ArgumentNode.java     | 22 +++---
 .../beetle/branch/nodes/BranchingNode.java    | 23 +++---
 .../branch/nodes/{api => }/CommandNode.java   | 12 ++-
 .../branch/nodes/{api => }/EndpointNode.java  |  2 +-
 .../nodes/{api => }/IdentifiableNode.java     |  2 +-
 .../beetle/branch/nodes/SingleNode.java       | 13 ++--
 .../branch/nodes/base/NodeBaseBuilder.java    |  7 --
 .../branch/nodes/base/SimpleNodeBase.java     | 49 -------------
 .../builders/BranchingBuilder.java            |  7 +-
 .../{ => nodes}/builders/SingleBuilder.java   |  6 +-
 .../branch/nodes/result/EmptyNodeResult.java  | 25 -------
 .../branch/nodes/result/ExecutionResult.java  | 22 ++++++
 .../branch/nodes/result/GetNodeResult.java    | 13 ----
 ...ullableNodeResult.java => NodeResult.java} | 12 ++-
 .../branch/permission/FallbackStrategy.java   | 12 ---
 .../beetle/branch/permission/Permission.java  |  4 +-
 .../permission/PredicatePermission.java       | 17 +++++
 .../permissions/EmptyPermission.java          |  4 +-
 .../permissions/StringPermission.java         | 21 ------
 .../strategies/AngryMessageStrategy.java      | 32 --------
 .../strategies/ExecutionFallbackStrategy.java | 14 ++++
 .../strategies/FallbackBaseStrategy.java      | 26 -------
 .../strategies/FallbackOneStrategy.java       | 28 -------
 .../strategies/FallbackPermStrategy.java      | 69 ++++++++++++++++++
 .../strategies/IgnoredStrategy.java           | 13 ----
 .../strategies/PassthroughStrategy.java       | 26 +++++++
 .../strategies/StringPermission.java          | 13 ++++
 .../beetle/branch/util/PreStoredHashSet.java  |  5 +-
 pom.xml                                       |  1 +
 spigot-impl/pom.xml                           | 32 ++++++++
 spigot-impl/spigot-impl.iml                   |  9 +++
 71 files changed, 585 insertions(+), 424 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java
 rename core/src/main/java/me/aurium/beetle/branch/annotate/{ => marker}/BranchCommand.java (84%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/context/StagedContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/context/StagedContextImpl.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/context/staging/InitialLocatorContext.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/context/staging/MutableLocatorContext.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
 rename core/src/main/java/me/aurium/beetle/branch/{nodes => launchpoints}/base/NodeBase.java (77%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{api => }/CommandNode.java (65%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{api => }/EndpointNode.java (84%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{api => }/IdentifiableNode.java (76%)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java
 rename core/src/main/java/me/aurium/beetle/branch/{ => nodes}/builders/BranchingBuilder.java (92%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => nodes}/builders/SingleBuilder.java (87%)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/result/EmptyNodeResult.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/result/ExecutionResult.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/result/GetNodeResult.java
 rename core/src/main/java/me/aurium/beetle/branch/nodes/result/{NullableNodeResult.java => NodeResult.java} (54%)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/FallbackStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/PredicatePermission.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/permissions/StringPermission.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/AngryMessageStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/ExecutionFallbackStrategy.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackBaseStrategy.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackPermStrategy.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/IgnoredStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/PassthroughStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/permission/strategies/StringPermission.java
 create mode 100644 spigot-impl/pom.xml
 create mode 100644 spigot-impl/spigot-impl.iml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index c21bcba..5263f5f 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,12 +6,12 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="beetle-impl" />
         <module name="tests" />
         <module name="branch-core" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
+      <module name="beetle-impl" target="11" />
       <module name="branch-tests" target="11" />
       <module name="core" target="11" />
       <module name="tests" target="11" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2f9aca2..f109e37 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,6 +9,7 @@
     </option>
     <option name="ignoredFiles">
       <set>
+        <option value="$PROJECT_DIR$/beetle-impl/pom.xml" />
         <option value="$PROJECT_DIR$/tests/pom.xml" />
       </set>
     </option>
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
index 678a1a4..177f1f8 100644
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
+++ b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
@@ -2,7 +2,7 @@
 
 import me.aurium.beetle.api.command.Command;
 import me.aurium.beetle.branch.context.Context;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
 
 public interface BranchCommand<T> extends Command<T> {
 
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
index 9867d17..acec904 100644
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
+++ b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
@@ -1,7 +1,8 @@
 package me.aurium.beetle.branch.converted.launchpoints;
 
 import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.nodes.base.NodeBase;
+import me.aurium.beetle.branch.launchpoints.base.NodeBase;
+/*
 
 public abstract class AbstractBaseCommand<T> extends AbstractBranchCommand<T> {
 
@@ -11,3 +12,4 @@ protected AbstractBaseCommand(ContextProducer<T> factory) {
 
     public abstract NodeBase<T,?> getBase();
 }
+*/
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
index ec5fa44..3bfb7fe 100644
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
+++ b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
@@ -2,12 +2,12 @@
 
 import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.converted.BranchCommand;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
 import me.aurium.beetle.branch.context.NodeContext;
 import me.aurium.beetle.branch.context.ContextProducer;
 import me.aurium.beetle.branch.block.CommonBlockPath;
-import me.aurium.beetle.branch.nodes.result.GetNodeResult;
 
+/*
 public abstract class AbstractBranchCommand<T> implements BranchCommand<T> {
 
     private final ContextProducer<T> factory;
@@ -38,3 +38,4 @@ public boolean execute(T t, String s, String[] strings) {
         return true;
     }
 }
+*/
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
index a45607d..56c7810 100644
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
@@ -2,20 +2,10 @@
 
 import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.context.AbstractNodeContext;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TestContext extends AbstractNodeContext<String> {
 
-    private final Logger logger = LoggerFactory.getLogger(TestContext.class);
-
-    protected TestContext(String s, String alias, String[] args, CommandNode<String> executed, CommandNode<String> base, BlockPath executedPath, BlockPath fullPath) {
-        super(s, alias, args, executed, base, executedPath, fullPath);
-    }
-
-    @Override
-    public void messageSender(String string) {
-        logger.info(string);
-    }
 }
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
index e5755dd..9cc574c 100644
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
@@ -4,7 +4,7 @@
 import me.aurium.beetle.branch.context.Context;
 import me.aurium.beetle.branch.context.ContextProducer;
 import me.aurium.beetle.branch.context.NodeContext;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
 
 public class TestContextProducer implements ContextProducer<String> {
 
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
index 7748c88..9996e5f 100644
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
@@ -1,10 +1,10 @@
 package me.aurium.beetle.branch.tests.mockups;
 
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
 import me.aurium.beetle.branch.context.ContextProducer;
 import me.aurium.beetle.branch.builders.Base;
-import me.aurium.beetle.branch.builders.BranchingBuilder;
-import me.aurium.beetle.branch.builders.SingleBuilder;
+import me.aurium.beetle.branch.nodes.builders.BranchingBuilder;
+import me.aurium.beetle.branch.nodes.builders.SingleBuilder;
 import me.aurium.beetle.branch.converted.launchpoints.AbstractBranchCommand;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
index 04b4faf..6f55af5 100644
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.tests.mockups;
 
 import me.aurium.beetle.branch.context.NodeContext;
-import me.aurium.beetle.branch.annotate.BranchCommand;
+import me.aurium.beetle.branch.annotate.marker.BranchCommand;
 import me.aurium.beetle.branch.annotate.marker.BranchingNode;
 import me.aurium.beetle.branch.annotate.marker.SingleNode;
 
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
index 7446aac..2a39332 100644
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.tests.mockups;
 
-import me.aurium.beetle.branch.annotate.BranchCommand;
+import me.aurium.beetle.branch.annotate.marker.BranchCommand;
 import me.aurium.beetle.branch.annotate.marker.SingleNode;
 
 @BranchCommand
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
index 58b2aaf..0db4b0f 100644
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
+++ b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
@@ -1,9 +1,9 @@
 package me.aurium.beetle.branch.tests.mockups;
 
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
 import me.aurium.beetle.branch.context.ContextProducer;
 import me.aurium.beetle.branch.builders.Base;
-import me.aurium.beetle.branch.builders.SingleBuilder;
+import me.aurium.beetle.branch.nodes.builders.SingleBuilder;
 import me.aurium.beetle.branch.converted.launchpoints.AbstractBranchCommand;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
index c39f358..74696db 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.annotate;
 
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
 
 public interface AnnotatedParser<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java b/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java
new file mode 100644
index 0000000..7ce0cab
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.annotate;
+
+public class ParsingException {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java b/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java
new file mode 100644
index 0000000..3fdb7b3
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java
@@ -0,0 +1,15 @@
+package me.aurium.beetle.branch.annotate;
+
+public class TypeToken<T> {
+
+    private final Class<T> type;
+
+    public <X> TypeToken(Class<T> type) {
+        this.type = type;
+    }
+    public Class<T> getType() {
+        return type;
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java b/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java
new file mode 100644
index 0000000..98831f4
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.annotate;
+
+public class UncheckedInvocationException extends RuntimeException{
+
+    public UncheckedInvocationException(Throwable throwable) {
+        super(throwable);
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/BranchCommand.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java
similarity index 84%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/BranchCommand.java
rename to core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java
index c5b1a3d..e9e539b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/BranchCommand.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.annotate;
+package me.aurium.beetle.branch.annotate.marker;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
new file mode 100644
index 0000000..f5a9542
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.annotate.marker.permission;
+
+public @interface Permission {
+
+    Class<? extends StringPermChecker> getRelativeChecker();
+
+    String permission();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
new file mode 100644
index 0000000..5f1a22f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.annotate.marker.permission;
+
+import me.aurium.beetle.branch.permission.strategies.StringPermission;
+
+public interface StringPermChecker {
+
+    StringPermission<?> get(String identifierToMakeWith);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java
new file mode 100644
index 0000000..d0e7051
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.annotate.parsers;
+
+public class BranchingAnnotatedParser {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
new file mode 100644
index 0000000..3fe48a9
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
@@ -0,0 +1,34 @@
+package me.aurium.beetle.branch.annotate.parsers;
+
+import me.aurium.beetle.branch.annotate.marker.permission.Permission;
+import me.aurium.beetle.branch.permission.strategies.StringPermission;
+
+import java.lang.annotation.Annotation;
+
+//TODO fix all of this bullshit - we need checks - this class only exists to tell me what i need to do in the future.
+public class PermissionAnnotationParser<T> {
+
+
+    me.aurium.beetle.branch.permission.Permission<T> parse(Annotation annotate) throws IllegalAccessException, InstantiationException {
+
+        if (!annotate.annotationType().equals(Permission.class)) throw new PermissionParsingException("Annotation must be of type Permission");
+
+        Permission permission = (Permission) annotate;
+
+        //TODO checks
+
+        //TODO fix this shit
+        StringPermission<?> perm = permission.getRelativeChecker().newInstance().get(permission.permission());
+
+
+        return (me.aurium.beetle.branch.permission.Permission<T>) perm;
+    }
+
+    public static class PermissionParsingException extends RuntimeException {
+        public PermissionParsingException(String lol ) {
+            super(lol);
+        }
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
new file mode 100644
index 0000000..0d4edde
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
@@ -0,0 +1,72 @@
+package me.aurium.beetle.branch.annotate.parsers;
+
+import me.aurium.beetle.branch.annotate.AnnotatedCommand;
+import me.aurium.beetle.branch.annotate.UncheckedInvocationException;
+import me.aurium.beetle.branch.annotate.marker.SingleNode;
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.lang.reflect.ParameterizedType;
+import java.util.ArrayList;
+import java.util.List;
+
+//TODO one of these days refactor, but right now i really don't care.
+public class SingleAnnotatedParser<T> {
+
+    private final Class<T> senderClass;
+
+    public SingleAnnotatedParser(Class<T> senderClass) {
+        this.senderClass = senderClass;
+    }
+
+    public List<me.aurium.beetle.branch.nodes.SingleNode<T>> parse(Class<? extends AnnotatedCommand> command) {
+
+        List<me.aurium.beetle.branch.nodes.SingleNode<T>> nodes = new ArrayList<>();
+
+        for (Method method : command.getMethods()) {
+            if (method.isAnnotationPresent(SingleNode.class)) {
+                //This method is a SingleNode, verify the argument signature of the command
+                SingleNode annotate = method.getAnnotation(SingleNode.class);
+                Parameter[] parameters = method.getParameters();
+
+                if (!method.getReturnType().equals(Void.TYPE)) throw new SingleNodeParsingException("Annotation return must be void");
+                if (parameters.length != 1 || !parameters[0].getType().isAssignableFrom(NodeContext.class)) throw new SingleNodeParsingException("Method signature length must be one argument!");
+
+                if (parameters[0].getParameterizedType() instanceof ParameterizedType) {
+
+                }
+
+
+                if (parameters[0].getType().isAssignableFrom(NodeContext.class)) {
+
+
+                    ExecutionHandler<T> handler = (context) -> {
+                        try {
+                            method.invoke(command,context);
+                        } catch (IllegalAccessException | InvocationTargetException e) {
+                            throw new UncheckedInvocationException(e);
+                        }
+
+                    };
+
+                } else {
+                    throw new SingleNodeParsingException("The method signature of a single-node must only contain a single NodeContext!");
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static class SingleNodeParsingException extends RuntimeException {
+
+        SingleNodeParsingException(String error) {
+            super(error);
+        }
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
index 97cc5e2..ec38484 100644
--- a/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
@@ -2,7 +2,8 @@
 
 import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.context.NodeContext;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.nodes.CommandNode;
 
 public class DelegatingArgumentContext<T> implements ArgumentContext<T>{
 
@@ -49,6 +50,16 @@ public BlockPath executedPath() {
         return delegate.executedPath();
     }
 
+    @Override
+    public BlockPath fullPath() {
+        return delegate.fullPath();
+    }
+
+    @Override
+    public FallbackHandler<T> getFallbackAction() {
+        return delegate.getFallbackAction();
+    }
+
     @Override
     public Arguments getArgumentContainer() {
         return arguments;
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
index 0533915..9f297be 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
@@ -95,11 +95,11 @@ public BlockPath withoutBase() {
         return fromIndex(0);
     }
 
-    @Override
+    @Override //TODO need a logic check here
     public BlockPath withoutTop() {
         BlockList clone = new DelegatingBlockList(new ArrayList<>(
                 blocks.getBackingList()
-        ));;
+        ));
 
         clone.removeLast();
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/Base.java b/core/src/main/java/me/aurium/beetle/branch/builders/Base.java
index 4060ed3..268899c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/Base.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/Base.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.builders;
 
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
 
 import java.util.function.Consumer;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java b/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
index 73db179..bd87513 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.builders;
 
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.IdentifiableNode;
 
 public interface Builder<C>{
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java
index 6813f62..43c8d15 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.context;
 
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
 
 public abstract class AbstractNodeContext<T> extends AbstractContext<T> implements NodeContext<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java b/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
index a130575..eda8bf6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
+++ b/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.context;
 
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
 
 /**
  * Produces context adapters, like the stock ContextSource for contexts.
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
index fe22c0d..0004d07 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
@@ -1,7 +1,8 @@
 package me.aurium.beetle.branch.context;
 
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.nodes.CommandNode;
 
 
 public interface NodeContext<T> extends Context<T> {
@@ -14,6 +15,8 @@ public interface NodeContext<T> extends Context<T> {
 
     boolean equals(Object comparison);
 
+    FallbackHandler<T> getFallbackAction();
+
     //TODO add more cool features like the debug message sender,
     // because NodeContext should be a collection of both context and context-specific actions? /review a248
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/StagedContext.java b/core/src/main/java/me/aurium/beetle/branch/context/StagedContext.java
deleted file mode 100644
index 6928fc3..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/context/StagedContext.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package me.aurium.beetle.branch.context;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-
-/**
- * Something like a nodecontext that hasn't been activated yet
- */
-public interface StagedContext<T> {
-
-    T getSender();
-    String getAlias();
-    String[] getArgs();
-
-    CommandNode<T> getExecutedNode();
-    CommandNode<T> getBaseExecutedNode();
-
-    BlockPath executedPath();
-    BlockPath fullPath();
-
-    boolean equals(Object comparison);
-
-    NodeContext<T> stage(ContextProducer<T> producer);
-
-    FallbackHandler<T> getFallbackAction();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/StagedContextImpl.java b/core/src/main/java/me/aurium/beetle/branch/context/StagedContextImpl.java
deleted file mode 100644
index 6fa3e71..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/context/StagedContextImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package me.aurium.beetle.branch.context;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-
-public class StagedContextImpl<T> implements StagedContext<T> {
-
-    private final T sender;
-    private final String alias;
-    private final String[] args;
-    private final CommandNode<T> executedNode;
-    private final CommandNode<T> baseNode;
-    private final BlockPath executedPath;
-    private final BlockPath basePath;
-    private final FallbackHandler<T> fallbackHandler;
-
-    public StagedContextImpl(T sender, String alias, String[] args, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<T> fallbackHandler) {
-        this.sender = sender;
-        this.alias = alias;
-        this.args = args;
-        this.executedNode = executedNode;
-        this.baseNode = baseNode;
-        this.executedPath = executedPath;
-        this.basePath = basePath;
-        this.fallbackHandler = fallbackHandler;
-    }
-
-    @Override
-    public T getSender() {
-        return sender;
-    }
-
-    @Override
-    public String getAlias() {
-        return alias;
-    }
-
-    @Override
-    public String[] getArgs() {
-        return args;
-    }
-
-    @Override
-    public CommandNode<T> getExecutedNode() {
-        return executedNode;
-    }
-
-    @Override
-    public CommandNode<T> getBaseExecutedNode() {
-        return baseNode;
-    }
-
-    @Override
-    public BlockPath executedPath() {
-        return executedPath;
-    }
-
-    @Override
-    public BlockPath fullPath() {
-        return basePath;
-    }
-
-    @Override
-    public NodeContext<T> stage(ContextProducer<T> producer) {
-        return producer.produce(sender,alias,args,executedNode,baseNode,executedPath,basePath);
-    }
-
-    @Override
-    public FallbackHandler<T> getFallbackAction() {
-        return fallbackHandler;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/staging/InitialLocatorContext.java b/core/src/main/java/me/aurium/beetle/branch/context/staging/InitialLocatorContext.java
new file mode 100644
index 0000000..f129061
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/context/staging/InitialLocatorContext.java
@@ -0,0 +1,16 @@
+package me.aurium.beetle.branch.context.staging;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.nodes.CommandNode;
+
+public class InitialLocatorContext<T> {
+
+    private final CommandNode<T> baseNode;
+    private final BlockPath basePath;
+
+
+    public InitialLocatorContext(CommandNode<T> baseNode, BlockPath basePath) {
+        this.baseNode = baseNode;
+        this.basePath = basePath;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/staging/MutableLocatorContext.java b/core/src/main/java/me/aurium/beetle/branch/context/staging/MutableLocatorContext.java
new file mode 100644
index 0000000..5355b13
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/context/staging/MutableLocatorContext.java
@@ -0,0 +1,46 @@
+package me.aurium.beetle.branch.context.staging;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.nodes.CommandNode;
+
+public class MutableLocatorContext<T> {
+
+    private final CommandNode<T> baseNode; //can't be changed
+    private final BlockPath basePath;
+
+    //these can be adjusted in staging
+    private CommandNode<T> mutableTargetNode;
+    private BlockPath mutableTargetPath;
+
+    public MutableLocatorContext(CommandNode<T> baseNode, BlockPath basePath, CommandNode<T> mutableTargetNode, BlockPath mutableTargetPath) {
+        this.baseNode = baseNode;
+        this.basePath = basePath;
+        this.mutableTargetNode = mutableTargetNode;
+        this.mutableTargetPath = mutableTargetPath;
+    }
+    public CommandNode<T> getBaseNode() {
+        return baseNode;
+    }
+
+    public BlockPath getBasePath() {
+        return basePath;
+    }
+
+    public CommandNode<T> getMutableTargetNode() {
+        return mutableTargetNode;
+    }
+
+    public BlockPath getMutableTargetPath() {
+        return mutableTargetPath;
+    }
+
+    //TODO limit access (permissions should not be able to touch these)
+    public void setMutableTargetNode(CommandNode<T> node) {
+        this.mutableTargetNode = node;
+    }
+
+    public void setMutableTargetPath(BlockPath path) {
+        this.mutableTargetPath = path;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
index 3445b1e..048442e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
@@ -4,6 +4,6 @@
 
 public interface ExecutionHandler<T> {
 
-    void handle(NodeContext<T> adapter);
+    void handle(NodeContext<T> context);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
index 7db22b2..6bde3cc 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
@@ -1,11 +1,14 @@
 package me.aurium.beetle.branch.handlers.api;
 
 import me.aurium.beetle.branch.context.Context;
+import me.aurium.beetle.branch.context.NodeContext;
 
 /**
  * Represents the fallback handler of a base that manages what happens when everything goes wrong
+ *
+ * EDIT THIS IS NO LONGER A FALLBACK HANDLER THIS IS ONLY FOR IF SOMETHIGN GOES HELL WRONG
  */
-public interface FallbackHandler<T> {
+public interface FallbackHandler<T>  {
 
     void handle(Context<T> context);
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
index 9c26790..ab55126 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
@@ -6,6 +6,6 @@
 
 public interface SuggestionHandler<T> {
 
-    List<String> handle(NodeContext<T> adapter);
+    List<String> handle(NodeContext<T> context);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
new file mode 100644
index 0000000..54602bc
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
@@ -0,0 +1,14 @@
+package me.aurium.beetle.branch.launchpoints;
+
+import me.aurium.beetle.branch.launchpoints.base.NodeBase;
+
+/**
+ * Represents the utmost base part of a command
+ * @param <T> the input type, does not need to be of same type as the node bases it utilizes
+ */
+public interface CentralizedManager<T> {
+
+    CentralizedManagerBinder getBinder();
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
new file mode 100644
index 0000000..096d7a7
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.launchpoints;
+
+public interface CentralizedManagerBinder {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
similarity index 77%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBase.java
rename to core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
index 0478c18..3af9eb2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.base;
+package me.aurium.beetle.branch.launchpoints.base;
 
 import java.util.List;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
new file mode 100644
index 0000000..2d81e69
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.launchpoints.base;
+
+public class NodeBaseBuilder<T> {
+
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
new file mode 100644
index 0000000..a2273a7
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
@@ -0,0 +1,35 @@
+package me.aurium.beetle.branch.launchpoints.base;
+
+import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.permission.strategies.ExecutionFallbackStrategy;
+
+import java.util.List;
+
+public class SimpleNodeBase<C> implements NodeBase<C> {
+
+    private final CommandNode<C> baseNode;
+    private final ContextProducer<C> factory;
+
+    private final FallbackHandler<C> fallbackHandler;
+    private final ExecutionFallbackStrategy<C> strategy;
+
+    public <X> SimpleNodeBase(CommandNode<C> baseNode, ContextProducer<C> factory, FallbackHandler<C> fallbackHandler, ExecutionFallbackStrategy<C> strategy) {
+
+        this.baseNode = baseNode;
+        this.factory = factory;
+        this.fallbackHandler = fallbackHandler;
+        this.strategy = strategy;
+    }
+
+    @Override
+    public void execute(C executor, String alias, String[] args) {
+        strategy.executeStrategy(executor,alias,args,baseNode, fallbackHandler,factory);
+    }
+
+    @Override
+    public List<String> suggest(C c, String alias, String[] args) {
+        return null;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
index 54e06ec..a3b9d68 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
@@ -2,17 +2,17 @@
 
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
 import me.aurium.beetle.branch.argument.Argument;
-import me.aurium.beetle.branch.nodes.result.GetNodeResult;
-import me.aurium.beetle.branch.nodes.result.NullableNodeResult;
+import me.aurium.beetle.branch.nodes.result.ExecutionResult;
+import me.aurium.beetle.branch.nodes.result.NodeResult;
 import me.aurium.beetle.branch.permission.Permission;
 
 import java.util.List;
 
 //kinda like a branching node except it throws forward and not to the sides
+
+//one of these days ill actually finish this class LMFAO
 public class ArgumentNode<T> implements IdentifiableNode<T> {
 
     private final Block identifier;
@@ -36,8 +36,8 @@ public ArgumentNode(Block identifier, List<Argument<?>> sequentialValueNodes, Si
 
 
     @Override
-    public GetNodeResult<T> getSpecificNode(BlockPath path) {
-        return new NullableNodeResult<>(this,path);
+    public NodeResult<T> getSpecificNode(BlockPath path) {
+        return new NodeResult<>(this,path);
     }
 
     /*if (path.isEmpty()) return Optional.of(noArgs);
@@ -59,12 +59,10 @@ public GetNodeResult<T> getSpecificNode(BlockPath path) {
         */
 
     @Override
-    public ExecutionHandler<T> getExecutionHandler() {
-        return (context) -> {
-            BlockPath path = context.executedPath();
-
-            //sort
-        };
+    public ExecutionResult<T> getExecutionHandler() {
+        return new ExecutionResult<>((context) -> {
+            BlockPath executed = context.executedPath();
+        });
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 79fcbf9..999cbdb 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -2,11 +2,8 @@
 
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
-import me.aurium.beetle.branch.nodes.result.GetNodeResult;
-import me.aurium.beetle.branch.nodes.result.NullableNodeResult;
+import me.aurium.beetle.branch.nodes.result.*;
 import me.aurium.beetle.branch.permission.Permission;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
@@ -33,24 +30,30 @@ public Block getIdentifier() {
     }
 
     @Override
-    public GetNodeResult<T> getSpecificNode(BlockPath blockPath) {
+    public NodeResult<T> getSpecificNode(BlockPath blockPath) {
 
-        if (blockPath.isEmpty()) return new NullableNodeResult<>(nodes.getAlreadyStored(),blockPath);
+        if (blockPath.isEmpty()) return new NodeResult<>(this,blockPath);
 
         for (IdentifiableNode<T> node : nodes.getContents()) {
 
             BlockPath subPath = blockPath.withoutBase(); //get everything after the index
 
             if (blockPath.startsWith(node.getIdentifier())) {
-                return node.getSpecificNode(blockPath.withoutBase());
+                return node.getSpecificNode(subPath);
             }
         }
-        return new NullableNodeResult<>(nodes.getAlreadyStored(), blockPath);
+        return new NodeResult<>(this, blockPath);
     }
 
     @Override
-    public ExecutionHandler<T> getExecutionHandler() {
-        return nodes.getAlreadyStored().getExecutionHandler();
+    public ExecutionResult<T> getExecutionHandler() {
+
+        if (nodes.getAlreadyStored().isPresent()) {
+            return nodes.getAlreadyStored().get().getExecutionHandler();
+        } else {
+            return ExecutionResult.empty(); //FALL BACK SOLDIER
+        }
+
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/CommandNode.java
similarity index 65%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/CommandNode.java
index 1e9a563..b207f40 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/CommandNode.java
@@ -1,22 +1,20 @@
-package me.aurium.beetle.branch.nodes.api;
+package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.result.GetNodeResult;
+import me.aurium.beetle.branch.nodes.result.ExecutionResult;
+import me.aurium.beetle.branch.nodes.result.NodeResult;
 import me.aurium.beetle.branch.permission.Permission;
 
-import java.util.Optional;
-
 /**
  * Base object
  * @param <T> fuck
  */
 public interface CommandNode<T> {
 
-    GetNodeResult<T> getSpecificNode(BlockPath path);
+    NodeResult<T> getSpecificNode(BlockPath path);
 
-    ExecutionHandler<T> getExecutionHandler();
+    ExecutionResult<T> getExecutionHandler();
     SuggestionHandler<T> getSuggestionHandler();
 
     /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/EndpointNode.java
similarity index 84%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/EndpointNode.java
index c15cf37..8df5b5b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/EndpointNode.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.api;
+package me.aurium.beetle.branch.nodes;
 
 /**
  * Marker interface for a node that is alone (so not branching, but not merging either)
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/IdentifiableNode.java
similarity index 76%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/IdentifiableNode.java
index ce79bb6..a12b1bd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/IdentifiableNode.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.api;
+package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index ea5127a..4616b6b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -5,9 +5,8 @@
 import me.aurium.beetle.branch.handlers.EmptySuggestionHandler;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.api.EndpointNode;
-import me.aurium.beetle.branch.nodes.result.GetNodeResult;
-import me.aurium.beetle.branch.nodes.result.NullableNodeResult;
+import me.aurium.beetle.branch.nodes.result.ExecutionResult;
+import me.aurium.beetle.branch.nodes.result.NodeResult;
 import me.aurium.beetle.branch.permission.Permission;
 
 public class SingleNode<T> implements EndpointNode<T> {
@@ -34,13 +33,13 @@ public Block getIdentifier() {
     }
 
     @Override
-    public GetNodeResult<T> getSpecificNode(BlockPath blockPath) {
-        return new NullableNodeResult<>(this,blockPath);
+    public NodeResult<T> getSpecificNode(BlockPath blockPath) {
+        return new NodeResult<>(this,blockPath);
     }
 
     @Override
-    public ExecutionHandler<T> getExecutionHandler() {
-        return executionHandler;
+    public ExecutionResult<T> getExecutionHandler() {
+        return new ExecutionResult<>(executionHandler);
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java
deleted file mode 100644
index 44a804e..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/base/NodeBaseBuilder.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.nodes.base;
-
-public class NodeBaseBuilder<T> {
-
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java
deleted file mode 100644
index ebcd173..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/base/SimpleNodeBase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package me.aurium.beetle.branch.nodes.base;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.block.CommonBlockPath;
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.context.StagedContext;
-import me.aurium.beetle.branch.context.StagedContextImpl;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.result.GetNodeResult;
-import me.aurium.beetle.branch.permission.FallbackStrategy;
-
-import java.util.List;
-
-public class SimpleNodeBase<T> implements NodeBase<T> {
-
-    private final CommandNode<T> baseNode;
-    private final ContextProducer<T> factory;
-
-    private final FallbackStrategy<T> strategy;
-    private final FallbackHandler<T> fallbackHandler;
-
-    public <X> SimpleNodeBase(CommandNode<T> baseNode, ContextProducer<T> factory, FallbackStrategy<T> strategy, FallbackHandler<T> fallbackHandler) {
-        this.baseNode = baseNode;
-        this.factory = factory;
-        this.strategy = strategy;
-        this.fallbackHandler = fallbackHandler;
-    }
-
-    @Override
-    public void execute(T t, String alias, String[] args) {
-        BlockPath path = CommonBlockPath.of(args);
-
-        GetNodeResult<T> result = baseNode.getSpecificNode(path);
-
-        result.resultingNode().ifPresentOrElse(node -> { //this should always be present, if it isn't that means something went wrong, so fallback!
-
-            StagedContext<T> context = new StagedContextImpl<>(t,alias,args,node,baseNode,path,result.resultingPath(), fallbackHandler);
-
-            strategy.strategy(context).handle(context.stage(factory));
-
-        }, () -> fallbackHandler.handle(factory.produce(t, alias, args)));
-    }
-
-    @Override
-    public List<String> suggest(T t, String alias, String[] args) {
-        return null;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
similarity index 92%
rename from core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
index 8ff48b6..78a524e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
@@ -1,11 +1,12 @@
-package me.aurium.beetle.branch.builders;
+package me.aurium.beetle.branch.nodes.builders;
 
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.EmptyBlock;
 import me.aurium.beetle.branch.block.StringBlock;
+import me.aurium.beetle.branch.builders.Builder;
 import me.aurium.beetle.branch.nodes.BranchingNode;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.IdentifiableNode;
 import me.aurium.beetle.branch.permission.Permission;
 import me.aurium.beetle.branch.permission.permissions.EmptyPermission;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
index 6c2ad5c..799819a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
@@ -1,11 +1,11 @@
-package me.aurium.beetle.branch.builders;
+package me.aurium.beetle.branch.nodes.builders;
 
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.EmptyBlock;
 import me.aurium.beetle.branch.block.StringBlock;
+import me.aurium.beetle.branch.builders.AloneBuilder;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.nodes.SingleNode;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
 import me.aurium.beetle.branch.permission.Permission;
 import me.aurium.beetle.branch.permission.permissions.EmptyPermission;
 
@@ -41,7 +41,7 @@ public SingleNode<C> build() {
     }
 
     @Override
-    public CommandNode<C> buildWithoutIdentifier() {
+    public me.aurium.beetle.branch.nodes.CommandNode<C> buildWithoutIdentifier() {
         Objects.requireNonNull(contextHandler);
 
         return new SingleNode<>(EmptyBlock.of(),contextHandler, permission);
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/EmptyNodeResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/result/EmptyNodeResult.java
deleted file mode 100644
index 775491f..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/result/EmptyNodeResult.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package me.aurium.beetle.branch.nodes.result;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-
-import java.util.Optional;
-
-public class EmptyNodeResult<T> implements GetNodeResult<T> {
-
-    private final BlockPath path;
-
-    public EmptyNodeResult(BlockPath path) {
-        this.path = path;
-    }
-
-    @Override
-    public Optional<CommandNode<T>> resultingNode() {
-        return Optional.empty();
-    }
-
-    @Override
-    public BlockPath resultingPath() {
-        return path;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/ExecutionResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/result/ExecutionResult.java
new file mode 100644
index 0000000..2e77d8f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/result/ExecutionResult.java
@@ -0,0 +1,22 @@
+package me.aurium.beetle.branch.nodes.result;
+
+import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+
+import java.util.Optional;
+
+public class ExecutionResult<T>{
+
+    private final ExecutionHandler<T> executionHandler;
+
+    public ExecutionResult(ExecutionHandler<T> executionHandler) {
+        this.executionHandler = executionHandler;
+    }
+
+    public Optional<ExecutionHandler<T>> getExecution() {
+        return Optional.ofNullable(executionHandler);
+    }
+
+    public static <C> ExecutionResult<C> empty() {
+        return new ExecutionResult<>(null);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/GetNodeResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/result/GetNodeResult.java
deleted file mode 100644
index f78b878..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/result/GetNodeResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.nodes.result;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-
-import java.util.Optional;
-
-public interface GetNodeResult<T> {
-
-    Optional<CommandNode<T>> resultingNode();
-    BlockPath resultingPath();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/NullableNodeResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
similarity index 54%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/result/NullableNodeResult.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
index 6ae80bd..93b895f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/result/NullableNodeResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
@@ -1,26 +1,24 @@
 package me.aurium.beetle.branch.nodes.result;
 
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.CommandNode;
 
 import java.util.Optional;
 
-public class NullableNodeResult<T> implements GetNodeResult<T> {
+public class NodeResult<T> {
 
     private final CommandNode<T> calculatedNode;
     private final BlockPath calculatedPath;
 
-    public NullableNodeResult(CommandNode<T> calculatedNode, BlockPath calculatedPath) {
+    public NodeResult(CommandNode<T> calculatedNode, BlockPath calculatedPath) {
         this.calculatedNode = calculatedNode;
         this.calculatedPath = calculatedPath;
     }
 
-    @Override
-    public Optional<CommandNode<T>> resultingNode() {
-        return Optional.ofNullable(calculatedNode);
+    public CommandNode<T> resultingNode() {
+        return calculatedNode;
     }
 
-    @Override
     public BlockPath resultingPath() {
         return calculatedPath;
     }
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/FallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/FallbackStrategy.java
deleted file mode 100644
index 03e8546..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/FallbackStrategy.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package me.aurium.beetle.branch.permission;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.context.StagedContext;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-
-public interface FallbackStrategy<T> {
-
-    ExecutionHandler<T> strategy(StagedContext<T> stagedContext);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
index e586055..d724110 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
@@ -1,12 +1,10 @@
 package me.aurium.beetle.branch.permission;
 
-import me.aurium.beetle.branch.context.StagedContext;
-
 /**
  *
  */
 public interface Permission<T> {
 
-   boolean attempt(StagedContext<T> context);
+   boolean attempt(T sender, String alias, String[] args); //because fuck you
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/PredicatePermission.java b/core/src/main/java/me/aurium/beetle/branch/permission/PredicatePermission.java
new file mode 100644
index 0000000..1efca9a
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/PredicatePermission.java
@@ -0,0 +1,17 @@
+package me.aurium.beetle.branch.permission;
+
+import java.util.function.Predicate;
+
+public class PredicatePermission<T> implements Permission<T> {
+
+    private final Predicate<T> predicate;
+
+    public PredicatePermission(Predicate<T> predicate) {
+        this.predicate = predicate;
+    }
+
+    @Override
+    public boolean attempt(T sender, String alias, String[] args) {
+        return predicate.test(sender);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/permission/permissions/EmptyPermission.java
index fc83922..f286bef 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/permissions/EmptyPermission.java
@@ -1,11 +1,11 @@
 package me.aurium.beetle.branch.permission.permissions;
 
-import me.aurium.beetle.branch.context.StagedContext;
 import me.aurium.beetle.branch.permission.Permission;
 
 public class EmptyPermission<T> implements Permission<T> {
+
     @Override
-    public boolean attempt(StagedContext<T> context) {
+    public boolean attempt(T sender, String alias, String[] args) {
         return true;
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/permissions/StringPermission.java b/core/src/main/java/me/aurium/beetle/branch/permission/permissions/StringPermission.java
deleted file mode 100644
index 8a7539d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/permissions/StringPermission.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package me.aurium.beetle.branch.permission.permissions;
-
-import me.aurium.beetle.branch.context.StagedContext;
-import me.aurium.beetle.branch.permission.Permission;
-
-/**
- * example permission i'm using for testing because i'm so godfucking bored
- */
-public class StringPermission implements Permission<String> {
-
-    private final String string;
-
-    public StringPermission(String string) {
-        this.string = string;
-    }
-
-    @Override
-    public boolean attempt(StagedContext<String> context) {
-        return context.getSender().equals(string);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/AngryMessageStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/AngryMessageStrategy.java
deleted file mode 100644
index aaf0a00..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/AngryMessageStrategy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package me.aurium.beetle.branch.permission.strategies;
-
-import me.aurium.beetle.branch.context.StagedContext;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.permission.FallbackStrategy;
-
-/**
- * does what it says on the tin (really just an example)
- */
-public class AngryMessageStrategy<T> implements FallbackStrategy<T> {
-
-    private final String antiPermissionMessage; //something like "You cannot run that!" or "Unknown command. Type /help for help!"
-
-    public AngryMessageStrategy(String antiPermissionMessage) {
-        this.antiPermissionMessage = antiPermissionMessage;
-    }
-
-    @Override
-    public ExecutionHandler<T> strategy(StagedContext<T> stagedContext) {
-        CommandNode<T> executedNode = stagedContext.getExecutedNode();
-
-        if (!executedNode.getPermission().attempt(stagedContext)) {
-            return (contex) -> {
-              contex.messageSender(antiPermissionMessage);
-            };
-        } else {
-            return executedNode.getExecutionHandler();
-        }
-
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/ExecutionFallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/ExecutionFallbackStrategy.java
new file mode 100644
index 0000000..1f083db
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/ExecutionFallbackStrategy.java
@@ -0,0 +1,14 @@
+package me.aurium.beetle.branch.permission.strategies;
+
+import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.nodes.CommandNode;
+
+public interface ExecutionFallbackStrategy<T> {
+
+
+    void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer);
+
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackBaseStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackBaseStrategy.java
deleted file mode 100644
index ee9c9aa..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackBaseStrategy.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package me.aurium.beetle.branch.permission.strategies;
-
-import me.aurium.beetle.branch.context.StagedContext;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.permission.FallbackStrategy;
-
-public class FallbackBaseStrategy<T> implements FallbackStrategy<T> {
-
-    @Override
-    public ExecutionHandler<T> strategy(StagedContext<T> stagedContext) {
-        //this strategy should: if base node, fall back to fallback-strategy. If not, fall back to base node's executor.
-
-        CommandNode<T> executed = stagedContext.getExecutedNode();
-        CommandNode<T> baseNode = stagedContext.getBaseExecutedNode();
-
-        if (executed.equals(baseNode)) {
-            //todo remove this
-            return (s) -> {
-                stagedContext.getFallbackAction().handle(s);
-            };
-        }
-
-        return null;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java
deleted file mode 100644
index 0d6c642..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackOneStrategy.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package me.aurium.beetle.branch.permission.strategies;
-
-import me.aurium.beetle.branch.context.StagedContext;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.permission.FallbackStrategy;
-
-/**
- * Falls back to the at-execution-time parent node
- */
-public class FallbackOneStrategy<T> implements FallbackStrategy<T> {
-
-    @Override
-    public ExecutionHandler<T> strategy(StagedContext<T> stagedContext) {
-
-        CommandNode<T> toBeExecuted = stagedContext.getExecutedNode();
-
-        if (!toBeExecuted.getPermission().attempt(stagedContext)) {
-
-            //NO PERMISSIONS! fall back to the node above it. However, if toBeExecuted is the base node, fall back to the fallbackhandler
-
-            return null;
-        } else {
-            //the user is authorized
-            return toBeExecuted.getExecutionHandler();
-        }
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackPermStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackPermStrategy.java
new file mode 100644
index 0000000..627867d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackPermStrategy.java
@@ -0,0 +1,69 @@
+package me.aurium.beetle.branch.permission.strategies;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.block.CommonBlockPath;
+import me.aurium.beetle.branch.context.Context;
+import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.result.NodeResult;
+
+/**
+ * Advanced startegy that does things:
+ *
+ * Parses a testing blockpath from existing args. It then finds the linked node from that path. There must be one,
+ * because even incorrect args will link to the base node or to a branching node like the branch node implementation.
+ *
+ * It checks the permissions first. If the sender does not have access to that specific node, or the node is missing a handler
+ * it will go one node up in the map and check it for permission. It will repeat this until it can find a permissible node,
+ * or until it reaches the base node.
+ *
+ * If the user does not have access to run the base node for some reason, it will call the fallback handler.
+ *
+ * TODO please check the logic here.
+ *
+ * @param <T>
+ */
+public class FallbackPermStrategy<T> implements ExecutionFallbackStrategy<T> {
+
+    //TODO a248, this is one of the most important classes. in depth logic review because all of this is untested
+    // and i have no idea if it's gonna work haha. Also if you can think of a way to reduce the boilerplate of the while loops that'd
+    // be nice but i'm pretty sure theyre essential
+
+    @Override
+    public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
+
+        BlockPath pathToTest = CommonBlockPath.of(args);
+        NodeResult<T> toBeExecuted = baseNode.getSpecificNode(pathToTest);
+
+        Context<T> failed = producer.produce(sender,alias,args);
+
+        //1. Check permissions and access
+
+        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args) || toBeExecuted.resultingNode().getExecutionHandler().getExecution().isEmpty()) {
+            //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
+
+            if (toBeExecuted.resultingNode().equals(baseNode)) {
+
+                fallback.handle(failed);
+
+                return;
+
+            } else {
+
+                pathToTest = pathToTest.withoutTop();
+
+                toBeExecuted = baseNode.getSpecificNode(pathToTest); //regress backwards a node
+            }
+        }
+
+        NodeContext<T> produced = producer.produce(sender,alias,args, toBeExecuted.resultingNode(), baseNode, toBeExecuted.resultingPath(), pathToTest);
+
+        toBeExecuted.resultingNode().getExecutionHandler().getExecution().get().handle(produced);
+    }
+
+
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/IgnoredStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/IgnoredStrategy.java
deleted file mode 100644
index 23573a3..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/IgnoredStrategy.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.permission.strategies;
-
-import me.aurium.beetle.branch.context.StagedContext;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-import me.aurium.beetle.branch.permission.FallbackStrategy;
-
-public class IgnoredStrategy<T> implements FallbackStrategy<T> {
-
-    @Override
-    public ExecutionHandler<T> strategy(StagedContext<T> stagedContext) {
-        return stagedContext.getExecutedNode().getExecutionHandler();
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/PassthroughStrategy.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/PassthroughStrategy.java
new file mode 100644
index 0000000..d513fac
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/PassthroughStrategy.java
@@ -0,0 +1,26 @@
+package me.aurium.beetle.branch.permission.strategies;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.block.CommonBlockPath;
+import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.result.NodeResult;
+
+/**
+ * Ignores everything and tries to execute ignoring permissions or fallbacks. If something goes wrong it delegates to the fallback handler immediately
+ * @param <T>
+ */
+public class PassthroughStrategy<T> implements ExecutionFallbackStrategy<T> {
+    @Override
+    public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
+        BlockPath path = CommonBlockPath.of(args);
+
+        NodeResult<T> result = baseNode.getSpecificNode(path);
+
+        result.resultingNode().getExecutionHandler().getExecution().ifPresentOrElse(
+                present -> present.handle(producer.produce(sender,alias,args, result.resultingNode(), baseNode, result.resultingPath(), path)),
+                () -> { fallback.handle(producer.produce(sender,alias,args));
+        });
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/StringPermission.java b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/StringPermission.java
new file mode 100644
index 0000000..7005d08
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/permission/strategies/StringPermission.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.permission.strategies;
+
+import me.aurium.beetle.branch.permission.Permission;
+
+/**
+ * Represents a permission that is controlled by a string identifier
+ * @param <T> the string identifier, duh
+ */
+public interface StringPermission<T> extends Permission<T> {
+
+    String permissionIdentifier();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
index 1708058..f4e80d9 100644
--- a/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
@@ -1,6 +1,7 @@
 package me.aurium.beetle.branch.util;
 
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -55,8 +56,8 @@ public Set<T> getContents() {
      * get already store thing
      * @return already stored thing or null
      */
-    public T getAlreadyStored() {
-        return alreadyStored;
+    public Optional<T> getAlreadyStored() {
+        return Optional.ofNullable(alreadyStored);
     }
 
 }
diff --git a/pom.xml b/pom.xml
index db1d5d2..d5f662a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
     <modules>
         <module>core</module>
         <module>beetle-impl</module>
+        <module>spigot-impl</module>
     </modules>
 
     <parent>
diff --git a/spigot-impl/pom.xml b/spigot-impl/pom.xml
new file mode 100644
index 0000000..8b60676
--- /dev/null
+++ b/spigot-impl/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>branch</artifactId>
+        <groupId>me.aurium</groupId>
+        <version>0.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>spigot-impl</artifactId>
+
+    <properties>
+        <maven.compiler.source>${compiler.version}</maven.compiler.source>
+        <maven.compiler.target>${compiler.version}</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>me.aurium</groupId>
+            <artifactId>beetle-spigot-impl</artifactId>
+            <version>0.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/spigot-impl/spigot-impl.iml b/spigot-impl/spigot-impl.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/spigot-impl/spigot-impl.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

From c98427857e82b29fa43799e430f1c2badffc958e Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Sat, 27 Mar 2021 12:11:31 -0700
Subject: [PATCH 23/56] finish work on the alpha fallback system

---
 .idea/compiler.xml                            |  1 +
 .idea/encodings.xml                           |  2 +
 .../branch/annotate/AnnotatedParser.java      |  2 +-
 .../marker/permission/StringPermChecker.java  |  2 +-
 .../parsers/PermissionAnnotationParser.java   |  6 +--
 .../parsers/SingleAnnotatedParser.java        |  2 +-
 .../beetle/branch/argument/Argument.java      |  2 +-
 .../branch/argument/ArgumentContext.java      |  2 +-
 .../argument/DelegatingArgumentContext.java   |  4 +-
 .../aurium/beetle/branch/block/BlockPath.java |  2 -
 .../beetle/branch/block/CommonBlockPath.java  |  2 -
 .../aurium/beetle/branch/builders/Base.java   | 20 --------
 .../beetle/branch/builders/Builder.java       | 11 -----
 .../staging/InitialLocatorContext.java        | 16 -------
 .../staging/MutableLocatorContext.java        | 46 -------------------
 .../message/BuilderMessageProvider.java       | 20 ++++++++
 .../message/FallbackMessagePrettier.java      |  9 ++++
 .../message/FallbackMessageProvider.java      |  4 ++
 .../impl/DefaultBuilderMessageProvider.java   | 41 +++++++++++++++++
 .../{ => fallback}/permission/Permission.java |  2 +-
 .../permission/PredicatePermission.java       |  2 +-
 .../permissions/EmptyPermission.java          |  4 +-
 .../strategies/ExecutionFallbackStrategy.java |  6 +--
 .../strategies/FallbackPermStrategy.java      | 10 ++--
 .../strategies/PassthroughStrategy.java       |  6 +--
 .../strategies/StringPermission.java          |  4 +-
 .../handlers/EmptyExecutionHandler.java       |  2 +-
 .../handlers/EmptySuggestionHandler.java      |  2 +-
 .../branch/handlers/api/ExecutionHandler.java |  2 +-
 .../branch/handlers/api/FallbackHandler.java  |  3 +-
 .../handlers/api/SuggestionHandler.java       |  2 +-
 .../context/AbstractContext.java              |  2 +-
 .../context/AbstractNodeContext.java          |  4 +-
 .../{ => handlers}/context/Context.java       |  2 +-
 .../context/ContextProducer.java              |  4 +-
 .../{ => handlers}/context/NodeContext.java   |  4 +-
 .../launchpoints/CentralizedManager.java      |  4 +-
 .../launchpoints/base/NodeBaseBuilder.java    | 33 +++++++++++++
 .../launchpoints/base/SimpleNodeBase.java     |  6 +--
 .../beetle/branch/nodes/ArgumentNode.java     |  3 +-
 .../beetle/branch/nodes/BranchingNode.java    |  3 +-
 .../beetle/branch/nodes/SingleNode.java       |  3 +-
 .../branch/nodes/{ => api}/CommandNode.java   |  4 +-
 .../branch/nodes/{ => api}/EndpointNode.java  |  2 +-
 .../nodes/{ => api}/IdentifiableNode.java     |  2 +-
 .../{ => nodes}/builders/AloneBuilder.java    |  2 +-
 .../nodes/builders/BranchingBuilder.java      | 26 ++++++++---
 .../beetle/branch/nodes/builders/Builder.java | 12 +++++
 .../branch/nodes/builders/SingleBuilder.java  |  8 ++--
 .../branch/nodes/result/NodeResult.java       |  4 +-
 spigot-impl/spigot-impl.iml                   |  9 +---
 .../beetle/branch/spigot/SpigotManager.java   |  4 ++
 52 files changed, 208 insertions(+), 172 deletions(-)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/Base.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/context/staging/InitialLocatorContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/context/staging/MutableLocatorContext.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/DefaultBuilderMessageProvider.java
 rename core/src/main/java/me/aurium/beetle/branch/{ => fallback}/permission/Permission.java (70%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => fallback}/permission/PredicatePermission.java (87%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => fallback}/permission/permissions/EmptyPermission.java (57%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => fallback}/permission/strategies/ExecutionFallbackStrategy.java (59%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => fallback}/permission/strategies/FallbackPermStrategy.java (89%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => fallback}/permission/strategies/PassthroughStrategy.java (85%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => fallback}/permission/strategies/StringPermission.java (63%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => handlers}/context/AbstractContext.java (91%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => handlers}/context/AbstractNodeContext.java (90%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => handlers}/context/Context.java (73%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => handlers}/context/ContextProducer.java (79%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => handlers}/context/NodeContext.java (84%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{ => api}/CommandNode.java (87%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{ => api}/EndpointNode.java (84%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{ => api}/IdentifiableNode.java (76%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => nodes}/builders/AloneBuilder.java (69%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5263f5f..c4429a4 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,6 +6,7 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="spigot-impl" />
         <module name="tests" />
         <module name="branch-core" />
       </profile>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 2748eec..71de4af 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -5,5 +5,7 @@
     <file url="file://$PROJECT_DIR$/beetle-impl/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/spigot-impl/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/spigot-impl/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
index 74696db..c39f358 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.annotate;
 
-import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 public interface AnnotatedParser<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
index 5f1a22f..a0ff553 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.annotate.marker.permission;
 
-import me.aurium.beetle.branch.permission.strategies.StringPermission;
+import me.aurium.beetle.branch.fallback.permission.strategies.StringPermission;
 
 public interface StringPermChecker {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
index 3fe48a9..0ced0f2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.annotate.parsers;
 
 import me.aurium.beetle.branch.annotate.marker.permission.Permission;
-import me.aurium.beetle.branch.permission.strategies.StringPermission;
+import me.aurium.beetle.branch.fallback.permission.strategies.StringPermission;
 
 import java.lang.annotation.Annotation;
 
@@ -9,7 +9,7 @@
 public class PermissionAnnotationParser<T> {
 
 
-    me.aurium.beetle.branch.permission.Permission<T> parse(Annotation annotate) throws IllegalAccessException, InstantiationException {
+    me.aurium.beetle.branch.fallback.permission.Permission<T> parse(Annotation annotate) throws IllegalAccessException, InstantiationException {
 
         if (!annotate.annotationType().equals(Permission.class)) throw new PermissionParsingException("Annotation must be of type Permission");
 
@@ -21,7 +21,7 @@ me.aurium.beetle.branch.permission.Permission<T> parse(Annotation annotate) thro
         StringPermission<?> perm = permission.getRelativeChecker().newInstance().get(permission.permission());
 
 
-        return (me.aurium.beetle.branch.permission.Permission<T>) perm;
+        return (me.aurium.beetle.branch.fallback.permission.Permission<T>) perm;
     }
 
     public static class PermissionParsingException extends RuntimeException {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
index 0d4edde..d615956 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
@@ -3,7 +3,7 @@
 import me.aurium.beetle.branch.annotate.AnnotatedCommand;
 import me.aurium.beetle.branch.annotate.UncheckedInvocationException;
 import me.aurium.beetle.branch.annotate.marker.SingleNode;
-import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/Argument.java b/core/src/main/java/me/aurium/beetle/branch/argument/Argument.java
index 5c77469..67de9e0 100644
--- a/core/src/main/java/me/aurium/beetle/branch/argument/Argument.java
+++ b/core/src/main/java/me/aurium/beetle/branch/argument/Argument.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.argument;
 
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java
index 433c180..33cd043 100644
--- a/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.argument;
 
-import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
 
 public interface ArgumentContext<T> extends NodeContext<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
index ec38484..134871c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
@@ -1,9 +1,9 @@
 package me.aurium.beetle.branch.argument;
 
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 public class DelegatingArgumentContext<T> implements ArgumentContext<T>{
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
index d3447df..f023c09 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
@@ -1,7 +1,5 @@
 package me.aurium.beetle.branch.block;
 
-import me.aurium.beetle.branch.context.NodeContext;
-
 public interface BlockPath {
 
     boolean isEmpty();
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
index 9f297be..d928916 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
@@ -1,7 +1,5 @@
 package me.aurium.beetle.branch.block;
 
-import me.aurium.beetle.branch.context.NodeContext;
-
 import java.util.ArrayList;
 
 public class CommonBlockPath implements BlockPath {
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/Base.java b/core/src/main/java/me/aurium/beetle/branch/builders/Base.java
deleted file mode 100644
index 268899c..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/Base.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-import me.aurium.beetle.branch.nodes.CommandNode;
-
-import java.util.function.Consumer;
-
-public class Base {
-
-    public static <E, C extends Builder<E>> CommandNode<E> base(C key, Consumer<C> consumer) {
-        consumer.accept(key);
-
-        return key.buildWithoutIdentifier();
-    }
-
-    //TODO a separate base logic to consume a ClassParser and turn it into a command :)
-    public static <T> CommandNode<T> base() {
-        return null;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java b/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
deleted file mode 100644
index bd87513..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/builders/Builder.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch.builders;
-
-import me.aurium.beetle.branch.nodes.CommandNode;
-import me.aurium.beetle.branch.nodes.IdentifiableNode;
-
-public interface Builder<C>{
-
-    IdentifiableNode<C> build();
-    CommandNode<C> buildWithoutIdentifier();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/staging/InitialLocatorContext.java b/core/src/main/java/me/aurium/beetle/branch/context/staging/InitialLocatorContext.java
deleted file mode 100644
index f129061..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/context/staging/InitialLocatorContext.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package me.aurium.beetle.branch.context.staging;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.CommandNode;
-
-public class InitialLocatorContext<T> {
-
-    private final CommandNode<T> baseNode;
-    private final BlockPath basePath;
-
-
-    public InitialLocatorContext(CommandNode<T> baseNode, BlockPath basePath) {
-        this.baseNode = baseNode;
-        this.basePath = basePath;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/staging/MutableLocatorContext.java b/core/src/main/java/me/aurium/beetle/branch/context/staging/MutableLocatorContext.java
deleted file mode 100644
index 5355b13..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/context/staging/MutableLocatorContext.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package me.aurium.beetle.branch.context.staging;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.CommandNode;
-
-public class MutableLocatorContext<T> {
-
-    private final CommandNode<T> baseNode; //can't be changed
-    private final BlockPath basePath;
-
-    //these can be adjusted in staging
-    private CommandNode<T> mutableTargetNode;
-    private BlockPath mutableTargetPath;
-
-    public MutableLocatorContext(CommandNode<T> baseNode, BlockPath basePath, CommandNode<T> mutableTargetNode, BlockPath mutableTargetPath) {
-        this.baseNode = baseNode;
-        this.basePath = basePath;
-        this.mutableTargetNode = mutableTargetNode;
-        this.mutableTargetPath = mutableTargetPath;
-    }
-    public CommandNode<T> getBaseNode() {
-        return baseNode;
-    }
-
-    public BlockPath getBasePath() {
-        return basePath;
-    }
-
-    public CommandNode<T> getMutableTargetNode() {
-        return mutableTargetNode;
-    }
-
-    public BlockPath getMutableTargetPath() {
-        return mutableTargetPath;
-    }
-
-    //TODO limit access (permissions should not be able to touch these)
-    public void setMutableTargetNode(CommandNode<T> node) {
-        this.mutableTargetNode = node;
-    }
-
-    public void setMutableTargetPath(BlockPath path) {
-        this.mutableTargetPath = path;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java
new file mode 100644
index 0000000..5150506
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java
@@ -0,0 +1,20 @@
+package me.aurium.beetle.branch.fallback.message;
+
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+
+/**
+ * Might not be the most scalable thing in the world but who the fuck cares
+ *
+ * I can't think of any nodes besides single (do an action) branching (do an action or separate out based on top buffer arg)
+ * and value (do an action or separate action based on buffer from this argument)
+ *
+ * so who cares? This will give me fallback messages
+ * @param <T>
+ */
+public interface BuilderMessageProvider<T> {
+
+    void handleDefaultSingle(NodeContext<T> context);
+    void handleDefaultBranching(NodeContext<T> context);
+    void handleDefaultValue(NodeContext<T> context);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java
new file mode 100644
index 0000000..3e136c0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.fallback.message;
+
+/**
+ * Makes messages pretty
+ */
+public interface FallbackMessagePrettier {
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java
new file mode 100644
index 0000000..acd1817
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public interface FallbackMessageProvider<T> {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/DefaultBuilderMessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/DefaultBuilderMessageProvider.java
new file mode 100644
index 0000000..d94ed2d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/DefaultBuilderMessageProvider.java
@@ -0,0 +1,41 @@
+package me.aurium.beetle.branch.fallback.message.impl;
+
+import me.aurium.beetle.branch.fallback.message.BuilderMessageProvider;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DefaultBuilderMessageProvider implements BuilderMessageProvider<Object> {
+
+    @Override
+    public void handleDefaultSingle(NodeContext<Object> context) {
+
+
+    }
+
+    @Override
+    public void handleDefaultBranching(NodeContext<Object> context) {
+
+        StringBuilder fuk = new StringBuilder("/");
+
+        context.fullPath().withoutTop().getAllBlocks().getBackingList().forEach(blok -> {
+            fuk.append(blok).append(" ");
+        });
+
+        String finalFuk = fuk.toString();
+
+        List<String> alternatives = new ArrayList<>(); //TODO make parameter
+
+        for (String string : alternatives) {
+            context.messageSender(finalFuk + string);
+        }
+
+
+    }
+
+    @Override
+    public void handleDefaultValue(NodeContext<Object> context) {
+
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/Permission.java
similarity index 70%
rename from core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permission/Permission.java
index d724110..f6f48d2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/Permission.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.permission;
+package me.aurium.beetle.branch.fallback.permission;
 
 /**
  *
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/PredicatePermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/PredicatePermission.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/permission/PredicatePermission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permission/PredicatePermission.java
index 1efca9a..b6cc15f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/PredicatePermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/PredicatePermission.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.permission;
+package me.aurium.beetle.branch.fallback.permission;
 
 import java.util.function.Predicate;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/permissions/EmptyPermission.java
similarity index 57%
rename from core/src/main/java/me/aurium/beetle/branch/permission/permissions/EmptyPermission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permission/permissions/EmptyPermission.java
index f286bef..b68d78c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/permissions/EmptyPermission.java
@@ -1,6 +1,6 @@
-package me.aurium.beetle.branch.permission.permissions;
+package me.aurium.beetle.branch.fallback.permission.permissions;
 
-import me.aurium.beetle.branch.permission.Permission;
+import me.aurium.beetle.branch.fallback.permission.Permission;
 
 public class EmptyPermission<T> implements Permission<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/ExecutionFallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
similarity index 59%
rename from core/src/main/java/me/aurium/beetle/branch/permission/strategies/ExecutionFallbackStrategy.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
index 1f083db..3055387 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/ExecutionFallbackStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
@@ -1,8 +1,8 @@
-package me.aurium.beetle.branch.permission.strategies;
+package me.aurium.beetle.branch.fallback.permission.strategies;
 
-import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
 import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 public interface ExecutionFallbackStrategy<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackPermStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
similarity index 89%
rename from core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackPermStrategy.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
index 627867d..d2f8ce2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/FallbackPermStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
@@ -1,12 +1,12 @@
-package me.aurium.beetle.branch.permission.strategies;
+package me.aurium.beetle.branch.fallback.permission.strategies;
 
 import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.block.CommonBlockPath;
-import me.aurium.beetle.branch.context.Context;
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.context.Context;
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 import me.aurium.beetle.branch.nodes.result.NodeResult;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/PassthroughStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
similarity index 85%
rename from core/src/main/java/me/aurium/beetle/branch/permission/strategies/PassthroughStrategy.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
index d513fac..44efbe8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/PassthroughStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
@@ -1,10 +1,10 @@
-package me.aurium.beetle.branch.permission.strategies;
+package me.aurium.beetle.branch.fallback.permission.strategies;
 
 import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.block.CommonBlockPath;
-import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
 import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 import me.aurium.beetle.branch.nodes.result.NodeResult;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/StringPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/StringPermission.java
similarity index 63%
rename from core/src/main/java/me/aurium/beetle/branch/permission/strategies/StringPermission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/StringPermission.java
index 7005d08..2b7674f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/permission/strategies/StringPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/StringPermission.java
@@ -1,6 +1,6 @@
-package me.aurium.beetle.branch.permission.strategies;
+package me.aurium.beetle.branch.fallback.permission.strategies;
 
-import me.aurium.beetle.branch.permission.Permission;
+import me.aurium.beetle.branch.fallback.permission.Permission;
 
 /**
  * Represents a permission that is controlled by a string identifier
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
index 28ebc8a..6af79d2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.handlers;
 
-import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 
 public class EmptyExecutionHandler<T> implements ExecutionHandler<T> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
index e1ff624..6fb5c4d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.handlers;
 
-import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
index 048442e..d32f48e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.handlers.api;
 
-import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
 
 public interface ExecutionHandler<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
index 6bde3cc..4f90b4f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
@@ -1,7 +1,6 @@
 package me.aurium.beetle.branch.handlers.api;
 
-import me.aurium.beetle.branch.context.Context;
-import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.context.Context;
 
 /**
  * Represents the fallback handler of a base that manages what happens when everything goes wrong
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
index ab55126..5225a93 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.handlers.api;
 
-import me.aurium.beetle.branch.context.NodeContext;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
 
 import java.util.List;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/AbstractContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractContext.java
similarity index 91%
rename from core/src/main/java/me/aurium/beetle/branch/context/AbstractContext.java
rename to core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractContext.java
index f3b80ac..8636ea4 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/AbstractContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractContext.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.context;
+package me.aurium.beetle.branch.handlers.context;
 
 public abstract class AbstractContext<T> implements Context<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
similarity index 90%
rename from core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java
rename to core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
index 43c8d15..5308ee2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
@@ -1,7 +1,7 @@
-package me.aurium.beetle.branch.context;
+package me.aurium.beetle.branch.handlers.context;
 
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 public abstract class AbstractNodeContext<T> extends AbstractContext<T> implements NodeContext<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/Context.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/Context.java
similarity index 73%
rename from core/src/main/java/me/aurium/beetle/branch/context/Context.java
rename to core/src/main/java/me/aurium/beetle/branch/handlers/context/Context.java
index f1670ad..efd485b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/Context.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/Context.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.context;
+package me.aurium.beetle.branch.handlers.context;
 
 public interface Context<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
similarity index 79%
rename from core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
rename to core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
index eda8bf6..5d2caf1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/ContextProducer.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
@@ -1,7 +1,7 @@
-package me.aurium.beetle.branch.context;
+package me.aurium.beetle.branch.handlers.context;
 
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 /**
  * Produces context adapters, like the stock ContextSource for contexts.
diff --git a/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
similarity index 84%
rename from core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
rename to core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
index 0004d07..741cd0e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
@@ -1,8 +1,8 @@
-package me.aurium.beetle.branch.context;
+package me.aurium.beetle.branch.handlers.context;
 
 import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.CommandNode;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 
 public interface NodeContext<T> extends Context<T> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
index 54602bc..cf7a83e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
@@ -8,7 +8,9 @@
  */
 public interface CentralizedManager<T> {
 
-    CentralizedManagerBinder getBinder();
+    CentralizedManagerBinder getBinder(); //think of Beetle's accessors for files, except this time it's for commands? idk
+
+
 
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
index 2d81e69..886a4d2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
@@ -1,7 +1,40 @@
 package me.aurium.beetle.branch.launchpoints.base;
 
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.fallback.permission.strategies.ExecutionFallbackStrategy;
+import me.aurium.beetle.branch.fallback.permission.strategies.FallbackPermStrategy;
+
+import java.util.Arrays;
+
 public class NodeBaseBuilder<T> {
 
+    private final CommandNode<T> base;
+    private final ContextProducer<T> producer;
+
+    private FallbackHandler<T> fallbackHandler = (shit) -> shit.messageSender("Error running command with arguments: " + Arrays.toString(shit.getArgs()));
+
+    private ExecutionFallbackStrategy<T> strategy = new FallbackPermStrategy<>();
+
+    public NodeBaseBuilder(CommandNode<T> base, ContextProducer<T> producer) {
+        this.base = base;
+        this.producer = producer;
+    }
+
+    public NodeBaseBuilder<T> withFallback(FallbackHandler<T> fallback) {
+        this.fallbackHandler = fallback;
+
+        return this;
+    }
+
+    public NodeBaseBuilder<T> withStrategy(ExecutionFallbackStrategy<T> strategy) {
+        this.strategy = strategy;
 
+        return this;
+    }
 
+    public NodeBase<T> build() {
+        return new SimpleNodeBase<>(base,producer,fallbackHandler,strategy);
+    }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
index a2273a7..d0bfde4 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
@@ -1,9 +1,9 @@
 package me.aurium.beetle.branch.launchpoints.base;
 
-import me.aurium.beetle.branch.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
 import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.CommandNode;
-import me.aurium.beetle.branch.permission.strategies.ExecutionFallbackStrategy;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.fallback.permission.strategies.ExecutionFallbackStrategy;
 
 import java.util.List;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
index a3b9d68..3190ab2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
@@ -4,9 +4,10 @@
 import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
 import me.aurium.beetle.branch.argument.Argument;
+import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
 import me.aurium.beetle.branch.nodes.result.ExecutionResult;
 import me.aurium.beetle.branch.nodes.result.NodeResult;
-import me.aurium.beetle.branch.permission.Permission;
+import me.aurium.beetle.branch.fallback.permission.Permission;
 
 import java.util.List;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 999cbdb..6fb2c93 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -3,8 +3,9 @@
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
 import me.aurium.beetle.branch.nodes.result.*;
-import me.aurium.beetle.branch.permission.Permission;
+import me.aurium.beetle.branch.fallback.permission.Permission;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index 4616b6b..12d982d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -5,9 +5,10 @@
 import me.aurium.beetle.branch.handlers.EmptySuggestionHandler;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+import me.aurium.beetle.branch.nodes.api.EndpointNode;
 import me.aurium.beetle.branch.nodes.result.ExecutionResult;
 import me.aurium.beetle.branch.nodes.result.NodeResult;
-import me.aurium.beetle.branch.permission.Permission;
+import me.aurium.beetle.branch.fallback.permission.Permission;
 
 public class SingleNode<T> implements EndpointNode<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/CommandNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
index b207f40..2d2ab04 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
@@ -1,10 +1,10 @@
-package me.aurium.beetle.branch.nodes;
+package me.aurium.beetle.branch.nodes.api;
 
 import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
 import me.aurium.beetle.branch.nodes.result.ExecutionResult;
 import me.aurium.beetle.branch.nodes.result.NodeResult;
-import me.aurium.beetle.branch.permission.Permission;
+import me.aurium.beetle.branch.fallback.permission.Permission;
 
 /**
  * Base object
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/EndpointNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
similarity index 84%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/EndpointNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
index 8df5b5b..c15cf37 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/EndpointNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes;
+package me.aurium.beetle.branch.nodes.api;
 
 /**
  * Marker interface for a node that is alone (so not branching, but not merging either)
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/IdentifiableNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
similarity index 76%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/IdentifiableNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
index a12b1bd..ce79bb6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/IdentifiableNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes;
+package me.aurium.beetle.branch.nodes.api;
 
 import me.aurium.beetle.branch.block.Block;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/builders/AloneBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java
similarity index 69%
rename from core/src/main/java/me/aurium/beetle/branch/builders/AloneBuilder.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java
index f957f56..3b65261 100644
--- a/core/src/main/java/me/aurium/beetle/branch/builders/AloneBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.builders;
+package me.aurium.beetle.branch.nodes.builders;
 
 /**
  * yet another marker interface
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
index 78a524e..9bc8f6c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
@@ -3,12 +3,11 @@
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.EmptyBlock;
 import me.aurium.beetle.branch.block.StringBlock;
-import me.aurium.beetle.branch.builders.Builder;
+import me.aurium.beetle.branch.fallback.permission.Permission;
+import me.aurium.beetle.branch.fallback.permission.permissions.EmptyPermission;
 import me.aurium.beetle.branch.nodes.BranchingNode;
-import me.aurium.beetle.branch.nodes.CommandNode;
-import me.aurium.beetle.branch.nodes.IdentifiableNode;
-import me.aurium.beetle.branch.permission.Permission;
-import me.aurium.beetle.branch.permission.permissions.EmptyPermission;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
 import java.util.HashSet;
@@ -18,13 +17,23 @@
 
 public class BranchingBuilder<T> implements Builder<T> {
 
-    private final Set<IdentifiableNode<T>> commands = new HashSet<>();
+    private final Set<IdentifiableNode<T>> commands;
 
     private Block block;
     private IdentifiableNode<T> noArgs;
+
     private boolean linked;
 
-    private Permission<T> permission = new EmptyPermission<>();
+    private Permission<T> permission;
+
+    public BranchingBuilder() {
+        this.commands = new HashSet<>();
+
+/*        this.noArgs = new SingleNode<>(new EmptyBlock(), messageProvider::handleDefaultBranching, new EmptyPermission<>());*/
+        this.linked = false;
+
+        this.permission = new EmptyPermission<>();
+    }
 
     public void withIdentifier(Block block) {
         this.block = block;
@@ -51,6 +60,7 @@ public <C extends SingleBuilder<T>> void withNoArgs(C key, boolean linked, Consu
         this.linked = linked;
     }
 
+
     @Override
     public BranchingNode<T> build() {
 
@@ -58,6 +68,8 @@ public BranchingNode<T> build() {
 
         PreStoredHashSet<IdentifiableNode<T>> set;
 
+
+
         if (noArgs == null) {
             if (linked) {
                 throw new IllegalStateException("Attempted link without no-arguments handler!");
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
new file mode 100644
index 0000000..2194533
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
@@ -0,0 +1,12 @@
+package me.aurium.beetle.branch.nodes.builders;
+
+import me.aurium.beetle.branch.fallback.message.BuilderMessageProvider;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
+
+public interface Builder<C>{
+
+    IdentifiableNode<C> build();
+    CommandNode<C> buildWithoutIdentifier();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
index 799819a..0af465f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
@@ -3,11 +3,11 @@
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.EmptyBlock;
 import me.aurium.beetle.branch.block.StringBlock;
-import me.aurium.beetle.branch.builders.AloneBuilder;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.nodes.SingleNode;
-import me.aurium.beetle.branch.permission.Permission;
-import me.aurium.beetle.branch.permission.permissions.EmptyPermission;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.fallback.permission.Permission;
+import me.aurium.beetle.branch.fallback.permission.permissions.EmptyPermission;
 
 import java.util.Objects;
 
@@ -41,7 +41,7 @@ public SingleNode<C> build() {
     }
 
     @Override
-    public me.aurium.beetle.branch.nodes.CommandNode<C> buildWithoutIdentifier() {
+    public CommandNode<C> buildWithoutIdentifier() {
         Objects.requireNonNull(contextHandler);
 
         return new SingleNode<>(EmptyBlock.of(),contextHandler, permission);
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
index 93b895f..5a92051 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
@@ -1,9 +1,7 @@
 package me.aurium.beetle.branch.nodes.result;
 
 import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.CommandNode;
-
-import java.util.Optional;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 public class NodeResult<T> {
 
diff --git a/spigot-impl/spigot-impl.iml b/spigot-impl/spigot-impl.iml
index d6ebd48..78b2cc5 100644
--- a/spigot-impl/spigot-impl.iml
+++ b/spigot-impl/spigot-impl.iml
@@ -1,9 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
+<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
new file mode 100644
index 0000000..12517cc
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.spigot;
+
+public class SpigotManager {
+}

From 6e11469cc81ddadd8d5aa6f446aa6b01326110d3 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Sun, 28 Mar 2021 23:22:59 -0700
Subject: [PATCH 24/56] add adapter stuff clumsily

---
 .../marker/permission/Permission.java         |  4 ++
 .../marker/permission/StringPermChecker.java  |  2 +-
 .../parsers/PermissionAnnotationParser.java   |  2 +-
 .../beetle/branch/fallback/FallbackPair.java  |  9 +++++
 .../message/MessageProviderFactory.java       |  9 +++++
 .../{strategies => }/StringPermission.java    |  2 +-
 .../strategies/AutoFallbackPermStrategy.java  | 16 ++++++++
 .../strategies/FallbackPermStrategy.java      | 13 ++++---
 .../strategies/PassthroughStrategy.java       |  2 +-
 .../handlers/context/AbstractNodeContext.java | 19 +++++++---
 .../handlers/context/ContextErrorMessage.java |  9 +++++
 .../handlers/context/ContextProducer.java     |  3 +-
 .../launchpoints/CentralizedManager.java      | 11 ++++--
 .../CentralizedManagerBinder.java             |  6 +++
 .../launchpoints/IllegalSenderException.java  |  9 +++++
 .../branch/launchpoints/base/NodeBase.java    |  2 -
 .../launchpoints/base/NodeBaseBuilder.java    | 17 +++++++--
 .../launchpoints/base/SimpleNodeBase.java     |  2 +-
 .../typeadapter/CommonAdapter.java            | 21 +++++++++++
 .../typeadapter/ManagerAdapter.java           | 15 ++++++++
 .../beetle/branch/nodes/BranchingNode.java    |  4 ++
 .../beetle/branch/util/PreStoredHashSet.java  |  2 +-
 spigot-impl/pom.xml                           |  5 +++
 .../beetle/branch/spigot/PlayerAdapter.java   | 32 ++++++++++++++++
 .../beetle/branch/spigot/SenderAdapter.java   |  7 ++++
 .../beetle/branch/spigot/SpigotContext.java   | 24 ++++++++++++
 .../branch/spigot/SpigotContextProducer.java  | 37 +++++++++++++++++++
 .../beetle/branch/spigot/SpigotManager.java   | 28 +++++++++++++-
 .../branch/spigot/SpigotManagerBinder.java    | 18 +++++++++
 .../beetle/branch/spigot/ExampleBinding.java  | 19 ++++++++++
 30 files changed, 320 insertions(+), 29 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
 rename core/src/main/java/me/aurium/beetle/branch/fallback/permission/{strategies => }/StringPermission.java (81%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
 create mode 100644 spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java

diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
index f5a9542..7dc843c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
@@ -1,5 +1,9 @@
 package me.aurium.beetle.branch.annotate.marker.permission;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD,ElementType.CONSTRUCTOR})
 public @interface Permission {
 
     Class<? extends StringPermChecker> getRelativeChecker();
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
index a0ff553..eba19f6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.annotate.marker.permission;
 
-import me.aurium.beetle.branch.fallback.permission.strategies.StringPermission;
+import me.aurium.beetle.branch.fallback.permission.StringPermission;
 
 public interface StringPermChecker {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
index 0ced0f2..5a1882c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.annotate.parsers;
 
 import me.aurium.beetle.branch.annotate.marker.permission.Permission;
-import me.aurium.beetle.branch.fallback.permission.strategies.StringPermission;
+import me.aurium.beetle.branch.fallback.permission.StringPermission;
 
 import java.lang.annotation.Annotation;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java b/core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java
new file mode 100644
index 0000000..c205e9f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.fallback;
+
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+
+public interface FallbackPair {
+
+    //TODO make this liek have two things: fallback for the base and fallback pre-base (for shit like adapter fails)
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
new file mode 100644
index 0000000..03e47f7
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public class MessageProviderFactory {
+
+    public static <T> BuilderMessageProvider<T> getProvider() {
+        return null;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/StringPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java
similarity index 81%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/StringPermission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java
index 2b7674f..e53a1a8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/StringPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
+package me.aurium.beetle.branch.fallback.permission;
 
 import me.aurium.beetle.branch.fallback.permission.Permission;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
new file mode 100644
index 0000000..f4b9c74
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
@@ -0,0 +1,16 @@
+package me.aurium.beetle.branch.fallback.permission.strategies;
+
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+public class AutoFallbackPermStrategy<T> implements ExecutionFallbackStrategy<T> {
+    @Override
+    public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
+
+    }
+
+    //TODO make this autogenerate messages for failure
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
index d2f8ce2..f11c12b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
@@ -27,13 +27,8 @@
  */
 public class FallbackPermStrategy<T> implements ExecutionFallbackStrategy<T> {
 
-    //TODO a248, this is one of the most important classes. in depth logic review because all of this is untested
-    // and i have no idea if it's gonna work haha. Also if you can think of a way to reduce the boilerplate of the while loops that'd
-    // be nice but i'm pretty sure theyre essential
-
     @Override
     public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
-
         BlockPath pathToTest = CommonBlockPath.of(args);
         NodeResult<T> toBeExecuted = baseNode.getSpecificNode(pathToTest);
 
@@ -58,11 +53,17 @@ public void executeStrategy(T sender, String alias, String[] args, CommandNode<T
             }
         }
 
-        NodeContext<T> produced = producer.produce(sender,alias,args, toBeExecuted.resultingNode(), baseNode, toBeExecuted.resultingPath(), pathToTest);
+        NodeContext<T> produced = producer.produce(sender,alias,args, toBeExecuted.resultingNode(), baseNode, toBeExecuted.resultingPath(), pathToTest, fallback);
 
         toBeExecuted.resultingNode().getExecutionHandler().getExecution().get().handle(produced);
     }
 
+    //TODO a248, this is one of the most important classes. in depth logic review because all of this is untested
+    // and i have no idea if it's gonna work haha. Also if you can think of a way to reduce the boilerplate of the while loops that'd
+    // be nice but i'm pretty sure theyre essential
+
+
+
 
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
index 44efbe8..111870d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
@@ -19,7 +19,7 @@ public void executeStrategy(T sender, String alias, String[] args, CommandNode<T
         NodeResult<T> result = baseNode.getSpecificNode(path);
 
         result.resultingNode().getExecutionHandler().getExecution().ifPresentOrElse(
-                present -> present.handle(producer.produce(sender,alias,args, result.resultingNode(), baseNode, result.resultingPath(), path)),
+                present -> present.handle(producer.produce(sender,alias,args, result.resultingNode(), baseNode, result.resultingPath(), path, fallback)),
                 () -> { fallback.handle(producer.produce(sender,alias,args));
         });
     }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
index 5308ee2..e0240d2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
@@ -1,6 +1,7 @@
 package me.aurium.beetle.branch.handlers.context;
 
 import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
 import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 public abstract class AbstractNodeContext<T> extends AbstractContext<T> implements NodeContext<T> {
@@ -9,13 +10,15 @@ public abstract class AbstractNodeContext<T> extends AbstractContext<T> implemen
     private final CommandNode<T> base;
     private final BlockPath executedPath;
     private final BlockPath fullPath;
+    private final FallbackHandler<T> handler;
 
-    protected AbstractNodeContext(T t, String alias, String[] args, CommandNode<T> executed, CommandNode<T> base, BlockPath executedPath, BlockPath fullPath) {
-        super(t, alias, args);
-        this.executed = executed;
-        this.base = base;
+    protected AbstractNodeContext(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<T> handler) {
+        super(t, alias, strings);
+        this.executed = executedNode;
+        this.base = baseNode;
         this.executedPath = executedPath;
-        this.fullPath = fullPath;
+        this.fullPath = basePath;
+        this.handler = handler;
     }
 
     @Override
@@ -37,4 +40,10 @@ public BlockPath executedPath() {
     public BlockPath fullPath() {
         return fullPath;
     }
+
+    @Override
+    public FallbackHandler<T> getFallbackAction() {
+        return handler;
+    }
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
new file mode 100644
index 0000000..8da0bf0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.handlers.context;
+
+/**
+ * easy to use interface that lets me give it a title, some strings, and let it be converted
+ *
+ * e.g. to prettified chatcolor output or to discord embed on discord-impl.
+ */
+public interface ContextErrorMessage {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
index 5d2caf1..6c7fc7b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
@@ -1,6 +1,7 @@
 package me.aurium.beetle.branch.handlers.context;
 
 import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
 import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 /**
@@ -8,7 +9,7 @@
  */
 public interface ContextProducer<T> {
 
-    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath);
+    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<T> handler);
 
     Context<T> produce(T sender, String alias, String[] strings);
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
index cf7a83e..22b765d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
@@ -1,16 +1,19 @@
 package me.aurium.beetle.branch.launchpoints;
 
-import me.aurium.beetle.branch.launchpoints.base.NodeBase;
+import me.aurium.beetle.branch.launchpoints.base.NodeBaseBuilder;
+import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
 
 /**
  * Represents the utmost base part of a command
  * @param <T> the input type, does not need to be of same type as the node bases it utilizes
+ * @param <V> the platform, void if there is none (how?)
  */
-public interface CentralizedManager<T> {
-
-    CentralizedManagerBinder getBinder(); //think of Beetle's accessors for files, except this time it's for commands? idk
+public interface CentralizedManager<T,V> {
 
+    CentralizedManagerBinder getBinder(V platform);
 
+    NodeBaseBuilder<T> newCommand();
+    <C extends T> NodeBaseBuilder<C> newCommand(ManagerAdapter<T,C> adapter);
 
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
index 096d7a7..a83c4d1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
@@ -1,4 +1,10 @@
 package me.aurium.beetle.branch.launchpoints;
 
 public interface CentralizedManagerBinder {
+
+    /**
+     * Register all commands to the platform
+     */
+    void bind();
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
new file mode 100644
index 0000000..10c29bc
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.launchpoints;
+
+public class IllegalSenderException extends RuntimeException{
+
+    public IllegalSenderException(String lmao) {
+        super(lmao);
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
index 3af9eb2..edfad8f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
@@ -5,8 +5,6 @@
 public interface NodeBase<T> {
 
     void execute(T t, String alias, String[] args);
-
     List<String> suggest(T t, String alias, String[] args);
 
-
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
index 886a4d2..722c31e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
@@ -7,21 +7,26 @@
 import me.aurium.beetle.branch.fallback.permission.strategies.FallbackPermStrategy;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 public class NodeBaseBuilder<T> {
 
-    private final CommandNode<T> base;
     private final ContextProducer<T> producer;
 
+    private CommandNode<T> base;
     private FallbackHandler<T> fallbackHandler = (shit) -> shit.messageSender("Error running command with arguments: " + Arrays.toString(shit.getArgs()));
-
     private ExecutionFallbackStrategy<T> strategy = new FallbackPermStrategy<>();
 
-    public NodeBaseBuilder(CommandNode<T> base, ContextProducer<T> producer) {
-        this.base = base;
+    public <X> NodeBaseBuilder(ContextProducer<T> producer) {
         this.producer = producer;
     }
 
+    public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
+        this.base = node;
+
+        return this;
+    }
+
     public NodeBaseBuilder<T> withFallback(FallbackHandler<T> fallback) {
         this.fallbackHandler = fallback;
 
@@ -35,6 +40,10 @@ public NodeBaseBuilder<T> withStrategy(ExecutionFallbackStrategy<T> strategy) {
     }
 
     public NodeBase<T> build() {
+        Objects.requireNonNull(base);
+        Objects.requireNonNull(fallbackHandler);
+        Objects.requireNonNull(strategy);
+
         return new SimpleNodeBase<>(base,producer,fallbackHandler,strategy);
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
index d0bfde4..ff26611 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
@@ -25,7 +25,7 @@ public <X> SimpleNodeBase(CommandNode<C> baseNode, ContextProducer<C> factory, F
 
     @Override
     public void execute(C executor, String alias, String[] args) {
-        strategy.executeStrategy(executor,alias,args,baseNode, fallbackHandler,factory);
+        strategy.executeStrategy(executor,alias,args,baseNode, fallbackHandler, factory);
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
new file mode 100644
index 0000000..715aa33
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
@@ -0,0 +1,21 @@
+package me.aurium.beetle.branch.launchpoints.typeadapter;
+
+import java.util.function.Consumer;
+
+public interface CommonAdapter<T> extends ManagerAdapter<T,T> {
+
+    @Override
+    default T adapt(T in) {
+        return in;
+    }
+
+    @Override
+    default boolean canAdapt(T t) {
+        return true;
+    }
+
+    @Override
+    default Consumer<T> failedAdaptAction() {
+        return (i) -> {}; //noops
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
new file mode 100644
index 0000000..4e62cbe
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
@@ -0,0 +1,15 @@
+package me.aurium.beetle.branch.launchpoints.typeadapter;
+
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
+
+import java.util.function.Consumer;
+
+public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
+
+    OUTPUT adapt(INPUT input);
+
+    boolean canAdapt(INPUT input);
+
+    Consumer<INPUT> failedAdaptAction();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 6fb2c93..8cb916d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -8,6 +8,8 @@
 import me.aurium.beetle.branch.fallback.permission.Permission;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
+import java.util.stream.Collectors;
+
 /**
  * TODO: missing a Node for noargs will cause it to rely on fallback rather than throwning exceptions and being bad
  * @param <T>
@@ -65,6 +67,8 @@ public SuggestionHandler<T> getSuggestionHandler() {
             //this works because this suggestion handler only gets called if we are on this object lmfao
             Block matchableBlock = context.executedPath().getAllBlocks().getLast();
 
+            nodes.getContents().stream().map(IdentifiableNode::getIdentifier).collect(Collectors.toList());
+
             return null;
         };
     }
diff --git a/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
index f4e80d9..33af162 100644
--- a/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
@@ -9,7 +9,7 @@
  */
 public class PreStoredHashSet<T> {
 
-    private T alreadyStored;
+    private final T alreadyStored;
     private final Set<T> otherThingsInTheSet;
     private final boolean linked;
 
diff --git a/spigot-impl/pom.xml b/spigot-impl/pom.xml
index 8b60676..3f1e678 100644
--- a/spigot-impl/pom.xml
+++ b/spigot-impl/pom.xml
@@ -22,6 +22,11 @@
             <artifactId>beetle-spigot-impl</artifactId>
             <version>0.4.1</version>
         </dependency>
+        <dependency>
+            <groupId>me.aurium</groupId>
+            <artifactId>branch-core</artifactId>
+            <version>0.1.1</version>
+        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java
new file mode 100644
index 0000000..4f49a25
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java
@@ -0,0 +1,32 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.function.Consumer;
+
+public class PlayerAdapter implements ManagerAdapter<CommandSender, Player> {
+
+    private final Consumer<CommandSender> failedOperation;
+
+    public PlayerAdapter(Consumer<CommandSender> failedOperation) {
+        this.failedOperation = failedOperation;
+    }
+
+    @Override
+    public Player adapt(CommandSender sender) {
+        return (Player) sender;
+    }
+
+    @Override
+    public boolean canAdapt(CommandSender sender) {
+        return sender instanceof Player;
+    }
+
+    @Override
+    public Consumer<CommandSender> failedAdaptAction() {
+        return failedOperation;
+    }
+
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
new file mode 100644
index 0000000..cda8236
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.launchpoints.typeadapter.CommonAdapter;
+import org.bukkit.command.CommandSender;
+
+public class SenderAdapter implements CommonAdapter<CommandSender> {
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
new file mode 100644
index 0000000..203ce45
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -0,0 +1,24 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.handlers.context.AbstractNodeContext;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+public class SpigotContext<T extends CommandSender> extends AbstractNodeContext<T> {
+
+    private final T sender;
+
+    public SpigotContext(T sender, String alias, String[] args, CommandNode<T> executed, CommandNode<T> base, BlockPath executedPath, BlockPath fullPath, FallbackHandler<T> handler) {
+        super(sender, alias, args, executed, base, executedPath, fullPath, handler);
+
+        this.sender = sender;
+    }
+
+    @Override
+    public void messageSender(String string) {
+        sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string)); //TODO prettify (or just use ContextErrorMessage LMFAO)
+    }
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
new file mode 100644
index 0000000..c8fa56e
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
@@ -0,0 +1,37 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.handlers.context.Context;
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.launchpoints.IllegalSenderException;
+import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import org.bukkit.command.CommandSender;
+
+public class SpigotContextProducer<C extends CommandSender> implements ContextProducer<C> {
+
+    private final ManagerAdapter<CommandSender,C> adapter;
+
+    public <T> SpigotContextProducer(ManagerAdapter<CommandSender,C> adapter) {
+        this.adapter = adapter;
+    }
+
+    @Override
+    public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> executedNode, CommandNode<C> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<C> handler) {
+
+        if (!adapter.canAdapt(sender)) {
+            adapter.failedAdaptAction();
+
+            throw new IllegalSenderException("Sender is not instance of correct type!"); //TODO more fallback bullshit :)
+        }
+
+        return new SpigotContext<>(adapter.adapt(sender), alias,strings,executedNode,baseNode,executedPath,basePath,handler);
+    }
+
+    @Override
+    public Context<C> produce(C sender, String alias, String[] strings) {
+        return produce(sender, alias, strings,null,null,null,null,null);
+    }
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index 12517cc..8df5e86 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -1,4 +1,30 @@
 package me.aurium.beetle.branch.spigot;
 
-public class SpigotManager {
+import me.aurium.beetle.branch.launchpoints.CentralizedManager;
+import me.aurium.beetle.branch.launchpoints.CentralizedManagerBinder;
+import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
+import me.aurium.beetle.branch.launchpoints.base.NodeBaseBuilder;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class SpigotManager implements CentralizedManager<CommandSender, JavaPlugin> {
+
+    private final SenderAdapter adapter = new SenderAdapter();
+
+    @Override
+    public CentralizedManagerBinder getBinder(JavaPlugin platform) {
+        return new SpigotManagerBinder(platform);
+    }
+
+    @Override
+    public NodeBaseBuilder<CommandSender> newCommand() {
+        return newCommand(adapter);
+    }
+
+    @Override
+    public <C extends CommandSender> NodeBaseBuilder<C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
+        return new NodeBaseBuilder<>(new SpigotContextProducer<>(adapter));
+    }
+
+
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
new file mode 100644
index 0000000..4fe2850
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
@@ -0,0 +1,18 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.launchpoints.CentralizedManagerBinder;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class SpigotManagerBinder implements CentralizedManagerBinder {
+
+    private final JavaPlugin plugin;
+
+    public SpigotManagerBinder(JavaPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void bind() { //TODO implement
+        plugin.getServer().getPluginManager();
+    }
+}
diff --git a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
new file mode 100644
index 0000000..abe418c
--- /dev/null
+++ b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
@@ -0,0 +1,19 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.nodes.builders.SingleBuilder;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class ExampleBinding extends JavaPlugin {
+
+
+    private static final SpigotManager manager = new SpigotManager();
+
+    @Override
+    public void onEnable() {
+        manager.getBinder(this).bind();
+
+
+
+
+    }
+}

From 9b02557f1161d0b113f9dceae6ace6132466777a Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Mon, 29 Mar 2021 20:26:01 -0700
Subject: [PATCH 25/56] pre-handler save commit

---
 .../branch/annotate/AnnotatedParser.java      |   2 +-
 .../parsers/SingleAnnotatedParser.java        |   2 +
 .../beetle/branch/argument/Arguments.java     |   4 -
 .../argument/DelegatingArgumentContext.java   |  67 ------
 .../me/aurium/beetle/branch/block/Block.java  |   9 +-
 .../aurium/beetle/branch/block/BlockList.java |  20 --
 .../aurium/beetle/branch/block/BlockPath.java |  48 -----
 .../beetle/branch/block/CommonBlockPath.java  | 190 ------------------
 .../branch/block/DelegatingBlockList.java     |  52 -----
 .../beetle/branch/block/EmptyBlock.java       |  14 +-
 .../beetle/branch/block/StringBlock.java      |  12 +-
 .../branch/fallback/failure/Failure.java      |  13 ++
 .../fallback/failure/SendableFailure.java     |  30 +++
 .../branch/fallback/message/BaseContext.java  |  11 +
 .../message/BuilderMessageProvider.java       |  20 --
 .../branch/fallback/message/CommonKeys.java   |   7 +
 .../message/FallbackMessagePrettier.java      |   9 -
 .../message/FallbackMessageProvider.java      |   4 -
 .../branch/fallback/message/Message.java      |   7 +
 .../fallback/message/MessageHandler.java      |   7 +
 .../branch/fallback/message/MessageInfo.java  |  21 ++
 .../branch/fallback/message/MessageKey.java   |  16 ++
 .../fallback/message/MessageProvider.java     |  10 +
 .../message/MessageProviderFactory.java       |   9 -
 .../fallback/message/MessageRequirement.java  |  24 +++
 .../message/impl/CommonMessageHandler.java    |  27 +++
 ...tBuilderMessageProvider.java => Shit.java} |  12 +-
 .../strategies/AutoFallbackPermStrategy.java  |  16 --
 .../strategies/CommonFallbackStrategy.java    |  78 +++++++
 .../strategies/ExecutionFallbackStrategy.java |  10 +-
 .../strategies/FallbackPermStrategy.java      |  70 -------
 .../strategies/PassthroughStrategy.java       |  26 ---
 .../handlers/EmptySuggestionHandler.java      |   3 +-
 .../branch/handlers/api/BranchHandler.java    |  12 ++
 .../handlers/api/SuggestionHandler.java       |   3 +-
 .../handlers/context/AbstractNodeContext.java |  44 ++--
 .../handlers/context/ContextProducer.java     |   8 +-
 .../branch/handlers/context/NodeContext.java  |  15 +-
 .../launchpoints/base/NodeBaseBuilder.java    |  10 +-
 .../launchpoints/base/SimpleBaseContext.java  |  18 ++
 .../launchpoints/base/SimpleNodeBase.java     |  16 +-
 .../typeadapter/ManagerAdapter.java           |   1 -
 .../beetle/branch/nodes/ArgumentNode.java     |  31 ++-
 .../beetle/branch/nodes/BranchingNode.java    |  53 +++--
 .../beetle/branch/nodes/SingleNode.java       |  17 +-
 .../branch/{ => nodes}/argument/Argument.java |   2 +-
 .../{ => nodes}/argument/ArgumentContext.java |   2 +-
 .../argument/ArgumentContextHandler.java      |   2 +-
 .../nodes/argument/ArgumentConvertet.java     |   4 +
 .../branch/nodes/argument/Arguments.java      |   4 +
 .../nodes/builders/BranchingBuilder.java      |  14 +-
 .../beetle/branch/nodes/builders/Builder.java |   5 +-
 .../branch/nodes/builders/SingleBuilder.java  |   2 +-
 .../nodes/{api => model}/CommandNode.java     |  11 +-
 .../nodes/{api => model}/EndpointNode.java    |   2 +-
 .../{api => model}/IdentifiableNode.java      |   2 +-
 .../branch/nodes/model/ResponseHandler.java   |   4 +
 .../branch/nodes/result/NodeResult.java       |  23 ---
 .../{result => results}/ExecutionResult.java  |   2 +-
 .../branch/nodes/results/SearchInfo.java      |  33 +++
 .../branch/nodes/results/SearchInput.java     |  48 +++++
 .../nodes/results/SuggestionResult.java       |   4 +
 .../nodes/results/model/FailingResult.java    |  24 +++
 .../branch/nodes/results/model/Result.java    |  12 ++
 .../nodes/results/model/SuccessfulResult.java |  24 +++
 .../beetle/branch/spigot/SpigotContext.java   |  12 +-
 .../branch/spigot/SpigotContextProducer.java  |  16 +-
 .../spigot/message/SpigotMessageProvider.java |  22 ++
 .../branch/spigot/message/TextMessage.java    |  18 ++
 .../beetle/branch/spigot/ExampleBinding.java  |   1 -
 spigot-impl/src/test/resources/plugin.yml     |   0
 71 files changed, 650 insertions(+), 721 deletions(-)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
 rename core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/{DefaultBuilderMessageProvider.java => Shit.java} (82%)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
 rename core/src/main/java/me/aurium/beetle/branch/{ => nodes}/argument/Argument.java (91%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => nodes}/argument/ArgumentContext.java (77%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => nodes}/argument/ArgumentContextHandler.java (66%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{api => model}/CommandNode.java (62%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{api => model}/EndpointNode.java (83%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{api => model}/IdentifiableNode.java (75%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{result => results}/ExecutionResult.java (91%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
 create mode 100644 spigot-impl/src/test/resources/plugin.yml

diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
index c39f358..7cd0c4d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.annotate;
 
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
 
 public interface AnnotatedParser<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
index d615956..8b87a8e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
@@ -40,6 +40,8 @@ public List<me.aurium.beetle.branch.nodes.SingleNode<T>> parse(Class<? extends A
                 }
 
 
+                //all of this is really really stupid lmfao we should be working with an instance of the class
+
                 if (parameters[0].getType().isAssignableFrom(NodeContext.class)) {
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java b/core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java
deleted file mode 100644
index 487a980..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.argument;
-
-public class Arguments {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
deleted file mode 100644
index 134871c..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package me.aurium.beetle.branch.argument;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-
-public class DelegatingArgumentContext<T> implements ArgumentContext<T>{
-
-    private final NodeContext<T> delegate;
-    private final Arguments arguments;
-
-    public DelegatingArgumentContext(NodeContext<T> delegate, Arguments arguments) {
-        this.delegate = delegate;
-        this.arguments = arguments;
-    }
-
-    @Override
-    public T getSender() {
-        return delegate.getSender();
-    }
-
-    @Override
-    public String getAlias() {
-        return delegate.getAlias();
-    }
-
-    @Override
-    public String[] getArgs() {
-        return delegate.getArgs();
-    }
-
-    @Override
-    public void messageSender(String string) {
-        delegate.messageSender(string);
-    }
-
-    @Override
-    public CommandNode<T> getExecutedNode() {
-        return delegate.getExecutedNode();
-    }
-
-    @Override
-    public CommandNode<T> getBaseExecutedNode() {
-        return delegate.getBaseExecutedNode();
-    }
-
-    @Override
-    public BlockPath executedPath() {
-        return delegate.executedPath();
-    }
-
-    @Override
-    public BlockPath fullPath() {
-        return delegate.fullPath();
-    }
-
-    @Override
-    public FallbackHandler<T> getFallbackAction() {
-        return delegate.getFallbackAction();
-    }
-
-    @Override
-    public Arguments getArgumentContainer() {
-        return arguments;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/Block.java b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
index aef4888..e24b841 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/Block.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
@@ -3,15 +3,8 @@
 public interface Block {
 
     String getIdentifier();
-    BlockPath asSingleBlockpath();
 
     boolean equals(Object object);
-
-    default void addLast(BlockList list) {
-        list.addLast(this);
-    }
-    default void addFirst(BlockList list) {
-        list.addFirst(this);
-    }
+    boolean isEmpty();
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
deleted file mode 100644
index 1fcd238..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-import java.util.List;
-
-public interface BlockList{
-
-    void addFirst(Block block);
-    void addLast(Block block);
-
-    void removeLast();
-
-    Block getFirst();
-    Block getLast();
-
-    boolean isEmpty();
-    int size();
-
-    List<Block> getBackingList();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
deleted file mode 100644
index f023c09..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-public interface BlockPath {
-
-    boolean isEmpty();
-
-    boolean isSevered();
-    boolean endsWith(Block path);
-    boolean startsWith(Block path);
-
-
-    BlockPath getRoot();
-    BlockPath getParent();
-
-    /**
-     * Adds all the blocks from a path
-     * @param path the path to add
-     * @return a cloned path plus all the blocks from that path
-     */
-    BlockPath resolve(BlockPath path);
-
-    /**
-     * Adds the block to this path
-     * @param block the block to add
-     * @return a cloned path plus that block
-     */
-    BlockPath resolve(Block block);
-
-    BlockPath withoutBase();
-    BlockPath withoutTop();
-
-    BlockPath fromIndex(int index);
-
-    int length();
-
-    /**
-     * Returns an ordered set of blocks
-     * @return ordered set of blocks
-     */
-    BlockList getAllBlocks();
-
-    /**
-     * DO NOT USE THIS FOR COMPARISONS. THIS IS FOR DEBUGGING ONLY.
-     * @return
-     */
-    String toString();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
deleted file mode 100644
index d928916..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-import java.util.ArrayList;
-
-public class CommonBlockPath implements BlockPath {
-
-    public final static String COMMON_SPLITTER = "-";
-
-    private final BlockPath root;
-    private final BlockPath parent;
-    private final BlockList blocks;
-    private final boolean isSevered;
-    private final String splitter;
-
-    public CommonBlockPath(BlockPath root, BlockPath parent, BlockList blocks, boolean isSevered, String splitter) {
-        this.root = root;
-        this.parent = parent;
-        this.blocks = blocks;
-        this.isSevered = isSevered;
-        this.splitter = splitter;
-    }
-
-    public CommonBlockPath(BlockList list, boolean isSevered, String splitter) {
-        this.root = this;
-        this.parent = this;
-        this.blocks = list;
-        this.isSevered = isSevered;
-        this.splitter = splitter;
-    }
-
-    public CommonBlockPath(String splitter) {
-        this.root = this;
-        this.parent = this;
-        this.blocks = new DelegatingBlockList(new ArrayList<>());
-        this.isSevered = true;
-        this.splitter = splitter;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return blocks.isEmpty();
-    }
-
-    @Override
-    public boolean isSevered() {
-        return isSevered;
-    }
-
-    @Override
-    public boolean endsWith(Block path) {
-        return blocks.getLast().equals(path);
-    }
-
-    @Override
-    public boolean startsWith(Block path) {
-        return blocks.getFirst().equals(path);
-    }
-
-    @Override
-    public BlockPath getRoot() {
-        return root;
-    }
-
-    @Override
-    public BlockPath getParent() {
-        return parent;
-    }
-
-    @Override
-    public BlockPath resolve(BlockPath path) {
-
-        BlockList pathBlocks = this.blocks;
-
-        for (Block block : path.getAllBlocks().getBackingList()) {
-            block.addLast(pathBlocks);
-        }
-
-        return new CommonBlockPath(root,this,pathBlocks,pathBlocks.size() > 1,this.splitter);
-    }
-
-    @Override
-    public BlockPath resolve(Block block) {
-
-        BlockList pathBlocks = this.blocks;
-
-        block.addLast(pathBlocks);
-
-        return new CommonBlockPath(root,this,pathBlocks,pathBlocks.size() > 1,this.splitter);
-    }
-
-    @Override
-    public BlockPath withoutBase() {
-        return fromIndex(0);
-    }
-
-    @Override //TODO need a logic check here
-    public BlockPath withoutTop() {
-        BlockList clone = new DelegatingBlockList(new ArrayList<>(
-                blocks.getBackingList()
-        ));
-
-        clone.removeLast();
-
-        return new CommonBlockPath(root,parent.getParent(),clone,clone.size() > 1, splitter);
-    }
-
-    @Override
-    public BlockPath fromIndex(int index) {
-        BlockList clone = new DelegatingBlockList(new ArrayList<>(
-                blocks.getBackingList().subList(index,blocks.size())
-        ));
-
-        return new CommonBlockPath(clone.getBackingList().get(0).asSingleBlockpath(),this.parent,clone,clone.size() > 1,splitter);
-    }
-
-    @Override
-    public int length() {
-        return blocks.size();
-    }
-
-    @Override
-    public BlockList getAllBlocks() {
-        return this.blocks;
-    }
-
-    @Override
-    public String toString() {
-
-        StringBuilder base = new StringBuilder();
-
-        for (Block block : this.blocks.getBackingList()) {
-            base.append('{').append(block.getIdentifier()).append('}');
-        }
-
-
-        //TODO: fix this:
-        return base.toString();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        CommonBlockPath that = (CommonBlockPath) o;
-        return blocks.equals(that.blocks);
-    }
-
-    @Override
-    public int hashCode() {
-        return blocks.hashCode();
-    }
-
-    public static BlockPath ofEmpty() {
-        return new CommonBlockPath(COMMON_SPLITTER);
-    }
-
-    public static BlockPath of(String string, String splitter) {
-        String[] subparts = string.split(splitter);
-
-        return of(subparts,splitter);
-    }
-
-    public static BlockPath of(String[] commandArguments, String splitter) {
-        BlockList blocklist = new DelegatingBlockList(new ArrayList<>());
-
-        for (String s : commandArguments) {
-            blocklist.addLast(StringBlock.of(s));
-        }
-
-        return new CommonBlockPath(blocklist,commandArguments.length > 1,splitter);
-    }
-
-    public static BlockPath of(Block block, String splitter) {
-        BlockList send = new DelegatingBlockList(new ArrayList<>());
-        send.addLast(block);
-        return new CommonBlockPath(send,true,splitter);
-    }
-
-    public static BlockPath of(String string) {
-        return of(string,COMMON_SPLITTER);
-    }
-
-    public static BlockPath of(String[] commandArguments) {
-        return of(commandArguments,COMMON_SPLITTER);
-    }
-
-    public static BlockPath of(Block block) {
-        return of(block,COMMON_SPLITTER);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java b/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
deleted file mode 100644
index 0422516..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-import java.util.List;
-
-public class DelegatingBlockList implements BlockList{
-
-    private final List<Block> blocks;
-
-    public DelegatingBlockList(List<Block> blocks) {
-        this.blocks = blocks;
-    }
-
-    @Override
-    public void addFirst(Block block) {
-        blocks.add(0,block);
-    }
-
-    @Override
-    public void addLast(Block block) {
-        blocks.add(block);
-    }
-
-    @Override
-    public void removeLast() {
-        blocks.remove(blocks.size()-1);
-    }
-
-    @Override
-    public Block getFirst() {
-        return blocks.get(0);
-    }
-
-    @Override
-    public Block getLast() {
-        return blocks.get(blocks.size()-1);
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return blocks.isEmpty();
-    }
-
-    @Override
-    public int size() {
-        return blocks.size();
-    }
-
-    @Override
-    public List<Block> getBackingList() {
-        return blocks;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
index 8b5558c..58a704a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
@@ -8,18 +8,8 @@ public String getIdentifier() {
     }
 
     @Override
-    public BlockPath asSingleBlockpath() {
-        return CommonBlockPath.ofEmpty();
-    }
-
-    @Override
-    public void addFirst(BlockList list) {
-        //nooops
-    }
-
-    @Override
-    public void addLast(BlockList list) {
-        //noops
+    public boolean isEmpty() {
+        return true;
     }
 
     public static EmptyBlock of() {
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
index 1cc122a..6dc4374 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
@@ -4,7 +4,7 @@ public class StringBlock implements Block {
 
     private final String identifier;
 
-    StringBlock(String identifier) {
+    public StringBlock(String identifier) {
         this.identifier = identifier;
     }
 
@@ -13,11 +13,6 @@ public String getIdentifier() {
         return identifier;
     }
 
-    @Override
-    public BlockPath asSingleBlockpath() {
-        return CommonBlockPath.of(this);
-    }
-
     public static Block of(String string) {
         if (string.contains(" ")) throw new IllegalStateException("Identifier cannot have spaces!");
 
@@ -32,6 +27,11 @@ public boolean equals(Object o) {
         return identifier.equalsIgnoreCase(that.identifier);
     }
 
+    @Override
+    public boolean isEmpty() {
+        return false;
+    }
+
     @Override
     public int hashCode() {
         return identifier.hashCode();
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
new file mode 100644
index 0000000..b2d9495
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.fallback.failure;
+
+import me.aurium.beetle.branch.fallback.message.MessageKey;
+import me.aurium.beetle.branch.fallback.message.MessageRequirement;
+
+public interface Failure {
+
+    MessageKey getCorrelatedMessage();
+    MessageRequirement[] getRequirements();
+
+    Throwable toThrowable();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
new file mode 100644
index 0000000..ff624a5
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
@@ -0,0 +1,30 @@
+package me.aurium.beetle.branch.fallback.failure;
+
+import me.aurium.beetle.branch.fallback.message.MessageKey;
+import me.aurium.beetle.branch.fallback.message.MessageRequirement;
+
+public class SendableFailure implements Failure{
+
+    private final MessageKey key;
+    private final MessageRequirement[] requirements;
+
+    public SendableFailure(MessageKey key, MessageRequirement... requirements) {
+        this.key = key;
+        this.requirements = requirements;
+    }
+
+    @Override
+    public MessageKey getCorrelatedMessage() {
+        return key;
+    }
+
+    @Override
+    public MessageRequirement[] getRequirements() {
+        return requirements;
+    }
+
+    @Override
+    public Throwable toThrowable() {
+        return new IllegalStateException();
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
new file mode 100644
index 0000000..0db1c78
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.fallback.message;
+
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+
+public interface BaseContext<T> {
+
+    FallbackHandler<T> getFallback();
+
+    //TODO message stuff
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java
deleted file mode 100644
index 5150506..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-
-/**
- * Might not be the most scalable thing in the world but who the fuck cares
- *
- * I can't think of any nodes besides single (do an action) branching (do an action or separate out based on top buffer arg)
- * and value (do an action or separate action based on buffer from this argument)
- *
- * so who cares? This will give me fallback messages
- * @param <T>
- */
-public interface BuilderMessageProvider<T> {
-
-    void handleDefaultSingle(NodeContext<T> context);
-    void handleDefaultBranching(NodeContext<T> context);
-    void handleDefaultValue(NodeContext<T> context);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
new file mode 100644
index 0000000..b0a2054
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public class CommonKeys {
+
+    public static final MessageKey TOO_MANY_ARGS = new MessageKey("TOO_MANY_ARGS");
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java
deleted file mode 100644
index 3e136c0..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-/**
- * Makes messages pretty
- */
-public interface FallbackMessagePrettier {
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java
deleted file mode 100644
index acd1817..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public interface FallbackMessageProvider<T> {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
new file mode 100644
index 0000000..ecc910c
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public interface Message<C> {
+
+    void accept(C c, Object... strings);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
new file mode 100644
index 0000000..3f2c7aa
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public interface MessageHandler<T> {
+
+    void sendMessage(T t, MessageInfo key);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
new file mode 100644
index 0000000..2100c6b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
@@ -0,0 +1,21 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public class MessageInfo {
+
+    private final MessageKey key;
+    private final Object[] args;
+
+    public MessageInfo(MessageKey key, Object[] args) {
+        this.key = key;
+        this.args = args;
+    }
+
+    public MessageKey getKey() {
+        return key;
+    }
+
+    public Object[] getStrings() {
+        return args;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
new file mode 100644
index 0000000..4dd0382
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
@@ -0,0 +1,16 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public class MessageKey {
+
+    private final String key;
+
+    public MessageKey(String key) {
+        this.key = key;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
new file mode 100644
index 0000000..6b6338d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
@@ -0,0 +1,10 @@
+package me.aurium.beetle.branch.fallback.message;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public interface MessageProvider<T> {
+
+    Map<MessageKey,Message<T>> make();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
deleted file mode 100644
index 03e47f7..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public class MessageProviderFactory {
-
-    public static <T> BuilderMessageProvider<T> getProvider() {
-        return null;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
new file mode 100644
index 0000000..933f94e
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
@@ -0,0 +1,24 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public class MessageRequirement {
+
+    private final String key;
+    private final String value;
+
+    private MessageRequirement(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public static MessageRequirement of(String key, String value) {
+        return new MessageRequirement(key, value);
+    }
+
+    public String getKey() {
+        return this.key;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
new file mode 100644
index 0000000..0ec2584
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.fallback.message.impl;
+
+import me.aurium.beetle.branch.fallback.message.*;
+
+import java.util.Map;
+
+public class CommonMessageHandler<T> implements MessageHandler<T> {
+
+    private final Map<MessageKey, Message<T>> messages;
+
+    public CommonMessageHandler(Map<MessageKey, Message<T>> messages) {
+        this.messages = messages;
+    }
+
+    public CommonMessageHandler(MessageProvider<T> messages) {
+        this.messages = messages.make();
+    }
+
+    @Override
+    public void sendMessage(T t, MessageInfo info) {
+        Message<T> message = messages.get(info.getKey());
+
+        if (message == null) throw new IllegalArgumentException("No message mapped to key!");
+
+        message.accept(t);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/DefaultBuilderMessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
similarity index 82%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/DefaultBuilderMessageProvider.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
index d94ed2d..c61e2e7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/DefaultBuilderMessageProvider.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
@@ -1,10 +1,7 @@
 package me.aurium.beetle.branch.fallback.message.impl;
 
-import me.aurium.beetle.branch.fallback.message.BuilderMessageProvider;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
-
-import java.util.ArrayList;
-import java.util.List;
+/*
 
 public class DefaultBuilderMessageProvider implements BuilderMessageProvider<Object> {
 
@@ -17,7 +14,8 @@ public void handleDefaultSingle(NodeContext<Object> context) {
     @Override
     public void handleDefaultBranching(NodeContext<Object> context) {
 
-        StringBuilder fuk = new StringBuilder("/");
+        */
+/*StringBuilder fuk = new StringBuilder("/");
 
         context.fullPath().withoutTop().getAllBlocks().getBackingList().forEach(blok -> {
             fuk.append(blok).append(" ");
@@ -29,7 +27,8 @@ public void handleDefaultBranching(NodeContext<Object> context) {
 
         for (String string : alternatives) {
             context.messageSender(finalFuk + string);
-        }
+        }*//*
+
 
 
     }
@@ -39,3 +38,4 @@ public void handleDefaultValue(NodeContext<Object> context) {
 
     }
 }
+*/
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
deleted file mode 100644
index f4b9c74..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
-
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-
-public class AutoFallbackPermStrategy<T> implements ExecutionFallbackStrategy<T> {
-    @Override
-    public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
-
-    }
-
-    //TODO make this autogenerate messages for failure
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java
new file mode 100644
index 0000000..057a3d4
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java
@@ -0,0 +1,78 @@
+package me.aurium.beetle.branch.fallback.permission.strategies;
+
+import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInput;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+
+import java.util.Optional;
+
+public class CommonFallbackStrategy<T> implements ExecutionFallbackStrategy<T> {
+
+    @Override
+    public Optional<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode) {
+
+        SearchInput input = SearchInput.of(args);
+
+        SearchInfo<T> toBeExecuted = baseNode.getSpecificNode(input);
+
+
+        //1. Check permissions and access (preprocessing)
+
+        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args) || toBeExecuted.resultingNode().getExecutionHandler().getExecution().isEmpty()) {
+            //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
+
+            if (toBeExecuted.resultingNode().equals(baseNode)) {
+                return Optional.empty();
+
+            } else {
+                toBeExecuted = baseNode.getSpecificNode(input.withoutTop()); //regress backwards a node
+            }
+        }
+
+        return Optional.of(toBeExecuted);
+    }
+
+
+    @Override
+    public void attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProducer<T> producer) {
+        NodeContext<T> produced = producer.produce(sender,alias,args,baseNode, result, baseContext);
+
+        result.resultingNode().getExecutionHandler().getExecution().orElseThrow().handle(produced); //this should never be null thanks to the preprocess
+    }
+
+
+    //TODO old code - refer to it if you need to
+    /*SearchInput input = SearchInput.of(args);
+
+    SearchResult<T> toBeExecuted = baseNode.getSpecificNode(input);
+
+    Context<T> failed = producer.produce(sender,alias,args);
+
+    //1. Check permissions and access (preprocessing)
+
+        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args) || toBeExecuted.resultingNode().getExecutionHandler().getExecution().isEmpty()) {
+        //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
+
+        if (toBeExecuted.resultingNode().equals(baseNode)) {
+
+            fallback.handle(failed);
+
+            return Optional.empty();
+
+        } else {
+            toBeExecuted = baseNode.getSpecificNode(input.withoutTop()); //regress backwards a node
+        }
+    }
+
+        return Optional.of(toBeExecuted);
+
+    //execute and process
+
+    NodeContext<T> produced = producer.produce(sender,alias,args,toBeExecuted.resultingNode(), baseNode, toBeExecuted.reducedPath(), toBeExecuted.initialPath(), fallback);
+
+        toBeExecuted.resultingNode().getExecutionHandler().getExecution().get().handle(produced);*/
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
index 3055387..c903cef 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
@@ -1,13 +1,17 @@
 package me.aurium.beetle.branch.fallback.permission.strategies;
 
+import me.aurium.beetle.branch.fallback.message.BaseContext;
 import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+
+import java.util.Optional;
 
 public interface ExecutionFallbackStrategy<T> {
 
 
-    void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer);
+    Optional<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode);
+    void attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProducer<T> producer);
 
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
deleted file mode 100644
index f11c12b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.block.CommonBlockPath;
-import me.aurium.beetle.branch.handlers.context.Context;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.result.NodeResult;
-
-/**
- * Advanced startegy that does things:
- *
- * Parses a testing blockpath from existing args. It then finds the linked node from that path. There must be one,
- * because even incorrect args will link to the base node or to a branching node like the branch node implementation.
- *
- * It checks the permissions first. If the sender does not have access to that specific node, or the node is missing a handler
- * it will go one node up in the map and check it for permission. It will repeat this until it can find a permissible node,
- * or until it reaches the base node.
- *
- * If the user does not have access to run the base node for some reason, it will call the fallback handler.
- *
- * TODO please check the logic here.
- *
- * @param <T>
- */
-public class FallbackPermStrategy<T> implements ExecutionFallbackStrategy<T> {
-
-    @Override
-    public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
-        BlockPath pathToTest = CommonBlockPath.of(args);
-        NodeResult<T> toBeExecuted = baseNode.getSpecificNode(pathToTest);
-
-        Context<T> failed = producer.produce(sender,alias,args);
-
-        //1. Check permissions and access
-
-        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args) || toBeExecuted.resultingNode().getExecutionHandler().getExecution().isEmpty()) {
-            //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
-
-            if (toBeExecuted.resultingNode().equals(baseNode)) {
-
-                fallback.handle(failed);
-
-                return;
-
-            } else {
-
-                pathToTest = pathToTest.withoutTop();
-
-                toBeExecuted = baseNode.getSpecificNode(pathToTest); //regress backwards a node
-            }
-        }
-
-        NodeContext<T> produced = producer.produce(sender,alias,args, toBeExecuted.resultingNode(), baseNode, toBeExecuted.resultingPath(), pathToTest, fallback);
-
-        toBeExecuted.resultingNode().getExecutionHandler().getExecution().get().handle(produced);
-    }
-
-    //TODO a248, this is one of the most important classes. in depth logic review because all of this is untested
-    // and i have no idea if it's gonna work haha. Also if you can think of a way to reduce the boilerplate of the while loops that'd
-    // be nice but i'm pretty sure theyre essential
-
-
-
-
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
deleted file mode 100644
index 111870d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.block.CommonBlockPath;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.result.NodeResult;
-
-/**
- * Ignores everything and tries to execute ignoring permissions or fallbacks. If something goes wrong it delegates to the fallback handler immediately
- * @param <T>
- */
-public class PassthroughStrategy<T> implements ExecutionFallbackStrategy<T> {
-    @Override
-    public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
-        BlockPath path = CommonBlockPath.of(args);
-
-        NodeResult<T> result = baseNode.getSpecificNode(path);
-
-        result.resultingNode().getExecutionHandler().getExecution().ifPresentOrElse(
-                present -> present.handle(producer.produce(sender,alias,args, result.resultingNode(), baseNode, result.resultingPath(), path, fallback)),
-                () -> { fallback.handle(producer.produce(sender,alias,args));
-        });
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
index 6fb5c4d..daac0e0 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
@@ -1,5 +1,6 @@
 package me.aurium.beetle.branch.handlers;
 
+import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
 
@@ -11,7 +12,7 @@ public class EmptySuggestionHandler<T> implements SuggestionHandler<T> {
     private final List<String> emptyList = new ArrayList<>();
 
     @Override
-    public List<String> handle(NodeContext<T> adapter) {
+    public List<Block> handle(NodeContext<T> adapter) {
         return List.of();
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
new file mode 100644
index 0000000..4d4ac58
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
@@ -0,0 +1,12 @@
+package me.aurium.beetle.branch.handlers.api;
+
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+
+import java.util.List;
+
+public interface BranchHandler<T> {
+
+    void getExecution(NodeContext<T> context);
+    List<String> getSuggestions(NodeContext<T> context);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
index 5225a93..b96c285 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
@@ -1,11 +1,12 @@
 package me.aurium.beetle.branch.handlers.api;
 
+import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 
 import java.util.List;
 
 public interface SuggestionHandler<T> {
 
-    List<String> handle(NodeContext<T> context);
+    List<Block> handle(NodeContext<T> context);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
index e0240d2..bd253c2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
@@ -1,49 +1,35 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
 public abstract class AbstractNodeContext<T> extends AbstractContext<T> implements NodeContext<T> {
 
-    private final CommandNode<T> executed;
-    private final CommandNode<T> base;
-    private final BlockPath executedPath;
-    private final BlockPath fullPath;
-    private final FallbackHandler<T> handler;
+    private final CommandNode<T> baseNode;
+    private final SearchInfo<T> searchInfo;
+    private final BaseContext<T> baseContext;
 
-    protected AbstractNodeContext(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<T> handler) {
+    protected AbstractNodeContext(T t, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
         super(t, alias, strings);
-        this.executed = executedNode;
-        this.base = baseNode;
-        this.executedPath = executedPath;
-        this.fullPath = basePath;
-        this.handler = handler;
-    }
 
-    @Override
-    public CommandNode<T> getExecutedNode() {
-        return executed;
+        this.baseContext = baseContext;
+        this.searchInfo = result;
+        this.baseNode = baseNode;
     }
 
     @Override
     public CommandNode<T> getBaseExecutedNode() {
-        return base;
-    }
-
-    @Override
-    public BlockPath executedPath() {
-        return executedPath;
+        return baseNode;
     }
 
     @Override
-    public BlockPath fullPath() {
-        return fullPath;
+    public SearchInfo<T> getResults() {
+        return searchInfo;
     }
 
     @Override
-    public FallbackHandler<T> getFallbackAction() {
-        return handler;
+    public BaseContext<T> getBaseContext() {
+        return baseContext;
     }
-
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
index 6c7fc7b..72f672b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
@@ -1,15 +1,15 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
 /**
  * Produces context adapters, like the stock ContextSource for contexts.
  */
 public interface ContextProducer<T> {
 
-    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<T> handler);
+    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search, BaseContext<T> baseContext);
 
     Context<T> produce(T sender, String alias, String[] strings);
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
index 741cd0e..77924db 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
@@ -1,21 +1,16 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
 
 public interface NodeContext<T> extends Context<T> {
 
-    CommandNode<T> getExecutedNode();
     CommandNode<T> getBaseExecutedNode();
 
-    BlockPath executedPath();
-    BlockPath fullPath();
-
-    boolean equals(Object comparison);
-
-    FallbackHandler<T> getFallbackAction();
+    SearchInfo<T> getResults();
+    BaseContext<T> getBaseContext();
 
     //TODO add more cool features like the debug message sender,
     // because NodeContext should be a collection of both context and context-specific actions? /review a248
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
index 722c31e..7850d1d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
@@ -1,10 +1,10 @@
 package me.aurium.beetle.branch.launchpoints.base;
 
+import me.aurium.beetle.branch.fallback.permission.strategies.CommonFallbackStrategy;
 import me.aurium.beetle.branch.handlers.context.ContextProducer;
 import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.permission.strategies.ExecutionFallbackStrategy;
-import me.aurium.beetle.branch.fallback.permission.strategies.FallbackPermStrategy;
 
 import java.util.Arrays;
 import java.util.Objects;
@@ -15,7 +15,7 @@ public class NodeBaseBuilder<T> {
 
     private CommandNode<T> base;
     private FallbackHandler<T> fallbackHandler = (shit) -> shit.messageSender("Error running command with arguments: " + Arrays.toString(shit.getArgs()));
-    private ExecutionFallbackStrategy<T> strategy = new FallbackPermStrategy<>();
+    private ExecutionFallbackStrategy<T> strategy = new CommonFallbackStrategy<>();
 
     public <X> NodeBaseBuilder(ContextProducer<T> producer) {
         this.producer = producer;
@@ -44,6 +44,8 @@ public NodeBase<T> build() {
         Objects.requireNonNull(fallbackHandler);
         Objects.requireNonNull(strategy);
 
-        return new SimpleNodeBase<>(base,producer,fallbackHandler,strategy);
+        return null;
+
+        //return new SimpleNodeBase<>(base,producer,fallbackHandler,strategy);
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
new file mode 100644
index 0000000..e89eeae
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
@@ -0,0 +1,18 @@
+package me.aurium.beetle.branch.launchpoints.base;
+
+import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+
+public class SimpleBaseContext<T> implements BaseContext<T> {
+
+    private final FallbackHandler<T> handler;
+
+    public SimpleBaseContext(FallbackHandler<T> handler) {
+        this.handler = handler;
+    }
+
+    @Override
+    public FallbackHandler<T> getFallback() {
+        return handler;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
index ff26611..83ed597 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
@@ -1,8 +1,8 @@
 package me.aurium.beetle.branch.launchpoints.base;
 
+import me.aurium.beetle.branch.fallback.message.BaseContext;
 import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.permission.strategies.ExecutionFallbackStrategy;
 
 import java.util.List;
@@ -12,20 +12,24 @@ public class SimpleNodeBase<C> implements NodeBase<C> {
     private final CommandNode<C> baseNode;
     private final ContextProducer<C> factory;
 
-    private final FallbackHandler<C> fallbackHandler;
+    private final BaseContext<C> baseContext;
     private final ExecutionFallbackStrategy<C> strategy;
 
-    public <X> SimpleNodeBase(CommandNode<C> baseNode, ContextProducer<C> factory, FallbackHandler<C> fallbackHandler, ExecutionFallbackStrategy<C> strategy) {
+    public <X> SimpleNodeBase(CommandNode<C> baseNode, ContextProducer<C> factory, BaseContext<C> baseContext, ExecutionFallbackStrategy<C> strategy) {
 
         this.baseNode = baseNode;
         this.factory = factory;
-        this.fallbackHandler = fallbackHandler;
+        this.baseContext = baseContext;
         this.strategy = strategy;
     }
 
     @Override
     public void execute(C executor, String alias, String[] args) {
-        strategy.executeStrategy(executor,alias,args,baseNode, fallbackHandler, factory);
+        strategy.attemptPreprocess(executor,alias,args,baseNode).ifPresentOrElse(
+                result -> strategy.attemptExecution(executor,alias,args,baseNode,result,baseContext,factory),
+                //else
+                () -> baseContext.getFallback().handle(factory.produce(executor, alias, args))
+        );
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
index 4e62cbe..2eb688b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
@@ -7,7 +7,6 @@
 public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
 
     OUTPUT adapt(INPUT input);
-
     boolean canAdapt(INPUT input);
 
     Consumer<INPUT> failedAdaptAction();
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
index 3190ab2..5c0114f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
@@ -1,19 +1,9 @@
 package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.argument.Argument;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
-import me.aurium.beetle.branch.nodes.result.ExecutionResult;
-import me.aurium.beetle.branch.nodes.result.NodeResult;
-import me.aurium.beetle.branch.fallback.permission.Permission;
-
-import java.util.List;
-
 //kinda like a branching node except it throws forward and not to the sides
 
 //one of these days ill actually finish this class LMFAO
+/*
 public class ArgumentNode<T> implements IdentifiableNode<T> {
 
     private final Block identifier;
@@ -37,15 +27,18 @@ public ArgumentNode(Block identifier, List<Argument<?>> sequentialValueNodes, Si
 
 
     @Override
-    public NodeResult<T> getSpecificNode(BlockPath path) {
-        return new NodeResult<>(this,path);
+    public SearchResult<T> getSpecificNode(SearchInput input) {
+        return new SearchResult<>(this, input);
     }
 
-    /*if (path.isEmpty()) return Optional.of(noArgs);
+    */
+/*if (path.isEmpty()) return Optional.of(noArgs);
+
+        return Optional.of(this);*//*
 
-        return Optional.of(this);*/
 
-        /* This was pointless, see below note
+        */
+/* This was pointless, see below note
 
         //we can either do this shit, or we can return **THIS** no matter what and let the context handler be variable, since the context handler delegates
         //to another adapter anyways
@@ -57,12 +50,13 @@ public NodeResult<T> getSpecificNode(BlockPath path) {
         if (position == size) return Optional.of(sequentialValueNodes.get(size - 1));
 
         return Optional.of(sequentialValueNodes.get(position));
-        */
+        *//*
+
 
     @Override
     public ExecutionResult<T> getExecutionHandler() {
         return new ExecutionResult<>((context) -> {
-            BlockPath executed = context.executedPath();
+            Deque<Block> executed = context.executedPath();
         });
     }
 
@@ -83,3 +77,4 @@ public Block getIdentifier() {
         return identifier;
     }
 }
+*/
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 8cb916d..3c0c42b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -1,17 +1,25 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.BranchHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
-import me.aurium.beetle.branch.nodes.result.*;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
+import me.aurium.beetle.branch.nodes.results.*;
 import me.aurium.beetle.branch.fallback.permission.Permission;
+import me.aurium.beetle.branch.nodes.results.model.FailingResult;
+import me.aurium.beetle.branch.nodes.results.model.Result;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
-import java.util.stream.Collectors;
+import java.util.Deque;
+import java.util.List;
 
 /**
- * TODO: missing a Node for noargs will cause it to rely on fallback rather than throwning exceptions and being bad
+ * TODO: missing a Node for noargs will cause it to rely on fallback rather than throwning exceptions and being bad (DONE - ish)
+ *
+ * Nodes should always assume that the first block in the blockpath is theirs to consume
+ *
  * @param <T>
  */
 public class BranchingNode<T> implements IdentifiableNode<T> {
@@ -33,19 +41,19 @@ public Block getIdentifier() {
     }
 
     @Override
-    public NodeResult<T> getSpecificNode(BlockPath blockPath) {
+    public SearchInfo<T> getSpecificNode(SearchInput input) {
 
-        if (blockPath.isEmpty()) return new NodeResult<>(this,blockPath);
+        Deque<Block> blockPath = input.getReducablePath();
 
         for (IdentifiableNode<T> node : nodes.getContents()) {
+            if (blockPath.getFirst().equals(node.getIdentifier())) {
+                blockPath.removeFirst(); //consume
 
-            BlockPath subPath = blockPath.withoutBase(); //get everything after the index
-
-            if (blockPath.startsWith(node.getIdentifier())) {
-                return node.getSpecificNode(subPath);
+                return node.getSpecificNode(input);
             }
         }
-        return new NodeResult<>(this, blockPath);
+
+        return new SearchInfo<>(this, input); //empty handling is in the strategy
     }
 
     @Override
@@ -64,11 +72,8 @@ public SuggestionHandler<T> getSuggestionHandler() {
         //TODO sort this out
 
         return (context) -> {
-            //this works because this suggestion handler only gets called if we are on this object lmfao
-            Block matchableBlock = context.executedPath().getAllBlocks().getLast();
-
-            nodes.getContents().stream().map(IdentifiableNode::getIdentifier).collect(Collectors.toList());
 
+            //this works because this suggestion handler only gets called if we are on this object lmfao
             return null;
         };
     }
@@ -78,5 +83,21 @@ public Permission<T> getPermission() {
         return permission;
     }
 
+    public static final class BranchingHandler<T> implements BranchHandler<T> {
+
+        private final CommandNode<T> alreadyPresent;
+
+        @Override
+        public void getExecution(NodeContext<T> context) {
+
+        }
+
+        @Override
+        public List<String> getSuggestions(NodeContext<T> context) {
+            return null;
+        }
+
+    }
+
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index 12d982d..f772c54 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -1,14 +1,16 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.handlers.EmptySuggestionHandler;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.api.EndpointNode;
-import me.aurium.beetle.branch.nodes.result.ExecutionResult;
-import me.aurium.beetle.branch.nodes.result.NodeResult;
+import me.aurium.beetle.branch.nodes.model.EndpointNode;
+import me.aurium.beetle.branch.nodes.results.ExecutionResult;
+import me.aurium.beetle.branch.nodes.results.SearchInput;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.fallback.permission.Permission;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+import me.aurium.beetle.branch.nodes.results.model.SuccessfulResult;
 
 public class SingleNode<T> implements EndpointNode<T> {
 
@@ -34,10 +36,13 @@ public Block getIdentifier() {
     }
 
     @Override
-    public NodeResult<T> getSpecificNode(BlockPath blockPath) {
-        return new NodeResult<>(this,blockPath);
+    public Result<SearchInfo<T>> getSpecificNode(SearchInput input) {
+        input.getReducablePath().removeFirst(); //consume
+
+        return new SuccessfulResult<>(new SearchInfo<>(this,input));
     }
 
+    //TODO these maybe need to go somewhere else to a sort of parser
     @Override
     public ExecutionResult<T> getExecutionHandler() {
         return new ExecutionResult<>(executionHandler);
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/Argument.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
similarity index 91%
rename from core/src/main/java/me/aurium/beetle/branch/argument/Argument.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
index 67de9e0..40fcee4 100644
--- a/core/src/main/java/me/aurium/beetle/branch/argument/Argument.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.argument;
+package me.aurium.beetle.branch.nodes.argument;
 
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
similarity index 77%
rename from core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
index 33cd043..efb6561 100644
--- a/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.argument;
+package me.aurium.beetle.branch.nodes.argument;
 
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContextHandler.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
similarity index 66%
rename from core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContextHandler.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
index 0af2801..70dd276 100644
--- a/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContextHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.argument;
+package me.aurium.beetle.branch.nodes.argument;
 
 public interface ArgumentContextHandler<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
new file mode 100644
index 0000000..50de57a
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes.argument;
+
+public interface ArgumentConvertet {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
new file mode 100644
index 0000000..f8b17e0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes.argument;
+
+public class Arguments {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
index 9bc8f6c..c0b580f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
@@ -6,8 +6,8 @@
 import me.aurium.beetle.branch.fallback.permission.Permission;
 import me.aurium.beetle.branch.fallback.permission.permissions.EmptyPermission;
 import me.aurium.beetle.branch.nodes.BranchingNode;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
 import java.util.HashSet;
@@ -47,6 +47,12 @@ public void withPermission(Permission<T> permission) {
         this.permission = permission;
     }
 
+    public BranchingBuilder<T> addNode(IdentifiableNode<T> node) {
+        commands.add(node);
+
+        return this;
+    }
+
     public <C extends Builder<T>> void withNode(C key, Consumer<C> consumer) {
         consumer.accept(key);
 
@@ -100,4 +106,8 @@ public CommandNode<T> buildWithoutIdentifier() {
 
         return new BranchingNode<>(set, EmptyBlock.of(), permission);
     }
+
+    public static <C> BranchingBuilder<C> make() {
+        return new BranchingBuilder<>();
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
index 2194533..eef2d03 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
@@ -1,8 +1,7 @@
 package me.aurium.beetle.branch.nodes.builders;
 
-import me.aurium.beetle.branch.fallback.message.BuilderMessageProvider;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
 
 public interface Builder<C>{
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
index 0af465f..7b81e72 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
@@ -5,7 +5,7 @@
 import me.aurium.beetle.branch.block.StringBlock;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.nodes.SingleNode;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.permission.Permission;
 import me.aurium.beetle.branch.fallback.permission.permissions.EmptyPermission;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
similarity index 62%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
index 2d2ab04..cde6f34 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
@@ -1,10 +1,11 @@
-package me.aurium.beetle.branch.nodes.api;
+package me.aurium.beetle.branch.nodes.model;
 
-import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.result.ExecutionResult;
-import me.aurium.beetle.branch.nodes.result.NodeResult;
+import me.aurium.beetle.branch.nodes.results.ExecutionResult;
+import me.aurium.beetle.branch.nodes.results.SearchInput;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.fallback.permission.Permission;
+import me.aurium.beetle.branch.nodes.results.model.Result;
 
 /**
  * Base object
@@ -12,7 +13,7 @@
  */
 public interface CommandNode<T> {
 
-    NodeResult<T> getSpecificNode(BlockPath path);
+    SearchInfo<T> getSpecificNode(SearchInput path);
 
     ExecutionResult<T> getExecutionHandler();
     SuggestionHandler<T> getSuggestionHandler();
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
similarity index 83%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
index c15cf37..ee3358e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.api;
+package me.aurium.beetle.branch.nodes.model;
 
 /**
  * Marker interface for a node that is alone (so not branching, but not merging either)
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
similarity index 75%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
index ce79bb6..f94d74d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.api;
+package me.aurium.beetle.branch.nodes.model;
 
 import me.aurium.beetle.branch.block.Block;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
new file mode 100644
index 0000000..1988067
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes.model;
+
+public class ResponseHandler {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
deleted file mode 100644
index 5a92051..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package me.aurium.beetle.branch.nodes.result;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-
-public class NodeResult<T> {
-
-    private final CommandNode<T> calculatedNode;
-    private final BlockPath calculatedPath;
-
-    public NodeResult(CommandNode<T> calculatedNode, BlockPath calculatedPath) {
-        this.calculatedNode = calculatedNode;
-        this.calculatedPath = calculatedPath;
-    }
-
-    public CommandNode<T> resultingNode() {
-        return calculatedNode;
-    }
-
-    public BlockPath resultingPath() {
-        return calculatedPath;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/ExecutionResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
similarity index 91%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/result/ExecutionResult.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
index 2e77d8f..b475977 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/result/ExecutionResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.result;
+package me.aurium.beetle.branch.nodes.results;
 
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
new file mode 100644
index 0000000..85c5e9c
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
@@ -0,0 +1,33 @@
+package me.aurium.beetle.branch.nodes.results;
+
+import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+
+import java.util.Deque;
+
+public class SearchInfo<T> {
+
+    private final CommandNode<T> calculatedNode;
+    private final SearchInput input;
+
+    public SearchInfo(CommandNode<T> calculatedNode, SearchInput input) {
+        this.calculatedNode = calculatedNode;
+        this.input = input;
+    }
+
+    public CommandNode<T> resultingNode() {
+        return calculatedNode;
+    }
+
+    public Deque<Block> initialPath() {
+        return input.getInitialPath();
+    }
+
+    public Deque<Block> reducedPath() {
+        return input.getReducablePath();
+    }
+
+    public boolean hasMoreArguments() {
+        return !input.getReducablePath().isEmpty();
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
new file mode 100644
index 0000000..c3fbf13
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
@@ -0,0 +1,48 @@
+package me.aurium.beetle.branch.nodes.results;
+
+import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.block.StringBlock;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+public class SearchInput {
+
+    private final Deque<Block> initialPath;
+    private final Deque<Block> reducablePath;
+
+    public SearchInput(Deque<Block> initialPath, Deque<Block> reducablePath) {
+        this.initialPath = initialPath;
+        this.reducablePath = reducablePath;
+    }
+
+    public Deque<Block> getInitialPath() {
+        return initialPath;
+    }
+
+    public Deque<Block> getReducablePath() {
+        return reducablePath;
+    }
+
+    public SearchInput withoutTop() {
+        Deque<Block> newBase = new ArrayDeque<>(initialPath);
+
+        newBase.removeLast();
+
+        return of(newBase);
+    }
+
+    public static SearchInput of(Deque<Block> initialPath) {
+        return new SearchInput(initialPath,new ArrayDeque<>(initialPath));
+    }
+
+    public static SearchInput of(String[] args) {
+        Deque<Block> blocks = new ArrayDeque<>();
+
+        for (String string : args) {
+            blocks.addLast(StringBlock.of(string));
+        }
+
+        return of(blocks);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
new file mode 100644
index 0000000..ed2ddf9
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes.results;
+
+public class SuggestionResult {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
new file mode 100644
index 0000000..a4a14e5
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
@@ -0,0 +1,24 @@
+package me.aurium.beetle.branch.nodes.results.model;
+
+import me.aurium.beetle.branch.fallback.failure.Failure;
+
+import java.util.Optional;
+
+public class FailingResult<T> implements Result<T> {
+
+    private final Failure failure;
+
+    public FailingResult(Failure failure) {
+        this.failure = failure;
+    }
+
+    @Override
+    public Optional<T> getSuccess() {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<Failure> getFailure() {
+        return Optional.of(failure);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
new file mode 100644
index 0000000..a6d6472
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
@@ -0,0 +1,12 @@
+package me.aurium.beetle.branch.nodes.results.model;
+
+import me.aurium.beetle.branch.fallback.failure.Failure;
+
+import java.util.Optional;
+
+public interface Result<T> {
+
+    Optional<T> getSuccess();
+    Optional<Failure> getFailure();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
new file mode 100644
index 0000000..36e33bb
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
@@ -0,0 +1,24 @@
+package me.aurium.beetle.branch.nodes.results.model;
+
+import me.aurium.beetle.branch.fallback.failure.Failure;
+
+import java.util.Optional;
+
+public class SuccessfulResult<T> implements Result<T> {
+
+    private final T sucessful;
+
+    public SuccessfulResult(T sucessful) {
+        this.sucessful = sucessful;
+    }
+
+    @Override
+    public Optional<T> getSuccess() {
+        return Optional.of(sucessful);
+    }
+
+    @Override
+    public Optional<Failure> getFailure() {
+        return Optional.empty();
+    }
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index 203ce45..444e1ef 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -1,9 +1,9 @@
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.fallback.message.BaseContext;
 import me.aurium.beetle.branch.handlers.context.AbstractNodeContext;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
@@ -11,10 +11,10 @@ public class SpigotContext<T extends CommandSender> extends AbstractNodeContext<
 
     private final T sender;
 
-    public SpigotContext(T sender, String alias, String[] args, CommandNode<T> executed, CommandNode<T> base, BlockPath executedPath, BlockPath fullPath, FallbackHandler<T> handler) {
-        super(sender, alias, args, executed, base, executedPath, fullPath, handler);
+    protected SpigotContext(T t, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
+        super(t, alias, strings, baseNode, result, baseContext);
 
-        this.sender = sender;
+        this.sender = t;
     }
 
     @Override
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
index c8fa56e..d2700b1 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
@@ -1,13 +1,13 @@
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.fallback.message.BaseContext;
 import me.aurium.beetle.branch.handlers.context.Context;
 import me.aurium.beetle.branch.handlers.context.ContextProducer;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.launchpoints.IllegalSenderException;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.command.CommandSender;
 
 public class SpigotContextProducer<C extends CommandSender> implements ContextProducer<C> {
@@ -18,20 +18,22 @@ public <T> SpigotContextProducer(ManagerAdapter<CommandSender,C> adapter) {
         this.adapter = adapter;
     }
 
-    @Override
-    public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> executedNode, CommandNode<C> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<C> handler) {
 
+    @Override
+    public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> baseNode, SearchInfo<C> search, BaseContext<C> baseContext) {
         if (!adapter.canAdapt(sender)) {
             adapter.failedAdaptAction();
 
+            //delegate to baseContext's stuff
+
             throw new IllegalSenderException("Sender is not instance of correct type!"); //TODO more fallback bullshit :)
         }
 
-        return new SpigotContext<>(adapter.adapt(sender), alias,strings,executedNode,baseNode,executedPath,basePath,handler);
+        return new SpigotContext<>(adapter.adapt(sender),alias,strings,baseNode,search,baseContext);
     }
 
     @Override
     public Context<C> produce(C sender, String alias, String[] strings) {
-        return produce(sender, alias, strings,null,null,null,null,null);
+        return produce(sender, alias, strings,null,null,null);
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
new file mode 100644
index 0000000..4ea5efc
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
@@ -0,0 +1,22 @@
+package me.aurium.beetle.branch.spigot.message;
+
+import me.aurium.beetle.branch.fallback.message.CommonKeys;
+import me.aurium.beetle.branch.fallback.message.Message;
+import me.aurium.beetle.branch.fallback.message.MessageKey;
+import me.aurium.beetle.branch.fallback.message.MessageProvider;
+import org.bukkit.command.CommandSender;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SpigotMessageProvider<C extends CommandSender> implements MessageProvider<C> {
+
+    public Map<MessageKey,Message<C>> make() {
+        Map<MessageKey,Message<C>> messMap = new HashMap<>();
+
+        messMap.put(CommonKeys.TOO_MANY_ARGS, new TextMessage<>("&7HI THERE IDIOT FACE! You provided %args% args!"));
+
+        return messMap;
+    }
+
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
new file mode 100644
index 0000000..035074a
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
@@ -0,0 +1,18 @@
+package me.aurium.beetle.branch.spigot.message;
+
+import me.aurium.beetle.branch.fallback.message.Message;
+import org.bukkit.command.CommandSender;
+
+public class TextMessage<C extends CommandSender> implements Message<C> {
+
+    private final String coloredStringToSend;
+
+    public TextMessage(String coloredStringToSend) {
+        this.coloredStringToSend = coloredStringToSend;
+    }
+
+    @Override
+    public void accept(C sender, Object... info) {
+        sender.sendMessage(String.format(coloredStringToSend,info));
+    }
+}
diff --git a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
index abe418c..da76a28 100644
--- a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
+++ b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
@@ -1,6 +1,5 @@
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.nodes.builders.SingleBuilder;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class ExampleBinding extends JavaPlugin {
diff --git a/spigot-impl/src/test/resources/plugin.yml b/spigot-impl/src/test/resources/plugin.yml
new file mode 100644
index 0000000..e69de29

From ba8b34cc8ff4f5814708b4af6747bb1a42d434b8 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Wed, 7 Apr 2021 00:27:15 -0700
Subject: [PATCH 26/56] work on the response system a bit more

---
 .../marker/permission/StringPermChecker.java  |  2 +-
 .../parsers/PermissionAnnotationParser.java   |  6 +-
 .../branch/fallback/failure/Failure.java      | 13 ----
 .../fallback/failure/SendableFailure.java     | 30 --------
 .../branch/fallback/message/BaseContext.java  | 11 ---
 .../branch/fallback/message/CommonKeys.java   |  7 --
 .../branch/fallback/message/Message.java      |  7 --
 .../fallback/message/MessageHandler.java      |  7 --
 .../branch/fallback/message/MessageInfo.java  | 21 ------
 .../branch/fallback/message/MessageKey.java   | 16 ----
 .../fallback/message/MessageProvider.java     | 10 ---
 .../fallback/message/MessageRequirement.java  | 24 ------
 .../message/impl/CommonMessageHandler.java    | 27 -------
 .../branch/fallback/message/impl/Shit.java    | 41 -----------
 .../strategies/ExecutionFallbackStrategy.java | 18 -----
 .../permissions/EmptyPermission.java          |  4 +-
 .../Permission.java                           |  4 +-
 .../PredicatePermission.java                  |  2 +-
 .../StringPermission.java                     |  4 +-
 .../strategies/FallbackSearchStrategy.java    | 13 ++++
 .../OneBackStrategy.java}                     | 29 +++++---
 .../{util => fun}/PreStoredHashSet.java       |  6 +-
 .../branch/handlers/api/BranchHandler.java    |  3 +-
 .../beetle/branch/handlers/api/Execution.java | 11 +++
 .../branch/handlers/api/FallbackHandler.java  | 14 ----
 .../handlers/context/AbstractContext.java     | 30 --------
 .../handlers/context/AbstractNodeContext.java | 27 ++++++-
 .../branch/handlers/context/Context.java      | 11 ---
 ...textProducer.java => ContextProvider.java} |  4 +-
 .../branch/handlers/context/NodeContext.java  | 28 ++++++-
 .../branch/interfacing/BlurbParser.java       |  8 ++
 .../beetle/branch/interfacing/CoreKeys.java   | 14 ++++
 .../FallbackPair.java                         |  4 +-
 .../branch/interfacing/ResultInterfacer.java  |  4 +
 .../branch/interfacing/message/Message.java   |  9 +++
 .../interfacing/message/Requirement.java      | 13 ++++
 .../message/impl/CommonMessageHandler.java    | 35 +++++++++
 .../message/impl/CommonResponseHandler.java   | 27 +++++++
 .../message/model/InterfacingHandler.java     | 16 ++++
 .../message/model/MessageInfo.java            | 24 ++++++
 .../message/model/MessageProvider.java        | 13 ++++
 .../message/model/ResponseHandler.java        | 18 +++++
 .../responses/ExecutionResponse.java          | 17 +++++
 .../responses/SendableResponse.java           | 27 +++++++
 .../common/NoPermissionResponse.java          | 20 +++++
 .../branch/launchpoints/base/NodeBase.java    |  2 +-
 .../launchpoints/base/NodeBaseBuilder.java    | 34 ++-------
 .../launchpoints/base/SimpleBaseContext.java  | 18 -----
 .../launchpoints/base/SimpleNodeBase.java     | 39 ----------
 .../launchpoints/base/SyncNodeBase.java       | 56 ++++++++++++++
 .../typeadapter/CommonAdapter.java            |  6 +-
 .../typeadapter/ManagerAdapter.java           |  6 +-
 .../beetle/branch/nodes/BranchingNode.java    | 61 +++++++++-------
 .../beetle/branch/nodes/SingleNode.java       | 73 +++++++++++++------
 .../nodes/builders/BranchingBuilder.java      |  6 +-
 .../branch/nodes/builders/SingleBuilder.java  |  4 +-
 .../branch/nodes/model/CommandNode.java       |  9 +--
 .../nodes/results/model/FailingResult.java    | 21 +++---
 .../branch/nodes/results/model/Result.java    | 19 +++--
 .../nodes/results/model/SuccessfulResult.java | 17 +++--
 .../beetle/branch/spigot/SpigotContext.java   |  2 +-
 ...oducer.java => SpigotContextProvider.java} |  7 +-
 .../beetle/branch/spigot/SpigotManager.java   |  2 +-
 .../spigot/message/AdventureMessage.java      |  4 +
 .../branch/spigot/message/SpigotKeys.java     |  9 +++
 .../spigot/message/SpigotMessageProvider.java | 26 +++++--
 .../branch/spigot/message/TextMessage.java    |  2 +-
 .../toPlayer/FailedAdaptingResponse.java      | 14 ++++
 .../spigot/{ => toPlayer}/PlayerAdapter.java  | 15 +---
 69 files changed, 604 insertions(+), 527 deletions(-)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
 rename core/src/main/java/me/aurium/beetle/branch/fallback/{permission => }/permissions/EmptyPermission.java (57%)
 rename core/src/main/java/me/aurium/beetle/branch/fallback/{permission => permissions}/Permission.java (62%)
 rename core/src/main/java/me/aurium/beetle/branch/fallback/{permission => permissions}/PredicatePermission.java (87%)
 rename core/src/main/java/me/aurium/beetle/branch/fallback/{permission => permissions}/StringPermission.java (65%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
 rename core/src/main/java/me/aurium/beetle/branch/fallback/{permission/strategies/CommonFallbackStrategy.java => strategies/OneBackStrategy.java} (67%)
 rename core/src/main/java/me/aurium/beetle/branch/{util => fun}/PreStoredHashSet.java (92%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/context/Context.java
 rename core/src/main/java/me/aurium/beetle/branch/handlers/context/{ContextProducer.java => ContextProvider.java} (81%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
 rename core/src/main/java/me/aurium/beetle/branch/{fallback => interfacing}/FallbackPair.java (59%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
 rename spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/{SpigotContextProducer.java => SpigotContextProvider.java} (82%)
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java
 rename spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/{ => toPlayer}/PlayerAdapter.java (57%)

diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
index eba19f6..5009a76 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.annotate.marker.permission;
 
-import me.aurium.beetle.branch.fallback.permission.StringPermission;
+import me.aurium.beetle.branch.fallback.permissions.StringPermission;
 
 public interface StringPermChecker {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
index 5a1882c..4b98904 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.annotate.parsers;
 
 import me.aurium.beetle.branch.annotate.marker.permission.Permission;
-import me.aurium.beetle.branch.fallback.permission.StringPermission;
+import me.aurium.beetle.branch.fallback.permissions.StringPermission;
 
 import java.lang.annotation.Annotation;
 
@@ -9,7 +9,7 @@
 public class PermissionAnnotationParser<T> {
 
 
-    me.aurium.beetle.branch.fallback.permission.Permission<T> parse(Annotation annotate) throws IllegalAccessException, InstantiationException {
+    me.aurium.beetle.branch.fallback.permissions.Permission<T> parse(Annotation annotate) throws IllegalAccessException, InstantiationException {
 
         if (!annotate.annotationType().equals(Permission.class)) throw new PermissionParsingException("Annotation must be of type Permission");
 
@@ -21,7 +21,7 @@ me.aurium.beetle.branch.fallback.permission.Permission<T> parse(Annotation annot
         StringPermission<?> perm = permission.getRelativeChecker().newInstance().get(permission.permission());
 
 
-        return (me.aurium.beetle.branch.fallback.permission.Permission<T>) perm;
+        return (me.aurium.beetle.branch.fallback.permissions.Permission<T>) perm;
     }
 
     public static class PermissionParsingException extends RuntimeException {
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
deleted file mode 100644
index b2d9495..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.fallback.failure;
-
-import me.aurium.beetle.branch.fallback.message.MessageKey;
-import me.aurium.beetle.branch.fallback.message.MessageRequirement;
-
-public interface Failure {
-
-    MessageKey getCorrelatedMessage();
-    MessageRequirement[] getRequirements();
-
-    Throwable toThrowable();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
deleted file mode 100644
index ff624a5..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package me.aurium.beetle.branch.fallback.failure;
-
-import me.aurium.beetle.branch.fallback.message.MessageKey;
-import me.aurium.beetle.branch.fallback.message.MessageRequirement;
-
-public class SendableFailure implements Failure{
-
-    private final MessageKey key;
-    private final MessageRequirement[] requirements;
-
-    public SendableFailure(MessageKey key, MessageRequirement... requirements) {
-        this.key = key;
-        this.requirements = requirements;
-    }
-
-    @Override
-    public MessageKey getCorrelatedMessage() {
-        return key;
-    }
-
-    @Override
-    public MessageRequirement[] getRequirements() {
-        return requirements;
-    }
-
-    @Override
-    public Throwable toThrowable() {
-        return new IllegalStateException();
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
deleted file mode 100644
index 0db1c78..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-
-public interface BaseContext<T> {
-
-    FallbackHandler<T> getFallback();
-
-    //TODO message stuff
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
deleted file mode 100644
index b0a2054..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public class CommonKeys {
-
-    public static final MessageKey TOO_MANY_ARGS = new MessageKey("TOO_MANY_ARGS");
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
deleted file mode 100644
index ecc910c..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public interface Message<C> {
-
-    void accept(C c, Object... strings);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
deleted file mode 100644
index 3f2c7aa..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public interface MessageHandler<T> {
-
-    void sendMessage(T t, MessageInfo key);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
deleted file mode 100644
index 2100c6b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public class MessageInfo {
-
-    private final MessageKey key;
-    private final Object[] args;
-
-    public MessageInfo(MessageKey key, Object[] args) {
-        this.key = key;
-        this.args = args;
-    }
-
-    public MessageKey getKey() {
-        return key;
-    }
-
-    public Object[] getStrings() {
-        return args;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
deleted file mode 100644
index 4dd0382..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public class MessageKey {
-
-    private final String key;
-
-    public MessageKey(String key) {
-        this.key = key;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
deleted file mode 100644
index 6b6338d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public interface MessageProvider<T> {
-
-    Map<MessageKey,Message<T>> make();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
deleted file mode 100644
index 933f94e..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public class MessageRequirement {
-
-    private final String key;
-    private final String value;
-
-    private MessageRequirement(String key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    public static MessageRequirement of(String key, String value) {
-        return new MessageRequirement(key, value);
-    }
-
-    public String getKey() {
-        return this.key;
-    }
-
-    public String getValue() {
-        return this.value;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
deleted file mode 100644
index 0ec2584..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.fallback.message.impl;
-
-import me.aurium.beetle.branch.fallback.message.*;
-
-import java.util.Map;
-
-public class CommonMessageHandler<T> implements MessageHandler<T> {
-
-    private final Map<MessageKey, Message<T>> messages;
-
-    public CommonMessageHandler(Map<MessageKey, Message<T>> messages) {
-        this.messages = messages;
-    }
-
-    public CommonMessageHandler(MessageProvider<T> messages) {
-        this.messages = messages.make();
-    }
-
-    @Override
-    public void sendMessage(T t, MessageInfo info) {
-        Message<T> message = messages.get(info.getKey());
-
-        if (message == null) throw new IllegalArgumentException("No message mapped to key!");
-
-        message.accept(t);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
deleted file mode 100644
index c61e2e7..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package me.aurium.beetle.branch.fallback.message.impl;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-/*
-
-public class DefaultBuilderMessageProvider implements BuilderMessageProvider<Object> {
-
-    @Override
-    public void handleDefaultSingle(NodeContext<Object> context) {
-
-
-    }
-
-    @Override
-    public void handleDefaultBranching(NodeContext<Object> context) {
-
-        */
-/*StringBuilder fuk = new StringBuilder("/");
-
-        context.fullPath().withoutTop().getAllBlocks().getBackingList().forEach(blok -> {
-            fuk.append(blok).append(" ");
-        });
-
-        String finalFuk = fuk.toString();
-
-        List<String> alternatives = new ArrayList<>(); //TODO make parameter
-
-        for (String string : alternatives) {
-            context.messageSender(finalFuk + string);
-        }*//*
-
-
-
-    }
-
-    @Override
-    public void handleDefaultValue(NodeContext<Object> context) {
-
-    }
-}
-*/
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
deleted file mode 100644
index c903cef..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
-
-import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
-
-import java.util.Optional;
-
-public interface ExecutionFallbackStrategy<T> {
-
-
-    Optional<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode);
-    void attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProducer<T> producer);
-
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
similarity index 57%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/permissions/EmptyPermission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
index b68d78c..a2c2125 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
@@ -1,6 +1,4 @@
-package me.aurium.beetle.branch.fallback.permission.permissions;
-
-import me.aurium.beetle.branch.fallback.permission.Permission;
+package me.aurium.beetle.branch.fallback.permissions;
 
 public class EmptyPermission<T> implements Permission<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
similarity index 62%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/Permission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
index f6f48d2..464979a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.fallback.permission;
+package me.aurium.beetle.branch.fallback.permissions;
 
 /**
  *
@@ -7,4 +7,6 @@ public interface Permission<T> {
 
    boolean attempt(T sender, String alias, String[] args); //because fuck you
 
+   String easyName();
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/PredicatePermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/PredicatePermission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
index b6cc15f..77609e6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/PredicatePermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.fallback.permission;
+package me.aurium.beetle.branch.fallback.permissions;
 
 import java.util.function.Predicate;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
similarity index 65%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
index e53a1a8..836aa47 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
@@ -1,6 +1,4 @@
-package me.aurium.beetle.branch.fallback.permission;
-
-import me.aurium.beetle.branch.fallback.permission.Permission;
+package me.aurium.beetle.branch.fallback.permissions;
 
 /**
  * Represents a permission that is controlled by a string identifier
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
new file mode 100644
index 0000000..ef0d2fd
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.fallback.strategies;
+
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+
+public interface FallbackSearchStrategy<T> {
+
+
+    Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode);
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
similarity index 67%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
index 057a3d4..fc5a47e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
@@ -1,47 +1,52 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
+package me.aurium.beetle.branch.fallback.strategies;
 
+import me.aurium.beetle.branch.interfacing.responses.common.NoPermissionResponse;
 import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.api.Execution;
+import me.aurium.beetle.branch.handlers.context.ContextProvider;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.nodes.results.model.Result;
 
-import java.util.Optional;
-
-public class CommonFallbackStrategy<T> implements ExecutionFallbackStrategy<T> {
+public class OneBackStrategy<T> implements FallbackSearchStrategy<T> {
 
     @Override
-    public Optional<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode) {
+    public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode) {
 
         SearchInput input = SearchInput.of(args);
-
         SearchInfo<T> toBeExecuted = baseNode.getSpecificNode(input);
 
 
         //1. Check permissions and access (preprocessing)
 
-        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args) || toBeExecuted.resultingNode().getExecutionHandler().getExecution().isEmpty()) {
+        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args)) {
             //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
 
             if (toBeExecuted.resultingNode().equals(baseNode)) {
-                return Optional.empty();
+                return Result.fail(new NoPermissionResponse(baseNode));
 
             } else {
                 toBeExecuted = baseNode.getSpecificNode(input.withoutTop()); //regress backwards a node
             }
         }
 
-        return Optional.of(toBeExecuted);
+        return Result.success(toBeExecuted);
     }
 
 
     @Override
-    public void attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProducer<T> producer) {
+    public Result<Execution> attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProvider<T> producer) {
         NodeContext<T> produced = producer.produce(sender,alias,args,baseNode, result, baseContext);
 
-        result.resultingNode().getExecutionHandler().getExecution().orElseThrow().handle(produced); //this should never be null thanks to the preprocess
+        Result<Execution> info = result.resultingNode().getHandling().getExecution(produced);
+
+        if (!info.isSuccessful()) {
+            return info;
+        }
+
+        result.resultingNode().getHandling().getExecutionHandler().getExecution().orElseThrow().handle(produced); //this should never be null thanks to the preprocess
     }
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java
similarity index 92%
rename from core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
rename to core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java
index 33af162..b8cb810 100644
--- a/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.util;
+package me.aurium.beetle.branch.fun;
 
 import java.util.HashSet;
 import java.util.Optional;
@@ -56,8 +56,8 @@ public Set<T> getContents() {
      * get already store thing
      * @return already stored thing or null
      */
-    public Optional<T> getAlreadyStored() {
-        return Optional.ofNullable(alreadyStored);
+    public T getAlreadyStored() {
+        return alreadyStored;
     }
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
index 4d4ac58..3704010 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
@@ -1,12 +1,13 @@
 package me.aurium.beetle.branch.handlers.api;
 
 import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.nodes.results.model.Result;
 
 import java.util.List;
 
 public interface BranchHandler<T> {
 
-    void getExecution(NodeContext<T> context);
+    Result<Execution> getExecution(NodeContext<T> context);
     List<String> getSuggestions(NodeContext<T> context);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
new file mode 100644
index 0000000..c22d3d6
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.handlers.api;
+
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+
+public class Execution {
+    private final Runnable runnable;
+
+    public Execution(Runnable runnable) {
+        this.runnable = runnable;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
deleted file mode 100644
index 4f90b4f..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package me.aurium.beetle.branch.handlers.api;
-
-import me.aurium.beetle.branch.handlers.context.Context;
-
-/**
- * Represents the fallback handler of a base that manages what happens when everything goes wrong
- *
- * EDIT THIS IS NO LONGER A FALLBACK HANDLER THIS IS ONLY FOR IF SOMETHIGN GOES HELL WRONG
- */
-public interface FallbackHandler<T>  {
-
-    void handle(Context<T> context);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractContext.java
deleted file mode 100644
index 8636ea4..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractContext.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package me.aurium.beetle.branch.handlers.context;
-
-public abstract class AbstractContext<T> implements Context<T> {
-
-    private final T t;
-    private final String alias;
-    private final String[] args;
-
-    protected AbstractContext(T t, String alias, String[] args) {
-        this.t = t;
-        this.alias = alias;
-        this.args = args;
-    }
-
-    @Override
-    public T getSender() {
-        return t;
-    }
-
-    @Override
-    public String getAlias() {
-        return alias;
-    }
-
-    @Override
-    public String[] getArgs() {
-        return args;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
index bd253c2..62a24a8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
@@ -4,20 +4,41 @@
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
-public abstract class AbstractNodeContext<T> extends AbstractContext<T> implements NodeContext<T> {
+public abstract class AbstractNodeContext<T> implements NodeContext<T> {
+
+    private final T sender;
+    private final String alias;
+    private final String[] args;
 
     private final CommandNode<T> baseNode;
     private final SearchInfo<T> searchInfo;
     private final BaseContext<T> baseContext;
 
-    protected AbstractNodeContext(T t, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
-        super(t, alias, strings);
+    protected AbstractNodeContext(T t, String sender, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
+        this.sender = t;
+        this.alias = sender;
+        this.args = args;
 
         this.baseContext = baseContext;
         this.searchInfo = result;
         this.baseNode = baseNode;
     }
 
+    @Override
+    public T getSender() {
+        return sender;
+    }
+
+    @Override
+    public String getAlias() {
+        return alias;
+    }
+
+    @Override
+    public String[] getArgs() {
+        return args;
+    }
+
     @Override
     public CommandNode<T> getBaseExecutedNode() {
         return baseNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/Context.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/Context.java
deleted file mode 100644
index efd485b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/Context.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch.handlers.context;
-
-public interface Context<T> {
-
-    T getSender();
-    String getAlias();
-    String[] getArgs();
-
-    void messageSender(String string);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
similarity index 81%
rename from core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
rename to core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
index 72f672b..b9ec494 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
@@ -7,10 +7,8 @@
 /**
  * Produces context adapters, like the stock ContextSource for contexts.
  */
-public interface ContextProducer<T> {
+public interface ContextProvider<T> {
 
     NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search, BaseContext<T> baseContext);
 
-    Context<T> produce(T sender, String alias, String[] strings);
-
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
index 77924db..b0cf26b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
@@ -1,18 +1,38 @@
 package me.aurium.beetle.branch.handlers.context;
 
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.interfacing.message.Message;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
 
-public interface NodeContext<T> extends Context<T> {
+public interface NodeContext<T> {
 
+    T getSender();
+    String getAlias();
+    String[] getArgs();
     CommandNode<T> getBaseExecutedNode();
-
     SearchInfo<T> getResults();
     BaseContext<T> getBaseContext();
 
-    //TODO add more cool features like the debug message sender,
-    // because NodeContext should be a collection of both context and context-specific actions? /review a248
+    /**
+     * Sends an ugly string to the player using the platform's message handler. Whatever floats your boat!
+     * @param string string
+     */
+    void stringSender(String string);
+
+    /**
+     * Sends a fancy formatted message to a player using the bound platform's message-handler
+     * @param message message
+     */
+    void messageSender(Message<? extends T> message);
+
+    /**
+     * Sends a fancy formatted failure to a player that is bound to a Message using the platform's message-handler
+     * @param failure the failure
+     */
+    void failureSender(ExecutionResponse failure);
+
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
new file mode 100644
index 0000000..8fc534b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
@@ -0,0 +1,8 @@
+package me.aurium.beetle.branch.interfacing;
+
+public interface BlurbParser {
+
+    void parse(BlurbParser parser);
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
new file mode 100644
index 0000000..35a337d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
@@ -0,0 +1,14 @@
+package me.aurium.beetle.branch.interfacing;
+
+import java.util.UUID;
+
+public class CoreKeys {
+
+    public static final UUID TOO_MANY_ARGS = UUID.randomUUID();
+    public static final UUID NO_INTEGRATED_NOARGS = UUID.randomUUID();
+
+    //When someone has no permissions to execute a node
+    public static final UUID NO_PERMISSIONS = UUID.randomUUID();
+    public static final UUID FAILED_ADAPTING = UUID.randomUUID();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
similarity index 59%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java
rename to core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
index c205e9f..1ae0b2c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
@@ -1,6 +1,4 @@
-package me.aurium.beetle.branch.fallback;
-
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+package me.aurium.beetle.branch.interfacing;
 
 public interface FallbackPair {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
new file mode 100644
index 0000000..695a43a
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.interfacing;
+
+public interface ResultInterfacer {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
new file mode 100644
index 0000000..88c6a85
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.interfacing.message;
+
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+
+public interface Message<C> {
+
+    void accept(C sender);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
new file mode 100644
index 0000000..4de91fa
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.interfacing.message;
+
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+
+/**
+ * rename messageRequirement
+ * @param <C>
+ */
+public interface Requirement<C> {
+
+    Message<C> toMessage(MessageInfo... infos);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
new file mode 100644
index 0000000..2c14de4
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
@@ -0,0 +1,35 @@
+package me.aurium.beetle.branch.interfacing.message.impl;
+
+import me.aurium.beetle.branch.interfacing.message.model.InterfacingHandler;
+import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
+import me.aurium.beetle.branch.interfacing.message.model.ResponseHandler;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+
+public class CommonMessageHandler<T> implements InterfacingHandler<T> {
+
+    private final ResponseHandler<T> handler;
+
+    public CommonMessageHandler(MessageProvider<T> provider) {
+        this.handler = new CommonResponseHandler<>(provider);
+    }
+
+    public CommonMessageHandler(ResponseHandler<T> handler) {
+        this.handler = handler;
+    }
+
+    @Override
+    public void sendMessage(T recipent, Message<T> message) {
+        message.accept(recipent);
+    }
+
+    @Override
+    public void sendMessage(T recipent, ExecutionResponse response) {
+        handler.sendMessage(recipent,response);
+    }
+
+    @Override
+    public void sendMessage(T recipent, String message) {
+
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
new file mode 100644
index 0000000..8ab63a8
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.interfacing.message.impl;
+
+import me.aurium.beetle.branch.interfacing.message.Requirement;
+import me.aurium.beetle.branch.interfacing.message.model.ResponseHandler;
+import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+
+import java.util.Map;
+import java.util.UUID;
+
+public class CommonResponseHandler<T> implements ResponseHandler<T> {
+
+    private final Map<UUID, Requirement<T>> requirements;
+
+    public CommonResponseHandler(MessageProvider<T> requirements) {
+        this.requirements = requirements.make();
+    }
+
+    @Override
+    public void sendMessage(T sender, ExecutionResponse info) {
+        Requirement<T> requirement = requirements.get(info.getCorrelatedMessage());
+
+        if (requirement == null) throw new IllegalArgumentException("No message mapped to key!");
+
+        requirement.toMessage(info.getRequirements()).accept(sender);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
new file mode 100644
index 0000000..2f46895
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
@@ -0,0 +1,16 @@
+package me.aurium.beetle.branch.interfacing.message.model;
+
+import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+
+/**
+ * Represents a centralized source for message providing as well as context creation. I am aware i spelled recipient wrong.
+ * @param <T> the type
+ */
+public interface InterfacingHandler<T> {
+
+    void sendMessage(T recipent, Message<T> message);
+    void sendMessage(T recipent, ExecutionResponse response);
+    void sendMessage(T recipent, String message);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
new file mode 100644
index 0000000..94dcd88
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
@@ -0,0 +1,24 @@
+package me.aurium.beetle.branch.interfacing.message.model;
+
+public class MessageInfo {
+
+    private final String key;
+    private final String value;
+
+    public MessageInfo(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public static MessageInfo of(String key, String value) {
+        return new MessageInfo(key, value);
+    }
+
+    public String getKey() {
+        return this.key;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
new file mode 100644
index 0000000..d9d049b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.interfacing.message.model;
+
+import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.message.Requirement;
+
+import java.util.Map;
+import java.util.UUID;
+
+public interface MessageProvider<T> {
+
+    Map<UUID, Requirement<T>> make();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
new file mode 100644
index 0000000..dc5191a
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
@@ -0,0 +1,18 @@
+package me.aurium.beetle.branch.interfacing.message.model;
+
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+
+/**
+ * Represents something that will handle the accessing of responses from the bound map and sending them.
+ * @param <T> the type
+ */
+public interface ResponseHandler<T> {
+
+    /**
+     * Sends a message bound to the execution response, or throws an exception if not present
+     * @param sender the sender
+     * @param key the response to send
+     */
+    void sendMessage(T sender, ExecutionResponse key);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
new file mode 100644
index 0000000..7a336aa
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
@@ -0,0 +1,17 @@
+package me.aurium.beetle.branch.interfacing.responses;
+
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+
+import java.util.UUID;
+
+/**
+ * Represents a prebuilt response to a request or command that is bound to the handler.
+ */
+public interface ExecutionResponse {
+
+    UUID getCorrelatedMessage();
+    MessageInfo[] getRequirements();
+
+    //TODO to throwable
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
new file mode 100644
index 0000000..61f8916
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.interfacing.responses;
+
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+
+import java.util.UUID;
+
+public class SendableResponse implements ExecutionResponse {
+
+    private final UUID key;
+    private final MessageInfo[] requirements;
+
+    public SendableResponse(UUID key, MessageInfo... requirements) {
+        this.key = key;
+        this.requirements = requirements;
+    }
+
+    @Override
+    public UUID getCorrelatedMessage() {
+        return key;
+    }
+
+    @Override
+    public MessageInfo[] getRequirements() {
+        return requirements;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
new file mode 100644
index 0000000..0816cf5
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
@@ -0,0 +1,20 @@
+package me.aurium.beetle.branch.interfacing.responses.common;
+
+import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
+import me.aurium.beetle.branch.interfacing.CoreKeys;
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+
+public class NoPermissionResponse extends SendableResponse {
+
+    public NoPermissionResponse(CommandNode<?> node) {
+        super(CoreKeys.NO_PERMISSIONS, new NoPermissionInfo(node));
+    }
+
+    public static class NoPermissionInfo extends MessageInfo {
+
+        public NoPermissionInfo(CommandNode<?> node) {
+            super("permission", node.getPermission().easyName());
+        }
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
index edfad8f..83813b1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
@@ -4,7 +4,7 @@
 
 public interface NodeBase<T> {
 
-    void execute(T t, String alias, String[] args);
+    void execute(T t, String alias, String[] args); //may execute instantly or take some time
     List<String> suggest(T t, String alias, String[] args);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
index 7850d1d..b3ea0ff 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
@@ -1,23 +1,18 @@
 package me.aurium.beetle.branch.launchpoints.base;
 
-import me.aurium.beetle.branch.fallback.permission.strategies.CommonFallbackStrategy;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
+import me.aurium.beetle.branch.handlers.context.ContextProvider;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.fallback.permission.strategies.ExecutionFallbackStrategy;
-
-import java.util.Arrays;
-import java.util.Objects;
+import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
 
 public class NodeBaseBuilder<T> {
 
-    private final ContextProducer<T> producer;
+    private final ContextProvider<T> producer;
 
     private CommandNode<T> base;
-    private FallbackHandler<T> fallbackHandler = (shit) -> shit.messageSender("Error running command with arguments: " + Arrays.toString(shit.getArgs()));
-    private ExecutionFallbackStrategy<T> strategy = new CommonFallbackStrategy<>();
+    private FallbackSearchStrategy<T> strategy = new OneBackStrategy<>();
 
-    public <X> NodeBaseBuilder(ContextProducer<T> producer) {
+    public <X> NodeBaseBuilder(ContextProvider<T> producer) {
         this.producer = producer;
     }
 
@@ -27,25 +22,10 @@ public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
         return this;
     }
 
-    public NodeBaseBuilder<T> withFallback(FallbackHandler<T> fallback) {
-        this.fallbackHandler = fallback;
-
-        return this;
-    }
-
-    public NodeBaseBuilder<T> withStrategy(ExecutionFallbackStrategy<T> strategy) {
+    public NodeBaseBuilder<T> withStrategy(FallbackSearchStrategy<T> strategy) {
         this.strategy = strategy;
 
         return this;
     }
 
-    public NodeBase<T> build() {
-        Objects.requireNonNull(base);
-        Objects.requireNonNull(fallbackHandler);
-        Objects.requireNonNull(strategy);
-
-        return null;
-
-        //return new SimpleNodeBase<>(base,producer,fallbackHandler,strategy);
-    }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
deleted file mode 100644
index e89eeae..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.base;
-
-import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-
-public class SimpleBaseContext<T> implements BaseContext<T> {
-
-    private final FallbackHandler<T> handler;
-
-    public SimpleBaseContext(FallbackHandler<T> handler) {
-        this.handler = handler;
-    }
-
-    @Override
-    public FallbackHandler<T> getFallback() {
-        return handler;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
deleted file mode 100644
index 83ed597..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.base;
-
-import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.fallback.permission.strategies.ExecutionFallbackStrategy;
-
-import java.util.List;
-
-public class SimpleNodeBase<C> implements NodeBase<C> {
-
-    private final CommandNode<C> baseNode;
-    private final ContextProducer<C> factory;
-
-    private final BaseContext<C> baseContext;
-    private final ExecutionFallbackStrategy<C> strategy;
-
-    public <X> SimpleNodeBase(CommandNode<C> baseNode, ContextProducer<C> factory, BaseContext<C> baseContext, ExecutionFallbackStrategy<C> strategy) {
-
-        this.baseNode = baseNode;
-        this.factory = factory;
-        this.baseContext = baseContext;
-        this.strategy = strategy;
-    }
-
-    @Override
-    public void execute(C executor, String alias, String[] args) {
-        strategy.attemptPreprocess(executor,alias,args,baseNode).ifPresentOrElse(
-                result -> strategy.attemptExecution(executor,alias,args,baseNode,result,baseContext,factory),
-                //else
-                () -> baseContext.getFallback().handle(factory.produce(executor, alias, args))
-        );
-    }
-
-    @Override
-    public List<String> suggest(C c, String alias, String[] args) {
-        return null;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
new file mode 100644
index 0000000..82d7493
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
@@ -0,0 +1,56 @@
+package me.aurium.beetle.branch.launchpoints.base;
+
+import me.aurium.beetle.branch.handlers.context.ContextProvider;
+import me.aurium.beetle.branch.interfacing.message.model.InterfacingHandler;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+
+import java.util.List;
+
+/**
+ * Represents a nodebase that will perform it's executions synchronously
+ * @param <C>
+ */
+public class SyncNodeBase<C> implements NodeBase<C> {
+
+    private final CommandNode<C> baseNode;
+    private final FallbackSearchStrategy<C> strategy;
+
+    private final ContextProvider<C> provider;
+    private final InterfacingHandler<C> handler;
+
+    public SyncNodeBase(CommandNode<C> baseNode, FallbackSearchStrategy<C> strategy, ContextProvider<C> provider, InterfacingHandler<C> handler) {
+        this.baseNode = baseNode;
+        this.provider = provider;
+        this.strategy = strategy;
+        this.handler = handler;
+    }
+
+    @Override
+    public void execute(C executor, String alias, String[] args) {
+        Result<SearchInfo<C>> result = strategy.attemptPreprocess(executor,alias,args,baseNode);
+
+        if (!result.isSuccessful()) {
+
+            handler.sendMessage(executor, result.getFailure());
+
+            ha
+            return;
+        }
+
+
+
+                .ifPresentOrElse(
+                result -> strategy.attemptExecution(executor,alias,args,baseNode,result,baseContext, provider),
+                //else
+                () -> baseContext.getFallback().handle(provider.produce(executor, alias, args))
+        );
+    }
+
+    @Override
+    public List<String> suggest(C c, String alias, String[] args) {
+        return null;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
index 715aa33..cf328d3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.launchpoints.typeadapter;
 
-import java.util.function.Consumer;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 
 public interface CommonAdapter<T> extends ManagerAdapter<T,T> {
 
@@ -15,7 +15,7 @@ default boolean canAdapt(T t) {
     }
 
     @Override
-    default Consumer<T> failedAdaptAction() {
-        return (i) -> {}; //noops
+    default ExecutionResponse failedAdaptAction() {
+        throw new IllegalStateException("How did you get here (Since canAdapt is always true this should never occur?)");
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
index 2eb688b..3e3ed1e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
@@ -1,14 +1,12 @@
 package me.aurium.beetle.branch.launchpoints.typeadapter;
 
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-
-import java.util.function.Consumer;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 
 public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
 
     OUTPUT adapt(INPUT input);
     boolean canAdapt(INPUT input);
 
-    Consumer<INPUT> failedAdaptAction();
+    ExecutionResponse failedAdaptAction(INPUT input);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 3c0c42b..5867f29 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -1,19 +1,20 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
+import me.aurium.beetle.branch.interfacing.CoreKeys;
 import me.aurium.beetle.branch.handlers.api.BranchHandler;
-import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+import me.aurium.beetle.branch.handlers.api.Execution;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
 import me.aurium.beetle.branch.nodes.results.*;
-import me.aurium.beetle.branch.fallback.permission.Permission;
-import me.aurium.beetle.branch.nodes.results.model.FailingResult;
+import me.aurium.beetle.branch.fallback.permissions.Permission;
 import me.aurium.beetle.branch.nodes.results.model.Result;
-import me.aurium.beetle.branch.util.PreStoredHashSet;
+import me.aurium.beetle.branch.fun.PreStoredHashSet;
 
 import java.util.Deque;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * TODO: missing a Node for noargs will cause it to rely on fallback rather than throwning exceptions and being bad (DONE - ish)
@@ -26,6 +27,7 @@ public class BranchingNode<T> implements IdentifiableNode<T> {
 
     private final PreStoredHashSet<IdentifiableNode<T>> nodes;
     private final Block path;
+    private final BranchHandler<T> handler;
 
     private final Permission<T> permission;
 
@@ -33,6 +35,8 @@ public BranchingNode(PreStoredHashSet<IdentifiableNode<T>> nodes, Block path, Pe
         this.nodes = nodes;
         this.path = path;
         this.permission = permission;
+
+        this.handler = new BranchingHandler<>(nodes);
     }
 
     @Override
@@ -57,25 +61,8 @@ public SearchInfo<T> getSpecificNode(SearchInput input) {
     }
 
     @Override
-    public ExecutionResult<T> getExecutionHandler() {
-
-        if (nodes.getAlreadyStored().isPresent()) {
-            return nodes.getAlreadyStored().get().getExecutionHandler();
-        } else {
-            return ExecutionResult.empty(); //FALL BACK SOLDIER
-        }
-
-    }
-
-    @Override
-    public SuggestionHandler<T> getSuggestionHandler() {
-        //TODO sort this out
-
-        return (context) -> {
-
-            //this works because this suggestion handler only gets called if we are on this object lmfao
-            return null;
-        };
+    public BranchHandler<T> getHandling() {
+        return handler;
     }
 
     @Override
@@ -85,19 +72,37 @@ public Permission<T> getPermission() {
 
     public static final class BranchingHandler<T> implements BranchHandler<T> {
 
-        private final CommandNode<T> alreadyPresent;
+        private final PreStoredHashSet<IdentifiableNode<T>> nodeShit;
+
+        public BranchingHandler(PreStoredHashSet<IdentifiableNode<T>> nodeShit) {
+            this.nodeShit = nodeShit;
+        }
 
-        @Override
-        public void getExecution(NodeContext<T> context) {
 
+        @Override
+        public Result<Execution> getExecution(NodeContext<T> context) {
+            if (nodeShit.getAlreadyStored() == null) {
+                return Result.fail(new NoIntegratedNoArgsBlurb());
+            } else {
+                return nodeShit.getAlreadyStored().getHandling().getExecution(context);
+            }
         }
 
         @Override
         public List<String> getSuggestions(NodeContext<T> context) {
-            return null;
+
+            //TODO fix this bullshit, add close-to-queue
+            return nodeShit.getContents().stream().map(s -> s.getIdentifier().getIdentifier()).collect(Collectors.toList());
         }
 
     }
 
+    public static final class NoIntegratedNoArgsBlurb extends SendableResponse {
+
+        public NoIntegratedNoArgsBlurb() {
+            super(CoreKeys.NO_INTEGRATED_NOARGS);
+        }
+    }
+
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index f772c54..71d04a6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -1,33 +1,33 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.EmptySuggestionHandler;
+import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
+import me.aurium.beetle.branch.interfacing.CoreKeys;
+import me.aurium.beetle.branch.handlers.api.BranchHandler;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+import me.aurium.beetle.branch.handlers.api.Execution;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.nodes.model.EndpointNode;
-import me.aurium.beetle.branch.nodes.results.ExecutionResult;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
-import me.aurium.beetle.branch.fallback.permission.Permission;
+import me.aurium.beetle.branch.fallback.permissions.Permission;
 import me.aurium.beetle.branch.nodes.results.model.Result;
-import me.aurium.beetle.branch.nodes.results.model.SuccessfulResult;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class SingleNode<T> implements EndpointNode<T> {
 
     private final Block identifier;
-
-    private final ExecutionHandler<T> executionHandler;
-    private final SuggestionHandler<T> suggestionHandler;
-
     private final Permission<T> permission;
 
+    private final SingleHandler<T> handler;
+
     public SingleNode(Block identifier, ExecutionHandler<T> executionHandler, Permission<T> permission) {
         this.identifier = identifier;
 
-        this.executionHandler = executionHandler;
+        this.handler = new SingleHandler<>(executionHandler);
         this.permission = permission;
-
-        this.suggestionHandler = new EmptySuggestionHandler<>();
     }
 
     @Override
@@ -36,27 +36,58 @@ public Block getIdentifier() {
     }
 
     @Override
-    public Result<SearchInfo<T>> getSpecificNode(SearchInput input) {
+    public SearchInfo<T> getSpecificNode(SearchInput input) {
         input.getReducablePath().removeFirst(); //consume
 
-        return new SuccessfulResult<>(new SearchInfo<>(this,input));
+        return new SearchInfo<>(this,input);
     }
 
-    //TODO these maybe need to go somewhere else to a sort of parser
     @Override
-    public ExecutionResult<T> getExecutionHandler() {
-        return new ExecutionResult<>(executionHandler);
+    public BranchHandler<T> getHandling() {
+        return handler;
     }
 
-    @Override
-    public SuggestionHandler<T> getSuggestionHandler() {
-        return suggestionHandler;
-    }
 
     @Override
     public Permission<T> getPermission() {
         return permission;
     }
 
+    public static class SingleHandler<T> implements BranchHandler<T> {
+
+        private final ExecutionHandler<T> handler;
+
+        public SingleHandler(ExecutionHandler<T> handler) {
+            this.handler = handler;
+        }
+
+        @Override
+        public Result<Execution> getExecution(NodeContext<T> context) {
+            context.getResults().reducedPath().removeFirst();
+
+            if (context.getResults().hasMoreArguments()) {
+                return Result.fail(new TooManyArgumentsBlurb());
+            }
+
+            return Result.success(new Execution(() -> {
+                handler.handle(context);
+            }));
+        }
+
+        @Override
+        public List<String> getSuggestions(NodeContext<T> context) {
+            return new ArrayList<>();
+        }
+
+    }
+
+    public static class TooManyArgumentsBlurb extends SendableResponse {
+
+        public TooManyArgumentsBlurb() {
+            super(CoreKeys.TOO_MANY_ARGS);
+        }
+
+    }
+
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
index c0b580f..ef31a7c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
@@ -3,12 +3,12 @@
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.EmptyBlock;
 import me.aurium.beetle.branch.block.StringBlock;
-import me.aurium.beetle.branch.fallback.permission.Permission;
-import me.aurium.beetle.branch.fallback.permission.permissions.EmptyPermission;
+import me.aurium.beetle.branch.fallback.permissions.Permission;
+import me.aurium.beetle.branch.fallback.permissions.EmptyPermission;
 import me.aurium.beetle.branch.nodes.BranchingNode;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
-import me.aurium.beetle.branch.util.PreStoredHashSet;
+import me.aurium.beetle.branch.fun.PreStoredHashSet;
 
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
index 7b81e72..8804bf6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
@@ -6,8 +6,8 @@
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.nodes.SingleNode;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.fallback.permission.Permission;
-import me.aurium.beetle.branch.fallback.permission.permissions.EmptyPermission;
+import me.aurium.beetle.branch.fallback.permissions.Permission;
+import me.aurium.beetle.branch.fallback.permissions.EmptyPermission;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
index cde6f34..3bf26f8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
@@ -1,11 +1,9 @@
 package me.aurium.beetle.branch.nodes.model;
 
-import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.results.ExecutionResult;
+import me.aurium.beetle.branch.handlers.api.BranchHandler;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
-import me.aurium.beetle.branch.fallback.permission.Permission;
-import me.aurium.beetle.branch.nodes.results.model.Result;
+import me.aurium.beetle.branch.fallback.permissions.Permission;
 
 /**
  * Base object
@@ -14,9 +12,8 @@
 public interface CommandNode<T> {
 
     SearchInfo<T> getSpecificNode(SearchInput path);
+    BranchHandler<T> getHandling();
 
-    ExecutionResult<T> getExecutionHandler();
-    SuggestionHandler<T> getSuggestionHandler();
 
     /**
      * Gets the permission required to execute and interact with this node. Depending on the base, this may cause the node to become locked, or just completely be ignored.
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
index a4a14e5..11eb7df 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
@@ -1,24 +1,27 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.fallback.failure.Failure;
-
-import java.util.Optional;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 
 public class FailingResult<T> implements Result<T> {
 
-    private final Failure failure;
+    private final ExecutionResponse failure;
 
-    public FailingResult(Failure failure) {
+    public FailingResult(ExecutionResponse failure) {
         this.failure = failure;
     }
 
     @Override
-    public Optional<T> getSuccess() {
-        return Optional.empty();
+    public boolean isSuccessful() {
+        return false;
+    }
+
+    @Override
+    public T getSuccess() {
+        throw new IllegalStateException("Attempted to get success of a failing result! (e.g. was not checked)");
     }
 
     @Override
-    public Optional<Failure> getFailure() {
-        return Optional.of(failure);
+    public ExecutionResponse getFailure() {
+        return failure;
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
index a6d6472..9937e58 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
@@ -1,12 +1,21 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.fallback.failure.Failure;
-
-import java.util.Optional;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 
 public interface Result<T> {
 
-    Optional<T> getSuccess();
-    Optional<Failure> getFailure();
+    boolean isSuccessful();
+
+    T getSuccess();
+    ExecutionResponse getFailure();
+
+    //wow this looks familiar (i liked the functionality shhhh)
+    static <X> Result<X> success(X t) {
+        return new SuccessfulResult<>(t);
+    }
+
+    static <X> Result<X> fail(ExecutionResponse failure) {
+        return new FailingResult<>(failure);
+    }
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
index 36e33bb..c75d457 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
@@ -1,8 +1,6 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.fallback.failure.Failure;
-
-import java.util.Optional;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 
 public class SuccessfulResult<T> implements Result<T> {
 
@@ -13,12 +11,17 @@ public SuccessfulResult(T sucessful) {
     }
 
     @Override
-    public Optional<T> getSuccess() {
-        return Optional.of(sucessful);
+    public boolean isSuccessful() {
+        return true;
+    }
+
+    @Override
+    public T getSuccess() {
+        return sucessful;
     }
 
     @Override
-    public Optional<Failure> getFailure() {
-        return Optional.empty();
+    public ExecutionResponse getFailure() {
+        throw new IllegalStateException("Attempted to get failure of a successful result!");
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index 444e1ef..e5f8080 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -18,7 +18,7 @@ protected SpigotContext(T t, String alias, String[] strings, CommandNode<T> base
     }
 
     @Override
-    public void messageSender(String string) {
+    public void stringSender(String string) {
         sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string)); //TODO prettify (or just use ContextErrorMessage LMFAO)
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
similarity index 82%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
rename to spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
index d2700b1..0c24248 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
@@ -1,8 +1,7 @@
 package me.aurium.beetle.branch.spigot;
 
 import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.context.Context;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.context.ContextProvider;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.launchpoints.IllegalSenderException;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
@@ -10,11 +9,11 @@
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.command.CommandSender;
 
-public class SpigotContextProducer<C extends CommandSender> implements ContextProducer<C> {
+public class SpigotContextProvider<C extends CommandSender> implements ContextProvider<C> {
 
     private final ManagerAdapter<CommandSender,C> adapter;
 
-    public <T> SpigotContextProducer(ManagerAdapter<CommandSender,C> adapter) {
+    public <T> SpigotContextProvider(ManagerAdapter<CommandSender,C> adapter) {
         this.adapter = adapter;
     }
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index 8df5e86..9f0723d 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -23,7 +23,7 @@ public NodeBaseBuilder<CommandSender> newCommand() {
 
     @Override
     public <C extends CommandSender> NodeBaseBuilder<C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
-        return new NodeBaseBuilder<>(new SpigotContextProducer<>(adapter));
+        return new NodeBaseBuilder<>(new SpigotContextProvider<>(adapter));
     }
 
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
new file mode 100644
index 0000000..4d2ff65
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.spigot.message;
+
+public class AdventureMessage {
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
new file mode 100644
index 0000000..ffd8116
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.spigot.message;
+
+import java.util.UUID;
+
+public class SpigotKeys {
+
+
+
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
index 4ea5efc..5471fc6 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
@@ -1,22 +1,32 @@
 package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.fallback.message.CommonKeys;
-import me.aurium.beetle.branch.fallback.message.Message;
-import me.aurium.beetle.branch.fallback.message.MessageKey;
-import me.aurium.beetle.branch.fallback.message.MessageProvider;
+import me.aurium.beetle.branch.interfacing.CoreKeys;
+import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.message.Requirement;
+import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
 import org.bukkit.command.CommandSender;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 public class SpigotMessageProvider<C extends CommandSender> implements MessageProvider<C> {
 
-    public Map<MessageKey,Message<C>> make() {
-        Map<MessageKey,Message<C>> messMap = new HashMap<>();
+    private final Map<UUID, Requirement<C>> map = new HashMap<>();
+
+    public SpigotMessageProvider() {
+        map.put(CoreKeys.TOO_MANY_ARGS, new TextMessage<>("&7HI THERE IDIOT FACE! You provided %args% args!"));
+    }
+
+    public SpigotMessageProvider<C> with(UUID uuid, Requirement<C> requirement) {
+        this.map.put(uuid,requirement);
+
+        return this;
+    }
 
-        messMap.put(CommonKeys.TOO_MANY_ARGS, new TextMessage<>("&7HI THERE IDIOT FACE! You provided %args% args!"));
 
-        return messMap;
+    public final Map<UUID, Requirement<C>>make() {
+        return map;
     }
 
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
index 035074a..372a0b7 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.fallback.message.Message;
+import me.aurium.beetle.branch.interfacing.message.Message;
 import org.bukkit.command.CommandSender;
 
 public class TextMessage<C extends CommandSender> implements Message<C> {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java
new file mode 100644
index 0000000..dd221b6
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java
@@ -0,0 +1,14 @@
+package me.aurium.beetle.branch.spigot.toPlayer;
+
+import me.aurium.beetle.branch.interfacing.CoreKeys;
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
+
+import java.util.UUID;
+
+public class FailedAdaptingResponse extends SendableResponse {
+
+    public FailedAdaptingResponse(String expected_type, String actual_type) {
+        super(CoreKeys.FAILED_ADAPTING, new MessageInfo("expected_type",toAdapt.getClass().getName()), new MessageInfo("actual_type",));
+    }
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
similarity index 57%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java
rename to spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
index 4f49a25..a68a81a 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
@@ -1,19 +1,12 @@
-package me.aurium.beetle.branch.spigot;
+package me.aurium.beetle.branch.spigot.toPlayer;
 
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.function.Consumer;
-
 public class PlayerAdapter implements ManagerAdapter<CommandSender, Player> {
 
-    private final Consumer<CommandSender> failedOperation;
-
-    public PlayerAdapter(Consumer<CommandSender> failedOperation) {
-        this.failedOperation = failedOperation;
-    }
-
     @Override
     public Player adapt(CommandSender sender) {
         return (Player) sender;
@@ -25,8 +18,8 @@ public boolean canAdapt(CommandSender sender) {
     }
 
     @Override
-    public Consumer<CommandSender> failedAdaptAction() {
-        return failedOperation;
+    public ExecutionResponse failedAdaptAction() {
+        return new FailedAdaptingResponse(null);
     }
 
 }

From 6fe88d0102524ac9e02a3920632666dae34229c7 Mon Sep 17 00:00:00 2001
From: Auriium <aukrais@gmail.com>
Date: Wed, 7 Apr 2021 20:45:09 -0700
Subject: [PATCH 27/56] intermediary commit, finish up basics of message and
 response system

---
 core/pom.xml                                  |  2 +-
 .../fallback/permissions/EmptyPermission.java |  5 +++
 .../permissions/PredicatePermission.java      |  9 +++-
 .../fallback/strategies/OneBackStrategy.java  | 42 ++++++++++---------
 .../strategies/PermissionLockoutStrategy.java | 26 ++++++++++++
 .../branch/handlers/api/BranchHandler.java    |  2 +-
 .../beetle/branch/handlers/api/Execution.java | 16 +++++--
 .../handlers/context/AbstractNodeContext.java | 14 ++-----
 .../handlers/context/ContextProvider.java     |  3 +-
 .../branch/handlers/context/NodeContext.java  | 14 +++----
 .../branch/interfacing/BlurbParser.java       |  8 ----
 .../beetle/branch/interfacing/CoreKeys.java   | 14 -------
 .../branch/interfacing/FallbackPair.java      |  7 ----
 .../branch/interfacing/ResultInterfacer.java  |  4 --
 .../common/FailedAdaptingResponse.java        | 27 ++++++++++++
 .../common/NoIntegratedArgsResponse.java      | 36 ++++++++++++++++
 .../common/NoPermissionResponse.java          | 16 +++++++
 .../common/TooManyArgsResponse.java           | 22 ++++++++++
 .../handlers/CommonInterfacingHandler.java    | 26 ++++++++++++
 .../handlers/CommonMessageMap.java            | 22 ++++++++++
 .../handlers/CommonResponseActionHandler.java | 32 ++++++++++++++
 .../handlers/InterfacingHandler.java          | 15 +++++++
 .../interfacing/handlers/MessageMap.java      | 11 +++++
 .../interfacing/handlers/MessageProvider.java | 12 ++++++
 .../handlers/ResponseActionHandler.java       | 13 ++++++
 .../branch/interfacing/message/Message.java   |  9 ----
 .../interfacing/message/Requirement.java      | 13 ------
 .../message/impl/CommonMessageHandler.java    | 35 ----------------
 .../message/impl/CommonResponseHandler.java   | 27 ------------
 .../message/model/InterfacingHandler.java     | 16 -------
 .../message/model/MessageInfo.java            | 24 -----------
 .../message/model/MessageProvider.java        | 13 ------
 .../message/model/ResponseHandler.java        | 18 --------
 .../branch/interfacing/model/Message.java     |  7 ++++
 .../branch/interfacing/model/Response.java    |  5 +++
 .../interfacing/model/ResponseAction.java     |  9 ++++
 .../responses/ExecutionResponse.java          | 17 --------
 .../responses/SendableResponse.java           | 27 ------------
 .../common/NoPermissionResponse.java          | 20 ---------
 .../launchpoints/base/NodeBaseBuilder.java    |  6 +--
 .../launchpoints/base/SyncNodeBase.java       | 21 ++++++----
 .../typeadapter/CommonAdapter.java            | 15 ++++---
 .../typeadapter/ManagerAdapter.java           |  9 +++-
 .../beetle/branch/nodes/BranchingNode.java    | 16 ++-----
 .../beetle/branch/nodes/SingleNode.java       | 30 +++++++------
 .../nodes/builders/BranchingBuilder.java      |  2 +-
 .../branch/nodes/results/ExecutionResult.java | 22 ----------
 .../nodes/results/SuggestionResult.java       |  4 --
 .../nodes/results/model/FailingResult.java    | 13 ++++--
 .../branch/nodes/results/model/Result.java    |  9 ++--
 .../nodes/results/model/SuccessfulResult.java |  4 +-
 .../{fun => utility}/PreStoredHashSet.java    |  3 +-
 .../beetle/branch/spigot/SpigotContext.java   | 25 ++++++++---
 .../branch/spigot/SpigotContextProvider.java  | 22 ++++------
 .../beetle/branch/spigot/SpigotManager.java   |  4 +-
 .../spigot/message/FancyTextMessage.java      |  4 ++
 .../spigot/message/SpigotMessageProvider.java | 30 ++++---------
 .../branch/spigot/message/TextMessage.java    | 15 ++++---
 .../toPlayer/FailedAdaptingResponse.java      | 14 -------
 .../branch/spigot/toPlayer/PlayerAdapter.java |  7 ++--
 60 files changed, 463 insertions(+), 450 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
 rename core/src/main/java/me/aurium/beetle/branch/{fun => utility}/PreStoredHashSet.java (96%)
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
 delete mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java

diff --git a/core/pom.xml b/core/pom.xml
index 09d2689..1f7cb8a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>me.aurium</groupId>
             <artifactId>beetle-core</artifactId>
-            <version>0.4.1</version>
+            <version>1.1.1</version>
         </dependency>
     </dependencies>
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
index a2c2125..d6c4831 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
@@ -6,4 +6,9 @@ public class EmptyPermission<T> implements Permission<T> {
     public boolean attempt(T sender, String alias, String[] args) {
         return true;
     }
+
+    @Override
+    public String easyName() {
+        return "none"; //TODO perhaps throw? This shouldn't happen.
+    }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
index 77609e6..20232bb 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
@@ -4,9 +4,11 @@
 
 public class PredicatePermission<T> implements Permission<T> {
 
+    private final String easyName;
     private final Predicate<T> predicate;
 
-    public PredicatePermission(Predicate<T> predicate) {
+    public PredicatePermission(String easyName, Predicate<T> predicate) {
+        this.easyName = easyName;
         this.predicate = predicate;
     }
 
@@ -14,4 +16,9 @@ public PredicatePermission(Predicate<T> predicate) {
     public boolean attempt(T sender, String alias, String[] args) {
         return predicate.test(sender);
     }
+
+    @Override
+    public String easyName() {
+        return easyName;
+    }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
index fc5a47e..4b635e2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
@@ -1,15 +1,32 @@
 package me.aurium.beetle.branch.fallback.strategies;
 
-import me.aurium.beetle.branch.interfacing.responses.common.NoPermissionResponse;
-import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.api.Execution;
-import me.aurium.beetle.branch.handlers.context.ContextProvider;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.common.NoPermissionResponse;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.nodes.results.model.Result;
 
+/**
+ * Fallback and processing strategy that does the following actions:
+ *
+ * Attempts to get a node via arguments search. It then checks if the user has permission to access the node.
+ * If they do not, it falls back a single node and checks again. This repeats until the user has permission or
+ * until the search reaches the base node, in which case a response is fired as a failure.
+ *
+ * In practice:
+ *
+ * Node tree looks like
+ *
+ * /kitpvp moderation ban
+ * /kitpvp moderation kick
+ *
+ * User has permissions for kitpvp.moderation but not kitpvp.moderation.ban and tries to execute kitpvp moderation ban
+ *
+ * Searcher sees no permissions for ban command and so it falls back to the no-args of /kitpvp moderation which is
+ * then executed.
+ *
+ * @param <T>
+ */
 public class OneBackStrategy<T> implements FallbackSearchStrategy<T> {
 
     @Override
@@ -25,7 +42,7 @@ public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[]
             //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
 
             if (toBeExecuted.resultingNode().equals(baseNode)) {
-                return Result.fail(new NoPermissionResponse(baseNode));
+                return Result.fail(new NoPermissionResponse(baseNode.getPermission().easyName()));
 
             } else {
                 toBeExecuted = baseNode.getSpecificNode(input.withoutTop()); //regress backwards a node
@@ -36,19 +53,6 @@ public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[]
     }
 
 
-    @Override
-    public Result<Execution> attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProvider<T> producer) {
-        NodeContext<T> produced = producer.produce(sender,alias,args,baseNode, result, baseContext);
-
-        Result<Execution> info = result.resultingNode().getHandling().getExecution(produced);
-
-        if (!info.isSuccessful()) {
-            return info;
-        }
-
-        result.resultingNode().getHandling().getExecutionHandler().getExecution().orElseThrow().handle(produced); //this should never be null thanks to the preprocess
-    }
-
 
     //TODO old code - refer to it if you need to
     /*SearchInput input = SearchInput.of(args);
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
new file mode 100644
index 0000000..e283963
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
@@ -0,0 +1,26 @@
+package me.aurium.beetle.branch.fallback.strategies;
+
+import me.aurium.beetle.branch.interfacing.common.NoPermissionResponse;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.beetle.branch.nodes.results.SearchInput;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+
+/**
+ * Simple fallback strategy that if the sender has no permission to execute the command they are sent a failing response.
+ * @param <T>
+ */
+public class PermissionLockoutStrategy<T> implements FallbackSearchStrategy<T> {
+    @Override
+    public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode) {
+
+        SearchInput input = SearchInput.of(args);
+        SearchInfo<T> toBeExecuted = baseNode.getSpecificNode(input);
+
+        if (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args)) {
+            return Result.fail(new NoPermissionResponse(toBeExecuted.resultingNode().getPermission().easyName()));
+        }
+
+        return Result.success(toBeExecuted);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
index 3704010..631aaa2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
@@ -7,7 +7,7 @@
 
 public interface BranchHandler<T> {
 
-    Result<Execution> getExecution(NodeContext<T> context);
+    Result<Execution<T>> getExecution(NodeContext<T> context);
     List<String> getSuggestions(NodeContext<T> context);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
index c22d3d6..ec9af67 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
@@ -2,10 +2,18 @@
 
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 
-public class Execution {
-    private final Runnable runnable;
+public class Execution<T> implements Runnable {
 
-    public Execution(Runnable runnable) {
-        this.runnable = runnable;
+    private final ExecutionHandler<T> handler;
+    private final NodeContext<T> node;
+
+    public Execution(ExecutionHandler<T> handler, NodeContext<T> node) {
+        this.handler = handler;
+        this.node = node;
+    }
+
+    @Override
+    public void run() {
+        handler.handle(node);
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
index 62a24a8..43e046f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.fallback.message.BaseContext;
+
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
@@ -12,14 +12,12 @@ public abstract class AbstractNodeContext<T> implements NodeContext<T> {
 
     private final CommandNode<T> baseNode;
     private final SearchInfo<T> searchInfo;
-    private final BaseContext<T> baseContext;
 
-    protected AbstractNodeContext(T t, String sender, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
-        this.sender = t;
-        this.alias = sender;
+    protected AbstractNodeContext(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result) {
+        this.sender = sender;
+        this.alias = alias;
         this.args = args;
 
-        this.baseContext = baseContext;
         this.searchInfo = result;
         this.baseNode = baseNode;
     }
@@ -49,8 +47,4 @@ public SearchInfo<T> getResults() {
         return searchInfo;
     }
 
-    @Override
-    public BaseContext<T> getBaseContext() {
-        return baseContext;
-    }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
index b9ec494..714f186 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
@@ -1,6 +1,5 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.fallback.message.BaseContext;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
@@ -9,6 +8,6 @@
  */
 public interface ContextProvider<T> {
 
-    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search, BaseContext<T> baseContext);
+    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
index b0cf26b..fc0927e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
@@ -1,8 +1,7 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
-import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
@@ -14,7 +13,6 @@ public interface NodeContext<T> {
     String[] getArgs();
     CommandNode<T> getBaseExecutedNode();
     SearchInfo<T> getResults();
-    BaseContext<T> getBaseContext();
 
     /**
      * Sends an ugly string to the player using the platform's message handler. Whatever floats your boat!
@@ -26,13 +24,13 @@ public interface NodeContext<T> {
      * Sends a fancy formatted message to a player using the bound platform's message-handler
      * @param message message
      */
-    void messageSender(Message<? extends T> message);
+    void messageSender(Message<T> message);
 
     /**
-     * Sends a fancy formatted failure to a player that is bound to a Message using the platform's message-handler
-     * @param failure the failure
+     * Sends a formatted response to a player coded to a key
+     * @param failure the response
      */
-    void failureSender(ExecutionResponse failure);
+    void response(Response failure);
 
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
deleted file mode 100644
index 8fc534b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package me.aurium.beetle.branch.interfacing;
-
-public interface BlurbParser {
-
-    void parse(BlurbParser parser);
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
deleted file mode 100644
index 35a337d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package me.aurium.beetle.branch.interfacing;
-
-import java.util.UUID;
-
-public class CoreKeys {
-
-    public static final UUID TOO_MANY_ARGS = UUID.randomUUID();
-    public static final UUID NO_INTEGRATED_NOARGS = UUID.randomUUID();
-
-    //When someone has no permissions to execute a node
-    public static final UUID NO_PERMISSIONS = UUID.randomUUID();
-    public static final UUID FAILED_ADAPTING = UUID.randomUUID();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
deleted file mode 100644
index 1ae0b2c..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.interfacing;
-
-public interface FallbackPair {
-
-    //TODO make this liek have two things: fallback for the base and fallback pre-base (for shit like adapter fails)
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
deleted file mode 100644
index 695a43a..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.interfacing;
-
-public interface ResultInterfacer {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
new file mode 100644
index 0000000..59886b0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.interfacing.common;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+/**
+ * Represents a response to the scenario in which a certain object was attempted to be adapted to an extending type
+ * but it was not an instance of it (or similar scenarios, such as attempting to flatmap a certain type to another.)
+ */
+public class FailedAdaptingResponse implements Response {
+
+    private final Class<?> expectedClass;
+    private final Class<?> receivedClass;
+
+    public FailedAdaptingResponse(Class<?> expectedClass, Class<?> receivedClass) {
+        this.expectedClass = expectedClass;
+        this.receivedClass = receivedClass;
+    }
+
+    public Class<?> getExpectedClass() {
+        return expectedClass;
+    }
+
+    public Class<?> getReceivedClass() {
+        return receivedClass;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java
new file mode 100644
index 0000000..54037ff
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java
@@ -0,0 +1,36 @@
+package me.aurium.beetle.branch.interfacing.common;
+
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+import java.util.ArrayList;
+import java.util.List;
+
+//This can probably be improved
+
+/**
+ * Represents a response to the scenario in which not enough arguments were supplied to execute a splittable
+ * node, so all alternative commands are suggested. This needs work, however, as it cannot list all alternative commands
+ * and their arguments just yet. (logic for this must be some kind of greedy queue consumer with potentially dangerous loops)
+ */
+public class NoIntegratedArgsResponse implements Response {
+
+    private final List<String> alternativeCommands;
+
+    public NoIntegratedArgsResponse(List<String> alternativeCommands) {
+        this.alternativeCommands = alternativeCommands;
+    }
+
+    public List<String> getAlternativeCommands() {
+        return alternativeCommands;
+    }
+
+    /**
+     * Use a basic nodeContext to produce a simple no integrated args response
+     * @param context lah
+     * @return lah
+     */
+    public static NoIntegratedArgsResponse of(NodeContext<?> context) {
+        return new NoIntegratedArgsResponse(new ArrayList<>()); //TODO IMPLEMENT
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
new file mode 100644
index 0000000..fdfc797
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
@@ -0,0 +1,16 @@
+package me.aurium.beetle.branch.interfacing.common;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+public class NoPermissionResponse implements Response {
+
+    private final String lackingPermission;
+
+    public NoPermissionResponse(String lackingPermission) {
+        this.lackingPermission = lackingPermission;
+    }
+
+    public String getLackingPermission() {
+        return lackingPermission;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
new file mode 100644
index 0000000..219c1f1
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
@@ -0,0 +1,22 @@
+package me.aurium.beetle.branch.interfacing.common;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+public class TooManyArgsResponse implements Response {
+
+    private final int expectedArgs;
+    private final int suppliedArgs;
+
+    public TooManyArgsResponse(int expectedArgs, int suppliedArgs) {
+        this.expectedArgs = expectedArgs;
+        this.suppliedArgs = suppliedArgs;
+    }
+
+    public int getExpectedArgs() {
+        return expectedArgs;
+    }
+
+    public int getSuppliedArgs() {
+        return suppliedArgs;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
new file mode 100644
index 0000000..2f451b8
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
@@ -0,0 +1,26 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+import java.util.concurrent.FutureTask;
+
+public class CommonInterfacingHandler<T> implements InterfacingHandler<T> {
+
+    private final ResponseActionHandler<T> handler;
+
+    public CommonInterfacingHandler(ResponseActionHandler<T> provider) {
+        this.handler = provider;
+    }
+
+    @Override
+    public void sendMessage(T recipent, Message<T> message) {
+        message.accept(recipent);
+    }
+
+    @Override
+    public void sendMessage(T recipent, Response response) {
+        handler.getMessage(response).accept(recipent);
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
new file mode 100644
index 0000000..2acfe8b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
@@ -0,0 +1,22 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CommonMessageMap<T> implements MessageMap<T>, MessageProvider<T> {
+
+    private final Map<Class<? extends Response>,ResponseAction<T,? extends Response>> map = new HashMap<>();
+
+    @Override
+    public <F extends Response> void add(Class<F> key, ResponseAction<T, F> action) {
+        map.put(key,action); //TODO checks
+    }
+
+    @Override
+    public ResponseActionHandler<T> make() {
+        return new CommonResponseActionHandler<>(Map.copyOf(map));
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
new file mode 100644
index 0000000..0cf984f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
@@ -0,0 +1,32 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+
+import java.util.Map;
+
+public class CommonResponseActionHandler<T> implements ResponseActionHandler<T> {
+
+    private final Map<Class<? extends Response>, ResponseAction<T,? extends Response>> map;
+
+    CommonResponseActionHandler(Map<Class<? extends Response>, ResponseAction<T,? extends Response>> map) {
+        this.map = map;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <C extends Response> ResponseAction<T, C> get(Class<C> clazz) {
+        ResponseAction<T,C> action = (ResponseAction<T, C>) map.get(clazz);
+
+        if (action == null) throw new IllegalStateException("A response was requested but internal map had no binding!");
+
+        return action;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <C extends Response> Message<T> getMessage(C response) {
+        return get((Class<C>) response.getClass()).consume(response);
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
new file mode 100644
index 0000000..cc046ae
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
@@ -0,0 +1,15 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+/**
+ * Represents a centralized source for message providing as well as context creation. I am aware i spelled recipient wrong.
+ * @param <T> the type
+ */
+public interface InterfacingHandler<T> {
+
+    void sendMessage(T recipent, Message<T> message);
+    void sendMessage(T recipent, Response response);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
new file mode 100644
index 0000000..cfccf71
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.handlers.ResponseActionHandler;
+import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+
+public interface MessageMap<T> {
+
+    <F extends Response> void add(Class<F> key, ResponseAction<T,F> action);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
new file mode 100644
index 0000000..6d726fd
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
@@ -0,0 +1,12 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+
+import java.util.Map;
+
+public interface MessageProvider<T> {
+
+    ResponseActionHandler<T> make();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
new file mode 100644
index 0000000..79c346d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+
+public interface ResponseActionHandler<T> {
+
+    <C extends Response> ResponseAction<T, C> get(Class<C> clazz);
+    <C extends Response> Message<T> getMessage(C response);
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
deleted file mode 100644
index 88c6a85..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message;
-
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-
-public interface Message<C> {
-
-    void accept(C sender);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
deleted file mode 100644
index 4de91fa..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message;
-
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-
-/**
- * rename messageRequirement
- * @param <C>
- */
-public interface Requirement<C> {
-
-    Message<C> toMessage(MessageInfo... infos);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
deleted file mode 100644
index 2c14de4..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.impl;
-
-import me.aurium.beetle.branch.interfacing.message.model.InterfacingHandler;
-import me.aurium.beetle.branch.interfacing.message.Message;
-import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
-import me.aurium.beetle.branch.interfacing.message.model.ResponseHandler;
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
-
-public class CommonMessageHandler<T> implements InterfacingHandler<T> {
-
-    private final ResponseHandler<T> handler;
-
-    public CommonMessageHandler(MessageProvider<T> provider) {
-        this.handler = new CommonResponseHandler<>(provider);
-    }
-
-    public CommonMessageHandler(ResponseHandler<T> handler) {
-        this.handler = handler;
-    }
-
-    @Override
-    public void sendMessage(T recipent, Message<T> message) {
-        message.accept(recipent);
-    }
-
-    @Override
-    public void sendMessage(T recipent, ExecutionResponse response) {
-        handler.sendMessage(recipent,response);
-    }
-
-    @Override
-    public void sendMessage(T recipent, String message) {
-
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
deleted file mode 100644
index 8ab63a8..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.impl;
-
-import me.aurium.beetle.branch.interfacing.message.Requirement;
-import me.aurium.beetle.branch.interfacing.message.model.ResponseHandler;
-import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
-
-import java.util.Map;
-import java.util.UUID;
-
-public class CommonResponseHandler<T> implements ResponseHandler<T> {
-
-    private final Map<UUID, Requirement<T>> requirements;
-
-    public CommonResponseHandler(MessageProvider<T> requirements) {
-        this.requirements = requirements.make();
-    }
-
-    @Override
-    public void sendMessage(T sender, ExecutionResponse info) {
-        Requirement<T> requirement = requirements.get(info.getCorrelatedMessage());
-
-        if (requirement == null) throw new IllegalArgumentException("No message mapped to key!");
-
-        requirement.toMessage(info.getRequirements()).accept(sender);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
deleted file mode 100644
index 2f46895..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.model;
-
-import me.aurium.beetle.branch.interfacing.message.Message;
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
-
-/**
- * Represents a centralized source for message providing as well as context creation. I am aware i spelled recipient wrong.
- * @param <T> the type
- */
-public interface InterfacingHandler<T> {
-
-    void sendMessage(T recipent, Message<T> message);
-    void sendMessage(T recipent, ExecutionResponse response);
-    void sendMessage(T recipent, String message);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
deleted file mode 100644
index 94dcd88..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.model;
-
-public class MessageInfo {
-
-    private final String key;
-    private final String value;
-
-    public MessageInfo(String key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    public static MessageInfo of(String key, String value) {
-        return new MessageInfo(key, value);
-    }
-
-    public String getKey() {
-        return this.key;
-    }
-
-    public String getValue() {
-        return this.value;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
deleted file mode 100644
index d9d049b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.model;
-
-import me.aurium.beetle.branch.interfacing.message.Message;
-import me.aurium.beetle.branch.interfacing.message.Requirement;
-
-import java.util.Map;
-import java.util.UUID;
-
-public interface MessageProvider<T> {
-
-    Map<UUID, Requirement<T>> make();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
deleted file mode 100644
index dc5191a..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.model;
-
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
-
-/**
- * Represents something that will handle the accessing of responses from the bound map and sending them.
- * @param <T> the type
- */
-public interface ResponseHandler<T> {
-
-    /**
-     * Sends a message bound to the execution response, or throws an exception if not present
-     * @param sender the sender
-     * @param key the response to send
-     */
-    void sendMessage(T sender, ExecutionResponse key);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
new file mode 100644
index 0000000..d97b2ad
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.interfacing.model;
+
+public interface Message<C> {
+
+    void accept(C sender);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
new file mode 100644
index 0000000..528d185
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
@@ -0,0 +1,5 @@
+package me.aurium.beetle.branch.interfacing.model;
+
+public interface Response {
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
new file mode 100644
index 0000000..564c981
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.interfacing.model;
+
+import me.aurium.beetle.branch.interfacing.model.Message;
+
+public interface ResponseAction<T,C extends Response> {
+
+    Message<T> consume(C response);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
deleted file mode 100644
index 7a336aa..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package me.aurium.beetle.branch.interfacing.responses;
-
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-
-import java.util.UUID;
-
-/**
- * Represents a prebuilt response to a request or command that is bound to the handler.
- */
-public interface ExecutionResponse {
-
-    UUID getCorrelatedMessage();
-    MessageInfo[] getRequirements();
-
-    //TODO to throwable
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
deleted file mode 100644
index 61f8916..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.interfacing.responses;
-
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-
-import java.util.UUID;
-
-public class SendableResponse implements ExecutionResponse {
-
-    private final UUID key;
-    private final MessageInfo[] requirements;
-
-    public SendableResponse(UUID key, MessageInfo... requirements) {
-        this.key = key;
-        this.requirements = requirements;
-    }
-
-    @Override
-    public UUID getCorrelatedMessage() {
-        return key;
-    }
-
-    @Override
-    public MessageInfo[] getRequirements() {
-        return requirements;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
deleted file mode 100644
index 0816cf5..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.aurium.beetle.branch.interfacing.responses.common;
-
-import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
-import me.aurium.beetle.branch.interfacing.CoreKeys;
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-
-public class NoPermissionResponse extends SendableResponse {
-
-    public NoPermissionResponse(CommandNode<?> node) {
-        super(CoreKeys.NO_PERMISSIONS, new NoPermissionInfo(node));
-    }
-
-    public static class NoPermissionInfo extends MessageInfo {
-
-        public NoPermissionInfo(CommandNode<?> node) {
-            super("permission", node.getPermission().easyName());
-        }
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
index b3ea0ff..eb63eba 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
@@ -7,15 +7,11 @@
 
 public class NodeBaseBuilder<T> {
 
-    private final ContextProvider<T> producer;
+    private ContextProvider<T> producer;
 
     private CommandNode<T> base;
     private FallbackSearchStrategy<T> strategy = new OneBackStrategy<>();
 
-    public <X> NodeBaseBuilder(ContextProvider<T> producer) {
-        this.producer = producer;
-    }
-
     public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
         this.base = node;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
index 82d7493..0353fff 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
@@ -1,7 +1,9 @@
 package me.aurium.beetle.branch.launchpoints.base;
 
+import me.aurium.beetle.branch.handlers.api.Execution;
 import me.aurium.beetle.branch.handlers.context.ContextProvider;
-import me.aurium.beetle.branch.interfacing.message.model.InterfacingHandler;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
@@ -33,20 +35,21 @@ public void execute(C executor, String alias, String[] args) {
         Result<SearchInfo<C>> result = strategy.attemptPreprocess(executor,alias,args,baseNode);
 
         if (!result.isSuccessful()) {
-
             handler.sendMessage(executor, result.getFailure());
-
-            ha
             return;
         }
 
+        SearchInfo<C> info = result.getSuccess();
+        NodeContext<C> produced = provider.produce(executor,alias,args,baseNode,info);
+
+        Result<Execution<C>> execution = info.resultingNode().getHandling().getExecution(produced);
 
+        if (!execution.isSuccessful()) {
+            handler.sendMessage(executor, execution.getFailure());
+            return;
+        }
 
-                .ifPresentOrElse(
-                result -> strategy.attemptExecution(executor,alias,args,baseNode,result,baseContext, provider),
-                //else
-                () -> baseContext.getFallback().handle(provider.produce(executor, alias, args))
-        );
+        execution.getSuccess().run();
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
index cf328d3..84c01e3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
@@ -1,21 +1,26 @@
 package me.aurium.beetle.branch.launchpoints.typeadapter;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
+import me.aurium.beetle.branch.interfacing.model.Response;
 
+/**
+ * Represents an adapter that does not convert and simply returns the same object
+ * @param <T> the object type
+ */
 public interface CommonAdapter<T> extends ManagerAdapter<T,T> {
 
     @Override
-    default T adapt(T in) {
-        return in;
+    default T adapt(T input) {
+        return input;
     }
 
     @Override
-    default boolean canAdapt(T t) {
+    default boolean canAdapt(T input) {
         return true;
     }
 
     @Override
-    default ExecutionResponse failedAdaptAction() {
+    default FailedAdaptingResponse failedParseResponse(T input) {
         throw new IllegalStateException("How did you get here (Since canAdapt is always true this should never occur?)");
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
index 3e3ed1e..be6acdc 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
@@ -1,12 +1,17 @@
 package me.aurium.beetle.branch.launchpoints.typeadapter;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
 
+/**
+ * Represents something that can convert an object of a certain type to another object
+ * @param <INPUT> Input object type
+ * @param <OUTPUT> Output object type
+ */
 public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
 
     OUTPUT adapt(INPUT input);
     boolean canAdapt(INPUT input);
 
-    ExecutionResponse failedAdaptAction(INPUT input);
+    FailedAdaptingResponse failedParseResponse(INPUT input);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 5867f29..1f92bf7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -1,16 +1,15 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
-import me.aurium.beetle.branch.interfacing.CoreKeys;
 import me.aurium.beetle.branch.handlers.api.BranchHandler;
 import me.aurium.beetle.branch.handlers.api.Execution;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.common.NoIntegratedArgsResponse;
 import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
 import me.aurium.beetle.branch.nodes.results.*;
 import me.aurium.beetle.branch.fallback.permissions.Permission;
 import me.aurium.beetle.branch.nodes.results.model.Result;
-import me.aurium.beetle.branch.fun.PreStoredHashSet;
+import me.aurium.beetle.branch.utility.PreStoredHashSet;
 
 import java.util.Deque;
 import java.util.List;
@@ -80,9 +79,9 @@ public BranchingHandler(PreStoredHashSet<IdentifiableNode<T>> nodeShit) {
 
 
         @Override
-        public Result<Execution> getExecution(NodeContext<T> context) {
+        public Result<Execution<T>> getExecution(NodeContext<T> context) {
             if (nodeShit.getAlreadyStored() == null) {
-                return Result.fail(new NoIntegratedNoArgsBlurb());
+                return Result.fail(NoIntegratedArgsResponse.of(context));
             } else {
                 return nodeShit.getAlreadyStored().getHandling().getExecution(context);
             }
@@ -97,12 +96,5 @@ public List<String> getSuggestions(NodeContext<T> context) {
 
     }
 
-    public static final class NoIntegratedNoArgsBlurb extends SendableResponse {
-
-        public NoIntegratedNoArgsBlurb() {
-            super(CoreKeys.NO_INTEGRATED_NOARGS);
-        }
-    }
-
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index 71d04a6..5ec3ce5 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -1,12 +1,11 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
-import me.aurium.beetle.branch.interfacing.CoreKeys;
 import me.aurium.beetle.branch.handlers.api.BranchHandler;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.Execution;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.common.TooManyArgsResponse;
 import me.aurium.beetle.branch.nodes.model.EndpointNode;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
@@ -16,6 +15,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Represents a node that can do one action and takes no arguments and has no tabcompletion
+ * @param <T> the type of executor
+ */
 public class SingleNode<T> implements EndpointNode<T> {
 
     private final Block identifier;
@@ -62,16 +65,18 @@ public SingleHandler(ExecutionHandler<T> handler) {
         }
 
         @Override
-        public Result<Execution> getExecution(NodeContext<T> context) {
-            context.getResults().reducedPath().removeFirst();
+        public Result<Execution<T>> getExecution(NodeContext<T> context) {
+            SearchInfo<T> info = context.getResults();
 
-            if (context.getResults().hasMoreArguments()) {
-                return Result.fail(new TooManyArgumentsBlurb());
+            info.reducedPath().removeFirst();
+
+            if (info.hasMoreArguments()) {
+                return Result.fail(
+                        new TooManyArgsResponse(0,info.reducedPath().size()) //TODO change this so it actually reflects
+                );
             }
 
-            return Result.success(new Execution(() -> {
-                handler.handle(context);
-            }));
+            return Result.success(new Execution<>(handler,context));
         }
 
         @Override
@@ -81,13 +86,6 @@ public List<String> getSuggestions(NodeContext<T> context) {
 
     }
 
-    public static class TooManyArgumentsBlurb extends SendableResponse {
-
-        public TooManyArgumentsBlurb() {
-            super(CoreKeys.TOO_MANY_ARGS);
-        }
-
-    }
 
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
index ef31a7c..778fe2b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
@@ -8,7 +8,7 @@
 import me.aurium.beetle.branch.nodes.BranchingNode;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
-import me.aurium.beetle.branch.fun.PreStoredHashSet;
+import me.aurium.beetle.branch.utility.PreStoredHashSet;
 
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
deleted file mode 100644
index b475977..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package me.aurium.beetle.branch.nodes.results;
-
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-
-import java.util.Optional;
-
-public class ExecutionResult<T>{
-
-    private final ExecutionHandler<T> executionHandler;
-
-    public ExecutionResult(ExecutionHandler<T> executionHandler) {
-        this.executionHandler = executionHandler;
-    }
-
-    public Optional<ExecutionHandler<T>> getExecution() {
-        return Optional.ofNullable(executionHandler);
-    }
-
-    public static <C> ExecutionResult<C> empty() {
-        return new ExecutionResult<>(null);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
deleted file mode 100644
index ed2ddf9..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.nodes.results;
-
-public class SuggestionResult {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
index 11eb7df..246bd0b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
@@ -1,12 +1,16 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.model.Response;
 
+/**
+ * A result that has failed
+ * @param <T> the response
+ */
 public class FailingResult<T> implements Result<T> {
 
-    private final ExecutionResponse failure;
+    private final Response failure;
 
-    public FailingResult(ExecutionResponse failure) {
+    public FailingResult(Response failure) {
         this.failure = failure;
     }
 
@@ -21,7 +25,8 @@ public T getSuccess() {
     }
 
     @Override
-    public ExecutionResponse getFailure() {
+    public Response getFailure() {
         return failure;
     }
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
index 9937e58..794900f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
@@ -1,20 +1,19 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.model.Response;
 
 public interface Result<T> {
 
     boolean isSuccessful();
 
     T getSuccess();
-    ExecutionResponse getFailure();
 
-    //wow this looks familiar (i liked the functionality shhhh)
+    Response getFailure();
+
     static <X> Result<X> success(X t) {
         return new SuccessfulResult<>(t);
     }
-
-    static <X> Result<X> fail(ExecutionResponse failure) {
+    static <X> Result<X> fail(Response failure) {
         return new FailingResult<>(failure);
     }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
index c75d457..70e481d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.model.Response;
 
 public class SuccessfulResult<T> implements Result<T> {
 
@@ -21,7 +21,7 @@ public T getSuccess() {
     }
 
     @Override
-    public ExecutionResponse getFailure() {
+    public Response getFailure() {
         throw new IllegalStateException("Attempted to get failure of a successful result!");
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
similarity index 96%
rename from core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java
rename to core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
index b8cb810..0cea68f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
@@ -1,7 +1,6 @@
-package me.aurium.beetle.branch.fun;
+package me.aurium.beetle.branch.utility;
 
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 
 /**
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index e5f8080..501aa9f 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -1,7 +1,10 @@
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.fallback.message.BaseContext;
+
 import me.aurium.beetle.branch.handlers.context.AbstractNodeContext;
+import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.ChatColor;
@@ -10,15 +13,27 @@
 public class SpigotContext<T extends CommandSender> extends AbstractNodeContext<T> {
 
     private final T sender;
+    private final InterfacingHandler<T> handler;
 
-    protected SpigotContext(T t, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
-        super(t, alias, strings, baseNode, result, baseContext);
+    protected SpigotContext(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, InterfacingHandler<T> handler) {
+        super(sender, alias, args, baseNode, result);
 
-        this.sender = t;
+        this.sender = sender;
+        this.handler = handler;
     }
 
     @Override
     public void stringSender(String string) {
-        sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string)); //TODO prettify (or just use ContextErrorMessage LMFAO)
+        this.sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string));
+    }
+
+    @Override
+    public void messageSender(Message<T> message) {
+        handler.sendMessage(sender,message);
+    }
+
+    @Override
+    public void response(Response failure) {
+        handler.sendMessage(sender,failure);
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
index 0c24248..7618597 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
@@ -1,9 +1,9 @@
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.fallback.message.BaseContext;
+
 import me.aurium.beetle.branch.handlers.context.ContextProvider;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.launchpoints.IllegalSenderException;
+import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
@@ -12,27 +12,21 @@
 public class SpigotContextProvider<C extends CommandSender> implements ContextProvider<C> {
 
     private final ManagerAdapter<CommandSender,C> adapter;
+    private final InterfacingHandler<C> handler;
 
-    public <T> SpigotContextProvider(ManagerAdapter<CommandSender,C> adapter) {
+    public <T> SpigotContextProvider(ManagerAdapter<CommandSender, C> adapter, InterfacingHandler<C> handler) {
         this.adapter = adapter;
+        this.handler = handler;
     }
 
 
     @Override
-    public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> baseNode, SearchInfo<C> search, BaseContext<C> baseContext) {
+    public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> baseNode, SearchInfo<C> search) {
         if (!adapter.canAdapt(sender)) {
-            adapter.failedAdaptAction();
-
-            //delegate to baseContext's stuff
-
-            throw new IllegalSenderException("Sender is not instance of correct type!"); //TODO more fallback bullshit :)
+            r
         }
 
-        return new SpigotContext<>(adapter.adapt(sender),alias,strings,baseNode,search,baseContext);
-    }
 
-    @Override
-    public Context<C> produce(C sender, String alias, String[] strings) {
-        return produce(sender, alias, strings,null,null,null);
+        return new SpigotContext<>(sender,alias,strings,baseNode,search, handler);
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index 9f0723d..1ebc6dd 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -1,5 +1,7 @@
 package me.aurium.beetle.branch.spigot;
 
+import me.aurium.beetle.branch.interfacing.handlers.CommonInterfacingHandler;
+import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.launchpoints.CentralizedManager;
 import me.aurium.beetle.branch.launchpoints.CentralizedManagerBinder;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
@@ -23,7 +25,7 @@ public NodeBaseBuilder<CommandSender> newCommand() {
 
     @Override
     public <C extends CommandSender> NodeBaseBuilder<C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
-        return new NodeBaseBuilder<>(new SpigotContextProvider<>(adapter));
+        return new NodeBaseBuilder<>(new SpigotContextProvider<>(adapter, new CommonInterfacingHandler<>()));
     }
 
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
new file mode 100644
index 0000000..acfd592
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.spigot.message;
+
+public class FancyTextMessage {
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
index 5471fc6..5e483a7 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
@@ -1,32 +1,20 @@
 package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.interfacing.CoreKeys;
-import me.aurium.beetle.branch.interfacing.message.Message;
-import me.aurium.beetle.branch.interfacing.message.Requirement;
-import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
-import org.bukkit.command.CommandSender;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
+import me.aurium.beetle.branch.interfacing.handlers.CommonMessageMap;
+import org.bukkit.command.CommandSender;
 
-public class SpigotMessageProvider<C extends CommandSender> implements MessageProvider<C> {
+public class SpigotMessageProvider<C extends CommandSender>{
 
-    private final Map<UUID, Requirement<C>> map = new HashMap<>();
+    private final CommonMessageMap<C> map = new CommonMessageMap<>();
 
     public SpigotMessageProvider() {
-        map.put(CoreKeys.TOO_MANY_ARGS, new TextMessage<>("&7HI THERE IDIOT FACE! You provided %args% args!"));
-    }
-
-    public SpigotMessageProvider<C> with(UUID uuid, Requirement<C> requirement) {
-        this.map.put(uuid,requirement);
-
-        return this;
-    }
-
+        map.add(FailedAdaptingResponse.class, response -> new TextMessage<>(
+                "Expected class: " + response.getExpectedClass().getName() + "Got class: " + response.getReceivedClass()
+        ));
 
-    public final Map<UUID, Requirement<C>>make() {
-        return map;
+        map.add(FailedAdaptingResponse.class, response -> new TextMessage<>());
     }
 
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
index 372a0b7..caf9f0d 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
@@ -1,18 +1,23 @@
 package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.model.Message;
+import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
 public class TextMessage<C extends CommandSender> implements Message<C> {
 
-    private final String coloredStringToSend;
+    private final String[] coloredStringToSend;
 
-    public TextMessage(String coloredStringToSend) {
+    public TextMessage(String... coloredStringToSend) {
         this.coloredStringToSend = coloredStringToSend;
     }
 
     @Override
-    public void accept(C sender, Object... info) {
-        sender.sendMessage(String.format(coloredStringToSend,info));
+    public void accept(C sender) {
+
+        for (String string : coloredStringToSend) {
+            sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string));
+        }
+
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java
deleted file mode 100644
index dd221b6..0000000
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package me.aurium.beetle.branch.spigot.toPlayer;
-
-import me.aurium.beetle.branch.interfacing.CoreKeys;
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
-
-import java.util.UUID;
-
-public class FailedAdaptingResponse extends SendableResponse {
-
-    public FailedAdaptingResponse(String expected_type, String actual_type) {
-        super(CoreKeys.FAILED_ADAPTING, new MessageInfo("expected_type",toAdapt.getClass().getName()), new MessageInfo("actual_type",));
-    }
-}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
index a68a81a..6970477 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.spigot.toPlayer;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -18,8 +18,9 @@ public boolean canAdapt(CommandSender sender) {
     }
 
     @Override
-    public ExecutionResponse failedAdaptAction() {
-        return new FailedAdaptingResponse(null);
+    public FailedAdaptingResponse failedParseResponse(CommandSender sender) {
+        return new FailedAdaptingResponse(Player.class, CommandSender.class);
     }
 
+
 }

From 3fd6000caf8609b02e6b8ec18fa66f151b685110 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Wed, 21 Apr 2021 18:21:02 -0700
Subject: [PATCH 28/56] re organize packages, add license

---
 .idea/jarRepositories.xml                     | 15 ++++
 .idea/misc.xml                                |  2 +-
 beetle-impl/beetle-impl.iml                   |  2 -
 beetle-impl/pom.xml                           | 59 -------------
 .../branch/converted/BranchCommand.java       | 15 ----
 .../launchpoints/AbstractBaseCommand.java     | 15 ----
 .../launchpoints/AbstractBranchCommand.java   | 41 ----------
 .../beetle/branch/tests/AbstractTests.java    | 18 ----
 .../branch/tests/BranchingNodeTests.java      | 50 -----------
 .../beetle/branch/tests/SingleNodeTests.java  | 37 ---------
 .../aurium/beetle/branch/tests/TestBase.java  |  7 --
 .../branch/tests/context/TestContext.java     | 11 ---
 .../tests/context/TestContextProducer.java    | 20 -----
 .../tests/mockups/BranchingCommand.java       | 82 -------------------
 .../BranchingImproperAnnotatedCommand.java    | 44 ----------
 .../mockups/ImproperAnnotatedCommand.java     | 14 ----
 .../tests/mockups/ProperAnnotatedCommand.java |  4 -
 .../branch/tests/mockups/SingleCommand.java   | 45 ----------
 branch.iml                                    |  2 -
 core/pom.xml                                  | 31 ++++---
 .../branch/annotate/AnnotateConstants.java    | 21 +++++
 .../branch/annotate/AnnotatedCommand.java     | 21 +++++
 .../branch/annotate/AnnotatedParser.java      | 21 +++++
 .../beetle/branch/annotate/ParserOptions.java | 21 +++++
 .../branch/annotate/ParsingException.java     | 21 +++++
 .../beetle/branch/annotate/TypeToken.java     | 21 +++++
 .../UncheckedInvocationException.java         | 21 +++++
 .../branch/annotate/marker/BranchCommand.java | 21 +++++
 .../branch/annotate/marker/BranchingNode.java | 21 +++++
 .../branch/annotate/marker/NoArgsNode.java    | 21 +++++
 .../branch/annotate/marker/SingleNode.java    | 21 +++++
 .../marker/permission/Permission.java         | 21 +++++
 .../marker/permission/StringPermChecker.java  | 21 +++++
 .../parsers/BranchingAnnotatedParser.java     | 21 +++++
 .../parsers/PermissionAnnotationParser.java   | 21 +++++
 .../parsers/SingleAnnotatedParser.java        | 25 +++++-
 .../me/aurium/beetle/branch/block/Block.java  | 10 ---
 .../beetle/branch/block/EmptyBlock.java       | 20 -----
 .../centralized/CentralizedManager.java       | 40 +++++++++
 .../centralized/CentralizedManagerBinder.java | 31 +++++++
 .../centralized/IllegalSenderException.java   | 30 +++++++
 .../branch/centralized/base/NodeBase.java     | 31 +++++++
 .../centralized/base/NodeBaseBuilder.java     | 48 +++++++++++
 .../base/SyncNodeBase.java                    | 32 ++++++--
 .../typeadapter/CommonAdapter.java            | 46 +++++++++++
 .../typeadapter/ManagerAdapter.java           | 40 +++++++++
 .../execution/EmptyExecutionHandler.java      | 32 ++++++++
 .../execution/EmptySuggestionHandler.java     | 39 +++++++++
 .../branch/execution/api/BranchHandler.java   | 34 ++++++++
 .../branch/execution/api/Execution.java       | 40 +++++++++
 .../execution/api/ExecutionHandler.java       | 30 +++++++
 .../execution/api/SuggestionHandler.java      | 33 ++++++++
 .../beetle/branch/execution/block/Block.java  | 31 +++++++
 .../branch/execution/block/EmptyBlock.java    | 41 ++++++++++
 .../{ => execution}/block/StringBlock.java    | 23 +++++-
 .../context/AbstractNodeContext.java          | 23 +++++-
 .../context/ContextErrorMessage.java          | 30 +++++++
 .../execution/context/ContextProvider.java    | 34 ++++++++
 .../context/NodeContext.java                  | 23 +++++-
 .../fallback/permissions/EmptyPermission.java | 21 +++++
 .../fallback/permissions/Permission.java      | 21 +++++
 .../permissions/PredicatePermission.java      | 21 +++++
 .../permissions/StringPermission.java         | 21 +++++
 .../strategies/FallbackSearchStrategy.java    | 21 +++++
 .../fallback/strategies/OneBackStrategy.java  | 23 +++++-
 .../strategies/PermissionLockoutStrategy.java | 23 +++++-
 .../handlers/EmptyExecutionHandler.java       | 11 ---
 .../handlers/EmptySuggestionHandler.java      | 18 ----
 .../branch/handlers/api/BranchHandler.java    | 13 ---
 .../beetle/branch/handlers/api/Execution.java | 19 -----
 .../branch/handlers/api/ExecutionHandler.java |  9 --
 .../handlers/api/SuggestionHandler.java       | 12 ---
 .../handlers/context/ContextErrorMessage.java |  9 --
 .../handlers/context/ContextProvider.java     | 13 ---
 .../branch/information/help/HelpEntry.java    | 25 ++++++
 .../information/suggestion/Suggestion.java    | 25 ++++++
 .../common/FailedAdaptingResponse.java        | 27 ------
 .../common/NoPermissionResponse.java          | 16 ----
 .../common/TooManyArgsResponse.java           | 22 -----
 .../handlers/CommonInterfacingHandler.java    | 21 +++++
 .../handlers/CommonMessageMap.java            | 21 +++++
 .../handlers/CommonResponseActionHandler.java | 21 +++++
 .../handlers/InterfacingHandler.java          | 21 +++++
 .../interfacing/handlers/MessageMap.java      | 21 +++++
 .../interfacing/handlers/MessageProvider.java | 21 +++++
 .../handlers/ResponseActionHandler.java       | 21 +++++
 .../branch/interfacing/model/Message.java     | 21 +++++
 .../branch/interfacing/model/Response.java    | 21 +++++
 .../interfacing/model/ResponseAction.java     | 21 +++++
 .../responses/FailedAdaptingResponse.java     | 48 +++++++++++
 .../NoIntegratedArgsResponse.java             | 25 +++++-
 .../responses/NoPermissionResponse.java       | 37 +++++++++
 .../responses/TooManyArgsResponse.java        | 43 ++++++++++
 .../launchpoints/CentralizedManager.java      | 19 -----
 .../CentralizedManagerBinder.java             | 10 ---
 .../launchpoints/IllegalSenderException.java  |  9 --
 .../branch/launchpoints/base/NodeBase.java    | 10 ---
 .../launchpoints/base/NodeBaseBuilder.java    | 27 ------
 .../typeadapter/CommonAdapter.java            | 26 ------
 .../typeadapter/ManagerAdapter.java           | 17 ----
 .../beetle/branch/nodes/ArgumentNode.java     | 21 +++++
 .../beetle/branch/nodes/BranchingNode.java    | 31 +++++--
 .../aurium/beetle/branch/nodes/HelpNode.java  | 28 +++++++
 .../beetle/branch/nodes/SingleNode.java       | 33 ++++++--
 .../beetle/branch/nodes/ValueContext.java     | 21 +++++
 .../branch/nodes/argument/Argument.java       | 25 +++++-
 .../nodes/argument/ArgumentContext.java       | 23 +++++-
 .../argument/ArgumentContextHandler.java      | 21 +++++
 .../nodes/argument/ArgumentConvertet.java     | 21 +++++
 .../branch/nodes/argument/Arguments.java      | 21 +++++
 .../branch/nodes/builders/AloneBuilder.java   | 21 +++++
 .../nodes/builders/BranchingBuilder.java      | 27 +++++-
 .../beetle/branch/nodes/builders/Builder.java | 21 +++++
 .../branch/nodes/builders/SingleBuilder.java  | 29 ++++++-
 .../branch/nodes/model/CommandNode.java       | 23 +++++-
 .../branch/nodes/model/EndpointNode.java      | 21 +++++
 .../branch/nodes/model/IdentifiableNode.java  | 23 +++++-
 .../branch/nodes/model/ResponseHandler.java   | 21 +++++
 .../branch/nodes/results/SearchInfo.java      | 23 +++++-
 .../branch/nodes/results/SearchInput.java     | 25 +++++-
 .../nodes/results/model/FailingResult.java    | 21 +++++
 .../branch/nodes/results/model/Result.java    | 21 +++++
 .../nodes/results/model/SuccessfulResult.java | 21 +++++
 .../branch/utility/PreStoredHashSet.java      | 21 +++++
 pom.xml                                       | 29 +++++--
 spigot-impl/pom.xml                           | 34 ++++++--
 spigot-impl/spigot-impl.iml                   |  2 -
 .../beetle/branch/spigot/SenderAdapter.java   | 23 +++++-
 .../beetle/branch/spigot/SpigotContext.java   | 23 +++++-
 .../branch/spigot/SpigotContextProvider.java  | 36 +++++---
 .../beetle/branch/spigot/SpigotManager.java   | 31 +++++--
 .../branch/spigot/SpigotManagerBinder.java    | 23 +++++-
 .../spigot/message/AdventureMessage.java      | 21 +++++
 .../spigot/message/FancyTextMessage.java      | 21 +++++
 .../branch/spigot/message/SpigotKeys.java     | 21 +++++
 .../spigot/message/SpigotMessageProvider.java | 24 +++++-
 .../branch/spigot/message/TextMessage.java    | 21 +++++
 .../branch/spigot/toPlayer/PlayerAdapter.java | 25 +++++-
 .../beetle/branch/spigot/ExampleBinding.java  | 21 +++++
 139 files changed, 2494 insertions(+), 870 deletions(-)
 delete mode 100644 beetle-impl/beetle-impl.iml
 delete mode 100644 beetle-impl/pom.xml
 delete mode 100644 beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
 delete mode 100644 beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
 delete mode 100644 beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
 delete mode 100644 branch.iml
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/Block.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
 rename core/src/main/java/me/aurium/beetle/branch/{launchpoints => centralized}/base/SyncNodeBase.java (60%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/CommonAdapter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/ManagerAdapter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/block/Block.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/block/EmptyBlock.java
 rename core/src/main/java/me/aurium/beetle/branch/{ => execution}/block/StringBlock.java (51%)
 rename core/src/main/java/me/aurium/beetle/branch/{handlers => execution}/context/AbstractNodeContext.java (55%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/context/ContextProvider.java
 rename core/src/main/java/me/aurium/beetle/branch/{handlers => execution}/context/NodeContext.java (52%)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/information/help/HelpEntry.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
 rename core/src/main/java/me/aurium/beetle/branch/interfacing/{common => responses}/NoIntegratedArgsResponse.java (56%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/HelpNode.java
 delete mode 100644 spigot-impl/spigot-impl.iml

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 57772c7..bf6e201 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,16 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="aurium-libs-release" />
+      <option name="url" value="https://aurium.jfrog.io/artifactory/aurium-libs-release" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="spigot-repo" />
+      <option name="name" value="spigot-repo" />
+      <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
@@ -31,6 +41,11 @@
       <option name="name" value="aurium" />
       <option name="url" value="" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="snapshots" />
+      <option name="name" value="aurium-libs-snapshot" />
+      <option name="url" value="https://aurium.jfrog.io/artifactory/aurium-libs-snapshot" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="solar-releases" />
       <option name="name" value="solar-releases" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f109e37..99bc4db 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,7 +14,7 @@
       </set>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="16" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/beetle-impl/beetle-impl.iml b/beetle-impl/beetle-impl.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/beetle-impl/beetle-impl.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/beetle-impl/pom.xml b/beetle-impl/pom.xml
deleted file mode 100644
index 482dfb5..0000000
--- a/beetle-impl/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>branch</artifactId>
-        <groupId>me.aurium</groupId>
-        <version>0.1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <version>0.1.0</version>
-
-    <artifactId>branch-beetle-impl</artifactId>
-
-    <properties>
-        <maven.compiler.source>${compiler.version}</maven.compiler.source>
-        <maven.compiler.target>${compiler.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>me.aurium</groupId>
-            <artifactId>branch-core</artifactId>
-            <version>0.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>me.aurium</groupId>
-            <artifactId>beetle-core</artifactId>
-            <version>0.4.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.7.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>2.0.0-alpha1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.3.0-alpha5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
deleted file mode 100644
index 177f1f8..0000000
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package me.aurium.beetle.branch.converted;
-
-import me.aurium.beetle.api.command.Command;
-import me.aurium.beetle.branch.context.Context;
-import me.aurium.beetle.branch.nodes.CommandNode;
-
-public interface BranchCommand<T> extends Command<T> {
-
-    CommandNode<T> getBaseNode();
-
-    default void noArgsMissingOrError(Context<T> context) {
-        context.messageSender("An error occurred while executing this command!");
-    }
-
-}
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
deleted file mode 100644
index acec904..0000000
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package me.aurium.beetle.branch.converted.launchpoints;
-
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.launchpoints.base.NodeBase;
-/*
-
-public abstract class AbstractBaseCommand<T> extends AbstractBranchCommand<T> {
-
-    protected AbstractBaseCommand(ContextProducer<T> factory) {
-        super(factory);
-    }
-
-    public abstract NodeBase<T,?> getBase();
-}
-*/
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
deleted file mode 100644
index 3bfb7fe..0000000
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package me.aurium.beetle.branch.converted.launchpoints;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.converted.BranchCommand;
-import me.aurium.beetle.branch.nodes.CommandNode;
-import me.aurium.beetle.branch.context.NodeContext;
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.block.CommonBlockPath;
-
-/*
-public abstract class AbstractBranchCommand<T> implements BranchCommand<T> {
-
-    private final ContextProducer<T> factory;
-
-    protected AbstractBranchCommand(ContextProducer<T> factory) {
-        this.factory = factory;
-    }
-
-    @Override
-    public boolean execute(T t, String s, String[] strings) {
-
-        BlockPath path = CommonBlockPath.of(strings);
-
-        CommandNode<T> baseNode = getBaseNode();
-
-        //this logic should be in a Base
-        GetNodeResult<T> result = baseNode.getSpecificNode(path);
-
-        result.resultingNode().ifPresentOrElse(node -> {
-
-            //TODO some kind of thing here
-            NodeContext<T> adapter = factory.produce(t,s,strings,node,baseNode,path, result.resultingPath());
-
-            node.getExecutionHandler().handle(adapter);
-
-        }, () -> noArgsMissingOrError(factory.produce(t,s,strings)));
-
-        return true;
-    }
-}
-*/
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
deleted file mode 100644
index b0147c7..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.aurium.beetle.branch.tests;
-
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.tests.context.TestContextProducer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class AbstractTests {
-
-    protected final Logger logger = LoggerFactory.getLogger(AbstractTests.class);
-
-    protected final ContextProducer<String> adapter = new TestContextProducer();
-
-    protected final static String SENDER = "Tester";
-    protected final static String ALIAS = "TestCommand";
-
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
deleted file mode 100644
index 631daba..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package me.aurium.beetle.branch.tests;
-
-import me.aurium.beetle.branch.tests.mockups.BranchingCommand;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
-
-public class BranchingNodeTests extends AbstractTests {
-
-    private final BranchingCommand command = new BranchingCommand(adapter);
-
-    @BeforeEach
-    public void logTestStarting(TestInfo info) {
-        logger.info("Starting test {}", info.getDisplayName());
-    }
-
-    @DisplayName("Test with no arguments")
-    @Test
-    public void testNoArgsExecution() {
-        command.execute(SENDER,ALIAS,new String[]{""});
-    }
-
-    @DisplayName("Test targetting the linked no-args node of a command")
-    @Test
-    public void testLinkedNodeExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"help"});
-    }
-
-    @DisplayName("Test targeting an unlinked no-args node")
-    @Test
-    public void testNotLinkedNodeExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"invites","nonexistent"});
-    }
-
-    @DisplayName("Test targetting a branching node")
-    @Test
-    public void testBranchingExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"join"});
-    }
-
-    @DisplayName("Test branch node inside of branch node")
-    @Test
-    public void testBranchInBranchExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"invites","on"});
-    }
-
-
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
deleted file mode 100644
index 403df29..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package me.aurium.beetle.branch.tests;
-
-import me.aurium.beetle.branch.tests.mockups.SingleCommand;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
-
-public class SingleNodeTests extends AbstractTests {
-
-    private final SingleCommand command = new SingleCommand(adapter);
-
-    @BeforeEach
-    public void logTestStarting(TestInfo info) {
-        logger.info("Starting test {}", info.getDisplayName());
-    }
-
-    @DisplayName("Test command with single variable, single node")
-    @Test
-    public void testSingleVarExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"arg1"});
-    }
-
-    @DisplayName("Test command with no arguments, single node")
-    @Test
-    public void testNoArgsExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"join"});
-    }
-
-    @DisplayName("Test command with two arguments, single node")
-    @Test
-    public void testMultiArgsExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"arg1","arg2"});
-    }
-
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java
deleted file mode 100644
index 1e2c434..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.tests;
-
-public class TestBase {
-
-
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
deleted file mode 100644
index 56c7810..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch.tests.context;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.context.AbstractNodeContext;
-import me.aurium.beetle.branch.nodes.CommandNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestContext extends AbstractNodeContext<String> {
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
deleted file mode 100644
index 9cc574c..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.aurium.beetle.branch.tests.context;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.context.Context;
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.context.NodeContext;
-import me.aurium.beetle.branch.nodes.CommandNode;
-
-public class TestContextProducer implements ContextProducer<String> {
-
-    @Override
-    public NodeContext<String> produce(String sender, String alias, String[] strings, CommandNode<String> executedNode, CommandNode<String> baseNode, BlockPath executedPath, BlockPath basePath) {
-        return new TestContext(sender,alias,strings,executedNode,baseNode, executedPath, basePath);
-    }
-
-    @Override
-    public Context<String> produce(String sender, String alias, String[] strings) {
-        return new TestContext(sender,alias,strings,null,null,null,null);
-    }
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
deleted file mode 100644
index 9996e5f..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-import me.aurium.beetle.branch.nodes.CommandNode;
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.builders.Base;
-import me.aurium.beetle.branch.nodes.builders.BranchingBuilder;
-import me.aurium.beetle.branch.nodes.builders.SingleBuilder;
-import me.aurium.beetle.branch.converted.launchpoints.AbstractBranchCommand;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A fake command pretending to be a kitpvp plugin command
- */
-public class BranchingCommand extends AbstractBranchCommand<String> {
-
-    private final Logger logger = LoggerFactory.getLogger(BranchingCommand.class);
-
-    public BranchingCommand(ContextProducer<String> factory) {
-        super(factory);
-    }
-
-    @Override
-    public CommandNode<String> getBaseNode() {
-        return Base.base(new BranchingBuilder<>(),kitpvp -> {
-
-            //argument /kitpvp join, which always prints that they joined the match
-            kitpvp.withNode(new SingleBuilder<>(), join -> {
-                join.withIdentifier("join");
-                join.withHandler(handler -> {
-                    logger.info(handler.getSender() + " joined the kitpvp match!");
-                    //logic
-                });
-            });
-            //argument /kitpvp invites <on/off>
-            kitpvp.withNode(new BranchingBuilder<>(), invites -> {
-                invites.withIdentifier("invites");
-                invites.withNode(new SingleBuilder<>(), on -> {
-                    on.withIdentifier("on");
-                    on.withHandler(text -> {
-                        logger.info("Invites toggled on!");
-                    });
-
-                });
-                invites.withNode(new SingleBuilder<>(), off -> {
-                    off.withIdentifier("on");
-                    off.withHandler(text -> {
-                        logger.info("Invites toggled on!");
-                    });
-                });
-                invites.withNoArgs(new SingleBuilder<>(), false, noArgs -> {
-                    noArgs.withIdentifier("unlinked");
-                    noArgs.withHandler(handler -> {
-                        logger.info("You must specify either on or off!");
-                    });
-                });
-            });
-            //argument /kitpvp help, which is the default
-            kitpvp.withNoArgs(new SingleBuilder<>(), true, help -> {
-                help.withIdentifier("help");
-                help.withHandler(handler -> {
-                    logger.info("Hey, " + handler.getSender() + ", here is some help from KitPVP!");
-                    logger.info("/kitpvp help");
-                    logger.info("/kitpvp join");
-                    logger.info("/kitpvp invites <on/off>");
-                });
-            });
-
-
-        });
-    }
-
-    @Override
-    public String getName() {
-        return "kitpvp";
-    }
-
-    @Override
-    public String getPermission() {
-        return "none";
-    }
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
deleted file mode 100644
index 6f55af5..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-import me.aurium.beetle.branch.context.NodeContext;
-import me.aurium.beetle.branch.annotate.marker.BranchCommand;
-import me.aurium.beetle.branch.annotate.marker.BranchingNode;
-import me.aurium.beetle.branch.annotate.marker.SingleNode;
-
-//rule of thumb: If 1 alonenode is found in the class, it is considered an alone-node based class.
-//if more than 1 commandnode is found in the class, it is considered a branching node based class
-//if there is one branching node in the class, it is considered a branching node based class sans that branching node (it's identifier doesn't matter)
-
-@BranchCommand
-public class BranchingImproperAnnotatedCommand {
-
-    @SingleNode(identifier = "branch1")
-    public void branch1(NodeContext<String> nodeContext) {
-        nodeContext.getSender();
-
-        //do some action, command looks like this: /command branch1
-    }
-
-    @SingleNode(identifier = "branch2")
-    public void branch2(NodeContext<String> nodeContext) {
-        nodeContext.getSender();
-
-        //do some action here, command looks like this: /command branch2
-    }
-
-    @BranchingNode(identifier = "branching1")
-    public static class branching1 {
-
-        @SingleNode(identifier = "mee")
-        public void lol() {
-            //do some action here, command looks like this: /command branching1 mee
-        }
-
-        @SingleNode(identifier = "cringe")
-        public void haha(NodeContext<String> context) {
-            //do some action here, command looks like this /command branching1 cringe
-        }
-
-    }
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
deleted file mode 100644
index 2a39332..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-import me.aurium.beetle.branch.annotate.marker.BranchCommand;
-import me.aurium.beetle.branch.annotate.marker.SingleNode;
-
-@BranchCommand
-public class ImproperAnnotatedCommand {
-
-    @SingleNode(identifier = "test")
-    public void someShit() {
-
-    }
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
deleted file mode 100644
index a7abd6e..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-public class ProperAnnotatedCommand {
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
deleted file mode 100644
index 0db4b0f..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-import me.aurium.beetle.branch.nodes.CommandNode;
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.builders.Base;
-import me.aurium.beetle.branch.nodes.builders.SingleBuilder;
-import me.aurium.beetle.branch.converted.launchpoints.AbstractBranchCommand;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-
-/**
- * Fake command representing something like /helloworld that always says helloworld
- */
-public class SingleCommand extends AbstractBranchCommand<String> {
-    private final Logger log = LoggerFactory.getLogger(SingleCommand.class);
-
-    public SingleCommand(ContextProducer<String> factory) {
-        super(factory);
-    }
-
-    @Override
-    public CommandNode<String> getBaseNode() {
-        return Base.base(new SingleBuilder<>(),builder -> {
-            builder.withHandler(context -> {
-                log.info("hello world!");
-
-                log.info("The sender is: " + context.getSender());
-                log.info("The arguments were: " + Arrays.toString(context.getArgs()));
-                log.info("The path was: " + context.executedPath());
-            });
-        });
-    }
-
-    @Override
-    public String getName() {
-        return "helloworld";
-    }
-
-    @Override
-    public String getPermission() {
-        return "testPermission";
-    }
-}
diff --git a/branch.iml b/branch.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/branch.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 1f7cb8a..0887e87 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~  Branch
+  ~  Copyright © 2021 Aurium
+  ~
+  ~  Branch is free software: you can redistribute it and/or modify
+  ~  It under the terms of the GNU Affero General Public License as
+  ~  published by the Free Software Foundation, either version 3 of the
+  ~  License, or (at your option) any later version.
+  ~
+  ~  Branch is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~  GNU Affero General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU Affero General Public License
+  ~  along with Branch. If not, see <https://www.gnu.org/licenses/>
+  ~  and navigate to version 3 of the GNU Affero General Public License.
+  ~
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -11,21 +32,11 @@
 
     <artifactId>branch-core</artifactId>
 
-    <version>0.1.1</version>
-
     <properties>
         <maven.compiler.source>${compiler.version}</maven.compiler.source>
         <maven.compiler.target>${compiler.version}</maven.compiler.target>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>me.aurium</groupId>
-            <artifactId>beetle-core</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java
index 06f573e..7195363 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 public class AnnotateConstants {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
index 757c480..d8c1954 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
index 7cd0c4d..d580008 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 import me.aurium.beetle.branch.nodes.model.CommandNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java b/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java
index 7319836..8c2091b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java b/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java
index 7ce0cab..99ccf73 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 public class ParsingException {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java b/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java
index 3fdb7b3..9c95f39 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 public class TypeToken<T> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java b/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java
index 98831f4..d22596c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 public class UncheckedInvocationException extends RuntimeException{
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java
index e9e539b..c791a3f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java
index 0138275..bbaea3a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java
index 2d4e704..3cbf536 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker;
 
 public @interface NoArgsNode {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java
index 108b53e..142e26c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker;
 
 import me.aurium.beetle.branch.annotate.AnnotateConstants;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
index 7dc843c..0845118 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker.permission;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
index 5009a76..75c4c91 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker.permission;
 
 import me.aurium.beetle.branch.fallback.permissions.StringPermission;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java
index d0e7051..7c87a00 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.parsers;
 
 public class BranchingAnnotatedParser {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
index 4b98904..0672408 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.parsers;
 
 import me.aurium.beetle.branch.annotate.marker.permission.Permission;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
index 8b87a8e..1148036 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
@@ -1,10 +1,31 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.parsers;
 
 import me.aurium.beetle.branch.annotate.AnnotatedCommand;
 import me.aurium.beetle.branch.annotate.UncheckedInvocationException;
 import me.aurium.beetle.branch.annotate.marker.SingleNode;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.api.ExecutionHandler;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/Block.java b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
deleted file mode 100644
index e24b841..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/Block.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-public interface Block {
-
-    String getIdentifier();
-
-    boolean equals(Object object);
-    boolean isEmpty();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
deleted file mode 100644
index 58a704a..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-public class EmptyBlock implements Block{
-
-    @Override
-    public String getIdentifier() {
-        throw new UnsupportedOperationException("Empty block should not exist in path!");
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return true;
-    }
-
-    public static EmptyBlock of() {
-        return new EmptyBlock();
-    }
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
new file mode 100644
index 0000000..20746cf
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
@@ -0,0 +1,40 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized;
+
+import me.aurium.beetle.branch.centralized.base.NodeBaseBuilder;
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
+
+/**
+ * Represents the utmost base part of a command
+ * @param <T> the input type, does not need to be of same type as the node bases it utilizes
+ * @param <V> the platform, void if there is none (how?)
+ */
+public interface CentralizedManager<T,V> {
+
+    CentralizedManagerBinder getBinder(V platform);
+
+    NodeBaseBuilder<T> newCommand();
+    <C extends T> NodeBaseBuilder<C> newCommand(ManagerAdapter<T,C> adapter);
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java
new file mode 100644
index 0000000..e26869b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java
@@ -0,0 +1,31 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized;
+
+public interface CentralizedManagerBinder {
+
+    /**
+     * Register all commands to the platform
+     */
+    void bind();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java b/core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java
new file mode 100644
index 0000000..4fb7918
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java
@@ -0,0 +1,30 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized;
+
+public class IllegalSenderException extends RuntimeException{
+
+    public IllegalSenderException(String lmao) {
+        super(lmao);
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java
new file mode 100644
index 0000000..a378065
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java
@@ -0,0 +1,31 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized.base;
+
+import java.util.List;
+
+public interface NodeBase<T> {
+
+    void execute(T t, String alias, String[] args); //may execute instantly or take some time
+    List<String> suggest(T t, String alias, String[] args);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
new file mode 100644
index 0000000..d404015
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
@@ -0,0 +1,48 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized.base;
+
+import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
+import me.aurium.beetle.branch.execution.context.ContextProvider;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
+
+public class NodeBaseBuilder<T> {
+
+    private ContextProvider<T> producer;
+
+    private CommandNode<T> base;
+    private FallbackSearchStrategy<T> strategy = new OneBackStrategy<>();
+
+    public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
+        this.base = node;
+
+        return this;
+    }
+
+    public NodeBaseBuilder<T> withStrategy(FallbackSearchStrategy<T> strategy) {
+        this.strategy = strategy;
+
+        return this;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java
similarity index 60%
rename from core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
rename to core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java
index 0353fff..a7f6d46 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java
@@ -1,8 +1,29 @@
-package me.aurium.beetle.branch.launchpoints.base;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized.base;
 
-import me.aurium.beetle.branch.handlers.api.Execution;
-import me.aurium.beetle.branch.handlers.context.ContextProvider;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.execution.api.Execution;
+import me.aurium.beetle.branch.execution.context.ContextProvider;
+import me.aurium.beetle.branch.execution.context.NodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
@@ -12,7 +33,8 @@
 import java.util.List;
 
 /**
- * Represents a nodebase that will perform it's executions synchronously
+ * Represents a nodebase that will search for executions synchronously
+ * it will also search for suggestions synchronously
  * @param <C>
  */
 public class SyncNodeBase<C> implements NodeBase<C> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/CommonAdapter.java b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/CommonAdapter.java
new file mode 100644
index 0000000..4ef8bde
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/CommonAdapter.java
@@ -0,0 +1,46 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized.typeadapter;
+
+import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
+
+/**
+ * Represents an adapter that does not convert and simply returns the same object
+ * @param <T> the object type
+ */
+public interface CommonAdapter<T> extends ManagerAdapter<T,T> {
+
+    @Override
+    default T adapt(T input) {
+        return input;
+    }
+
+    @Override
+    default boolean canAdapt(T input) {
+        return true;
+    }
+
+    @Override
+    default FailedAdaptingResponse failedParseResponse(T input) {
+        throw new IllegalStateException("How did you get here (Since canAdapt is always true this should never occur?)");
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/ManagerAdapter.java
new file mode 100644
index 0000000..c3001f6
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/ManagerAdapter.java
@@ -0,0 +1,40 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized.typeadapter;
+
+import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
+
+/**
+ * Represents something that can convert an object of a certain type to another object
+ * It is used to enable the use of nodes of a unique type on a centralized manager of a separate type.
+ *
+ * @param <INPUT> Input object type
+ * @param <OUTPUT> Output object type
+ */
+public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
+
+    OUTPUT adapt(INPUT input);
+    boolean canAdapt(INPUT input);
+
+    FailedAdaptingResponse failedParseResponse(INPUT input);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java
new file mode 100644
index 0000000..f8c946c
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java
@@ -0,0 +1,32 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution;
+
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.api.ExecutionHandler;
+
+public class EmptyExecutionHandler<T> implements ExecutionHandler<T> {
+    @Override
+    public void handle(NodeContext<T> adapter) {
+
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java
new file mode 100644
index 0000000..b12f1a8
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java
@@ -0,0 +1,39 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution;
+
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.api.SuggestionHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EmptySuggestionHandler<T> implements SuggestionHandler<T> {
+
+    private final List<String> emptyList = new ArrayList<>();
+
+    @Override
+    public List<Block> handle(NodeContext<T> adapter) {
+        return List.of();
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java
new file mode 100644
index 0000000..10ee0cf
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java
@@ -0,0 +1,34 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.api;
+
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+
+import java.util.List;
+
+public interface BranchHandler<T> {
+
+    Result<Execution<T>> getExecution(NodeContext<T> context);
+    List<String> getSuggestions(NodeContext<T> context);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java
new file mode 100644
index 0000000..8ec67e9
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java
@@ -0,0 +1,40 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.api;
+
+import me.aurium.beetle.branch.execution.context.NodeContext;
+
+public class Execution<T> implements Runnable {
+
+    private final ExecutionHandler<T> handler;
+    private final NodeContext<T> node;
+
+    public Execution(ExecutionHandler<T> handler, NodeContext<T> node) {
+        this.handler = handler;
+        this.node = node;
+    }
+
+    @Override
+    public void run() {
+        handler.handle(node);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java
new file mode 100644
index 0000000..e334187
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java
@@ -0,0 +1,30 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.api;
+
+import me.aurium.beetle.branch.execution.context.NodeContext;
+
+public interface ExecutionHandler<T> {
+
+    void handle(NodeContext<T> context);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java
new file mode 100644
index 0000000..f243322
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java
@@ -0,0 +1,33 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.api;
+
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.context.NodeContext;
+
+import java.util.List;
+
+public interface SuggestionHandler<T> {
+
+    List<Block> handle(NodeContext<T> context);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/block/Block.java b/core/src/main/java/me/aurium/beetle/branch/execution/block/Block.java
new file mode 100644
index 0000000..58769a7
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/block/Block.java
@@ -0,0 +1,31 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.block;
+
+public interface Block {
+
+    String getIdentifier();
+
+    boolean equals(Object object);
+    boolean isEmpty();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/block/EmptyBlock.java b/core/src/main/java/me/aurium/beetle/branch/execution/block/EmptyBlock.java
new file mode 100644
index 0000000..bcfb132
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/block/EmptyBlock.java
@@ -0,0 +1,41 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.block;
+
+public class EmptyBlock implements Block{
+
+    @Override
+    public String getIdentifier() {
+        throw new UnsupportedOperationException("Empty block should not exist in path!");
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return true;
+    }
+
+    public static EmptyBlock of() {
+        return new EmptyBlock();
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java b/core/src/main/java/me/aurium/beetle/branch/execution/block/StringBlock.java
similarity index 51%
rename from core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/block/StringBlock.java
index 6dc4374..eb83b29 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/block/StringBlock.java
@@ -1,4 +1,25 @@
-package me.aurium.beetle.branch.block;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.block;
 
 public class StringBlock implements Block {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/AbstractNodeContext.java
similarity index 55%
rename from core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/context/AbstractNodeContext.java
index 43e046f..5f907fd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/AbstractNodeContext.java
@@ -1,4 +1,25 @@
-package me.aurium.beetle.branch.handlers.context;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.context;
 
 
 import me.aurium.beetle.branch.nodes.model.CommandNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java
new file mode 100644
index 0000000..9946584
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java
@@ -0,0 +1,30 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.context;
+
+/**
+ * easy to use interface that lets me give it a title, some strings, and let it be converted
+ *
+ * e.g. to prettified chatcolor output or to discord embed on discord-impl.
+ */
+public interface ContextErrorMessage {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextProvider.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextProvider.java
new file mode 100644
index 0000000..bc22d9f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextProvider.java
@@ -0,0 +1,34 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.context;
+
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+
+/**
+ * Produces context adapters, like the stock ContextSource for contexts.
+ */
+public interface ContextProvider<T> {
+
+    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
similarity index 52%
rename from core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
index fc0927e..a49b82b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
@@ -1,4 +1,25 @@
-package me.aurium.beetle.branch.handlers.context;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.context;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
index d6c4831..ddd4a37 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.permissions;
 
 public class EmptyPermission<T> implements Permission<T> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
index 464979a..dcc03e1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.permissions;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
index 20232bb..66bbbb6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.permissions;
 
 import java.util.function.Predicate;
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
index 836aa47..be5ecf4 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.permissions;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
index ef0d2fd..1cb419a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.strategies;
 
 import me.aurium.beetle.branch.nodes.model.CommandNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
index 4b635e2..3cf7c18 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.strategies;
 
-import me.aurium.beetle.branch.interfacing.common.NoPermissionResponse;
+import me.aurium.beetle.branch.interfacing.responses.NoPermissionResponse;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
index e283963..987e75f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.strategies;
 
-import me.aurium.beetle.branch.interfacing.common.NoPermissionResponse;
+import me.aurium.beetle.branch.interfacing.responses.NoPermissionResponse;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
deleted file mode 100644
index 6af79d2..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch.handlers;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-
-public class EmptyExecutionHandler<T> implements ExecutionHandler<T> {
-    @Override
-    public void handle(NodeContext<T> adapter) {
-
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
deleted file mode 100644
index daac0e0..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.aurium.beetle.branch.handlers;
-
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class EmptySuggestionHandler<T> implements SuggestionHandler<T> {
-
-    private final List<String> emptyList = new ArrayList<>();
-
-    @Override
-    public List<Block> handle(NodeContext<T> adapter) {
-        return List.of();
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
deleted file mode 100644
index 631aaa2..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.handlers.api;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.nodes.results.model.Result;
-
-import java.util.List;
-
-public interface BranchHandler<T> {
-
-    Result<Execution<T>> getExecution(NodeContext<T> context);
-    List<String> getSuggestions(NodeContext<T> context);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
deleted file mode 100644
index ec9af67..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package me.aurium.beetle.branch.handlers.api;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-
-public class Execution<T> implements Runnable {
-
-    private final ExecutionHandler<T> handler;
-    private final NodeContext<T> node;
-
-    public Execution(ExecutionHandler<T> handler, NodeContext<T> node) {
-        this.handler = handler;
-        this.node = node;
-    }
-
-    @Override
-    public void run() {
-        handler.handle(node);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
deleted file mode 100644
index d32f48e..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.handlers.api;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-
-public interface ExecutionHandler<T> {
-
-    void handle(NodeContext<T> context);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
deleted file mode 100644
index b96c285..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package me.aurium.beetle.branch.handlers.api;
-
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-
-import java.util.List;
-
-public interface SuggestionHandler<T> {
-
-    List<Block> handle(NodeContext<T> context);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
deleted file mode 100644
index 8da0bf0..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.handlers.context;
-
-/**
- * easy to use interface that lets me give it a title, some strings, and let it be converted
- *
- * e.g. to prettified chatcolor output or to discord embed on discord-impl.
- */
-public interface ContextErrorMessage {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
deleted file mode 100644
index 714f186..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.handlers.context;
-
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
-
-/**
- * Produces context adapters, like the stock ContextSource for contexts.
- */
-public interface ContextProvider<T> {
-
-    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/information/help/HelpEntry.java b/core/src/main/java/me/aurium/beetle/branch/information/help/HelpEntry.java
new file mode 100644
index 0000000..8ac21a0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/information/help/HelpEntry.java
@@ -0,0 +1,25 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.information.help;
+
+public interface HelpEntry {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java b/core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java
new file mode 100644
index 0000000..f90b5c2
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java
@@ -0,0 +1,25 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.information.suggestion;
+
+public class Suggestion {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
deleted file mode 100644
index 59886b0..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.interfacing.common;
-
-import me.aurium.beetle.branch.interfacing.model.Response;
-
-/**
- * Represents a response to the scenario in which a certain object was attempted to be adapted to an extending type
- * but it was not an instance of it (or similar scenarios, such as attempting to flatmap a certain type to another.)
- */
-public class FailedAdaptingResponse implements Response {
-
-    private final Class<?> expectedClass;
-    private final Class<?> receivedClass;
-
-    public FailedAdaptingResponse(Class<?> expectedClass, Class<?> receivedClass) {
-        this.expectedClass = expectedClass;
-        this.receivedClass = receivedClass;
-    }
-
-    public Class<?> getExpectedClass() {
-        return expectedClass;
-    }
-
-    public Class<?> getReceivedClass() {
-        return receivedClass;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
deleted file mode 100644
index fdfc797..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package me.aurium.beetle.branch.interfacing.common;
-
-import me.aurium.beetle.branch.interfacing.model.Response;
-
-public class NoPermissionResponse implements Response {
-
-    private final String lackingPermission;
-
-    public NoPermissionResponse(String lackingPermission) {
-        this.lackingPermission = lackingPermission;
-    }
-
-    public String getLackingPermission() {
-        return lackingPermission;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
deleted file mode 100644
index 219c1f1..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package me.aurium.beetle.branch.interfacing.common;
-
-import me.aurium.beetle.branch.interfacing.model.Response;
-
-public class TooManyArgsResponse implements Response {
-
-    private final int expectedArgs;
-    private final int suppliedArgs;
-
-    public TooManyArgsResponse(int expectedArgs, int suppliedArgs) {
-        this.expectedArgs = expectedArgs;
-        this.suppliedArgs = suppliedArgs;
-    }
-
-    public int getExpectedArgs() {
-        return expectedArgs;
-    }
-
-    public int getSuppliedArgs() {
-        return suppliedArgs;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
index 2f451b8..85f7d98 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
index 2acfe8b..8a14ab2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
index 0cf984f..e7a2a6b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
index cc046ae..cadee9e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
index cfccf71..e750542 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.handlers.ResponseActionHandler;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
index 6d726fd..ae0844b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
index 79c346d..dd5247d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
index d97b2ad..a8ba0cc 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.model;
 
 public interface Message<C> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
index 528d185..8d8730c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.model;
 
 public interface Response {
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
index 564c981..549c84e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.model;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
new file mode 100644
index 0000000..e9e6ac3
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
@@ -0,0 +1,48 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.interfacing.responses;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+/**
+ * Represents a response to the scenario in which a certain object was attempted to be adapted to an extending type
+ * but it was not an instance of it (or similar scenarios, such as attempting to flatmap a certain type to another.)
+ */
+public class FailedAdaptingResponse implements Response {
+
+    private final Class<?> expectedClass;
+    private final Class<?> receivedClass;
+
+    public FailedAdaptingResponse(Class<?> expectedClass, Class<?> receivedClass) {
+        this.expectedClass = expectedClass;
+        this.receivedClass = receivedClass;
+    }
+
+    public Class<?> getExpectedClass() {
+        return expectedClass;
+    }
+
+    public Class<?> getReceivedClass() {
+        return receivedClass;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
similarity index 56%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java
rename to core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
index 54037ff..995a360 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
@@ -1,6 +1,27 @@
-package me.aurium.beetle.branch.interfacing.common;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.execution.context.NodeContext;
 import me.aurium.beetle.branch.interfacing.model.Response;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
new file mode 100644
index 0000000..afb42ef
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
@@ -0,0 +1,37 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.interfacing.responses;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+public class NoPermissionResponse implements Response {
+
+    private final String lackingPermission;
+
+    public NoPermissionResponse(String lackingPermission) {
+        this.lackingPermission = lackingPermission;
+    }
+
+    public String getLackingPermission() {
+        return lackingPermission;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
new file mode 100644
index 0000000..ea3d965
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
@@ -0,0 +1,43 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.interfacing.responses;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+public class TooManyArgsResponse implements Response {
+
+    private final int expectedArgs;
+    private final int suppliedArgs;
+
+    public TooManyArgsResponse(int expectedArgs, int suppliedArgs) {
+        this.expectedArgs = expectedArgs;
+        this.suppliedArgs = suppliedArgs;
+    }
+
+    public int getExpectedArgs() {
+        return expectedArgs;
+    }
+
+    public int getSuppliedArgs() {
+        return suppliedArgs;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
deleted file mode 100644
index 22b765d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package me.aurium.beetle.branch.launchpoints;
-
-import me.aurium.beetle.branch.launchpoints.base.NodeBaseBuilder;
-import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
-
-/**
- * Represents the utmost base part of a command
- * @param <T> the input type, does not need to be of same type as the node bases it utilizes
- * @param <V> the platform, void if there is none (how?)
- */
-public interface CentralizedManager<T,V> {
-
-    CentralizedManagerBinder getBinder(V platform);
-
-    NodeBaseBuilder<T> newCommand();
-    <C extends T> NodeBaseBuilder<C> newCommand(ManagerAdapter<T,C> adapter);
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
deleted file mode 100644
index a83c4d1..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package me.aurium.beetle.branch.launchpoints;
-
-public interface CentralizedManagerBinder {
-
-    /**
-     * Register all commands to the platform
-     */
-    void bind();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
deleted file mode 100644
index 10c29bc..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.launchpoints;
-
-public class IllegalSenderException extends RuntimeException{
-
-    public IllegalSenderException(String lmao) {
-        super(lmao);
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
deleted file mode 100644
index 83813b1..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.base;
-
-import java.util.List;
-
-public interface NodeBase<T> {
-
-    void execute(T t, String alias, String[] args); //may execute instantly or take some time
-    List<String> suggest(T t, String alias, String[] args);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
deleted file mode 100644
index eb63eba..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.base;
-
-import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
-import me.aurium.beetle.branch.handlers.context.ContextProvider;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
-
-public class NodeBaseBuilder<T> {
-
-    private ContextProvider<T> producer;
-
-    private CommandNode<T> base;
-    private FallbackSearchStrategy<T> strategy = new OneBackStrategy<>();
-
-    public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
-        this.base = node;
-
-        return this;
-    }
-
-    public NodeBaseBuilder<T> withStrategy(FallbackSearchStrategy<T> strategy) {
-        this.strategy = strategy;
-
-        return this;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
deleted file mode 100644
index 84c01e3..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.typeadapter;
-
-import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
-import me.aurium.beetle.branch.interfacing.model.Response;
-
-/**
- * Represents an adapter that does not convert and simply returns the same object
- * @param <T> the object type
- */
-public interface CommonAdapter<T> extends ManagerAdapter<T,T> {
-
-    @Override
-    default T adapt(T input) {
-        return input;
-    }
-
-    @Override
-    default boolean canAdapt(T input) {
-        return true;
-    }
-
-    @Override
-    default FailedAdaptingResponse failedParseResponse(T input) {
-        throw new IllegalStateException("How did you get here (Since canAdapt is always true this should never occur?)");
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
deleted file mode 100644
index be6acdc..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.typeadapter;
-
-import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
-
-/**
- * Represents something that can convert an object of a certain type to another object
- * @param <INPUT> Input object type
- * @param <OUTPUT> Output object type
- */
-public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
-
-    OUTPUT adapt(INPUT input);
-    boolean canAdapt(INPUT input);
-
-    FailedAdaptingResponse failedParseResponse(INPUT input);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
index 5c0114f..b8b3422 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes;
 
 //kinda like a branching node except it throws forward and not to the sides
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 1f92bf7..937d14a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -1,10 +1,31 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.api.BranchHandler;
-import me.aurium.beetle.branch.handlers.api.Execution;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.interfacing.common.NoIntegratedArgsResponse;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.api.BranchHandler;
+import me.aurium.beetle.branch.execution.api.Execution;
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.responses.NoIntegratedArgsResponse;
 import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
 import me.aurium.beetle.branch.nodes.results.*;
 import me.aurium.beetle.branch.fallback.permissions.Permission;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/HelpNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/HelpNode.java
new file mode 100644
index 0000000..5a808f2
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/HelpNode.java
@@ -0,0 +1,28 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.nodes;
+
+/**
+ * Represents a node that pregenerates help entries based on the message context
+ */
+public class HelpNode {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index 5ec3ce5..75656e3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -1,11 +1,32 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.api.BranchHandler;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-import me.aurium.beetle.branch.handlers.api.Execution;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.interfacing.common.TooManyArgsResponse;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.api.BranchHandler;
+import me.aurium.beetle.branch.execution.api.ExecutionHandler;
+import me.aurium.beetle.branch.execution.api.Execution;
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.responses.TooManyArgsResponse;
 import me.aurium.beetle.branch.nodes.model.EndpointNode;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java
index 05abc88..c56d712 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
index 40fcee4..49cf101 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
@@ -1,7 +1,28 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.argument;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.context.NodeContext;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
index efb6561..bdf8815 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.argument;
 
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.execution.context.NodeContext;
 
 public interface ArgumentContext<T> extends NodeContext<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
index 70dd276..8861dbd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.argument;
 
 public interface ArgumentContextHandler<T> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
index 50de57a..95fe577 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.argument;
 
 public interface ArgumentConvertet {
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
index f8b17e0..f5afa2a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.argument;
 
 public class Arguments {
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java
index 3b65261..d5a4631 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.builders;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
index 778fe2b..6f82093 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
@@ -1,8 +1,29 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.builders;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.EmptyBlock;
-import me.aurium.beetle.branch.block.StringBlock;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.block.EmptyBlock;
+import me.aurium.beetle.branch.execution.block.StringBlock;
 import me.aurium.beetle.branch.fallback.permissions.Permission;
 import me.aurium.beetle.branch.fallback.permissions.EmptyPermission;
 import me.aurium.beetle.branch.nodes.BranchingNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
index eef2d03..ddebebd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.builders;
 
 import me.aurium.beetle.branch.nodes.model.CommandNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
index 8804bf6..1506e6f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
@@ -1,9 +1,30 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.builders;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.EmptyBlock;
-import me.aurium.beetle.branch.block.StringBlock;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.block.EmptyBlock;
+import me.aurium.beetle.branch.execution.block.StringBlock;
+import me.aurium.beetle.branch.execution.api.ExecutionHandler;
 import me.aurium.beetle.branch.nodes.SingleNode;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.permissions.Permission;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
index 3bf26f8..7c96d57 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.model;
 
-import me.aurium.beetle.branch.handlers.api.BranchHandler;
+import me.aurium.beetle.branch.execution.api.BranchHandler;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.fallback.permissions.Permission;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
index ee3358e..9d05ff3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.model;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
index f94d74d..9952479 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.model;
 
-import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.execution.block.Block;
 
 public interface IdentifiableNode<T> extends CommandNode<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
index 1988067..4112c07 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.model;
 
 public class ResponseHandler {
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
index 85c5e9c..fa0da4b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.results;
 
-import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.execution.block.Block;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 
 import java.util.Deque;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
index c3fbf13..89f0e7f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
@@ -1,7 +1,28 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.results;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.StringBlock;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.block.StringBlock;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
index 246bd0b..5e4a7b7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.results.model;
 
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
index 794900f..a3f47a0 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.results.model;
 
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
index 70e481d..e706a48 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.results.model;
 
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
index 0cea68f..8d58a42 100644
--- a/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.utility;
 
 import java.util.HashSet;
diff --git a/pom.xml b/pom.xml
index d5f662a..ea7a941 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~  Branch
+  ~  Copyright © 2021 Aurium
+  ~
+  ~  Branch is free software: you can redistribute it and/or modify
+  ~  It under the terms of the GNU Affero General Public License as
+  ~  published by the Free Software Foundation, either version 3 of the
+  ~  License, or (at your option) any later version.
+  ~
+  ~  Branch is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~  GNU Affero General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU Affero General Public License
+  ~  along with Branch. If not, see <https://www.gnu.org/licenses/>
+  ~  and navigate to version 3 of the GNU Affero General Public License.
+  ~
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>me.aurium</groupId>
     <artifactId>branch</artifactId>
     <packaging>pom</packaging>
     <version>0.1.0</version>
+
     <modules>
         <module>core</module>
         <module>beetle-impl</module>
         <module>spigot-impl</module>
     </modules>
 
-    <parent>
-        <artifactId>beetle</artifactId>
-        <groupId>me.aurium</groupId>
-        <version>0.2.0</version>
-    </parent>
-
     <properties>
         <maven.compiler.source>${compiler.version}</maven.compiler.source>
         <maven.compiler.target>${compiler.version}</maven.compiler.target>
diff --git a/spigot-impl/pom.xml b/spigot-impl/pom.xml
index 3f1e678..52fbc29 100644
--- a/spigot-impl/pom.xml
+++ b/spigot-impl/pom.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~  Branch
+  ~  Copyright © 2021 Aurium
+  ~
+  ~  Branch is free software: you can redistribute it and/or modify
+  ~  It under the terms of the GNU Affero General Public License as
+  ~  published by the Free Software Foundation, either version 3 of the
+  ~  License, or (at your option) any later version.
+  ~
+  ~  Branch is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~  GNU Affero General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU Affero General Public License
+  ~  along with Branch. If not, see <https://www.gnu.org/licenses/>
+  ~  and navigate to version 3 of the GNU Affero General Public License.
+  ~
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -17,11 +38,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>me.aurium</groupId>
-            <artifactId>beetle-spigot-impl</artifactId>
-            <version>0.4.1</version>
-        </dependency>
         <dependency>
             <groupId>me.aurium</groupId>
             <artifactId>branch-core</artifactId>
@@ -31,7 +47,15 @@
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
             <version>1.16.5-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
 </project>
\ No newline at end of file
diff --git a/spigot-impl/spigot-impl.iml b/spigot-impl/spigot-impl.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/spigot-impl/spigot-impl.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
index cda8236..c27acf2 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.launchpoints.typeadapter.CommonAdapter;
+import me.aurium.beetle.branch.centralized.typeadapter.CommonAdapter;
 import org.bukkit.command.CommandSender;
 
 public class SenderAdapter implements CommonAdapter<CommandSender> {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index 501aa9f..c531e06 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -1,7 +1,28 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
 
-import me.aurium.beetle.branch.handlers.context.AbstractNodeContext;
+import me.aurium.beetle.branch.execution.context.AbstractNodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.interfacing.model.Message;
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
index 7618597..d42be67 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
@@ -1,32 +1,46 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
 
-import me.aurium.beetle.branch.handlers.context.ContextProvider;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.execution.context.ContextProvider;
+import me.aurium.beetle.branch.execution.context.NodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.command.CommandSender;
 
 public class SpigotContextProvider<C extends CommandSender> implements ContextProvider<C> {
 
-    private final ManagerAdapter<CommandSender,C> adapter;
     private final InterfacingHandler<C> handler;
 
-    public <T> SpigotContextProvider(ManagerAdapter<CommandSender, C> adapter, InterfacingHandler<C> handler) {
-        this.adapter = adapter;
+    public SpigotContextProvider(InterfacingHandler<C> handler) {
         this.handler = handler;
     }
 
 
     @Override
     public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> baseNode, SearchInfo<C> search) {
-        if (!adapter.canAdapt(sender)) {
-            r
-        }
-
-
         return new SpigotContext<>(sender,alias,strings,baseNode,search, handler);
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index 1ebc6dd..c466cb6 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -1,11 +1,32 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
 import me.aurium.beetle.branch.interfacing.handlers.CommonInterfacingHandler;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.launchpoints.CentralizedManager;
-import me.aurium.beetle.branch.launchpoints.CentralizedManagerBinder;
-import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
-import me.aurium.beetle.branch.launchpoints.base.NodeBaseBuilder;
+import me.aurium.beetle.branch.centralized.CentralizedManager;
+import me.aurium.beetle.branch.centralized.CentralizedManagerBinder;
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
+import me.aurium.beetle.branch.centralized.base.NodeBaseBuilder;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -25,7 +46,7 @@ public NodeBaseBuilder<CommandSender> newCommand() {
 
     @Override
     public <C extends CommandSender> NodeBaseBuilder<C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
-        return new NodeBaseBuilder<>(new SpigotContextProvider<>(adapter, new CommonInterfacingHandler<>()));
+        return null;
     }
 
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
index 4fe2850..5340b01 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.launchpoints.CentralizedManagerBinder;
+import me.aurium.beetle.branch.centralized.CentralizedManagerBinder;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class SpigotManagerBinder implements CentralizedManagerBinder {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
index 4d2ff65..650aecc 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot.message;
 
 public class AdventureMessage {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
index acfd592..a288cc7 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot.message;
 
 public class FancyTextMessage {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
index ffd8116..aefdf2d 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot.message;
 
 import java.util.UUID;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
index 5e483a7..b3e50c0 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
@@ -1,8 +1,28 @@
-package me.aurium.beetle.branch.spigot.message;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
 
+package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
 import me.aurium.beetle.branch.interfacing.handlers.CommonMessageMap;
+import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
 import org.bukkit.command.CommandSender;
 
 public class SpigotMessageProvider<C extends CommandSender>{
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
index caf9f0d..0a7edf3 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot.message;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
index 6970477..5c40ade 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
@@ -1,7 +1,28 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot.toPlayer;
 
-import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
-import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
+import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
diff --git a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
index da76a28..2e77465 100644
--- a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
+++ b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
 import org.bukkit.plugin.java.JavaPlugin;

From 6ca9cc8e939e3c5a7d7097c70e74fe20d8ce7333 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Wed, 21 Apr 2021 21:03:59 -0700
Subject: [PATCH 29/56] work on adapters (hint: adapters need to provide an
 interfacing handler)

---
 .idea/jarRepositories.xml                     |  5 ++
 .../centralized/CentralizedManager.java       |  7 ++-
 ...yncNodeBase.java => AdaptingNodeBase.java} | 43 ++++++-------
 .../centralized/base/NodeBaseBuilder.java     | 60 ++++++++++++++++---
 .../typeadapter/StandardCommonAdapter.java    |  9 +--
 .../branch/execution/context/NodeContext.java |  4 +-
 .../interfacing/{model => }/Message.java      |  2 +-
 .../interfacing/{model => }/Response.java     |  2 +-
 .../{model => }/ResponseAction.java           |  4 +-
 .../handlers/CommonInterfacingHandler.java    |  6 +-
 .../handlers/CommonMessageMap.java            |  4 +-
 .../handlers/CommonResponseActionHandler.java |  6 +-
 .../handlers/InterfacingHandler.java          |  4 +-
 .../interfacing/handlers/MessageMap.java      |  5 +-
 .../interfacing/handlers/MessageProvider.java |  5 --
 .../handlers/ResponseActionHandler.java       |  6 +-
 .../responses/FailedAdaptingResponse.java     |  2 +-
 .../responses/NoIntegratedArgsResponse.java   |  2 +-
 .../responses/NoPermissionResponse.java       |  2 +-
 .../responses/TooManyArgsResponse.java        |  2 +-
 .../nodes/results/model/FailingResult.java    |  2 +-
 .../branch/nodes/results/model/Result.java    |  2 +-
 .../nodes/results/model/SuccessfulResult.java |  2 +-
 spigot-impl/pom.xml                           |  8 +--
 .../beetle/branch/spigot/CommandWrapper.java  | 52 ++++++++++++++++
 .../beetle/branch/spigot/SpigotContext.java   |  4 +-
 .../branch/spigot/SpigotContextProvider.java  |  2 -
 .../beetle/branch/spigot/SpigotManager.java   | 35 ++++++++---
 .../branch/spigot/SpigotManagerBinder.java    | 20 +++++--
 .../{toPlayer => adapter}/PlayerAdapter.java  |  2 +-
 .../spigot/{ => adapter}/SenderAdapter.java   |  2 +-
 .../spigot/message/SpigotMessageProvider.java |  4 ++
 .../branch/spigot/message/TextMessage.java    |  2 +-
 .../beetle/branch/spigot/ExampleBinding.java  |  2 +-
 34 files changed, 220 insertions(+), 99 deletions(-)
 rename core/src/main/java/me/aurium/beetle/branch/centralized/base/{SyncNodeBase.java => AdaptingNodeBase.java} (66%)
 rename spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java => core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java (86%)
 rename core/src/main/java/me/aurium/beetle/branch/interfacing/{model => }/Message.java (94%)
 rename core/src/main/java/me/aurium/beetle/branch/interfacing/{model => }/Response.java (94%)
 rename core/src/main/java/me/aurium/beetle/branch/interfacing/{model => }/ResponseAction.java (88%)
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/CommandWrapper.java
 rename spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/{toPlayer => adapter}/PlayerAdapter.java (96%)
 rename spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/{ => adapter}/SenderAdapter.java (95%)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index bf6e201..cc475cd 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="papermc" />
+      <option name="name" value="papermc" />
+      <option name="url" value="https://papermc.io/repo/repository/maven-public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="aurium-libs-release" />
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
index 20746cf..f37f5f7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
@@ -21,6 +21,7 @@
 
 package me.aurium.beetle.branch.centralized;
 
+import me.aurium.beetle.branch.centralized.base.NodeBase;
 import me.aurium.beetle.branch.centralized.base.NodeBaseBuilder;
 import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 
@@ -33,8 +34,10 @@ public interface CentralizedManager<T,V> {
 
     CentralizedManagerBinder getBinder(V platform);
 
-    NodeBaseBuilder<T> newCommand();
-    <C extends T> NodeBaseBuilder<C> newCommand(ManagerAdapter<T,C> adapter);
+    NodeBaseBuilder<T,T> newCommand();
+    <C extends T> NodeBaseBuilder<T,C> newCommand(ManagerAdapter<T,C> adapter);
+
+    void injectCommand(NodeBase<T> base);
 
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
similarity index 66%
rename from core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java
rename to core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
index a7f6d46..e8ba911 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
@@ -21,61 +21,64 @@
 
 package me.aurium.beetle.branch.centralized.base;
 
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.execution.api.Execution;
 import me.aurium.beetle.branch.execution.context.ContextProvider;
 import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.nodes.results.model.Result;
 
 import java.util.List;
 
-/**
- * Represents a nodebase that will search for executions synchronously
- * it will also search for suggestions synchronously
- * @param <C>
- */
-public class SyncNodeBase<C> implements NodeBase<C> {
+public class AdaptingNodeBase<T,C extends T> implements NodeBase<T> {
+
+    private final ManagerAdapter<T,C> adapter;
 
     private final CommandNode<C> baseNode;
     private final FallbackSearchStrategy<C> strategy;
-
     private final ContextProvider<C> provider;
-    private final InterfacingHandler<C> handler;
+    private final InterfacingHandler<T> handler;
 
-    public SyncNodeBase(CommandNode<C> baseNode, FallbackSearchStrategy<C> strategy, ContextProvider<C> provider, InterfacingHandler<C> handler) {
+    public AdaptingNodeBase(ManagerAdapter<T, C> adapter, CommandNode<C> baseNode, FallbackSearchStrategy<C> strategy, ContextProvider<C> provider, InterfacingHandler<T> handler) {
+        this.adapter = adapter;
         this.baseNode = baseNode;
-        this.provider = provider;
         this.strategy = strategy;
+        this.provider = provider;
         this.handler = handler;
     }
 
-    @Override
-    public void execute(C executor, String alias, String[] args) {
-        Result<SearchInfo<C>> result = strategy.attemptPreprocess(executor,alias,args,baseNode);
+    public void execute(T t, String alias, String[] args) {
+        if (!adapter.canAdapt(t)) {
+            handler.sendMessage(t,adapter.failedParseResponse(t));
+            return;
+        }
+
+        C adaptedSender = adapter.adapt(t);
+
+        Result<SearchInfo<C>> result = strategy.attemptPreprocess(adaptedSender,alias,args,baseNode);
 
         if (!result.isSuccessful()) {
-            handler.sendMessage(executor, result.getFailure());
+            handler.sendMessage(adaptedSender, result.getFailure());
             return;
         }
 
         SearchInfo<C> info = result.getSuccess();
-        NodeContext<C> produced = provider.produce(executor,alias,args,baseNode,info);
+        NodeContext<C> produced = provider.produce(adaptedSender,alias,args,baseNode,info);
 
         Result<Execution<C>> execution = info.resultingNode().getHandling().getExecution(produced);
 
         if (!execution.isSuccessful()) {
-            handler.sendMessage(executor, execution.getFailure());
+            handler.sendMessage(adaptedSender, execution.getFailure());
             return;
         }
 
         execution.getSuccess().run();
     }
 
-    @Override
-    public List<String> suggest(C c, String alias, String[] args) {
-        return null;
+    public List<String> suggest(T t, String alias, String[] args) {
+        return null; //TODO
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
index d404015..ea3d645 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
@@ -21,28 +21,70 @@
 
 package me.aurium.beetle.branch.centralized.base;
 
-import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
+import me.aurium.beetle.branch.centralized.CentralizedManager;
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.execution.context.ContextProvider;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
+import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
+import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+
+import java.util.Objects;
+
+public class NodeBaseBuilder<T,C extends T> {
 
-public class NodeBaseBuilder<T> {
+    private final CentralizedManager<T,?> manager;
+    private final ManagerAdapter<T,C> adapter;
 
-    private ContextProvider<T> producer;
+    private CommandNode<C> node;
+    private FallbackSearchStrategy<C> strategy;
+    private ContextProvider<C> provider;
+    private InterfacingHandler<T> handler;
 
-    private CommandNode<T> base;
-    private FallbackSearchStrategy<T> strategy = new OneBackStrategy<>();
 
-    public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
-        this.base = node;
+    public NodeBaseBuilder(CentralizedManager<T, ?> manager, ManagerAdapter<T, C> adapter) {
+        this.manager = manager;
+        this.adapter = adapter;
+    }
+
+    public NodeBaseBuilder(CentralizedManager<T, ?> manager, ManagerAdapter<T, C> adapter, FallbackSearchStrategy<C> strategy, ContextProvider<C> provider, InterfacingHandler<T> handler) {
+        this.manager = manager;
+        this.adapter = adapter;
+        this.strategy = strategy;
+        this.provider = provider;
+        this.handler = handler;
+    }
+
+    public NodeBaseBuilder<T,C> setNode(CommandNode<C> node) {
+        this.node = node;
 
         return this;
     }
 
-    public NodeBaseBuilder<T> withStrategy(FallbackSearchStrategy<T> strategy) {
+    public NodeBaseBuilder<T,C> setStrategy(FallbackSearchStrategy<C> strategy) {
         this.strategy = strategy;
 
         return this;
     }
 
+    public NodeBaseBuilder<T,C> setProvider(ContextProvider<C> provider) {
+        this.provider = provider;
+
+        return this;
+    }
+
+    public NodeBaseBuilder<T,C> setHandler(InterfacingHandler<T> handler) {
+        this.handler = handler;
+
+        return this;
+    }
+
+    public void inject() {
+        Objects.requireNonNull(node);
+        Objects.requireNonNull(strategy);
+        Objects.requireNonNull(provider);
+        Objects.requireNonNull(handler);
+
+        manager.injectCommand(new AdaptingNodeBase<>(adapter,node,strategy,provider,handler));
+    }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java
similarity index 86%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
rename to core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java
index aefdf2d..816aac1 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java
@@ -19,12 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot.message;
-
-import java.util.UUID;
-
-public class SpigotKeys {
-
-
+package me.aurium.beetle.branch.centralized.typeadapter;
 
+public class StandardCommonAdapter implements CommonAdapter<Object> {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
index a49b82b..29d7ac7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
@@ -21,8 +21,8 @@
 
 package me.aurium.beetle.branch.execution.context;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
rename to core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java
index a8ba0cc..b898926 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.model;
+package me.aurium.beetle.branch.interfacing;
 
 public interface Message<C> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
rename to core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java
index 8d8730c..d55e2d1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.model;
+package me.aurium.beetle.branch.interfacing;
 
 public interface Response {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java
similarity index 88%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
rename to core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java
index 549c84e..acbe657 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java
@@ -19,9 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.model;
-
-import me.aurium.beetle.branch.interfacing.model.Message;
+package me.aurium.beetle.branch.interfacing;
 
 public interface ResponseAction<T,C extends Response> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
index 85f7d98..0ca6f44 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
@@ -21,10 +21,8 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
-
-import java.util.concurrent.FutureTask;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
 
 public class CommonInterfacingHandler<T> implements InterfacingHandler<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
index 8a14ab2..6b64eee 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
@@ -21,8 +21,8 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
-import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.beetle.branch.interfacing.ResponseAction;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
index e7a2a6b..a344cc7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
@@ -21,9 +21,9 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
-import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.beetle.branch.interfacing.ResponseAction;
 
 import java.util.Map;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
index cadee9e..bf7b24b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
@@ -21,8 +21,8 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
 
 /**
  * Represents a centralized source for message providing as well as context creation. I am aware i spelled recipient wrong.
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
index e750542..21a3059 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
@@ -21,9 +21,8 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.handlers.ResponseActionHandler;
-import me.aurium.beetle.branch.interfacing.model.Response;
-import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.beetle.branch.interfacing.ResponseAction;
 
 public interface MessageMap<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
index ae0844b..e322c1f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
@@ -21,11 +21,6 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
-import me.aurium.beetle.branch.interfacing.model.ResponseAction;
-
-import java.util.Map;
-
 public interface MessageProvider<T> {
 
     ResponseActionHandler<T> make();
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
index dd5247d..4939892 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
@@ -21,9 +21,9 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
-import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.beetle.branch.interfacing.ResponseAction;
 
 public interface ResponseActionHandler<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
index e9e6ac3..e3b7672 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 /**
  * Represents a response to the scenario in which a certain object was attempted to be adapted to an extending type
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
index 995a360..355bc85 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
@@ -22,7 +22,7 @@
 package me.aurium.beetle.branch.interfacing.responses;
 
 import me.aurium.beetle.branch.execution.context.NodeContext;
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
index afb42ef..7d69c0c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 public class NoPermissionResponse implements Response {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
index ea3d965..c8423c6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 public class TooManyArgsResponse implements Response {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
index 5e4a7b7..23ea321 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 /**
  * A result that has failed
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
index a3f47a0..19ee4c7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 public interface Result<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
index e706a48..b714b85 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 public class SuccessfulResult<T> implements Result<T> {
 
diff --git a/spigot-impl/pom.xml b/spigot-impl/pom.xml
index 52fbc29..6092a45 100644
--- a/spigot-impl/pom.xml
+++ b/spigot-impl/pom.xml
@@ -44,8 +44,8 @@
             <version>0.1.1</version>
         </dependency>
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
+            <groupId>com.destroystokyo.paper</groupId>
+            <artifactId>paper-api</artifactId>
             <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
@@ -53,8 +53,8 @@
 
     <repositories>
         <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
     </repositories>
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/CommandWrapper.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/CommandWrapper.java
new file mode 100644
index 0000000..c5d5fd8
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/CommandWrapper.java
@@ -0,0 +1,52 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.centralized.base.NodeBase;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class CommandWrapper extends Command {
+
+    private final NodeBase<CommandSender> base;
+
+    public CommandWrapper(NodeBase<CommandSender> base) {
+        super(null); //TODO description of base node, etc etc etc etc etc
+
+        this.base = base;
+    }
+
+    @Override
+    public boolean execute(@NotNull CommandSender commandSender, @NotNull String s, String[] strings) {
+        base.execute(commandSender, s, strings);
+
+        return true;
+    }
+
+    @Override
+    public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, String[] args) throws IllegalArgumentException {
+        return base.suggest(sender, alias, args);
+    }
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index c531e06..ea01e94 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -24,8 +24,8 @@
 
 import me.aurium.beetle.branch.execution.context.AbstractNodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.ChatColor;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
index d42be67..8458955 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
@@ -25,7 +25,6 @@
 import me.aurium.beetle.branch.execution.context.ContextProvider;
 import me.aurium.beetle.branch.execution.context.NodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.command.CommandSender;
@@ -38,7 +37,6 @@ public SpigotContextProvider(InterfacingHandler<C> handler) {
         this.handler = handler;
     }
 
-
     @Override
     public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> baseNode, SearchInfo<C> search) {
         return new SpigotContext<>(sender,alias,strings,baseNode,search, handler);
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index c466cb6..04b286e 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -21,33 +21,52 @@
 
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.interfacing.handlers.CommonInterfacingHandler;
-import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.centralized.CentralizedManager;
 import me.aurium.beetle.branch.centralized.CentralizedManagerBinder;
+import me.aurium.beetle.branch.centralized.base.NodeBase;
 import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.centralized.base.NodeBaseBuilder;
+import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
+import me.aurium.beetle.branch.interfacing.handlers.CommonInterfacingHandler;
+import me.aurium.beetle.branch.interfacing.handlers.ResponseActionHandler;
+import me.aurium.beetle.branch.spigot.adapter.SenderAdapter;
+import me.aurium.beetle.branch.spigot.message.SpigotMessageProvider;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class SpigotManager implements CentralizedManager<CommandSender, JavaPlugin> {
 
-    private final SenderAdapter adapter = new SenderAdapter();
+    private final static SenderAdapter senderAdapter = new SenderAdapter();
+
+    private final CommonInterfacingHandler<CommandSender> defaultInterfacing;
+    private final Set<NodeBase<CommandSender>> senders;
+
+    public SpigotManager(ResponseActionHandler<CommandSender> defaultResponser) {
+        this.defaultInterfacing = new CommonInterfacingHandler<>(defaultResponser);
+        this.senders = new HashSet<>();
+    }
 
     @Override
     public CentralizedManagerBinder getBinder(JavaPlugin platform) {
-        return new SpigotManagerBinder(platform);
+        return new SpigotManagerBinder(platform.getName(), platform.getServer().getCommandMap(), senders);
     }
 
     @Override
-    public NodeBaseBuilder<CommandSender> newCommand() {
-        return newCommand(adapter);
+    public NodeBaseBuilder<CommandSender, CommandSender> newCommand() {
+        return new NodeBaseBuilder<>(this, senderAdapter, new OneBackStrategy<>(), new SpigotContextProvider<>(defaultInterfacing), defaultInterfacing);
     }
 
     @Override
-    public <C extends CommandSender> NodeBaseBuilder<C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
-        return null;
+    public <C extends CommandSender> NodeBaseBuilder<CommandSender, C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
+        return new NodeBaseBuilder<>(this,adapter, new OneBackStrategy<>(), new SpigotContextProvider<>(null), defaultInterfacing);
     }
 
+    @Override
+    public void injectCommand(NodeBase<CommandSender> base) {
+        senders.add(base);
+    }
 
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
index 5340b01..0a5685f 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
@@ -22,18 +22,28 @@
 package me.aurium.beetle.branch.spigot;
 
 import me.aurium.beetle.branch.centralized.CentralizedManagerBinder;
-import org.bukkit.plugin.java.JavaPlugin;
+import me.aurium.beetle.branch.centralized.base.NodeBase;
+import org.bukkit.command.CommandMap;
+import org.bukkit.command.CommandSender;
+
+import java.util.Set;
 
 public class SpigotManagerBinder implements CentralizedManagerBinder {
 
-    private final JavaPlugin plugin;
+    private final String pluginName;
+    private final CommandMap map;
+    private final Set<NodeBase<CommandSender>> senders;
 
-    public SpigotManagerBinder(JavaPlugin plugin) {
-        this.plugin = plugin;
+    public SpigotManagerBinder(String pluginName, CommandMap map, Set<NodeBase<CommandSender>> senders) {
+        this.pluginName = pluginName;
+        this.map = map;
+        this.senders = senders;
     }
 
     @Override
     public void bind() { //TODO implement
-        plugin.getServer().getPluginManager();
+        for (NodeBase<CommandSender> node : senders) {
+            map.register(pluginName,new CommandWrapper(node));
+        }
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/PlayerAdapter.java
similarity index 96%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
rename to spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/PlayerAdapter.java
index 5c40ade..686401b 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/PlayerAdapter.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot.toPlayer;
+package me.aurium.beetle.branch.spigot.adapter;
 
 import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
 import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/SenderAdapter.java
similarity index 95%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
rename to spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/SenderAdapter.java
index c27acf2..40ad889 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/SenderAdapter.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot;
+package me.aurium.beetle.branch.spigot.adapter;
 
 import me.aurium.beetle.branch.centralized.typeadapter.CommonAdapter;
 import org.bukkit.command.CommandSender;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
index b3e50c0..99aba24 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
@@ -37,4 +37,8 @@ public SpigotMessageProvider() {
         map.add(FailedAdaptingResponse.class, response -> new TextMessage<>());
     }
 
+    public CommonMessageMap<C> build() {
+        return map;
+    }
+
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
index 0a7edf3..a2c4a61 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.Message;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
diff --git a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
index 2e77465..44f3630 100644
--- a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
+++ b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
@@ -26,7 +26,7 @@
 public class ExampleBinding extends JavaPlugin {
 
 
-    private static final SpigotManager manager = new SpigotManager();
+    private static final SpigotManager manager = new SpigotManager(defaultResponser);
 
     @Override
     public void onEnable() {

From 93e075a48f33763757c9656e4126c877cf6713c1 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Wed, 21 Apr 2021 21:50:01 -0700
Subject: [PATCH 30/56] finish up with adapters

---
 .../beetle/branch/centralized/base/AdaptingNodeBase.java | 4 ++--
 .../beetle/branch/execution/context/NodeContext.java     | 6 ------
 .../me/aurium/beetle/branch/spigot/SpigotContext.java    | 9 ++-------
 .../beetle/branch/spigot/SpigotContextProvider.java      | 4 ++--
 .../me/aurium/beetle/branch/spigot/SpigotManager.java    | 2 +-
 5 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
index e8ba911..6d718fd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
@@ -61,7 +61,7 @@ public void execute(T t, String alias, String[] args) {
         Result<SearchInfo<C>> result = strategy.attemptPreprocess(adaptedSender,alias,args,baseNode);
 
         if (!result.isSuccessful()) {
-            handler.sendMessage(adaptedSender, result.getFailure());
+            handler.sendMessage(t, result.getFailure());
             return;
         }
 
@@ -71,7 +71,7 @@ public void execute(T t, String alias, String[] args) {
         Result<Execution<C>> execution = info.resultingNode().getHandling().getExecution(produced);
 
         if (!execution.isSuccessful()) {
-            handler.sendMessage(adaptedSender, execution.getFailure());
+            handler.sendMessage(t, execution.getFailure());
             return;
         }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
index 29d7ac7..efa6b5d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
@@ -41,12 +41,6 @@ public interface NodeContext<T> {
      */
     void stringSender(String string);
 
-    /**
-     * Sends a fancy formatted message to a player using the bound platform's message-handler
-     * @param message message
-     */
-    void messageSender(Message<T> message);
-
     /**
      * Sends a formatted response to a player coded to a key
      * @param failure the response
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index ea01e94..2dd55e0 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -34,9 +34,9 @@
 public class SpigotContext<T extends CommandSender> extends AbstractNodeContext<T> {
 
     private final T sender;
-    private final InterfacingHandler<T> handler;
+    private final InterfacingHandler<CommandSender> handler;
 
-    protected SpigotContext(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, InterfacingHandler<T> handler) {
+    protected SpigotContext(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, InterfacingHandler<CommandSender> handler) {
         super(sender, alias, args, baseNode, result);
 
         this.sender = sender;
@@ -48,11 +48,6 @@ public void stringSender(String string) {
         this.sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string));
     }
 
-    @Override
-    public void messageSender(Message<T> message) {
-        handler.sendMessage(sender,message);
-    }
-
     @Override
     public void response(Response failure) {
         handler.sendMessage(sender,failure);
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
index 8458955..441571a 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
@@ -31,9 +31,9 @@
 
 public class SpigotContextProvider<C extends CommandSender> implements ContextProvider<C> {
 
-    private final InterfacingHandler<C> handler;
+    private final InterfacingHandler<CommandSender> handler;
 
-    public SpigotContextProvider(InterfacingHandler<C> handler) {
+    public SpigotContextProvider(InterfacingHandler<CommandSender> handler) {
         this.handler = handler;
     }
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index 04b286e..7c4d889 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -61,7 +61,7 @@ public NodeBaseBuilder<CommandSender, CommandSender> newCommand() {
 
     @Override
     public <C extends CommandSender> NodeBaseBuilder<CommandSender, C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
-        return new NodeBaseBuilder<>(this,adapter, new OneBackStrategy<>(), new SpigotContextProvider<>(null), defaultInterfacing);
+        return new NodeBaseBuilder<>(this,adapter, new OneBackStrategy<>(), new SpigotContextProvider<>(defaultInterfacing), defaultInterfacing);
     }
 
     @Override

From 9510fc9d4bae090598803ae6fa3797f1826e2e44 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Wed, 21 Apr 2021 22:05:32 -0700
Subject: [PATCH 31/56] randomshit

---
 .idea/encodings.xml                            |  4 ----
 .../Description.java}                          |  4 ++--
 pom.xml                                        | 18 ++++++++++++++++--
 spigot-impl/pom.xml                            |  1 -
 .../beetle/branch/spigot/ExampleBinding.java   |  5 -----
 5 files changed, 18 insertions(+), 14 deletions(-)
 rename core/src/main/java/me/aurium/beetle/branch/information/{suggestion/Suggestion.java => description/Description.java} (90%)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 71de4af..c57d607 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/beetle-impl/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/beetle-impl/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/spigot-impl/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/spigot-impl/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java b/core/src/main/java/me/aurium/beetle/branch/information/description/Description.java
similarity index 90%
rename from core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java
rename to core/src/main/java/me/aurium/beetle/branch/information/description/Description.java
index f90b5c2..24c5ec3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java
+++ b/core/src/main/java/me/aurium/beetle/branch/information/description/Description.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.information.suggestion;
+package me.aurium.beetle.branch.information.description;
 
-public class Suggestion {
+public class Description {
 }
diff --git a/pom.xml b/pom.xml
index ea7a941..9d1b34b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,14 +25,18 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>me.aurium</groupId>
     <artifactId>branch</artifactId>
     <packaging>pom</packaging>
     <version>0.1.0</version>
 
+    <parent>
+        <groupId>me.aurium</groupId>
+        <artifactId>insect</artifactId>
+        <version>0.2.1</version>
+    </parent>
+
     <modules>
         <module>core</module>
-        <module>beetle-impl</module>
         <module>spigot-impl</module>
     </modules>
 
@@ -41,4 +45,14 @@
         <maven.compiler.target>${compiler.version}</maven.compiler.target>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <artifactId>branch-core</artifactId>
+                <groupId>me.aurium</groupId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>
\ No newline at end of file
diff --git a/spigot-impl/pom.xml b/spigot-impl/pom.xml
index 6092a45..fe5896b 100644
--- a/spigot-impl/pom.xml
+++ b/spigot-impl/pom.xml
@@ -41,7 +41,6 @@
         <dependency>
             <groupId>me.aurium</groupId>
             <artifactId>branch-core</artifactId>
-            <version>0.1.1</version>
         </dependency>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
diff --git a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
index 44f3630..984079a 100644
--- a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
+++ b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
@@ -25,13 +25,8 @@
 
 public class ExampleBinding extends JavaPlugin {
 
-
-    private static final SpigotManager manager = new SpigotManager(defaultResponser);
-
     @Override
     public void onEnable() {
-        manager.getBinder(this).bind();
-
 
 
 

From a531c41bf8f136c34c6490a16fbc5874b84cf698 Mon Sep 17 00:00:00 2001
From: "Aurium_ @ElytraForce" <aukrais@gmail.com>
Date: Wed, 21 Apr 2021 22:07:39 -0700
Subject: [PATCH 32/56] Update maven.yml

---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c8aeb3a..ffa0eb4 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,9 +16,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 16
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 16
     - name: Build with Maven
       run: mvn -B package --file pom.xml

From 9cd345ef8ffc1b2a196b5502d68862129878e806 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Sun, 28 Mar 2021 23:22:59 -0700
Subject: [PATCH 33/56] add adapter stuff clumsily

---
 .../marker/permission/Permission.java         |  4 ++
 .../marker/permission/StringPermChecker.java  |  2 +-
 .../parsers/PermissionAnnotationParser.java   |  2 +-
 .../beetle/branch/fallback/FallbackPair.java  |  9 +++++
 .../message/MessageProviderFactory.java       |  9 +++++
 .../{strategies => }/StringPermission.java    |  2 +-
 .../strategies/AutoFallbackPermStrategy.java  | 16 ++++++++
 .../strategies/FallbackPermStrategy.java      | 13 ++++---
 .../strategies/PassthroughStrategy.java       |  2 +-
 .../handlers/context/AbstractNodeContext.java | 19 +++++++---
 .../handlers/context/ContextErrorMessage.java |  9 +++++
 .../handlers/context/ContextProducer.java     |  3 +-
 .../launchpoints/CentralizedManager.java      | 11 ++++--
 .../CentralizedManagerBinder.java             |  6 +++
 .../launchpoints/IllegalSenderException.java  |  9 +++++
 .../branch/launchpoints/base/NodeBase.java    |  2 -
 .../launchpoints/base/NodeBaseBuilder.java    | 17 +++++++--
 .../launchpoints/base/SimpleNodeBase.java     |  2 +-
 .../typeadapter/CommonAdapter.java            | 21 +++++++++++
 .../typeadapter/ManagerAdapter.java           | 15 ++++++++
 .../beetle/branch/nodes/BranchingNode.java    |  4 ++
 .../beetle/branch/util/PreStoredHashSet.java  |  2 +-
 spigot-impl/pom.xml                           |  5 +++
 .../beetle/branch/spigot/PlayerAdapter.java   | 32 ++++++++++++++++
 .../beetle/branch/spigot/SenderAdapter.java   |  7 ++++
 .../beetle/branch/spigot/SpigotContext.java   | 24 ++++++++++++
 .../branch/spigot/SpigotContextProducer.java  | 37 +++++++++++++++++++
 .../beetle/branch/spigot/SpigotManager.java   | 28 +++++++++++++-
 .../branch/spigot/SpigotManagerBinder.java    | 18 +++++++++
 .../beetle/branch/spigot/ExampleBinding.java  | 19 ++++++++++
 30 files changed, 320 insertions(+), 29 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
 rename core/src/main/java/me/aurium/beetle/branch/fallback/permission/{strategies => }/StringPermission.java (81%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
 create mode 100644 spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java

diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
index f5a9542..7dc843c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
@@ -1,5 +1,9 @@
 package me.aurium.beetle.branch.annotate.marker.permission;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD,ElementType.CONSTRUCTOR})
 public @interface Permission {
 
     Class<? extends StringPermChecker> getRelativeChecker();
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
index a0ff553..eba19f6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.annotate.marker.permission;
 
-import me.aurium.beetle.branch.fallback.permission.strategies.StringPermission;
+import me.aurium.beetle.branch.fallback.permission.StringPermission;
 
 public interface StringPermChecker {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
index 0ced0f2..5a1882c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.annotate.parsers;
 
 import me.aurium.beetle.branch.annotate.marker.permission.Permission;
-import me.aurium.beetle.branch.fallback.permission.strategies.StringPermission;
+import me.aurium.beetle.branch.fallback.permission.StringPermission;
 
 import java.lang.annotation.Annotation;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java b/core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java
new file mode 100644
index 0000000..c205e9f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.fallback;
+
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+
+public interface FallbackPair {
+
+    //TODO make this liek have two things: fallback for the base and fallback pre-base (for shit like adapter fails)
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
new file mode 100644
index 0000000..03e47f7
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public class MessageProviderFactory {
+
+    public static <T> BuilderMessageProvider<T> getProvider() {
+        return null;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/StringPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java
similarity index 81%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/StringPermission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java
index 2b7674f..e53a1a8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/StringPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
+package me.aurium.beetle.branch.fallback.permission;
 
 import me.aurium.beetle.branch.fallback.permission.Permission;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
new file mode 100644
index 0000000..f4b9c74
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
@@ -0,0 +1,16 @@
+package me.aurium.beetle.branch.fallback.permission.strategies;
+
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+
+public class AutoFallbackPermStrategy<T> implements ExecutionFallbackStrategy<T> {
+    @Override
+    public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
+
+    }
+
+    //TODO make this autogenerate messages for failure
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
index d2f8ce2..f11c12b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
@@ -27,13 +27,8 @@
  */
 public class FallbackPermStrategy<T> implements ExecutionFallbackStrategy<T> {
 
-    //TODO a248, this is one of the most important classes. in depth logic review because all of this is untested
-    // and i have no idea if it's gonna work haha. Also if you can think of a way to reduce the boilerplate of the while loops that'd
-    // be nice but i'm pretty sure theyre essential
-
     @Override
     public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
-
         BlockPath pathToTest = CommonBlockPath.of(args);
         NodeResult<T> toBeExecuted = baseNode.getSpecificNode(pathToTest);
 
@@ -58,11 +53,17 @@ public void executeStrategy(T sender, String alias, String[] args, CommandNode<T
             }
         }
 
-        NodeContext<T> produced = producer.produce(sender,alias,args, toBeExecuted.resultingNode(), baseNode, toBeExecuted.resultingPath(), pathToTest);
+        NodeContext<T> produced = producer.produce(sender,alias,args, toBeExecuted.resultingNode(), baseNode, toBeExecuted.resultingPath(), pathToTest, fallback);
 
         toBeExecuted.resultingNode().getExecutionHandler().getExecution().get().handle(produced);
     }
 
+    //TODO a248, this is one of the most important classes. in depth logic review because all of this is untested
+    // and i have no idea if it's gonna work haha. Also if you can think of a way to reduce the boilerplate of the while loops that'd
+    // be nice but i'm pretty sure theyre essential
+
+
+
 
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
index 44efbe8..111870d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
@@ -19,7 +19,7 @@ public void executeStrategy(T sender, String alias, String[] args, CommandNode<T
         NodeResult<T> result = baseNode.getSpecificNode(path);
 
         result.resultingNode().getExecutionHandler().getExecution().ifPresentOrElse(
-                present -> present.handle(producer.produce(sender,alias,args, result.resultingNode(), baseNode, result.resultingPath(), path)),
+                present -> present.handle(producer.produce(sender,alias,args, result.resultingNode(), baseNode, result.resultingPath(), path, fallback)),
                 () -> { fallback.handle(producer.produce(sender,alias,args));
         });
     }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
index 5308ee2..e0240d2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
@@ -1,6 +1,7 @@
 package me.aurium.beetle.branch.handlers.context;
 
 import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
 import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 public abstract class AbstractNodeContext<T> extends AbstractContext<T> implements NodeContext<T> {
@@ -9,13 +10,15 @@ public abstract class AbstractNodeContext<T> extends AbstractContext<T> implemen
     private final CommandNode<T> base;
     private final BlockPath executedPath;
     private final BlockPath fullPath;
+    private final FallbackHandler<T> handler;
 
-    protected AbstractNodeContext(T t, String alias, String[] args, CommandNode<T> executed, CommandNode<T> base, BlockPath executedPath, BlockPath fullPath) {
-        super(t, alias, args);
-        this.executed = executed;
-        this.base = base;
+    protected AbstractNodeContext(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<T> handler) {
+        super(t, alias, strings);
+        this.executed = executedNode;
+        this.base = baseNode;
         this.executedPath = executedPath;
-        this.fullPath = fullPath;
+        this.fullPath = basePath;
+        this.handler = handler;
     }
 
     @Override
@@ -37,4 +40,10 @@ public BlockPath executedPath() {
     public BlockPath fullPath() {
         return fullPath;
     }
+
+    @Override
+    public FallbackHandler<T> getFallbackAction() {
+        return handler;
+    }
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
new file mode 100644
index 0000000..8da0bf0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.handlers.context;
+
+/**
+ * easy to use interface that lets me give it a title, some strings, and let it be converted
+ *
+ * e.g. to prettified chatcolor output or to discord embed on discord-impl.
+ */
+public interface ContextErrorMessage {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
index 5d2caf1..6c7fc7b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
@@ -1,6 +1,7 @@
 package me.aurium.beetle.branch.handlers.context;
 
 import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
 import me.aurium.beetle.branch.nodes.api.CommandNode;
 
 /**
@@ -8,7 +9,7 @@
  */
 public interface ContextProducer<T> {
 
-    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath);
+    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<T> handler);
 
     Context<T> produce(T sender, String alias, String[] strings);
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
index cf7a83e..22b765d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
@@ -1,16 +1,19 @@
 package me.aurium.beetle.branch.launchpoints;
 
-import me.aurium.beetle.branch.launchpoints.base.NodeBase;
+import me.aurium.beetle.branch.launchpoints.base.NodeBaseBuilder;
+import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
 
 /**
  * Represents the utmost base part of a command
  * @param <T> the input type, does not need to be of same type as the node bases it utilizes
+ * @param <V> the platform, void if there is none (how?)
  */
-public interface CentralizedManager<T> {
-
-    CentralizedManagerBinder getBinder(); //think of Beetle's accessors for files, except this time it's for commands? idk
+public interface CentralizedManager<T,V> {
 
+    CentralizedManagerBinder getBinder(V platform);
 
+    NodeBaseBuilder<T> newCommand();
+    <C extends T> NodeBaseBuilder<C> newCommand(ManagerAdapter<T,C> adapter);
 
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
index 096d7a7..a83c4d1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
@@ -1,4 +1,10 @@
 package me.aurium.beetle.branch.launchpoints;
 
 public interface CentralizedManagerBinder {
+
+    /**
+     * Register all commands to the platform
+     */
+    void bind();
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
new file mode 100644
index 0000000..10c29bc
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.launchpoints;
+
+public class IllegalSenderException extends RuntimeException{
+
+    public IllegalSenderException(String lmao) {
+        super(lmao);
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
index 3af9eb2..edfad8f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
@@ -5,8 +5,6 @@
 public interface NodeBase<T> {
 
     void execute(T t, String alias, String[] args);
-
     List<String> suggest(T t, String alias, String[] args);
 
-
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
index 886a4d2..722c31e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
@@ -7,21 +7,26 @@
 import me.aurium.beetle.branch.fallback.permission.strategies.FallbackPermStrategy;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 public class NodeBaseBuilder<T> {
 
-    private final CommandNode<T> base;
     private final ContextProducer<T> producer;
 
+    private CommandNode<T> base;
     private FallbackHandler<T> fallbackHandler = (shit) -> shit.messageSender("Error running command with arguments: " + Arrays.toString(shit.getArgs()));
-
     private ExecutionFallbackStrategy<T> strategy = new FallbackPermStrategy<>();
 
-    public NodeBaseBuilder(CommandNode<T> base, ContextProducer<T> producer) {
-        this.base = base;
+    public <X> NodeBaseBuilder(ContextProducer<T> producer) {
         this.producer = producer;
     }
 
+    public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
+        this.base = node;
+
+        return this;
+    }
+
     public NodeBaseBuilder<T> withFallback(FallbackHandler<T> fallback) {
         this.fallbackHandler = fallback;
 
@@ -35,6 +40,10 @@ public NodeBaseBuilder<T> withStrategy(ExecutionFallbackStrategy<T> strategy) {
     }
 
     public NodeBase<T> build() {
+        Objects.requireNonNull(base);
+        Objects.requireNonNull(fallbackHandler);
+        Objects.requireNonNull(strategy);
+
         return new SimpleNodeBase<>(base,producer,fallbackHandler,strategy);
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
index d0bfde4..ff26611 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
@@ -25,7 +25,7 @@ public <X> SimpleNodeBase(CommandNode<C> baseNode, ContextProducer<C> factory, F
 
     @Override
     public void execute(C executor, String alias, String[] args) {
-        strategy.executeStrategy(executor,alias,args,baseNode, fallbackHandler,factory);
+        strategy.executeStrategy(executor,alias,args,baseNode, fallbackHandler, factory);
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
new file mode 100644
index 0000000..715aa33
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
@@ -0,0 +1,21 @@
+package me.aurium.beetle.branch.launchpoints.typeadapter;
+
+import java.util.function.Consumer;
+
+public interface CommonAdapter<T> extends ManagerAdapter<T,T> {
+
+    @Override
+    default T adapt(T in) {
+        return in;
+    }
+
+    @Override
+    default boolean canAdapt(T t) {
+        return true;
+    }
+
+    @Override
+    default Consumer<T> failedAdaptAction() {
+        return (i) -> {}; //noops
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
new file mode 100644
index 0000000..4e62cbe
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
@@ -0,0 +1,15 @@
+package me.aurium.beetle.branch.launchpoints.typeadapter;
+
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
+
+import java.util.function.Consumer;
+
+public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
+
+    OUTPUT adapt(INPUT input);
+
+    boolean canAdapt(INPUT input);
+
+    Consumer<INPUT> failedAdaptAction();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 6fb2c93..8cb916d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -8,6 +8,8 @@
 import me.aurium.beetle.branch.fallback.permission.Permission;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
+import java.util.stream.Collectors;
+
 /**
  * TODO: missing a Node for noargs will cause it to rely on fallback rather than throwning exceptions and being bad
  * @param <T>
@@ -65,6 +67,8 @@ public SuggestionHandler<T> getSuggestionHandler() {
             //this works because this suggestion handler only gets called if we are on this object lmfao
             Block matchableBlock = context.executedPath().getAllBlocks().getLast();
 
+            nodes.getContents().stream().map(IdentifiableNode::getIdentifier).collect(Collectors.toList());
+
             return null;
         };
     }
diff --git a/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
index f4e80d9..33af162 100644
--- a/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
@@ -9,7 +9,7 @@
  */
 public class PreStoredHashSet<T> {
 
-    private T alreadyStored;
+    private final T alreadyStored;
     private final Set<T> otherThingsInTheSet;
     private final boolean linked;
 
diff --git a/spigot-impl/pom.xml b/spigot-impl/pom.xml
index 8b60676..3f1e678 100644
--- a/spigot-impl/pom.xml
+++ b/spigot-impl/pom.xml
@@ -22,6 +22,11 @@
             <artifactId>beetle-spigot-impl</artifactId>
             <version>0.4.1</version>
         </dependency>
+        <dependency>
+            <groupId>me.aurium</groupId>
+            <artifactId>branch-core</artifactId>
+            <version>0.1.1</version>
+        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java
new file mode 100644
index 0000000..4f49a25
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java
@@ -0,0 +1,32 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.function.Consumer;
+
+public class PlayerAdapter implements ManagerAdapter<CommandSender, Player> {
+
+    private final Consumer<CommandSender> failedOperation;
+
+    public PlayerAdapter(Consumer<CommandSender> failedOperation) {
+        this.failedOperation = failedOperation;
+    }
+
+    @Override
+    public Player adapt(CommandSender sender) {
+        return (Player) sender;
+    }
+
+    @Override
+    public boolean canAdapt(CommandSender sender) {
+        return sender instanceof Player;
+    }
+
+    @Override
+    public Consumer<CommandSender> failedAdaptAction() {
+        return failedOperation;
+    }
+
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
new file mode 100644
index 0000000..cda8236
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.launchpoints.typeadapter.CommonAdapter;
+import org.bukkit.command.CommandSender;
+
+public class SenderAdapter implements CommonAdapter<CommandSender> {
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
new file mode 100644
index 0000000..203ce45
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -0,0 +1,24 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.handlers.context.AbstractNodeContext;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+public class SpigotContext<T extends CommandSender> extends AbstractNodeContext<T> {
+
+    private final T sender;
+
+    public SpigotContext(T sender, String alias, String[] args, CommandNode<T> executed, CommandNode<T> base, BlockPath executedPath, BlockPath fullPath, FallbackHandler<T> handler) {
+        super(sender, alias, args, executed, base, executedPath, fullPath, handler);
+
+        this.sender = sender;
+    }
+
+    @Override
+    public void messageSender(String string) {
+        sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string)); //TODO prettify (or just use ContextErrorMessage LMFAO)
+    }
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
new file mode 100644
index 0000000..c8fa56e
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
@@ -0,0 +1,37 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.handlers.context.Context;
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.launchpoints.IllegalSenderException;
+import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
+import me.aurium.beetle.branch.nodes.api.CommandNode;
+import org.bukkit.command.CommandSender;
+
+public class SpigotContextProducer<C extends CommandSender> implements ContextProducer<C> {
+
+    private final ManagerAdapter<CommandSender,C> adapter;
+
+    public <T> SpigotContextProducer(ManagerAdapter<CommandSender,C> adapter) {
+        this.adapter = adapter;
+    }
+
+    @Override
+    public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> executedNode, CommandNode<C> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<C> handler) {
+
+        if (!adapter.canAdapt(sender)) {
+            adapter.failedAdaptAction();
+
+            throw new IllegalSenderException("Sender is not instance of correct type!"); //TODO more fallback bullshit :)
+        }
+
+        return new SpigotContext<>(adapter.adapt(sender), alias,strings,executedNode,baseNode,executedPath,basePath,handler);
+    }
+
+    @Override
+    public Context<C> produce(C sender, String alias, String[] strings) {
+        return produce(sender, alias, strings,null,null,null,null,null);
+    }
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index 12517cc..8df5e86 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -1,4 +1,30 @@
 package me.aurium.beetle.branch.spigot;
 
-public class SpigotManager {
+import me.aurium.beetle.branch.launchpoints.CentralizedManager;
+import me.aurium.beetle.branch.launchpoints.CentralizedManagerBinder;
+import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
+import me.aurium.beetle.branch.launchpoints.base.NodeBaseBuilder;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class SpigotManager implements CentralizedManager<CommandSender, JavaPlugin> {
+
+    private final SenderAdapter adapter = new SenderAdapter();
+
+    @Override
+    public CentralizedManagerBinder getBinder(JavaPlugin platform) {
+        return new SpigotManagerBinder(platform);
+    }
+
+    @Override
+    public NodeBaseBuilder<CommandSender> newCommand() {
+        return newCommand(adapter);
+    }
+
+    @Override
+    public <C extends CommandSender> NodeBaseBuilder<C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
+        return new NodeBaseBuilder<>(new SpigotContextProducer<>(adapter));
+    }
+
+
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
new file mode 100644
index 0000000..4fe2850
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
@@ -0,0 +1,18 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.launchpoints.CentralizedManagerBinder;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class SpigotManagerBinder implements CentralizedManagerBinder {
+
+    private final JavaPlugin plugin;
+
+    public SpigotManagerBinder(JavaPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void bind() { //TODO implement
+        plugin.getServer().getPluginManager();
+    }
+}
diff --git a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
new file mode 100644
index 0000000..abe418c
--- /dev/null
+++ b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
@@ -0,0 +1,19 @@
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.nodes.builders.SingleBuilder;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class ExampleBinding extends JavaPlugin {
+
+
+    private static final SpigotManager manager = new SpigotManager();
+
+    @Override
+    public void onEnable() {
+        manager.getBinder(this).bind();
+
+
+
+
+    }
+}

From 1062c49ad31a77c89f8486a772795880af888193 Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Mon, 29 Mar 2021 20:26:01 -0700
Subject: [PATCH 34/56] pre-handler save commit

---
 .../branch/annotate/AnnotatedParser.java      |   2 +-
 .../parsers/SingleAnnotatedParser.java        |   2 +
 .../beetle/branch/argument/Arguments.java     |   4 -
 .../argument/DelegatingArgumentContext.java   |  67 ------
 .../me/aurium/beetle/branch/block/Block.java  |   9 +-
 .../aurium/beetle/branch/block/BlockList.java |  20 --
 .../aurium/beetle/branch/block/BlockPath.java |  48 -----
 .../beetle/branch/block/CommonBlockPath.java  | 190 ------------------
 .../branch/block/DelegatingBlockList.java     |  52 -----
 .../beetle/branch/block/EmptyBlock.java       |  14 +-
 .../beetle/branch/block/StringBlock.java      |  12 +-
 .../branch/fallback/failure/Failure.java      |  13 ++
 .../fallback/failure/SendableFailure.java     |  30 +++
 .../branch/fallback/message/BaseContext.java  |  11 +
 .../message/BuilderMessageProvider.java       |  20 --
 .../branch/fallback/message/CommonKeys.java   |   7 +
 .../message/FallbackMessagePrettier.java      |   9 -
 .../message/FallbackMessageProvider.java      |   4 -
 .../branch/fallback/message/Message.java      |   7 +
 .../fallback/message/MessageHandler.java      |   7 +
 .../branch/fallback/message/MessageInfo.java  |  21 ++
 .../branch/fallback/message/MessageKey.java   |  16 ++
 .../fallback/message/MessageProvider.java     |  10 +
 .../message/MessageProviderFactory.java       |   9 -
 .../fallback/message/MessageRequirement.java  |  24 +++
 .../message/impl/CommonMessageHandler.java    |  27 +++
 ...tBuilderMessageProvider.java => Shit.java} |  12 +-
 .../strategies/AutoFallbackPermStrategy.java  |  16 --
 .../strategies/CommonFallbackStrategy.java    |  78 +++++++
 .../strategies/ExecutionFallbackStrategy.java |  10 +-
 .../strategies/FallbackPermStrategy.java      |  70 -------
 .../strategies/PassthroughStrategy.java       |  26 ---
 .../handlers/EmptySuggestionHandler.java      |   3 +-
 .../branch/handlers/api/BranchHandler.java    |  12 ++
 .../handlers/api/SuggestionHandler.java       |   3 +-
 .../handlers/context/AbstractNodeContext.java |  44 ++--
 .../handlers/context/ContextProducer.java     |   8 +-
 .../branch/handlers/context/NodeContext.java  |  15 +-
 .../launchpoints/base/NodeBaseBuilder.java    |  10 +-
 .../launchpoints/base/SimpleBaseContext.java  |  18 ++
 .../launchpoints/base/SimpleNodeBase.java     |  16 +-
 .../typeadapter/ManagerAdapter.java           |   1 -
 .../beetle/branch/nodes/ArgumentNode.java     |  31 ++-
 .../beetle/branch/nodes/BranchingNode.java    |  53 +++--
 .../beetle/branch/nodes/SingleNode.java       |  17 +-
 .../branch/{ => nodes}/argument/Argument.java |   2 +-
 .../{ => nodes}/argument/ArgumentContext.java |   2 +-
 .../argument/ArgumentContextHandler.java      |   2 +-
 .../nodes/argument/ArgumentConvertet.java     |   4 +
 .../branch/nodes/argument/Arguments.java      |   4 +
 .../nodes/builders/BranchingBuilder.java      |  14 +-
 .../beetle/branch/nodes/builders/Builder.java |   5 +-
 .../branch/nodes/builders/SingleBuilder.java  |   2 +-
 .../nodes/{api => model}/CommandNode.java     |  11 +-
 .../nodes/{api => model}/EndpointNode.java    |   2 +-
 .../{api => model}/IdentifiableNode.java      |   2 +-
 .../branch/nodes/model/ResponseHandler.java   |   4 +
 .../branch/nodes/result/NodeResult.java       |  23 ---
 .../{result => results}/ExecutionResult.java  |   2 +-
 .../branch/nodes/results/SearchInfo.java      |  33 +++
 .../branch/nodes/results/SearchInput.java     |  48 +++++
 .../nodes/results/SuggestionResult.java       |   4 +
 .../nodes/results/model/FailingResult.java    |  24 +++
 .../branch/nodes/results/model/Result.java    |  12 ++
 .../nodes/results/model/SuccessfulResult.java |  24 +++
 .../beetle/branch/spigot/SpigotContext.java   |  12 +-
 .../branch/spigot/SpigotContextProducer.java  |  16 +-
 .../spigot/message/SpigotMessageProvider.java |  22 ++
 .../branch/spigot/message/TextMessage.java    |  18 ++
 .../beetle/branch/spigot/ExampleBinding.java  |   1 -
 spigot-impl/src/test/resources/plugin.yml     |   0
 71 files changed, 650 insertions(+), 721 deletions(-)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
 rename core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/{DefaultBuilderMessageProvider.java => Shit.java} (82%)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
 rename core/src/main/java/me/aurium/beetle/branch/{ => nodes}/argument/Argument.java (91%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => nodes}/argument/ArgumentContext.java (77%)
 rename core/src/main/java/me/aurium/beetle/branch/{ => nodes}/argument/ArgumentContextHandler.java (66%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{api => model}/CommandNode.java (62%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{api => model}/EndpointNode.java (83%)
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{api => model}/IdentifiableNode.java (75%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
 rename core/src/main/java/me/aurium/beetle/branch/nodes/{result => results}/ExecutionResult.java (91%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
 create mode 100644 spigot-impl/src/test/resources/plugin.yml

diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
index c39f358..7cd0c4d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.annotate;
 
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
 
 public interface AnnotatedParser<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
index d615956..8b87a8e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
@@ -40,6 +40,8 @@ public List<me.aurium.beetle.branch.nodes.SingleNode<T>> parse(Class<? extends A
                 }
 
 
+                //all of this is really really stupid lmfao we should be working with an instance of the class
+
                 if (parameters[0].getType().isAssignableFrom(NodeContext.class)) {
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java b/core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java
deleted file mode 100644
index 487a980..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/argument/Arguments.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.argument;
-
-public class Arguments {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
deleted file mode 100644
index 134871c..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/argument/DelegatingArgumentContext.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package me.aurium.beetle.branch.argument;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-
-public class DelegatingArgumentContext<T> implements ArgumentContext<T>{
-
-    private final NodeContext<T> delegate;
-    private final Arguments arguments;
-
-    public DelegatingArgumentContext(NodeContext<T> delegate, Arguments arguments) {
-        this.delegate = delegate;
-        this.arguments = arguments;
-    }
-
-    @Override
-    public T getSender() {
-        return delegate.getSender();
-    }
-
-    @Override
-    public String getAlias() {
-        return delegate.getAlias();
-    }
-
-    @Override
-    public String[] getArgs() {
-        return delegate.getArgs();
-    }
-
-    @Override
-    public void messageSender(String string) {
-        delegate.messageSender(string);
-    }
-
-    @Override
-    public CommandNode<T> getExecutedNode() {
-        return delegate.getExecutedNode();
-    }
-
-    @Override
-    public CommandNode<T> getBaseExecutedNode() {
-        return delegate.getBaseExecutedNode();
-    }
-
-    @Override
-    public BlockPath executedPath() {
-        return delegate.executedPath();
-    }
-
-    @Override
-    public BlockPath fullPath() {
-        return delegate.fullPath();
-    }
-
-    @Override
-    public FallbackHandler<T> getFallbackAction() {
-        return delegate.getFallbackAction();
-    }
-
-    @Override
-    public Arguments getArgumentContainer() {
-        return arguments;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/Block.java b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
index aef4888..e24b841 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/Block.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
@@ -3,15 +3,8 @@
 public interface Block {
 
     String getIdentifier();
-    BlockPath asSingleBlockpath();
 
     boolean equals(Object object);
-
-    default void addLast(BlockList list) {
-        list.addLast(this);
-    }
-    default void addFirst(BlockList list) {
-        list.addFirst(this);
-    }
+    boolean isEmpty();
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
deleted file mode 100644
index 1fcd238..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockList.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-import java.util.List;
-
-public interface BlockList{
-
-    void addFirst(Block block);
-    void addLast(Block block);
-
-    void removeLast();
-
-    Block getFirst();
-    Block getLast();
-
-    boolean isEmpty();
-    int size();
-
-    List<Block> getBackingList();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
deleted file mode 100644
index f023c09..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/BlockPath.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-public interface BlockPath {
-
-    boolean isEmpty();
-
-    boolean isSevered();
-    boolean endsWith(Block path);
-    boolean startsWith(Block path);
-
-
-    BlockPath getRoot();
-    BlockPath getParent();
-
-    /**
-     * Adds all the blocks from a path
-     * @param path the path to add
-     * @return a cloned path plus all the blocks from that path
-     */
-    BlockPath resolve(BlockPath path);
-
-    /**
-     * Adds the block to this path
-     * @param block the block to add
-     * @return a cloned path plus that block
-     */
-    BlockPath resolve(Block block);
-
-    BlockPath withoutBase();
-    BlockPath withoutTop();
-
-    BlockPath fromIndex(int index);
-
-    int length();
-
-    /**
-     * Returns an ordered set of blocks
-     * @return ordered set of blocks
-     */
-    BlockList getAllBlocks();
-
-    /**
-     * DO NOT USE THIS FOR COMPARISONS. THIS IS FOR DEBUGGING ONLY.
-     * @return
-     */
-    String toString();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java b/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
deleted file mode 100644
index d928916..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/CommonBlockPath.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-import java.util.ArrayList;
-
-public class CommonBlockPath implements BlockPath {
-
-    public final static String COMMON_SPLITTER = "-";
-
-    private final BlockPath root;
-    private final BlockPath parent;
-    private final BlockList blocks;
-    private final boolean isSevered;
-    private final String splitter;
-
-    public CommonBlockPath(BlockPath root, BlockPath parent, BlockList blocks, boolean isSevered, String splitter) {
-        this.root = root;
-        this.parent = parent;
-        this.blocks = blocks;
-        this.isSevered = isSevered;
-        this.splitter = splitter;
-    }
-
-    public CommonBlockPath(BlockList list, boolean isSevered, String splitter) {
-        this.root = this;
-        this.parent = this;
-        this.blocks = list;
-        this.isSevered = isSevered;
-        this.splitter = splitter;
-    }
-
-    public CommonBlockPath(String splitter) {
-        this.root = this;
-        this.parent = this;
-        this.blocks = new DelegatingBlockList(new ArrayList<>());
-        this.isSevered = true;
-        this.splitter = splitter;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return blocks.isEmpty();
-    }
-
-    @Override
-    public boolean isSevered() {
-        return isSevered;
-    }
-
-    @Override
-    public boolean endsWith(Block path) {
-        return blocks.getLast().equals(path);
-    }
-
-    @Override
-    public boolean startsWith(Block path) {
-        return blocks.getFirst().equals(path);
-    }
-
-    @Override
-    public BlockPath getRoot() {
-        return root;
-    }
-
-    @Override
-    public BlockPath getParent() {
-        return parent;
-    }
-
-    @Override
-    public BlockPath resolve(BlockPath path) {
-
-        BlockList pathBlocks = this.blocks;
-
-        for (Block block : path.getAllBlocks().getBackingList()) {
-            block.addLast(pathBlocks);
-        }
-
-        return new CommonBlockPath(root,this,pathBlocks,pathBlocks.size() > 1,this.splitter);
-    }
-
-    @Override
-    public BlockPath resolve(Block block) {
-
-        BlockList pathBlocks = this.blocks;
-
-        block.addLast(pathBlocks);
-
-        return new CommonBlockPath(root,this,pathBlocks,pathBlocks.size() > 1,this.splitter);
-    }
-
-    @Override
-    public BlockPath withoutBase() {
-        return fromIndex(0);
-    }
-
-    @Override //TODO need a logic check here
-    public BlockPath withoutTop() {
-        BlockList clone = new DelegatingBlockList(new ArrayList<>(
-                blocks.getBackingList()
-        ));
-
-        clone.removeLast();
-
-        return new CommonBlockPath(root,parent.getParent(),clone,clone.size() > 1, splitter);
-    }
-
-    @Override
-    public BlockPath fromIndex(int index) {
-        BlockList clone = new DelegatingBlockList(new ArrayList<>(
-                blocks.getBackingList().subList(index,blocks.size())
-        ));
-
-        return new CommonBlockPath(clone.getBackingList().get(0).asSingleBlockpath(),this.parent,clone,clone.size() > 1,splitter);
-    }
-
-    @Override
-    public int length() {
-        return blocks.size();
-    }
-
-    @Override
-    public BlockList getAllBlocks() {
-        return this.blocks;
-    }
-
-    @Override
-    public String toString() {
-
-        StringBuilder base = new StringBuilder();
-
-        for (Block block : this.blocks.getBackingList()) {
-            base.append('{').append(block.getIdentifier()).append('}');
-        }
-
-
-        //TODO: fix this:
-        return base.toString();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        CommonBlockPath that = (CommonBlockPath) o;
-        return blocks.equals(that.blocks);
-    }
-
-    @Override
-    public int hashCode() {
-        return blocks.hashCode();
-    }
-
-    public static BlockPath ofEmpty() {
-        return new CommonBlockPath(COMMON_SPLITTER);
-    }
-
-    public static BlockPath of(String string, String splitter) {
-        String[] subparts = string.split(splitter);
-
-        return of(subparts,splitter);
-    }
-
-    public static BlockPath of(String[] commandArguments, String splitter) {
-        BlockList blocklist = new DelegatingBlockList(new ArrayList<>());
-
-        for (String s : commandArguments) {
-            blocklist.addLast(StringBlock.of(s));
-        }
-
-        return new CommonBlockPath(blocklist,commandArguments.length > 1,splitter);
-    }
-
-    public static BlockPath of(Block block, String splitter) {
-        BlockList send = new DelegatingBlockList(new ArrayList<>());
-        send.addLast(block);
-        return new CommonBlockPath(send,true,splitter);
-    }
-
-    public static BlockPath of(String string) {
-        return of(string,COMMON_SPLITTER);
-    }
-
-    public static BlockPath of(String[] commandArguments) {
-        return of(commandArguments,COMMON_SPLITTER);
-    }
-
-    public static BlockPath of(Block block) {
-        return of(block,COMMON_SPLITTER);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java b/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
deleted file mode 100644
index 0422516..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/DelegatingBlockList.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-import java.util.List;
-
-public class DelegatingBlockList implements BlockList{
-
-    private final List<Block> blocks;
-
-    public DelegatingBlockList(List<Block> blocks) {
-        this.blocks = blocks;
-    }
-
-    @Override
-    public void addFirst(Block block) {
-        blocks.add(0,block);
-    }
-
-    @Override
-    public void addLast(Block block) {
-        blocks.add(block);
-    }
-
-    @Override
-    public void removeLast() {
-        blocks.remove(blocks.size()-1);
-    }
-
-    @Override
-    public Block getFirst() {
-        return blocks.get(0);
-    }
-
-    @Override
-    public Block getLast() {
-        return blocks.get(blocks.size()-1);
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return blocks.isEmpty();
-    }
-
-    @Override
-    public int size() {
-        return blocks.size();
-    }
-
-    @Override
-    public List<Block> getBackingList() {
-        return blocks;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
index 8b5558c..58a704a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
@@ -8,18 +8,8 @@ public String getIdentifier() {
     }
 
     @Override
-    public BlockPath asSingleBlockpath() {
-        return CommonBlockPath.ofEmpty();
-    }
-
-    @Override
-    public void addFirst(BlockList list) {
-        //nooops
-    }
-
-    @Override
-    public void addLast(BlockList list) {
-        //noops
+    public boolean isEmpty() {
+        return true;
     }
 
     public static EmptyBlock of() {
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
index 1cc122a..6dc4374 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
@@ -4,7 +4,7 @@ public class StringBlock implements Block {
 
     private final String identifier;
 
-    StringBlock(String identifier) {
+    public StringBlock(String identifier) {
         this.identifier = identifier;
     }
 
@@ -13,11 +13,6 @@ public String getIdentifier() {
         return identifier;
     }
 
-    @Override
-    public BlockPath asSingleBlockpath() {
-        return CommonBlockPath.of(this);
-    }
-
     public static Block of(String string) {
         if (string.contains(" ")) throw new IllegalStateException("Identifier cannot have spaces!");
 
@@ -32,6 +27,11 @@ public boolean equals(Object o) {
         return identifier.equalsIgnoreCase(that.identifier);
     }
 
+    @Override
+    public boolean isEmpty() {
+        return false;
+    }
+
     @Override
     public int hashCode() {
         return identifier.hashCode();
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
new file mode 100644
index 0000000..b2d9495
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.fallback.failure;
+
+import me.aurium.beetle.branch.fallback.message.MessageKey;
+import me.aurium.beetle.branch.fallback.message.MessageRequirement;
+
+public interface Failure {
+
+    MessageKey getCorrelatedMessage();
+    MessageRequirement[] getRequirements();
+
+    Throwable toThrowable();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
new file mode 100644
index 0000000..ff624a5
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
@@ -0,0 +1,30 @@
+package me.aurium.beetle.branch.fallback.failure;
+
+import me.aurium.beetle.branch.fallback.message.MessageKey;
+import me.aurium.beetle.branch.fallback.message.MessageRequirement;
+
+public class SendableFailure implements Failure{
+
+    private final MessageKey key;
+    private final MessageRequirement[] requirements;
+
+    public SendableFailure(MessageKey key, MessageRequirement... requirements) {
+        this.key = key;
+        this.requirements = requirements;
+    }
+
+    @Override
+    public MessageKey getCorrelatedMessage() {
+        return key;
+    }
+
+    @Override
+    public MessageRequirement[] getRequirements() {
+        return requirements;
+    }
+
+    @Override
+    public Throwable toThrowable() {
+        return new IllegalStateException();
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
new file mode 100644
index 0000000..0db1c78
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.fallback.message;
+
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+
+public interface BaseContext<T> {
+
+    FallbackHandler<T> getFallback();
+
+    //TODO message stuff
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java
deleted file mode 100644
index 5150506..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/BuilderMessageProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-
-/**
- * Might not be the most scalable thing in the world but who the fuck cares
- *
- * I can't think of any nodes besides single (do an action) branching (do an action or separate out based on top buffer arg)
- * and value (do an action or separate action based on buffer from this argument)
- *
- * so who cares? This will give me fallback messages
- * @param <T>
- */
-public interface BuilderMessageProvider<T> {
-
-    void handleDefaultSingle(NodeContext<T> context);
-    void handleDefaultBranching(NodeContext<T> context);
-    void handleDefaultValue(NodeContext<T> context);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
new file mode 100644
index 0000000..b0a2054
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public class CommonKeys {
+
+    public static final MessageKey TOO_MANY_ARGS = new MessageKey("TOO_MANY_ARGS");
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java
deleted file mode 100644
index 3e136c0..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessagePrettier.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-/**
- * Makes messages pretty
- */
-public interface FallbackMessagePrettier {
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java
deleted file mode 100644
index acd1817..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/FallbackMessageProvider.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public interface FallbackMessageProvider<T> {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
new file mode 100644
index 0000000..ecc910c
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public interface Message<C> {
+
+    void accept(C c, Object... strings);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
new file mode 100644
index 0000000..3f2c7aa
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public interface MessageHandler<T> {
+
+    void sendMessage(T t, MessageInfo key);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
new file mode 100644
index 0000000..2100c6b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
@@ -0,0 +1,21 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public class MessageInfo {
+
+    private final MessageKey key;
+    private final Object[] args;
+
+    public MessageInfo(MessageKey key, Object[] args) {
+        this.key = key;
+        this.args = args;
+    }
+
+    public MessageKey getKey() {
+        return key;
+    }
+
+    public Object[] getStrings() {
+        return args;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
new file mode 100644
index 0000000..4dd0382
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
@@ -0,0 +1,16 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public class MessageKey {
+
+    private final String key;
+
+    public MessageKey(String key) {
+        this.key = key;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
new file mode 100644
index 0000000..6b6338d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
@@ -0,0 +1,10 @@
+package me.aurium.beetle.branch.fallback.message;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public interface MessageProvider<T> {
+
+    Map<MessageKey,Message<T>> make();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
deleted file mode 100644
index 03e47f7..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProviderFactory.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public class MessageProviderFactory {
-
-    public static <T> BuilderMessageProvider<T> getProvider() {
-        return null;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
new file mode 100644
index 0000000..933f94e
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
@@ -0,0 +1,24 @@
+package me.aurium.beetle.branch.fallback.message;
+
+public class MessageRequirement {
+
+    private final String key;
+    private final String value;
+
+    private MessageRequirement(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public static MessageRequirement of(String key, String value) {
+        return new MessageRequirement(key, value);
+    }
+
+    public String getKey() {
+        return this.key;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
new file mode 100644
index 0000000..0ec2584
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.fallback.message.impl;
+
+import me.aurium.beetle.branch.fallback.message.*;
+
+import java.util.Map;
+
+public class CommonMessageHandler<T> implements MessageHandler<T> {
+
+    private final Map<MessageKey, Message<T>> messages;
+
+    public CommonMessageHandler(Map<MessageKey, Message<T>> messages) {
+        this.messages = messages;
+    }
+
+    public CommonMessageHandler(MessageProvider<T> messages) {
+        this.messages = messages.make();
+    }
+
+    @Override
+    public void sendMessage(T t, MessageInfo info) {
+        Message<T> message = messages.get(info.getKey());
+
+        if (message == null) throw new IllegalArgumentException("No message mapped to key!");
+
+        message.accept(t);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/DefaultBuilderMessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
similarity index 82%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/DefaultBuilderMessageProvider.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
index d94ed2d..c61e2e7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/DefaultBuilderMessageProvider.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
@@ -1,10 +1,7 @@
 package me.aurium.beetle.branch.fallback.message.impl;
 
-import me.aurium.beetle.branch.fallback.message.BuilderMessageProvider;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
-
-import java.util.ArrayList;
-import java.util.List;
+/*
 
 public class DefaultBuilderMessageProvider implements BuilderMessageProvider<Object> {
 
@@ -17,7 +14,8 @@ public void handleDefaultSingle(NodeContext<Object> context) {
     @Override
     public void handleDefaultBranching(NodeContext<Object> context) {
 
-        StringBuilder fuk = new StringBuilder("/");
+        */
+/*StringBuilder fuk = new StringBuilder("/");
 
         context.fullPath().withoutTop().getAllBlocks().getBackingList().forEach(blok -> {
             fuk.append(blok).append(" ");
@@ -29,7 +27,8 @@ public void handleDefaultBranching(NodeContext<Object> context) {
 
         for (String string : alternatives) {
             context.messageSender(finalFuk + string);
-        }
+        }*//*
+
 
 
     }
@@ -39,3 +38,4 @@ public void handleDefaultValue(NodeContext<Object> context) {
 
     }
 }
+*/
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
deleted file mode 100644
index f4b9c74..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/AutoFallbackPermStrategy.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
-
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-
-public class AutoFallbackPermStrategy<T> implements ExecutionFallbackStrategy<T> {
-    @Override
-    public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
-
-    }
-
-    //TODO make this autogenerate messages for failure
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java
new file mode 100644
index 0000000..057a3d4
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java
@@ -0,0 +1,78 @@
+package me.aurium.beetle.branch.fallback.permission.strategies;
+
+import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInput;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+
+import java.util.Optional;
+
+public class CommonFallbackStrategy<T> implements ExecutionFallbackStrategy<T> {
+
+    @Override
+    public Optional<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode) {
+
+        SearchInput input = SearchInput.of(args);
+
+        SearchInfo<T> toBeExecuted = baseNode.getSpecificNode(input);
+
+
+        //1. Check permissions and access (preprocessing)
+
+        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args) || toBeExecuted.resultingNode().getExecutionHandler().getExecution().isEmpty()) {
+            //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
+
+            if (toBeExecuted.resultingNode().equals(baseNode)) {
+                return Optional.empty();
+
+            } else {
+                toBeExecuted = baseNode.getSpecificNode(input.withoutTop()); //regress backwards a node
+            }
+        }
+
+        return Optional.of(toBeExecuted);
+    }
+
+
+    @Override
+    public void attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProducer<T> producer) {
+        NodeContext<T> produced = producer.produce(sender,alias,args,baseNode, result, baseContext);
+
+        result.resultingNode().getExecutionHandler().getExecution().orElseThrow().handle(produced); //this should never be null thanks to the preprocess
+    }
+
+
+    //TODO old code - refer to it if you need to
+    /*SearchInput input = SearchInput.of(args);
+
+    SearchResult<T> toBeExecuted = baseNode.getSpecificNode(input);
+
+    Context<T> failed = producer.produce(sender,alias,args);
+
+    //1. Check permissions and access (preprocessing)
+
+        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args) || toBeExecuted.resultingNode().getExecutionHandler().getExecution().isEmpty()) {
+        //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
+
+        if (toBeExecuted.resultingNode().equals(baseNode)) {
+
+            fallback.handle(failed);
+
+            return Optional.empty();
+
+        } else {
+            toBeExecuted = baseNode.getSpecificNode(input.withoutTop()); //regress backwards a node
+        }
+    }
+
+        return Optional.of(toBeExecuted);
+
+    //execute and process
+
+    NodeContext<T> produced = producer.produce(sender,alias,args,toBeExecuted.resultingNode(), baseNode, toBeExecuted.reducedPath(), toBeExecuted.initialPath(), fallback);
+
+        toBeExecuted.resultingNode().getExecutionHandler().getExecution().get().handle(produced);*/
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
index 3055387..c903cef 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
@@ -1,13 +1,17 @@
 package me.aurium.beetle.branch.fallback.permission.strategies;
 
+import me.aurium.beetle.branch.fallback.message.BaseContext;
 import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+
+import java.util.Optional;
 
 public interface ExecutionFallbackStrategy<T> {
 
 
-    void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer);
+    Optional<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode);
+    void attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProducer<T> producer);
 
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
deleted file mode 100644
index f11c12b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/FallbackPermStrategy.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.block.CommonBlockPath;
-import me.aurium.beetle.branch.handlers.context.Context;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.result.NodeResult;
-
-/**
- * Advanced startegy that does things:
- *
- * Parses a testing blockpath from existing args. It then finds the linked node from that path. There must be one,
- * because even incorrect args will link to the base node or to a branching node like the branch node implementation.
- *
- * It checks the permissions first. If the sender does not have access to that specific node, or the node is missing a handler
- * it will go one node up in the map and check it for permission. It will repeat this until it can find a permissible node,
- * or until it reaches the base node.
- *
- * If the user does not have access to run the base node for some reason, it will call the fallback handler.
- *
- * TODO please check the logic here.
- *
- * @param <T>
- */
-public class FallbackPermStrategy<T> implements ExecutionFallbackStrategy<T> {
-
-    @Override
-    public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
-        BlockPath pathToTest = CommonBlockPath.of(args);
-        NodeResult<T> toBeExecuted = baseNode.getSpecificNode(pathToTest);
-
-        Context<T> failed = producer.produce(sender,alias,args);
-
-        //1. Check permissions and access
-
-        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args) || toBeExecuted.resultingNode().getExecutionHandler().getExecution().isEmpty()) {
-            //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
-
-            if (toBeExecuted.resultingNode().equals(baseNode)) {
-
-                fallback.handle(failed);
-
-                return;
-
-            } else {
-
-                pathToTest = pathToTest.withoutTop();
-
-                toBeExecuted = baseNode.getSpecificNode(pathToTest); //regress backwards a node
-            }
-        }
-
-        NodeContext<T> produced = producer.produce(sender,alias,args, toBeExecuted.resultingNode(), baseNode, toBeExecuted.resultingPath(), pathToTest, fallback);
-
-        toBeExecuted.resultingNode().getExecutionHandler().getExecution().get().handle(produced);
-    }
-
-    //TODO a248, this is one of the most important classes. in depth logic review because all of this is untested
-    // and i have no idea if it's gonna work haha. Also if you can think of a way to reduce the boilerplate of the while loops that'd
-    // be nice but i'm pretty sure theyre essential
-
-
-
-
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
deleted file mode 100644
index 111870d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/PassthroughStrategy.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.block.CommonBlockPath;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.result.NodeResult;
-
-/**
- * Ignores everything and tries to execute ignoring permissions or fallbacks. If something goes wrong it delegates to the fallback handler immediately
- * @param <T>
- */
-public class PassthroughStrategy<T> implements ExecutionFallbackStrategy<T> {
-    @Override
-    public void executeStrategy(T sender, String alias, String[] args, CommandNode<T> baseNode, FallbackHandler<T> fallback, ContextProducer<T> producer) {
-        BlockPath path = CommonBlockPath.of(args);
-
-        NodeResult<T> result = baseNode.getSpecificNode(path);
-
-        result.resultingNode().getExecutionHandler().getExecution().ifPresentOrElse(
-                present -> present.handle(producer.produce(sender,alias,args, result.resultingNode(), baseNode, result.resultingPath(), path, fallback)),
-                () -> { fallback.handle(producer.produce(sender,alias,args));
-        });
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
index 6fb5c4d..daac0e0 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
@@ -1,5 +1,6 @@
 package me.aurium.beetle.branch.handlers;
 
+import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
 
@@ -11,7 +12,7 @@ public class EmptySuggestionHandler<T> implements SuggestionHandler<T> {
     private final List<String> emptyList = new ArrayList<>();
 
     @Override
-    public List<String> handle(NodeContext<T> adapter) {
+    public List<Block> handle(NodeContext<T> adapter) {
         return List.of();
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
new file mode 100644
index 0000000..4d4ac58
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
@@ -0,0 +1,12 @@
+package me.aurium.beetle.branch.handlers.api;
+
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+
+import java.util.List;
+
+public interface BranchHandler<T> {
+
+    void getExecution(NodeContext<T> context);
+    List<String> getSuggestions(NodeContext<T> context);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
index 5225a93..b96c285 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
@@ -1,11 +1,12 @@
 package me.aurium.beetle.branch.handlers.api;
 
+import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 
 import java.util.List;
 
 public interface SuggestionHandler<T> {
 
-    List<String> handle(NodeContext<T> context);
+    List<Block> handle(NodeContext<T> context);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
index e0240d2..bd253c2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
@@ -1,49 +1,35 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
 public abstract class AbstractNodeContext<T> extends AbstractContext<T> implements NodeContext<T> {
 
-    private final CommandNode<T> executed;
-    private final CommandNode<T> base;
-    private final BlockPath executedPath;
-    private final BlockPath fullPath;
-    private final FallbackHandler<T> handler;
+    private final CommandNode<T> baseNode;
+    private final SearchInfo<T> searchInfo;
+    private final BaseContext<T> baseContext;
 
-    protected AbstractNodeContext(T t, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<T> handler) {
+    protected AbstractNodeContext(T t, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
         super(t, alias, strings);
-        this.executed = executedNode;
-        this.base = baseNode;
-        this.executedPath = executedPath;
-        this.fullPath = basePath;
-        this.handler = handler;
-    }
 
-    @Override
-    public CommandNode<T> getExecutedNode() {
-        return executed;
+        this.baseContext = baseContext;
+        this.searchInfo = result;
+        this.baseNode = baseNode;
     }
 
     @Override
     public CommandNode<T> getBaseExecutedNode() {
-        return base;
-    }
-
-    @Override
-    public BlockPath executedPath() {
-        return executedPath;
+        return baseNode;
     }
 
     @Override
-    public BlockPath fullPath() {
-        return fullPath;
+    public SearchInfo<T> getResults() {
+        return searchInfo;
     }
 
     @Override
-    public FallbackHandler<T> getFallbackAction() {
-        return handler;
+    public BaseContext<T> getBaseContext() {
+        return baseContext;
     }
-
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
index 6c7fc7b..72f672b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
@@ -1,15 +1,15 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
 /**
  * Produces context adapters, like the stock ContextSource for contexts.
  */
 public interface ContextProducer<T> {
 
-    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> executedNode, CommandNode<T> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<T> handler);
+    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search, BaseContext<T> baseContext);
 
     Context<T> produce(T sender, String alias, String[] strings);
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
index 741cd0e..77924db 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
@@ -1,21 +1,16 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
 
 public interface NodeContext<T> extends Context<T> {
 
-    CommandNode<T> getExecutedNode();
     CommandNode<T> getBaseExecutedNode();
 
-    BlockPath executedPath();
-    BlockPath fullPath();
-
-    boolean equals(Object comparison);
-
-    FallbackHandler<T> getFallbackAction();
+    SearchInfo<T> getResults();
+    BaseContext<T> getBaseContext();
 
     //TODO add more cool features like the debug message sender,
     // because NodeContext should be a collection of both context and context-specific actions? /review a248
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
index 722c31e..7850d1d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
@@ -1,10 +1,10 @@
 package me.aurium.beetle.branch.launchpoints.base;
 
+import me.aurium.beetle.branch.fallback.permission.strategies.CommonFallbackStrategy;
 import me.aurium.beetle.branch.handlers.context.ContextProducer;
 import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.permission.strategies.ExecutionFallbackStrategy;
-import me.aurium.beetle.branch.fallback.permission.strategies.FallbackPermStrategy;
 
 import java.util.Arrays;
 import java.util.Objects;
@@ -15,7 +15,7 @@ public class NodeBaseBuilder<T> {
 
     private CommandNode<T> base;
     private FallbackHandler<T> fallbackHandler = (shit) -> shit.messageSender("Error running command with arguments: " + Arrays.toString(shit.getArgs()));
-    private ExecutionFallbackStrategy<T> strategy = new FallbackPermStrategy<>();
+    private ExecutionFallbackStrategy<T> strategy = new CommonFallbackStrategy<>();
 
     public <X> NodeBaseBuilder(ContextProducer<T> producer) {
         this.producer = producer;
@@ -44,6 +44,8 @@ public NodeBase<T> build() {
         Objects.requireNonNull(fallbackHandler);
         Objects.requireNonNull(strategy);
 
-        return new SimpleNodeBase<>(base,producer,fallbackHandler,strategy);
+        return null;
+
+        //return new SimpleNodeBase<>(base,producer,fallbackHandler,strategy);
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
new file mode 100644
index 0000000..e89eeae
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
@@ -0,0 +1,18 @@
+package me.aurium.beetle.branch.launchpoints.base;
+
+import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+
+public class SimpleBaseContext<T> implements BaseContext<T> {
+
+    private final FallbackHandler<T> handler;
+
+    public SimpleBaseContext(FallbackHandler<T> handler) {
+        this.handler = handler;
+    }
+
+    @Override
+    public FallbackHandler<T> getFallback() {
+        return handler;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
index ff26611..83ed597 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
@@ -1,8 +1,8 @@
 package me.aurium.beetle.branch.launchpoints.base;
 
+import me.aurium.beetle.branch.fallback.message.BaseContext;
 import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.permission.strategies.ExecutionFallbackStrategy;
 
 import java.util.List;
@@ -12,20 +12,24 @@ public class SimpleNodeBase<C> implements NodeBase<C> {
     private final CommandNode<C> baseNode;
     private final ContextProducer<C> factory;
 
-    private final FallbackHandler<C> fallbackHandler;
+    private final BaseContext<C> baseContext;
     private final ExecutionFallbackStrategy<C> strategy;
 
-    public <X> SimpleNodeBase(CommandNode<C> baseNode, ContextProducer<C> factory, FallbackHandler<C> fallbackHandler, ExecutionFallbackStrategy<C> strategy) {
+    public <X> SimpleNodeBase(CommandNode<C> baseNode, ContextProducer<C> factory, BaseContext<C> baseContext, ExecutionFallbackStrategy<C> strategy) {
 
         this.baseNode = baseNode;
         this.factory = factory;
-        this.fallbackHandler = fallbackHandler;
+        this.baseContext = baseContext;
         this.strategy = strategy;
     }
 
     @Override
     public void execute(C executor, String alias, String[] args) {
-        strategy.executeStrategy(executor,alias,args,baseNode, fallbackHandler, factory);
+        strategy.attemptPreprocess(executor,alias,args,baseNode).ifPresentOrElse(
+                result -> strategy.attemptExecution(executor,alias,args,baseNode,result,baseContext,factory),
+                //else
+                () -> baseContext.getFallback().handle(factory.produce(executor, alias, args))
+        );
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
index 4e62cbe..2eb688b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
@@ -7,7 +7,6 @@
 public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
 
     OUTPUT adapt(INPUT input);
-
     boolean canAdapt(INPUT input);
 
     Consumer<INPUT> failedAdaptAction();
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
index 3190ab2..5c0114f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
@@ -1,19 +1,9 @@
 package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.argument.Argument;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
-import me.aurium.beetle.branch.nodes.result.ExecutionResult;
-import me.aurium.beetle.branch.nodes.result.NodeResult;
-import me.aurium.beetle.branch.fallback.permission.Permission;
-
-import java.util.List;
-
 //kinda like a branching node except it throws forward and not to the sides
 
 //one of these days ill actually finish this class LMFAO
+/*
 public class ArgumentNode<T> implements IdentifiableNode<T> {
 
     private final Block identifier;
@@ -37,15 +27,18 @@ public ArgumentNode(Block identifier, List<Argument<?>> sequentialValueNodes, Si
 
 
     @Override
-    public NodeResult<T> getSpecificNode(BlockPath path) {
-        return new NodeResult<>(this,path);
+    public SearchResult<T> getSpecificNode(SearchInput input) {
+        return new SearchResult<>(this, input);
     }
 
-    /*if (path.isEmpty()) return Optional.of(noArgs);
+    */
+/*if (path.isEmpty()) return Optional.of(noArgs);
+
+        return Optional.of(this);*//*
 
-        return Optional.of(this);*/
 
-        /* This was pointless, see below note
+        */
+/* This was pointless, see below note
 
         //we can either do this shit, or we can return **THIS** no matter what and let the context handler be variable, since the context handler delegates
         //to another adapter anyways
@@ -57,12 +50,13 @@ public NodeResult<T> getSpecificNode(BlockPath path) {
         if (position == size) return Optional.of(sequentialValueNodes.get(size - 1));
 
         return Optional.of(sequentialValueNodes.get(position));
-        */
+        *//*
+
 
     @Override
     public ExecutionResult<T> getExecutionHandler() {
         return new ExecutionResult<>((context) -> {
-            BlockPath executed = context.executedPath();
+            Deque<Block> executed = context.executedPath();
         });
     }
 
@@ -83,3 +77,4 @@ public Block getIdentifier() {
         return identifier;
     }
 }
+*/
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 8cb916d..3c0c42b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -1,17 +1,25 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.BlockPath;
+import me.aurium.beetle.branch.handlers.api.BranchHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
-import me.aurium.beetle.branch.nodes.result.*;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
+import me.aurium.beetle.branch.nodes.results.*;
 import me.aurium.beetle.branch.fallback.permission.Permission;
+import me.aurium.beetle.branch.nodes.results.model.FailingResult;
+import me.aurium.beetle.branch.nodes.results.model.Result;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
-import java.util.stream.Collectors;
+import java.util.Deque;
+import java.util.List;
 
 /**
- * TODO: missing a Node for noargs will cause it to rely on fallback rather than throwning exceptions and being bad
+ * TODO: missing a Node for noargs will cause it to rely on fallback rather than throwning exceptions and being bad (DONE - ish)
+ *
+ * Nodes should always assume that the first block in the blockpath is theirs to consume
+ *
  * @param <T>
  */
 public class BranchingNode<T> implements IdentifiableNode<T> {
@@ -33,19 +41,19 @@ public Block getIdentifier() {
     }
 
     @Override
-    public NodeResult<T> getSpecificNode(BlockPath blockPath) {
+    public SearchInfo<T> getSpecificNode(SearchInput input) {
 
-        if (blockPath.isEmpty()) return new NodeResult<>(this,blockPath);
+        Deque<Block> blockPath = input.getReducablePath();
 
         for (IdentifiableNode<T> node : nodes.getContents()) {
+            if (blockPath.getFirst().equals(node.getIdentifier())) {
+                blockPath.removeFirst(); //consume
 
-            BlockPath subPath = blockPath.withoutBase(); //get everything after the index
-
-            if (blockPath.startsWith(node.getIdentifier())) {
-                return node.getSpecificNode(subPath);
+                return node.getSpecificNode(input);
             }
         }
-        return new NodeResult<>(this, blockPath);
+
+        return new SearchInfo<>(this, input); //empty handling is in the strategy
     }
 
     @Override
@@ -64,11 +72,8 @@ public SuggestionHandler<T> getSuggestionHandler() {
         //TODO sort this out
 
         return (context) -> {
-            //this works because this suggestion handler only gets called if we are on this object lmfao
-            Block matchableBlock = context.executedPath().getAllBlocks().getLast();
-
-            nodes.getContents().stream().map(IdentifiableNode::getIdentifier).collect(Collectors.toList());
 
+            //this works because this suggestion handler only gets called if we are on this object lmfao
             return null;
         };
     }
@@ -78,5 +83,21 @@ public Permission<T> getPermission() {
         return permission;
     }
 
+    public static final class BranchingHandler<T> implements BranchHandler<T> {
+
+        private final CommandNode<T> alreadyPresent;
+
+        @Override
+        public void getExecution(NodeContext<T> context) {
+
+        }
+
+        @Override
+        public List<String> getSuggestions(NodeContext<T> context) {
+            return null;
+        }
+
+    }
+
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index 12d982d..f772c54 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -1,14 +1,16 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.handlers.EmptySuggestionHandler;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.api.EndpointNode;
-import me.aurium.beetle.branch.nodes.result.ExecutionResult;
-import me.aurium.beetle.branch.nodes.result.NodeResult;
+import me.aurium.beetle.branch.nodes.model.EndpointNode;
+import me.aurium.beetle.branch.nodes.results.ExecutionResult;
+import me.aurium.beetle.branch.nodes.results.SearchInput;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.fallback.permission.Permission;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+import me.aurium.beetle.branch.nodes.results.model.SuccessfulResult;
 
 public class SingleNode<T> implements EndpointNode<T> {
 
@@ -34,10 +36,13 @@ public Block getIdentifier() {
     }
 
     @Override
-    public NodeResult<T> getSpecificNode(BlockPath blockPath) {
-        return new NodeResult<>(this,blockPath);
+    public Result<SearchInfo<T>> getSpecificNode(SearchInput input) {
+        input.getReducablePath().removeFirst(); //consume
+
+        return new SuccessfulResult<>(new SearchInfo<>(this,input));
     }
 
+    //TODO these maybe need to go somewhere else to a sort of parser
     @Override
     public ExecutionResult<T> getExecutionHandler() {
         return new ExecutionResult<>(executionHandler);
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/Argument.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
similarity index 91%
rename from core/src/main/java/me/aurium/beetle/branch/argument/Argument.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
index 67de9e0..40fcee4 100644
--- a/core/src/main/java/me/aurium/beetle/branch/argument/Argument.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.argument;
+package me.aurium.beetle.branch.nodes.argument;
 
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
similarity index 77%
rename from core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
index 33cd043..efb6561 100644
--- a/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.argument;
+package me.aurium.beetle.branch.nodes.argument;
 
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContextHandler.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
similarity index 66%
rename from core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContextHandler.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
index 0af2801..70dd276 100644
--- a/core/src/main/java/me/aurium/beetle/branch/argument/ArgumentContextHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.argument;
+package me.aurium.beetle.branch.nodes.argument;
 
 public interface ArgumentContextHandler<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
new file mode 100644
index 0000000..50de57a
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes.argument;
+
+public interface ArgumentConvertet {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
new file mode 100644
index 0000000..f8b17e0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes.argument;
+
+public class Arguments {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
index 9bc8f6c..c0b580f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
@@ -6,8 +6,8 @@
 import me.aurium.beetle.branch.fallback.permission.Permission;
 import me.aurium.beetle.branch.fallback.permission.permissions.EmptyPermission;
 import me.aurium.beetle.branch.nodes.BranchingNode;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
 import me.aurium.beetle.branch.util.PreStoredHashSet;
 
 import java.util.HashSet;
@@ -47,6 +47,12 @@ public void withPermission(Permission<T> permission) {
         this.permission = permission;
     }
 
+    public BranchingBuilder<T> addNode(IdentifiableNode<T> node) {
+        commands.add(node);
+
+        return this;
+    }
+
     public <C extends Builder<T>> void withNode(C key, Consumer<C> consumer) {
         consumer.accept(key);
 
@@ -100,4 +106,8 @@ public CommandNode<T> buildWithoutIdentifier() {
 
         return new BranchingNode<>(set, EmptyBlock.of(), permission);
     }
+
+    public static <C> BranchingBuilder<C> make() {
+        return new BranchingBuilder<>();
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
index 2194533..eef2d03 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
@@ -1,8 +1,7 @@
 package me.aurium.beetle.branch.nodes.builders;
 
-import me.aurium.beetle.branch.fallback.message.BuilderMessageProvider;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-import me.aurium.beetle.branch.nodes.api.IdentifiableNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
 
 public interface Builder<C>{
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
index 0af465f..7b81e72 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
@@ -5,7 +5,7 @@
 import me.aurium.beetle.branch.block.StringBlock;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.nodes.SingleNode;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.permission.Permission;
 import me.aurium.beetle.branch.fallback.permission.permissions.EmptyPermission;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
similarity index 62%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
index 2d2ab04..cde6f34 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/api/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
@@ -1,10 +1,11 @@
-package me.aurium.beetle.branch.nodes.api;
+package me.aurium.beetle.branch.nodes.model;
 
-import me.aurium.beetle.branch.block.BlockPath;
 import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.result.ExecutionResult;
-import me.aurium.beetle.branch.nodes.result.NodeResult;
+import me.aurium.beetle.branch.nodes.results.ExecutionResult;
+import me.aurium.beetle.branch.nodes.results.SearchInput;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.fallback.permission.Permission;
+import me.aurium.beetle.branch.nodes.results.model.Result;
 
 /**
  * Base object
@@ -12,7 +13,7 @@
  */
 public interface CommandNode<T> {
 
-    NodeResult<T> getSpecificNode(BlockPath path);
+    SearchInfo<T> getSpecificNode(SearchInput path);
 
     ExecutionResult<T> getExecutionHandler();
     SuggestionHandler<T> getSuggestionHandler();
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
similarity index 83%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
index c15cf37..ee3358e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/api/EndpointNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.api;
+package me.aurium.beetle.branch.nodes.model;
 
 /**
  * Marker interface for a node that is alone (so not branching, but not merging either)
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
similarity index 75%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
index ce79bb6..f94d74d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/api/IdentifiableNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.api;
+package me.aurium.beetle.branch.nodes.model;
 
 import me.aurium.beetle.branch.block.Block;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
new file mode 100644
index 0000000..1988067
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes.model;
+
+public class ResponseHandler {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
deleted file mode 100644
index 5a92051..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/result/NodeResult.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package me.aurium.beetle.branch.nodes.result;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
-
-public class NodeResult<T> {
-
-    private final CommandNode<T> calculatedNode;
-    private final BlockPath calculatedPath;
-
-    public NodeResult(CommandNode<T> calculatedNode, BlockPath calculatedPath) {
-        this.calculatedNode = calculatedNode;
-        this.calculatedPath = calculatedPath;
-    }
-
-    public CommandNode<T> resultingNode() {
-        return calculatedNode;
-    }
-
-    public BlockPath resultingPath() {
-        return calculatedPath;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/result/ExecutionResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
similarity index 91%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/result/ExecutionResult.java
rename to core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
index 2e77d8f..b475977 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/result/ExecutionResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.nodes.result;
+package me.aurium.beetle.branch.nodes.results;
 
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
new file mode 100644
index 0000000..85c5e9c
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
@@ -0,0 +1,33 @@
+package me.aurium.beetle.branch.nodes.results;
+
+import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+
+import java.util.Deque;
+
+public class SearchInfo<T> {
+
+    private final CommandNode<T> calculatedNode;
+    private final SearchInput input;
+
+    public SearchInfo(CommandNode<T> calculatedNode, SearchInput input) {
+        this.calculatedNode = calculatedNode;
+        this.input = input;
+    }
+
+    public CommandNode<T> resultingNode() {
+        return calculatedNode;
+    }
+
+    public Deque<Block> initialPath() {
+        return input.getInitialPath();
+    }
+
+    public Deque<Block> reducedPath() {
+        return input.getReducablePath();
+    }
+
+    public boolean hasMoreArguments() {
+        return !input.getReducablePath().isEmpty();
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
new file mode 100644
index 0000000..c3fbf13
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
@@ -0,0 +1,48 @@
+package me.aurium.beetle.branch.nodes.results;
+
+import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.block.StringBlock;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+public class SearchInput {
+
+    private final Deque<Block> initialPath;
+    private final Deque<Block> reducablePath;
+
+    public SearchInput(Deque<Block> initialPath, Deque<Block> reducablePath) {
+        this.initialPath = initialPath;
+        this.reducablePath = reducablePath;
+    }
+
+    public Deque<Block> getInitialPath() {
+        return initialPath;
+    }
+
+    public Deque<Block> getReducablePath() {
+        return reducablePath;
+    }
+
+    public SearchInput withoutTop() {
+        Deque<Block> newBase = new ArrayDeque<>(initialPath);
+
+        newBase.removeLast();
+
+        return of(newBase);
+    }
+
+    public static SearchInput of(Deque<Block> initialPath) {
+        return new SearchInput(initialPath,new ArrayDeque<>(initialPath));
+    }
+
+    public static SearchInput of(String[] args) {
+        Deque<Block> blocks = new ArrayDeque<>();
+
+        for (String string : args) {
+            blocks.addLast(StringBlock.of(string));
+        }
+
+        return of(blocks);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
new file mode 100644
index 0000000..ed2ddf9
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.nodes.results;
+
+public class SuggestionResult {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
new file mode 100644
index 0000000..a4a14e5
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
@@ -0,0 +1,24 @@
+package me.aurium.beetle.branch.nodes.results.model;
+
+import me.aurium.beetle.branch.fallback.failure.Failure;
+
+import java.util.Optional;
+
+public class FailingResult<T> implements Result<T> {
+
+    private final Failure failure;
+
+    public FailingResult(Failure failure) {
+        this.failure = failure;
+    }
+
+    @Override
+    public Optional<T> getSuccess() {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<Failure> getFailure() {
+        return Optional.of(failure);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
new file mode 100644
index 0000000..a6d6472
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
@@ -0,0 +1,12 @@
+package me.aurium.beetle.branch.nodes.results.model;
+
+import me.aurium.beetle.branch.fallback.failure.Failure;
+
+import java.util.Optional;
+
+public interface Result<T> {
+
+    Optional<T> getSuccess();
+    Optional<Failure> getFailure();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
new file mode 100644
index 0000000..36e33bb
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
@@ -0,0 +1,24 @@
+package me.aurium.beetle.branch.nodes.results.model;
+
+import me.aurium.beetle.branch.fallback.failure.Failure;
+
+import java.util.Optional;
+
+public class SuccessfulResult<T> implements Result<T> {
+
+    private final T sucessful;
+
+    public SuccessfulResult(T sucessful) {
+        this.sucessful = sucessful;
+    }
+
+    @Override
+    public Optional<T> getSuccess() {
+        return Optional.of(sucessful);
+    }
+
+    @Override
+    public Optional<Failure> getFailure() {
+        return Optional.empty();
+    }
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index 203ce45..444e1ef 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -1,9 +1,9 @@
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.fallback.message.BaseContext;
 import me.aurium.beetle.branch.handlers.context.AbstractNodeContext;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
@@ -11,10 +11,10 @@ public class SpigotContext<T extends CommandSender> extends AbstractNodeContext<
 
     private final T sender;
 
-    public SpigotContext(T sender, String alias, String[] args, CommandNode<T> executed, CommandNode<T> base, BlockPath executedPath, BlockPath fullPath, FallbackHandler<T> handler) {
-        super(sender, alias, args, executed, base, executedPath, fullPath, handler);
+    protected SpigotContext(T t, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
+        super(t, alias, strings, baseNode, result, baseContext);
 
-        this.sender = sender;
+        this.sender = t;
     }
 
     @Override
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
index c8fa56e..d2700b1 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
@@ -1,13 +1,13 @@
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.fallback.message.BaseContext;
 import me.aurium.beetle.branch.handlers.context.Context;
 import me.aurium.beetle.branch.handlers.context.ContextProducer;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.launchpoints.IllegalSenderException;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
-import me.aurium.beetle.branch.nodes.api.CommandNode;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.command.CommandSender;
 
 public class SpigotContextProducer<C extends CommandSender> implements ContextProducer<C> {
@@ -18,20 +18,22 @@ public <T> SpigotContextProducer(ManagerAdapter<CommandSender,C> adapter) {
         this.adapter = adapter;
     }
 
-    @Override
-    public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> executedNode, CommandNode<C> baseNode, BlockPath executedPath, BlockPath basePath, FallbackHandler<C> handler) {
 
+    @Override
+    public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> baseNode, SearchInfo<C> search, BaseContext<C> baseContext) {
         if (!adapter.canAdapt(sender)) {
             adapter.failedAdaptAction();
 
+            //delegate to baseContext's stuff
+
             throw new IllegalSenderException("Sender is not instance of correct type!"); //TODO more fallback bullshit :)
         }
 
-        return new SpigotContext<>(adapter.adapt(sender), alias,strings,executedNode,baseNode,executedPath,basePath,handler);
+        return new SpigotContext<>(adapter.adapt(sender),alias,strings,baseNode,search,baseContext);
     }
 
     @Override
     public Context<C> produce(C sender, String alias, String[] strings) {
-        return produce(sender, alias, strings,null,null,null,null,null);
+        return produce(sender, alias, strings,null,null,null);
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
new file mode 100644
index 0000000..4ea5efc
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
@@ -0,0 +1,22 @@
+package me.aurium.beetle.branch.spigot.message;
+
+import me.aurium.beetle.branch.fallback.message.CommonKeys;
+import me.aurium.beetle.branch.fallback.message.Message;
+import me.aurium.beetle.branch.fallback.message.MessageKey;
+import me.aurium.beetle.branch.fallback.message.MessageProvider;
+import org.bukkit.command.CommandSender;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SpigotMessageProvider<C extends CommandSender> implements MessageProvider<C> {
+
+    public Map<MessageKey,Message<C>> make() {
+        Map<MessageKey,Message<C>> messMap = new HashMap<>();
+
+        messMap.put(CommonKeys.TOO_MANY_ARGS, new TextMessage<>("&7HI THERE IDIOT FACE! You provided %args% args!"));
+
+        return messMap;
+    }
+
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
new file mode 100644
index 0000000..035074a
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
@@ -0,0 +1,18 @@
+package me.aurium.beetle.branch.spigot.message;
+
+import me.aurium.beetle.branch.fallback.message.Message;
+import org.bukkit.command.CommandSender;
+
+public class TextMessage<C extends CommandSender> implements Message<C> {
+
+    private final String coloredStringToSend;
+
+    public TextMessage(String coloredStringToSend) {
+        this.coloredStringToSend = coloredStringToSend;
+    }
+
+    @Override
+    public void accept(C sender, Object... info) {
+        sender.sendMessage(String.format(coloredStringToSend,info));
+    }
+}
diff --git a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
index abe418c..da76a28 100644
--- a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
+++ b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
@@ -1,6 +1,5 @@
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.nodes.builders.SingleBuilder;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class ExampleBinding extends JavaPlugin {
diff --git a/spigot-impl/src/test/resources/plugin.yml b/spigot-impl/src/test/resources/plugin.yml
new file mode 100644
index 0000000..e69de29

From 1366f8eafded5190afaefb62aecfa9753bab3f8f Mon Sep 17 00:00:00 2001
From: Aurium <aukrais@gmail.com>
Date: Wed, 7 Apr 2021 00:27:15 -0700
Subject: [PATCH 35/56] work on the response system a bit more

---
 .../marker/permission/StringPermChecker.java  |  2 +-
 .../parsers/PermissionAnnotationParser.java   |  6 +-
 .../branch/fallback/failure/Failure.java      | 13 ----
 .../fallback/failure/SendableFailure.java     | 30 --------
 .../branch/fallback/message/BaseContext.java  | 11 ---
 .../branch/fallback/message/CommonKeys.java   |  7 --
 .../branch/fallback/message/Message.java      |  7 --
 .../fallback/message/MessageHandler.java      |  7 --
 .../branch/fallback/message/MessageInfo.java  | 21 ------
 .../branch/fallback/message/MessageKey.java   | 16 ----
 .../fallback/message/MessageProvider.java     | 10 ---
 .../fallback/message/MessageRequirement.java  | 24 ------
 .../message/impl/CommonMessageHandler.java    | 27 -------
 .../branch/fallback/message/impl/Shit.java    | 41 -----------
 .../strategies/ExecutionFallbackStrategy.java | 18 -----
 .../permissions/EmptyPermission.java          |  4 +-
 .../Permission.java                           |  4 +-
 .../PredicatePermission.java                  |  2 +-
 .../StringPermission.java                     |  4 +-
 .../strategies/FallbackSearchStrategy.java    | 13 ++++
 .../OneBackStrategy.java}                     | 29 +++++---
 .../{util => fun}/PreStoredHashSet.java       |  6 +-
 .../branch/handlers/api/BranchHandler.java    |  3 +-
 .../beetle/branch/handlers/api/Execution.java | 11 +++
 .../branch/handlers/api/FallbackHandler.java  | 14 ----
 .../handlers/context/AbstractContext.java     | 30 --------
 .../handlers/context/AbstractNodeContext.java | 27 ++++++-
 .../branch/handlers/context/Context.java      | 11 ---
 ...textProducer.java => ContextProvider.java} |  4 +-
 .../branch/handlers/context/NodeContext.java  | 28 ++++++-
 .../branch/interfacing/BlurbParser.java       |  8 ++
 .../beetle/branch/interfacing/CoreKeys.java   | 14 ++++
 .../FallbackPair.java                         |  4 +-
 .../branch/interfacing/ResultInterfacer.java  |  4 +
 .../branch/interfacing/message/Message.java   |  9 +++
 .../interfacing/message/Requirement.java      | 13 ++++
 .../message/impl/CommonMessageHandler.java    | 35 +++++++++
 .../message/impl/CommonResponseHandler.java   | 27 +++++++
 .../message/model/InterfacingHandler.java     | 16 ++++
 .../message/model/MessageInfo.java            | 24 ++++++
 .../message/model/MessageProvider.java        | 13 ++++
 .../message/model/ResponseHandler.java        | 18 +++++
 .../responses/ExecutionResponse.java          | 17 +++++
 .../responses/SendableResponse.java           | 27 +++++++
 .../common/NoPermissionResponse.java          | 20 +++++
 .../branch/launchpoints/base/NodeBase.java    |  2 +-
 .../launchpoints/base/NodeBaseBuilder.java    | 34 ++-------
 .../launchpoints/base/SimpleBaseContext.java  | 18 -----
 .../launchpoints/base/SimpleNodeBase.java     | 39 ----------
 .../launchpoints/base/SyncNodeBase.java       | 56 ++++++++++++++
 .../typeadapter/CommonAdapter.java            |  6 +-
 .../typeadapter/ManagerAdapter.java           |  6 +-
 .../beetle/branch/nodes/BranchingNode.java    | 61 +++++++++-------
 .../beetle/branch/nodes/SingleNode.java       | 73 +++++++++++++------
 .../nodes/builders/BranchingBuilder.java      |  6 +-
 .../branch/nodes/builders/SingleBuilder.java  |  4 +-
 .../branch/nodes/model/CommandNode.java       |  9 +--
 .../nodes/results/model/FailingResult.java    | 21 +++---
 .../branch/nodes/results/model/Result.java    | 19 +++--
 .../nodes/results/model/SuccessfulResult.java | 17 +++--
 .../beetle/branch/spigot/SpigotContext.java   |  2 +-
 ...oducer.java => SpigotContextProvider.java} |  7 +-
 .../beetle/branch/spigot/SpigotManager.java   |  2 +-
 .../spigot/message/AdventureMessage.java      |  4 +
 .../branch/spigot/message/SpigotKeys.java     |  9 +++
 .../spigot/message/SpigotMessageProvider.java | 26 +++++--
 .../branch/spigot/message/TextMessage.java    |  2 +-
 .../toPlayer/FailedAdaptingResponse.java      | 14 ++++
 .../spigot/{ => toPlayer}/PlayerAdapter.java  | 15 +---
 69 files changed, 604 insertions(+), 527 deletions(-)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
 rename core/src/main/java/me/aurium/beetle/branch/fallback/{permission => }/permissions/EmptyPermission.java (57%)
 rename core/src/main/java/me/aurium/beetle/branch/fallback/{permission => permissions}/Permission.java (62%)
 rename core/src/main/java/me/aurium/beetle/branch/fallback/{permission => permissions}/PredicatePermission.java (87%)
 rename core/src/main/java/me/aurium/beetle/branch/fallback/{permission => permissions}/StringPermission.java (65%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
 rename core/src/main/java/me/aurium/beetle/branch/fallback/{permission/strategies/CommonFallbackStrategy.java => strategies/OneBackStrategy.java} (67%)
 rename core/src/main/java/me/aurium/beetle/branch/{util => fun}/PreStoredHashSet.java (92%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/context/Context.java
 rename core/src/main/java/me/aurium/beetle/branch/handlers/context/{ContextProducer.java => ContextProvider.java} (81%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
 rename core/src/main/java/me/aurium/beetle/branch/{fallback => interfacing}/FallbackPair.java (59%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
 rename spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/{SpigotContextProducer.java => SpigotContextProvider.java} (82%)
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java
 rename spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/{ => toPlayer}/PlayerAdapter.java (57%)

diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
index eba19f6..5009a76 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.annotate.marker.permission;
 
-import me.aurium.beetle.branch.fallback.permission.StringPermission;
+import me.aurium.beetle.branch.fallback.permissions.StringPermission;
 
 public interface StringPermChecker {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
index 5a1882c..4b98904 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
@@ -1,7 +1,7 @@
 package me.aurium.beetle.branch.annotate.parsers;
 
 import me.aurium.beetle.branch.annotate.marker.permission.Permission;
-import me.aurium.beetle.branch.fallback.permission.StringPermission;
+import me.aurium.beetle.branch.fallback.permissions.StringPermission;
 
 import java.lang.annotation.Annotation;
 
@@ -9,7 +9,7 @@
 public class PermissionAnnotationParser<T> {
 
 
-    me.aurium.beetle.branch.fallback.permission.Permission<T> parse(Annotation annotate) throws IllegalAccessException, InstantiationException {
+    me.aurium.beetle.branch.fallback.permissions.Permission<T> parse(Annotation annotate) throws IllegalAccessException, InstantiationException {
 
         if (!annotate.annotationType().equals(Permission.class)) throw new PermissionParsingException("Annotation must be of type Permission");
 
@@ -21,7 +21,7 @@ me.aurium.beetle.branch.fallback.permission.Permission<T> parse(Annotation annot
         StringPermission<?> perm = permission.getRelativeChecker().newInstance().get(permission.permission());
 
 
-        return (me.aurium.beetle.branch.fallback.permission.Permission<T>) perm;
+        return (me.aurium.beetle.branch.fallback.permissions.Permission<T>) perm;
     }
 
     public static class PermissionParsingException extends RuntimeException {
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
deleted file mode 100644
index b2d9495..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/Failure.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.fallback.failure;
-
-import me.aurium.beetle.branch.fallback.message.MessageKey;
-import me.aurium.beetle.branch.fallback.message.MessageRequirement;
-
-public interface Failure {
-
-    MessageKey getCorrelatedMessage();
-    MessageRequirement[] getRequirements();
-
-    Throwable toThrowable();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java b/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
deleted file mode 100644
index ff624a5..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/failure/SendableFailure.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package me.aurium.beetle.branch.fallback.failure;
-
-import me.aurium.beetle.branch.fallback.message.MessageKey;
-import me.aurium.beetle.branch.fallback.message.MessageRequirement;
-
-public class SendableFailure implements Failure{
-
-    private final MessageKey key;
-    private final MessageRequirement[] requirements;
-
-    public SendableFailure(MessageKey key, MessageRequirement... requirements) {
-        this.key = key;
-        this.requirements = requirements;
-    }
-
-    @Override
-    public MessageKey getCorrelatedMessage() {
-        return key;
-    }
-
-    @Override
-    public MessageRequirement[] getRequirements() {
-        return requirements;
-    }
-
-    @Override
-    public Throwable toThrowable() {
-        return new IllegalStateException();
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
deleted file mode 100644
index 0db1c78..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/BaseContext.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-
-public interface BaseContext<T> {
-
-    FallbackHandler<T> getFallback();
-
-    //TODO message stuff
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
deleted file mode 100644
index b0a2054..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/CommonKeys.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public class CommonKeys {
-
-    public static final MessageKey TOO_MANY_ARGS = new MessageKey("TOO_MANY_ARGS");
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
deleted file mode 100644
index ecc910c..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/Message.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public interface Message<C> {
-
-    void accept(C c, Object... strings);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
deleted file mode 100644
index 3f2c7aa..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageHandler.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public interface MessageHandler<T> {
-
-    void sendMessage(T t, MessageInfo key);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
deleted file mode 100644
index 2100c6b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageInfo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public class MessageInfo {
-
-    private final MessageKey key;
-    private final Object[] args;
-
-    public MessageInfo(MessageKey key, Object[] args) {
-        this.key = key;
-        this.args = args;
-    }
-
-    public MessageKey getKey() {
-        return key;
-    }
-
-    public Object[] getStrings() {
-        return args;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
deleted file mode 100644
index 4dd0382..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageKey.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public class MessageKey {
-
-    private final String key;
-
-    public MessageKey(String key) {
-        this.key = key;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
deleted file mode 100644
index 6b6338d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageProvider.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public interface MessageProvider<T> {
-
-    Map<MessageKey,Message<T>> make();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
deleted file mode 100644
index 933f94e..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/MessageRequirement.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package me.aurium.beetle.branch.fallback.message;
-
-public class MessageRequirement {
-
-    private final String key;
-    private final String value;
-
-    private MessageRequirement(String key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    public static MessageRequirement of(String key, String value) {
-        return new MessageRequirement(key, value);
-    }
-
-    public String getKey() {
-        return this.key;
-    }
-
-    public String getValue() {
-        return this.value;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
deleted file mode 100644
index 0ec2584..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/CommonMessageHandler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.fallback.message.impl;
-
-import me.aurium.beetle.branch.fallback.message.*;
-
-import java.util.Map;
-
-public class CommonMessageHandler<T> implements MessageHandler<T> {
-
-    private final Map<MessageKey, Message<T>> messages;
-
-    public CommonMessageHandler(Map<MessageKey, Message<T>> messages) {
-        this.messages = messages;
-    }
-
-    public CommonMessageHandler(MessageProvider<T> messages) {
-        this.messages = messages.make();
-    }
-
-    @Override
-    public void sendMessage(T t, MessageInfo info) {
-        Message<T> message = messages.get(info.getKey());
-
-        if (message == null) throw new IllegalArgumentException("No message mapped to key!");
-
-        message.accept(t);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java b/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
deleted file mode 100644
index c61e2e7..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/message/impl/Shit.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package me.aurium.beetle.branch.fallback.message.impl;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-/*
-
-public class DefaultBuilderMessageProvider implements BuilderMessageProvider<Object> {
-
-    @Override
-    public void handleDefaultSingle(NodeContext<Object> context) {
-
-
-    }
-
-    @Override
-    public void handleDefaultBranching(NodeContext<Object> context) {
-
-        */
-/*StringBuilder fuk = new StringBuilder("/");
-
-        context.fullPath().withoutTop().getAllBlocks().getBackingList().forEach(blok -> {
-            fuk.append(blok).append(" ");
-        });
-
-        String finalFuk = fuk.toString();
-
-        List<String> alternatives = new ArrayList<>(); //TODO make parameter
-
-        for (String string : alternatives) {
-            context.messageSender(finalFuk + string);
-        }*//*
-
-
-
-    }
-
-    @Override
-    public void handleDefaultValue(NodeContext<Object> context) {
-
-    }
-}
-*/
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
deleted file mode 100644
index c903cef..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/ExecutionFallbackStrategy.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
-
-import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
-
-import java.util.Optional;
-
-public interface ExecutionFallbackStrategy<T> {
-
-
-    Optional<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode);
-    void attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProducer<T> producer);
-
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
similarity index 57%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/permissions/EmptyPermission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
index b68d78c..a2c2125 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
@@ -1,6 +1,4 @@
-package me.aurium.beetle.branch.fallback.permission.permissions;
-
-import me.aurium.beetle.branch.fallback.permission.Permission;
+package me.aurium.beetle.branch.fallback.permissions;
 
 public class EmptyPermission<T> implements Permission<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
similarity index 62%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/Permission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
index f6f48d2..464979a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.fallback.permission;
+package me.aurium.beetle.branch.fallback.permissions;
 
 /**
  *
@@ -7,4 +7,6 @@ public interface Permission<T> {
 
    boolean attempt(T sender, String alias, String[] args); //because fuck you
 
+   String easyName();
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/PredicatePermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/PredicatePermission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
index b6cc15f..77609e6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/PredicatePermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.fallback.permission;
+package me.aurium.beetle.branch.fallback.permissions;
 
 import java.util.function.Predicate;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
similarity index 65%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
index e53a1a8..836aa47 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/StringPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
@@ -1,6 +1,4 @@
-package me.aurium.beetle.branch.fallback.permission;
-
-import me.aurium.beetle.branch.fallback.permission.Permission;
+package me.aurium.beetle.branch.fallback.permissions;
 
 /**
  * Represents a permission that is controlled by a string identifier
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
new file mode 100644
index 0000000..ef0d2fd
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.fallback.strategies;
+
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+
+public interface FallbackSearchStrategy<T> {
+
+
+    Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode);
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
similarity index 67%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java
rename to core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
index 057a3d4..fc5a47e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permission/strategies/CommonFallbackStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
@@ -1,47 +1,52 @@
-package me.aurium.beetle.branch.fallback.permission.strategies;
+package me.aurium.beetle.branch.fallback.strategies;
 
+import me.aurium.beetle.branch.interfacing.responses.common.NoPermissionResponse;
 import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.api.Execution;
+import me.aurium.beetle.branch.handlers.context.ContextProvider;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.nodes.results.model.Result;
 
-import java.util.Optional;
-
-public class CommonFallbackStrategy<T> implements ExecutionFallbackStrategy<T> {
+public class OneBackStrategy<T> implements FallbackSearchStrategy<T> {
 
     @Override
-    public Optional<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode) {
+    public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode) {
 
         SearchInput input = SearchInput.of(args);
-
         SearchInfo<T> toBeExecuted = baseNode.getSpecificNode(input);
 
 
         //1. Check permissions and access (preprocessing)
 
-        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args) || toBeExecuted.resultingNode().getExecutionHandler().getExecution().isEmpty()) {
+        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args)) {
             //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
 
             if (toBeExecuted.resultingNode().equals(baseNode)) {
-                return Optional.empty();
+                return Result.fail(new NoPermissionResponse(baseNode));
 
             } else {
                 toBeExecuted = baseNode.getSpecificNode(input.withoutTop()); //regress backwards a node
             }
         }
 
-        return Optional.of(toBeExecuted);
+        return Result.success(toBeExecuted);
     }
 
 
     @Override
-    public void attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProducer<T> producer) {
+    public Result<Execution> attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProvider<T> producer) {
         NodeContext<T> produced = producer.produce(sender,alias,args,baseNode, result, baseContext);
 
-        result.resultingNode().getExecutionHandler().getExecution().orElseThrow().handle(produced); //this should never be null thanks to the preprocess
+        Result<Execution> info = result.resultingNode().getHandling().getExecution(produced);
+
+        if (!info.isSuccessful()) {
+            return info;
+        }
+
+        result.resultingNode().getHandling().getExecutionHandler().getExecution().orElseThrow().handle(produced); //this should never be null thanks to the preprocess
     }
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java
similarity index 92%
rename from core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
rename to core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java
index 33af162..b8cb810 100644
--- a/core/src/main/java/me/aurium/beetle/branch/util/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java
@@ -1,4 +1,4 @@
-package me.aurium.beetle.branch.util;
+package me.aurium.beetle.branch.fun;
 
 import java.util.HashSet;
 import java.util.Optional;
@@ -56,8 +56,8 @@ public Set<T> getContents() {
      * get already store thing
      * @return already stored thing or null
      */
-    public Optional<T> getAlreadyStored() {
-        return Optional.ofNullable(alreadyStored);
+    public T getAlreadyStored() {
+        return alreadyStored;
     }
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
index 4d4ac58..3704010 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
@@ -1,12 +1,13 @@
 package me.aurium.beetle.branch.handlers.api;
 
 import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.nodes.results.model.Result;
 
 import java.util.List;
 
 public interface BranchHandler<T> {
 
-    void getExecution(NodeContext<T> context);
+    Result<Execution> getExecution(NodeContext<T> context);
     List<String> getSuggestions(NodeContext<T> context);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
new file mode 100644
index 0000000..c22d3d6
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.handlers.api;
+
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+
+public class Execution {
+    private final Runnable runnable;
+
+    public Execution(Runnable runnable) {
+        this.runnable = runnable;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
deleted file mode 100644
index 4f90b4f..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/FallbackHandler.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package me.aurium.beetle.branch.handlers.api;
-
-import me.aurium.beetle.branch.handlers.context.Context;
-
-/**
- * Represents the fallback handler of a base that manages what happens when everything goes wrong
- *
- * EDIT THIS IS NO LONGER A FALLBACK HANDLER THIS IS ONLY FOR IF SOMETHIGN GOES HELL WRONG
- */
-public interface FallbackHandler<T>  {
-
-    void handle(Context<T> context);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractContext.java
deleted file mode 100644
index 8636ea4..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractContext.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package me.aurium.beetle.branch.handlers.context;
-
-public abstract class AbstractContext<T> implements Context<T> {
-
-    private final T t;
-    private final String alias;
-    private final String[] args;
-
-    protected AbstractContext(T t, String alias, String[] args) {
-        this.t = t;
-        this.alias = alias;
-        this.args = args;
-    }
-
-    @Override
-    public T getSender() {
-        return t;
-    }
-
-    @Override
-    public String getAlias() {
-        return alias;
-    }
-
-    @Override
-    public String[] getArgs() {
-        return args;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
index bd253c2..62a24a8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
@@ -4,20 +4,41 @@
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
-public abstract class AbstractNodeContext<T> extends AbstractContext<T> implements NodeContext<T> {
+public abstract class AbstractNodeContext<T> implements NodeContext<T> {
+
+    private final T sender;
+    private final String alias;
+    private final String[] args;
 
     private final CommandNode<T> baseNode;
     private final SearchInfo<T> searchInfo;
     private final BaseContext<T> baseContext;
 
-    protected AbstractNodeContext(T t, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
-        super(t, alias, strings);
+    protected AbstractNodeContext(T t, String sender, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
+        this.sender = t;
+        this.alias = sender;
+        this.args = args;
 
         this.baseContext = baseContext;
         this.searchInfo = result;
         this.baseNode = baseNode;
     }
 
+    @Override
+    public T getSender() {
+        return sender;
+    }
+
+    @Override
+    public String getAlias() {
+        return alias;
+    }
+
+    @Override
+    public String[] getArgs() {
+        return args;
+    }
+
     @Override
     public CommandNode<T> getBaseExecutedNode() {
         return baseNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/Context.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/Context.java
deleted file mode 100644
index efd485b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/Context.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch.handlers.context;
-
-public interface Context<T> {
-
-    T getSender();
-    String getAlias();
-    String[] getArgs();
-
-    void messageSender(String string);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
similarity index 81%
rename from core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
rename to core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
index 72f672b..b9ec494 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProducer.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
@@ -7,10 +7,8 @@
 /**
  * Produces context adapters, like the stock ContextSource for contexts.
  */
-public interface ContextProducer<T> {
+public interface ContextProvider<T> {
 
     NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search, BaseContext<T> baseContext);
 
-    Context<T> produce(T sender, String alias, String[] strings);
-
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
index 77924db..b0cf26b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
@@ -1,18 +1,38 @@
 package me.aurium.beetle.branch.handlers.context;
 
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 import me.aurium.beetle.branch.fallback.message.BaseContext;
+import me.aurium.beetle.branch.interfacing.message.Message;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
 
-public interface NodeContext<T> extends Context<T> {
+public interface NodeContext<T> {
 
+    T getSender();
+    String getAlias();
+    String[] getArgs();
     CommandNode<T> getBaseExecutedNode();
-
     SearchInfo<T> getResults();
     BaseContext<T> getBaseContext();
 
-    //TODO add more cool features like the debug message sender,
-    // because NodeContext should be a collection of both context and context-specific actions? /review a248
+    /**
+     * Sends an ugly string to the player using the platform's message handler. Whatever floats your boat!
+     * @param string string
+     */
+    void stringSender(String string);
+
+    /**
+     * Sends a fancy formatted message to a player using the bound platform's message-handler
+     * @param message message
+     */
+    void messageSender(Message<? extends T> message);
+
+    /**
+     * Sends a fancy formatted failure to a player that is bound to a Message using the platform's message-handler
+     * @param failure the failure
+     */
+    void failureSender(ExecutionResponse failure);
+
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
new file mode 100644
index 0000000..8fc534b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
@@ -0,0 +1,8 @@
+package me.aurium.beetle.branch.interfacing;
+
+public interface BlurbParser {
+
+    void parse(BlurbParser parser);
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
new file mode 100644
index 0000000..35a337d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
@@ -0,0 +1,14 @@
+package me.aurium.beetle.branch.interfacing;
+
+import java.util.UUID;
+
+public class CoreKeys {
+
+    public static final UUID TOO_MANY_ARGS = UUID.randomUUID();
+    public static final UUID NO_INTEGRATED_NOARGS = UUID.randomUUID();
+
+    //When someone has no permissions to execute a node
+    public static final UUID NO_PERMISSIONS = UUID.randomUUID();
+    public static final UUID FAILED_ADAPTING = UUID.randomUUID();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
similarity index 59%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java
rename to core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
index c205e9f..1ae0b2c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/FallbackPair.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
@@ -1,6 +1,4 @@
-package me.aurium.beetle.branch.fallback;
-
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+package me.aurium.beetle.branch.interfacing;
 
 public interface FallbackPair {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
new file mode 100644
index 0000000..695a43a
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.interfacing;
+
+public interface ResultInterfacer {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
new file mode 100644
index 0000000..88c6a85
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.interfacing.message;
+
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+
+public interface Message<C> {
+
+    void accept(C sender);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
new file mode 100644
index 0000000..4de91fa
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.interfacing.message;
+
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+
+/**
+ * rename messageRequirement
+ * @param <C>
+ */
+public interface Requirement<C> {
+
+    Message<C> toMessage(MessageInfo... infos);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
new file mode 100644
index 0000000..2c14de4
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
@@ -0,0 +1,35 @@
+package me.aurium.beetle.branch.interfacing.message.impl;
+
+import me.aurium.beetle.branch.interfacing.message.model.InterfacingHandler;
+import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
+import me.aurium.beetle.branch.interfacing.message.model.ResponseHandler;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+
+public class CommonMessageHandler<T> implements InterfacingHandler<T> {
+
+    private final ResponseHandler<T> handler;
+
+    public CommonMessageHandler(MessageProvider<T> provider) {
+        this.handler = new CommonResponseHandler<>(provider);
+    }
+
+    public CommonMessageHandler(ResponseHandler<T> handler) {
+        this.handler = handler;
+    }
+
+    @Override
+    public void sendMessage(T recipent, Message<T> message) {
+        message.accept(recipent);
+    }
+
+    @Override
+    public void sendMessage(T recipent, ExecutionResponse response) {
+        handler.sendMessage(recipent,response);
+    }
+
+    @Override
+    public void sendMessage(T recipent, String message) {
+
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
new file mode 100644
index 0000000..8ab63a8
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.interfacing.message.impl;
+
+import me.aurium.beetle.branch.interfacing.message.Requirement;
+import me.aurium.beetle.branch.interfacing.message.model.ResponseHandler;
+import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+
+import java.util.Map;
+import java.util.UUID;
+
+public class CommonResponseHandler<T> implements ResponseHandler<T> {
+
+    private final Map<UUID, Requirement<T>> requirements;
+
+    public CommonResponseHandler(MessageProvider<T> requirements) {
+        this.requirements = requirements.make();
+    }
+
+    @Override
+    public void sendMessage(T sender, ExecutionResponse info) {
+        Requirement<T> requirement = requirements.get(info.getCorrelatedMessage());
+
+        if (requirement == null) throw new IllegalArgumentException("No message mapped to key!");
+
+        requirement.toMessage(info.getRequirements()).accept(sender);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
new file mode 100644
index 0000000..2f46895
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
@@ -0,0 +1,16 @@
+package me.aurium.beetle.branch.interfacing.message.model;
+
+import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+
+/**
+ * Represents a centralized source for message providing as well as context creation. I am aware i spelled recipient wrong.
+ * @param <T> the type
+ */
+public interface InterfacingHandler<T> {
+
+    void sendMessage(T recipent, Message<T> message);
+    void sendMessage(T recipent, ExecutionResponse response);
+    void sendMessage(T recipent, String message);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
new file mode 100644
index 0000000..94dcd88
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
@@ -0,0 +1,24 @@
+package me.aurium.beetle.branch.interfacing.message.model;
+
+public class MessageInfo {
+
+    private final String key;
+    private final String value;
+
+    public MessageInfo(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public static MessageInfo of(String key, String value) {
+        return new MessageInfo(key, value);
+    }
+
+    public String getKey() {
+        return this.key;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
new file mode 100644
index 0000000..d9d049b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.interfacing.message.model;
+
+import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.message.Requirement;
+
+import java.util.Map;
+import java.util.UUID;
+
+public interface MessageProvider<T> {
+
+    Map<UUID, Requirement<T>> make();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
new file mode 100644
index 0000000..dc5191a
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
@@ -0,0 +1,18 @@
+package me.aurium.beetle.branch.interfacing.message.model;
+
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+
+/**
+ * Represents something that will handle the accessing of responses from the bound map and sending them.
+ * @param <T> the type
+ */
+public interface ResponseHandler<T> {
+
+    /**
+     * Sends a message bound to the execution response, or throws an exception if not present
+     * @param sender the sender
+     * @param key the response to send
+     */
+    void sendMessage(T sender, ExecutionResponse key);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
new file mode 100644
index 0000000..7a336aa
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
@@ -0,0 +1,17 @@
+package me.aurium.beetle.branch.interfacing.responses;
+
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+
+import java.util.UUID;
+
+/**
+ * Represents a prebuilt response to a request or command that is bound to the handler.
+ */
+public interface ExecutionResponse {
+
+    UUID getCorrelatedMessage();
+    MessageInfo[] getRequirements();
+
+    //TODO to throwable
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
new file mode 100644
index 0000000..61f8916
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.interfacing.responses;
+
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+
+import java.util.UUID;
+
+public class SendableResponse implements ExecutionResponse {
+
+    private final UUID key;
+    private final MessageInfo[] requirements;
+
+    public SendableResponse(UUID key, MessageInfo... requirements) {
+        this.key = key;
+        this.requirements = requirements;
+    }
+
+    @Override
+    public UUID getCorrelatedMessage() {
+        return key;
+    }
+
+    @Override
+    public MessageInfo[] getRequirements() {
+        return requirements;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
new file mode 100644
index 0000000..0816cf5
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
@@ -0,0 +1,20 @@
+package me.aurium.beetle.branch.interfacing.responses.common;
+
+import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
+import me.aurium.beetle.branch.interfacing.CoreKeys;
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+
+public class NoPermissionResponse extends SendableResponse {
+
+    public NoPermissionResponse(CommandNode<?> node) {
+        super(CoreKeys.NO_PERMISSIONS, new NoPermissionInfo(node));
+    }
+
+    public static class NoPermissionInfo extends MessageInfo {
+
+        public NoPermissionInfo(CommandNode<?> node) {
+            super("permission", node.getPermission().easyName());
+        }
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
index edfad8f..83813b1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
@@ -4,7 +4,7 @@
 
 public interface NodeBase<T> {
 
-    void execute(T t, String alias, String[] args);
+    void execute(T t, String alias, String[] args); //may execute instantly or take some time
     List<String> suggest(T t, String alias, String[] args);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
index 7850d1d..b3ea0ff 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
@@ -1,23 +1,18 @@
 package me.aurium.beetle.branch.launchpoints.base;
 
-import me.aurium.beetle.branch.fallback.permission.strategies.CommonFallbackStrategy;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
+import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
+import me.aurium.beetle.branch.handlers.context.ContextProvider;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.fallback.permission.strategies.ExecutionFallbackStrategy;
-
-import java.util.Arrays;
-import java.util.Objects;
+import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
 
 public class NodeBaseBuilder<T> {
 
-    private final ContextProducer<T> producer;
+    private final ContextProvider<T> producer;
 
     private CommandNode<T> base;
-    private FallbackHandler<T> fallbackHandler = (shit) -> shit.messageSender("Error running command with arguments: " + Arrays.toString(shit.getArgs()));
-    private ExecutionFallbackStrategy<T> strategy = new CommonFallbackStrategy<>();
+    private FallbackSearchStrategy<T> strategy = new OneBackStrategy<>();
 
-    public <X> NodeBaseBuilder(ContextProducer<T> producer) {
+    public <X> NodeBaseBuilder(ContextProvider<T> producer) {
         this.producer = producer;
     }
 
@@ -27,25 +22,10 @@ public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
         return this;
     }
 
-    public NodeBaseBuilder<T> withFallback(FallbackHandler<T> fallback) {
-        this.fallbackHandler = fallback;
-
-        return this;
-    }
-
-    public NodeBaseBuilder<T> withStrategy(ExecutionFallbackStrategy<T> strategy) {
+    public NodeBaseBuilder<T> withStrategy(FallbackSearchStrategy<T> strategy) {
         this.strategy = strategy;
 
         return this;
     }
 
-    public NodeBase<T> build() {
-        Objects.requireNonNull(base);
-        Objects.requireNonNull(fallbackHandler);
-        Objects.requireNonNull(strategy);
-
-        return null;
-
-        //return new SimpleNodeBase<>(base,producer,fallbackHandler,strategy);
-    }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
deleted file mode 100644
index e89eeae..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleBaseContext.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.base;
-
-import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.api.FallbackHandler;
-
-public class SimpleBaseContext<T> implements BaseContext<T> {
-
-    private final FallbackHandler<T> handler;
-
-    public SimpleBaseContext(FallbackHandler<T> handler) {
-        this.handler = handler;
-    }
-
-    @Override
-    public FallbackHandler<T> getFallback() {
-        return handler;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
deleted file mode 100644
index 83ed597..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SimpleNodeBase.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.base;
-
-import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.fallback.permission.strategies.ExecutionFallbackStrategy;
-
-import java.util.List;
-
-public class SimpleNodeBase<C> implements NodeBase<C> {
-
-    private final CommandNode<C> baseNode;
-    private final ContextProducer<C> factory;
-
-    private final BaseContext<C> baseContext;
-    private final ExecutionFallbackStrategy<C> strategy;
-
-    public <X> SimpleNodeBase(CommandNode<C> baseNode, ContextProducer<C> factory, BaseContext<C> baseContext, ExecutionFallbackStrategy<C> strategy) {
-
-        this.baseNode = baseNode;
-        this.factory = factory;
-        this.baseContext = baseContext;
-        this.strategy = strategy;
-    }
-
-    @Override
-    public void execute(C executor, String alias, String[] args) {
-        strategy.attemptPreprocess(executor,alias,args,baseNode).ifPresentOrElse(
-                result -> strategy.attemptExecution(executor,alias,args,baseNode,result,baseContext,factory),
-                //else
-                () -> baseContext.getFallback().handle(factory.produce(executor, alias, args))
-        );
-    }
-
-    @Override
-    public List<String> suggest(C c, String alias, String[] args) {
-        return null;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
new file mode 100644
index 0000000..82d7493
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
@@ -0,0 +1,56 @@
+package me.aurium.beetle.branch.launchpoints.base;
+
+import me.aurium.beetle.branch.handlers.context.ContextProvider;
+import me.aurium.beetle.branch.interfacing.message.model.InterfacingHandler;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+
+import java.util.List;
+
+/**
+ * Represents a nodebase that will perform it's executions synchronously
+ * @param <C>
+ */
+public class SyncNodeBase<C> implements NodeBase<C> {
+
+    private final CommandNode<C> baseNode;
+    private final FallbackSearchStrategy<C> strategy;
+
+    private final ContextProvider<C> provider;
+    private final InterfacingHandler<C> handler;
+
+    public SyncNodeBase(CommandNode<C> baseNode, FallbackSearchStrategy<C> strategy, ContextProvider<C> provider, InterfacingHandler<C> handler) {
+        this.baseNode = baseNode;
+        this.provider = provider;
+        this.strategy = strategy;
+        this.handler = handler;
+    }
+
+    @Override
+    public void execute(C executor, String alias, String[] args) {
+        Result<SearchInfo<C>> result = strategy.attemptPreprocess(executor,alias,args,baseNode);
+
+        if (!result.isSuccessful()) {
+
+            handler.sendMessage(executor, result.getFailure());
+
+            ha
+            return;
+        }
+
+
+
+                .ifPresentOrElse(
+                result -> strategy.attemptExecution(executor,alias,args,baseNode,result,baseContext, provider),
+                //else
+                () -> baseContext.getFallback().handle(provider.produce(executor, alias, args))
+        );
+    }
+
+    @Override
+    public List<String> suggest(C c, String alias, String[] args) {
+        return null;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
index 715aa33..cf328d3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.launchpoints.typeadapter;
 
-import java.util.function.Consumer;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 
 public interface CommonAdapter<T> extends ManagerAdapter<T,T> {
 
@@ -15,7 +15,7 @@ default boolean canAdapt(T t) {
     }
 
     @Override
-    default Consumer<T> failedAdaptAction() {
-        return (i) -> {}; //noops
+    default ExecutionResponse failedAdaptAction() {
+        throw new IllegalStateException("How did you get here (Since canAdapt is always true this should never occur?)");
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
index 2eb688b..3e3ed1e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
@@ -1,14 +1,12 @@
 package me.aurium.beetle.branch.launchpoints.typeadapter;
 
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
-
-import java.util.function.Consumer;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 
 public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
 
     OUTPUT adapt(INPUT input);
     boolean canAdapt(INPUT input);
 
-    Consumer<INPUT> failedAdaptAction();
+    ExecutionResponse failedAdaptAction(INPUT input);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 3c0c42b..5867f29 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -1,19 +1,20 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
+import me.aurium.beetle.branch.interfacing.CoreKeys;
 import me.aurium.beetle.branch.handlers.api.BranchHandler;
-import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+import me.aurium.beetle.branch.handlers.api.Execution;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
 import me.aurium.beetle.branch.nodes.results.*;
-import me.aurium.beetle.branch.fallback.permission.Permission;
-import me.aurium.beetle.branch.nodes.results.model.FailingResult;
+import me.aurium.beetle.branch.fallback.permissions.Permission;
 import me.aurium.beetle.branch.nodes.results.model.Result;
-import me.aurium.beetle.branch.util.PreStoredHashSet;
+import me.aurium.beetle.branch.fun.PreStoredHashSet;
 
 import java.util.Deque;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * TODO: missing a Node for noargs will cause it to rely on fallback rather than throwning exceptions and being bad (DONE - ish)
@@ -26,6 +27,7 @@ public class BranchingNode<T> implements IdentifiableNode<T> {
 
     private final PreStoredHashSet<IdentifiableNode<T>> nodes;
     private final Block path;
+    private final BranchHandler<T> handler;
 
     private final Permission<T> permission;
 
@@ -33,6 +35,8 @@ public BranchingNode(PreStoredHashSet<IdentifiableNode<T>> nodes, Block path, Pe
         this.nodes = nodes;
         this.path = path;
         this.permission = permission;
+
+        this.handler = new BranchingHandler<>(nodes);
     }
 
     @Override
@@ -57,25 +61,8 @@ public SearchInfo<T> getSpecificNode(SearchInput input) {
     }
 
     @Override
-    public ExecutionResult<T> getExecutionHandler() {
-
-        if (nodes.getAlreadyStored().isPresent()) {
-            return nodes.getAlreadyStored().get().getExecutionHandler();
-        } else {
-            return ExecutionResult.empty(); //FALL BACK SOLDIER
-        }
-
-    }
-
-    @Override
-    public SuggestionHandler<T> getSuggestionHandler() {
-        //TODO sort this out
-
-        return (context) -> {
-
-            //this works because this suggestion handler only gets called if we are on this object lmfao
-            return null;
-        };
+    public BranchHandler<T> getHandling() {
+        return handler;
     }
 
     @Override
@@ -85,19 +72,37 @@ public Permission<T> getPermission() {
 
     public static final class BranchingHandler<T> implements BranchHandler<T> {
 
-        private final CommandNode<T> alreadyPresent;
+        private final PreStoredHashSet<IdentifiableNode<T>> nodeShit;
+
+        public BranchingHandler(PreStoredHashSet<IdentifiableNode<T>> nodeShit) {
+            this.nodeShit = nodeShit;
+        }
 
-        @Override
-        public void getExecution(NodeContext<T> context) {
 
+        @Override
+        public Result<Execution> getExecution(NodeContext<T> context) {
+            if (nodeShit.getAlreadyStored() == null) {
+                return Result.fail(new NoIntegratedNoArgsBlurb());
+            } else {
+                return nodeShit.getAlreadyStored().getHandling().getExecution(context);
+            }
         }
 
         @Override
         public List<String> getSuggestions(NodeContext<T> context) {
-            return null;
+
+            //TODO fix this bullshit, add close-to-queue
+            return nodeShit.getContents().stream().map(s -> s.getIdentifier().getIdentifier()).collect(Collectors.toList());
         }
 
     }
 
+    public static final class NoIntegratedNoArgsBlurb extends SendableResponse {
+
+        public NoIntegratedNoArgsBlurb() {
+            super(CoreKeys.NO_INTEGRATED_NOARGS);
+        }
+    }
+
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index f772c54..71d04a6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -1,33 +1,33 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.EmptySuggestionHandler;
+import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
+import me.aurium.beetle.branch.interfacing.CoreKeys;
+import me.aurium.beetle.branch.handlers.api.BranchHandler;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
+import me.aurium.beetle.branch.handlers.api.Execution;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.nodes.model.EndpointNode;
-import me.aurium.beetle.branch.nodes.results.ExecutionResult;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
-import me.aurium.beetle.branch.fallback.permission.Permission;
+import me.aurium.beetle.branch.fallback.permissions.Permission;
 import me.aurium.beetle.branch.nodes.results.model.Result;
-import me.aurium.beetle.branch.nodes.results.model.SuccessfulResult;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class SingleNode<T> implements EndpointNode<T> {
 
     private final Block identifier;
-
-    private final ExecutionHandler<T> executionHandler;
-    private final SuggestionHandler<T> suggestionHandler;
-
     private final Permission<T> permission;
 
+    private final SingleHandler<T> handler;
+
     public SingleNode(Block identifier, ExecutionHandler<T> executionHandler, Permission<T> permission) {
         this.identifier = identifier;
 
-        this.executionHandler = executionHandler;
+        this.handler = new SingleHandler<>(executionHandler);
         this.permission = permission;
-
-        this.suggestionHandler = new EmptySuggestionHandler<>();
     }
 
     @Override
@@ -36,27 +36,58 @@ public Block getIdentifier() {
     }
 
     @Override
-    public Result<SearchInfo<T>> getSpecificNode(SearchInput input) {
+    public SearchInfo<T> getSpecificNode(SearchInput input) {
         input.getReducablePath().removeFirst(); //consume
 
-        return new SuccessfulResult<>(new SearchInfo<>(this,input));
+        return new SearchInfo<>(this,input);
     }
 
-    //TODO these maybe need to go somewhere else to a sort of parser
     @Override
-    public ExecutionResult<T> getExecutionHandler() {
-        return new ExecutionResult<>(executionHandler);
+    public BranchHandler<T> getHandling() {
+        return handler;
     }
 
-    @Override
-    public SuggestionHandler<T> getSuggestionHandler() {
-        return suggestionHandler;
-    }
 
     @Override
     public Permission<T> getPermission() {
         return permission;
     }
 
+    public static class SingleHandler<T> implements BranchHandler<T> {
+
+        private final ExecutionHandler<T> handler;
+
+        public SingleHandler(ExecutionHandler<T> handler) {
+            this.handler = handler;
+        }
+
+        @Override
+        public Result<Execution> getExecution(NodeContext<T> context) {
+            context.getResults().reducedPath().removeFirst();
+
+            if (context.getResults().hasMoreArguments()) {
+                return Result.fail(new TooManyArgumentsBlurb());
+            }
+
+            return Result.success(new Execution(() -> {
+                handler.handle(context);
+            }));
+        }
+
+        @Override
+        public List<String> getSuggestions(NodeContext<T> context) {
+            return new ArrayList<>();
+        }
+
+    }
+
+    public static class TooManyArgumentsBlurb extends SendableResponse {
+
+        public TooManyArgumentsBlurb() {
+            super(CoreKeys.TOO_MANY_ARGS);
+        }
+
+    }
+
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
index c0b580f..ef31a7c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
@@ -3,12 +3,12 @@
 import me.aurium.beetle.branch.block.Block;
 import me.aurium.beetle.branch.block.EmptyBlock;
 import me.aurium.beetle.branch.block.StringBlock;
-import me.aurium.beetle.branch.fallback.permission.Permission;
-import me.aurium.beetle.branch.fallback.permission.permissions.EmptyPermission;
+import me.aurium.beetle.branch.fallback.permissions.Permission;
+import me.aurium.beetle.branch.fallback.permissions.EmptyPermission;
 import me.aurium.beetle.branch.nodes.BranchingNode;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
-import me.aurium.beetle.branch.util.PreStoredHashSet;
+import me.aurium.beetle.branch.fun.PreStoredHashSet;
 
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
index 7b81e72..8804bf6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
@@ -6,8 +6,8 @@
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.nodes.SingleNode;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.fallback.permission.Permission;
-import me.aurium.beetle.branch.fallback.permission.permissions.EmptyPermission;
+import me.aurium.beetle.branch.fallback.permissions.Permission;
+import me.aurium.beetle.branch.fallback.permissions.EmptyPermission;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
index cde6f34..3bf26f8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
@@ -1,11 +1,9 @@
 package me.aurium.beetle.branch.nodes.model;
 
-import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-import me.aurium.beetle.branch.nodes.results.ExecutionResult;
+import me.aurium.beetle.branch.handlers.api.BranchHandler;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
-import me.aurium.beetle.branch.fallback.permission.Permission;
-import me.aurium.beetle.branch.nodes.results.model.Result;
+import me.aurium.beetle.branch.fallback.permissions.Permission;
 
 /**
  * Base object
@@ -14,9 +12,8 @@
 public interface CommandNode<T> {
 
     SearchInfo<T> getSpecificNode(SearchInput path);
+    BranchHandler<T> getHandling();
 
-    ExecutionResult<T> getExecutionHandler();
-    SuggestionHandler<T> getSuggestionHandler();
 
     /**
      * Gets the permission required to execute and interact with this node. Depending on the base, this may cause the node to become locked, or just completely be ignored.
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
index a4a14e5..11eb7df 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
@@ -1,24 +1,27 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.fallback.failure.Failure;
-
-import java.util.Optional;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 
 public class FailingResult<T> implements Result<T> {
 
-    private final Failure failure;
+    private final ExecutionResponse failure;
 
-    public FailingResult(Failure failure) {
+    public FailingResult(ExecutionResponse failure) {
         this.failure = failure;
     }
 
     @Override
-    public Optional<T> getSuccess() {
-        return Optional.empty();
+    public boolean isSuccessful() {
+        return false;
+    }
+
+    @Override
+    public T getSuccess() {
+        throw new IllegalStateException("Attempted to get success of a failing result! (e.g. was not checked)");
     }
 
     @Override
-    public Optional<Failure> getFailure() {
-        return Optional.of(failure);
+    public ExecutionResponse getFailure() {
+        return failure;
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
index a6d6472..9937e58 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
@@ -1,12 +1,21 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.fallback.failure.Failure;
-
-import java.util.Optional;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 
 public interface Result<T> {
 
-    Optional<T> getSuccess();
-    Optional<Failure> getFailure();
+    boolean isSuccessful();
+
+    T getSuccess();
+    ExecutionResponse getFailure();
+
+    //wow this looks familiar (i liked the functionality shhhh)
+    static <X> Result<X> success(X t) {
+        return new SuccessfulResult<>(t);
+    }
+
+    static <X> Result<X> fail(ExecutionResponse failure) {
+        return new FailingResult<>(failure);
+    }
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
index 36e33bb..c75d457 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
@@ -1,8 +1,6 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.fallback.failure.Failure;
-
-import java.util.Optional;
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 
 public class SuccessfulResult<T> implements Result<T> {
 
@@ -13,12 +11,17 @@ public SuccessfulResult(T sucessful) {
     }
 
     @Override
-    public Optional<T> getSuccess() {
-        return Optional.of(sucessful);
+    public boolean isSuccessful() {
+        return true;
+    }
+
+    @Override
+    public T getSuccess() {
+        return sucessful;
     }
 
     @Override
-    public Optional<Failure> getFailure() {
-        return Optional.empty();
+    public ExecutionResponse getFailure() {
+        throw new IllegalStateException("Attempted to get failure of a successful result!");
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index 444e1ef..e5f8080 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -18,7 +18,7 @@ protected SpigotContext(T t, String alias, String[] strings, CommandNode<T> base
     }
 
     @Override
-    public void messageSender(String string) {
+    public void stringSender(String string) {
         sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string)); //TODO prettify (or just use ContextErrorMessage LMFAO)
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
similarity index 82%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
rename to spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
index d2700b1..0c24248 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProducer.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
@@ -1,8 +1,7 @@
 package me.aurium.beetle.branch.spigot;
 
 import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.context.Context;
-import me.aurium.beetle.branch.handlers.context.ContextProducer;
+import me.aurium.beetle.branch.handlers.context.ContextProvider;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 import me.aurium.beetle.branch.launchpoints.IllegalSenderException;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
@@ -10,11 +9,11 @@
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.command.CommandSender;
 
-public class SpigotContextProducer<C extends CommandSender> implements ContextProducer<C> {
+public class SpigotContextProvider<C extends CommandSender> implements ContextProvider<C> {
 
     private final ManagerAdapter<CommandSender,C> adapter;
 
-    public <T> SpigotContextProducer(ManagerAdapter<CommandSender,C> adapter) {
+    public <T> SpigotContextProvider(ManagerAdapter<CommandSender,C> adapter) {
         this.adapter = adapter;
     }
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index 8df5e86..9f0723d 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -23,7 +23,7 @@ public NodeBaseBuilder<CommandSender> newCommand() {
 
     @Override
     public <C extends CommandSender> NodeBaseBuilder<C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
-        return new NodeBaseBuilder<>(new SpigotContextProducer<>(adapter));
+        return new NodeBaseBuilder<>(new SpigotContextProvider<>(adapter));
     }
 
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
new file mode 100644
index 0000000..4d2ff65
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.spigot.message;
+
+public class AdventureMessage {
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
new file mode 100644
index 0000000..ffd8116
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.spigot.message;
+
+import java.util.UUID;
+
+public class SpigotKeys {
+
+
+
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
index 4ea5efc..5471fc6 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
@@ -1,22 +1,32 @@
 package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.fallback.message.CommonKeys;
-import me.aurium.beetle.branch.fallback.message.Message;
-import me.aurium.beetle.branch.fallback.message.MessageKey;
-import me.aurium.beetle.branch.fallback.message.MessageProvider;
+import me.aurium.beetle.branch.interfacing.CoreKeys;
+import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.message.Requirement;
+import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
 import org.bukkit.command.CommandSender;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 public class SpigotMessageProvider<C extends CommandSender> implements MessageProvider<C> {
 
-    public Map<MessageKey,Message<C>> make() {
-        Map<MessageKey,Message<C>> messMap = new HashMap<>();
+    private final Map<UUID, Requirement<C>> map = new HashMap<>();
+
+    public SpigotMessageProvider() {
+        map.put(CoreKeys.TOO_MANY_ARGS, new TextMessage<>("&7HI THERE IDIOT FACE! You provided %args% args!"));
+    }
+
+    public SpigotMessageProvider<C> with(UUID uuid, Requirement<C> requirement) {
+        this.map.put(uuid,requirement);
+
+        return this;
+    }
 
-        messMap.put(CommonKeys.TOO_MANY_ARGS, new TextMessage<>("&7HI THERE IDIOT FACE! You provided %args% args!"));
 
-        return messMap;
+    public final Map<UUID, Requirement<C>>make() {
+        return map;
     }
 
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
index 035074a..372a0b7 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.fallback.message.Message;
+import me.aurium.beetle.branch.interfacing.message.Message;
 import org.bukkit.command.CommandSender;
 
 public class TextMessage<C extends CommandSender> implements Message<C> {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java
new file mode 100644
index 0000000..dd221b6
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java
@@ -0,0 +1,14 @@
+package me.aurium.beetle.branch.spigot.toPlayer;
+
+import me.aurium.beetle.branch.interfacing.CoreKeys;
+import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
+import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
+
+import java.util.UUID;
+
+public class FailedAdaptingResponse extends SendableResponse {
+
+    public FailedAdaptingResponse(String expected_type, String actual_type) {
+        super(CoreKeys.FAILED_ADAPTING, new MessageInfo("expected_type",toAdapt.getClass().getName()), new MessageInfo("actual_type",));
+    }
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
similarity index 57%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java
rename to spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
index 4f49a25..a68a81a 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/PlayerAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
@@ -1,19 +1,12 @@
-package me.aurium.beetle.branch.spigot;
+package me.aurium.beetle.branch.spigot.toPlayer;
 
+import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.function.Consumer;
-
 public class PlayerAdapter implements ManagerAdapter<CommandSender, Player> {
 
-    private final Consumer<CommandSender> failedOperation;
-
-    public PlayerAdapter(Consumer<CommandSender> failedOperation) {
-        this.failedOperation = failedOperation;
-    }
-
     @Override
     public Player adapt(CommandSender sender) {
         return (Player) sender;
@@ -25,8 +18,8 @@ public boolean canAdapt(CommandSender sender) {
     }
 
     @Override
-    public Consumer<CommandSender> failedAdaptAction() {
-        return failedOperation;
+    public ExecutionResponse failedAdaptAction() {
+        return new FailedAdaptingResponse(null);
     }
 
 }

From 25797a5d7664a8499dfec744a97828c3e49e0531 Mon Sep 17 00:00:00 2001
From: Auriium <aukrais@gmail.com>
Date: Wed, 7 Apr 2021 20:45:09 -0700
Subject: [PATCH 36/56] intermediary commit, finish up basics of message and
 response system

---
 core/pom.xml                                  |  2 +-
 .../fallback/permissions/EmptyPermission.java |  5 +++
 .../permissions/PredicatePermission.java      |  9 +++-
 .../fallback/strategies/OneBackStrategy.java  | 42 ++++++++++---------
 .../strategies/PermissionLockoutStrategy.java | 26 ++++++++++++
 .../branch/handlers/api/BranchHandler.java    |  2 +-
 .../beetle/branch/handlers/api/Execution.java | 16 +++++--
 .../handlers/context/AbstractNodeContext.java | 14 ++-----
 .../handlers/context/ContextProvider.java     |  3 +-
 .../branch/handlers/context/NodeContext.java  | 14 +++----
 .../branch/interfacing/BlurbParser.java       |  8 ----
 .../beetle/branch/interfacing/CoreKeys.java   | 14 -------
 .../branch/interfacing/FallbackPair.java      |  7 ----
 .../branch/interfacing/ResultInterfacer.java  |  4 --
 .../common/FailedAdaptingResponse.java        | 27 ++++++++++++
 .../common/NoIntegratedArgsResponse.java      | 36 ++++++++++++++++
 .../common/NoPermissionResponse.java          | 16 +++++++
 .../common/TooManyArgsResponse.java           | 22 ++++++++++
 .../handlers/CommonInterfacingHandler.java    | 26 ++++++++++++
 .../handlers/CommonMessageMap.java            | 22 ++++++++++
 .../handlers/CommonResponseActionHandler.java | 32 ++++++++++++++
 .../handlers/InterfacingHandler.java          | 15 +++++++
 .../interfacing/handlers/MessageMap.java      | 11 +++++
 .../interfacing/handlers/MessageProvider.java | 12 ++++++
 .../handlers/ResponseActionHandler.java       | 13 ++++++
 .../branch/interfacing/message/Message.java   |  9 ----
 .../interfacing/message/Requirement.java      | 13 ------
 .../message/impl/CommonMessageHandler.java    | 35 ----------------
 .../message/impl/CommonResponseHandler.java   | 27 ------------
 .../message/model/InterfacingHandler.java     | 16 -------
 .../message/model/MessageInfo.java            | 24 -----------
 .../message/model/MessageProvider.java        | 13 ------
 .../message/model/ResponseHandler.java        | 18 --------
 .../branch/interfacing/model/Message.java     |  7 ++++
 .../branch/interfacing/model/Response.java    |  5 +++
 .../interfacing/model/ResponseAction.java     |  9 ++++
 .../responses/ExecutionResponse.java          | 17 --------
 .../responses/SendableResponse.java           | 27 ------------
 .../common/NoPermissionResponse.java          | 20 ---------
 .../launchpoints/base/NodeBaseBuilder.java    |  6 +--
 .../launchpoints/base/SyncNodeBase.java       | 21 ++++++----
 .../typeadapter/CommonAdapter.java            | 15 ++++---
 .../typeadapter/ManagerAdapter.java           |  9 +++-
 .../beetle/branch/nodes/BranchingNode.java    | 16 ++-----
 .../beetle/branch/nodes/SingleNode.java       | 30 +++++++------
 .../nodes/builders/BranchingBuilder.java      |  2 +-
 .../branch/nodes/results/ExecutionResult.java | 22 ----------
 .../nodes/results/SuggestionResult.java       |  4 --
 .../nodes/results/model/FailingResult.java    | 13 ++++--
 .../branch/nodes/results/model/Result.java    |  9 ++--
 .../nodes/results/model/SuccessfulResult.java |  4 +-
 .../{fun => utility}/PreStoredHashSet.java    |  3 +-
 .../beetle/branch/spigot/SpigotContext.java   | 25 ++++++++---
 .../branch/spigot/SpigotContextProvider.java  | 22 ++++------
 .../beetle/branch/spigot/SpigotManager.java   |  4 +-
 .../spigot/message/FancyTextMessage.java      |  4 ++
 .../spigot/message/SpigotMessageProvider.java | 30 ++++---------
 .../branch/spigot/message/TextMessage.java    | 15 ++++---
 .../toPlayer/FailedAdaptingResponse.java      | 14 -------
 .../branch/spigot/toPlayer/PlayerAdapter.java |  7 ++--
 60 files changed, 463 insertions(+), 450 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
 rename core/src/main/java/me/aurium/beetle/branch/{fun => utility}/PreStoredHashSet.java (96%)
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
 delete mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java

diff --git a/core/pom.xml b/core/pom.xml
index 09d2689..1f7cb8a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>me.aurium</groupId>
             <artifactId>beetle-core</artifactId>
-            <version>0.4.1</version>
+            <version>1.1.1</version>
         </dependency>
     </dependencies>
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
index a2c2125..d6c4831 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
@@ -6,4 +6,9 @@ public class EmptyPermission<T> implements Permission<T> {
     public boolean attempt(T sender, String alias, String[] args) {
         return true;
     }
+
+    @Override
+    public String easyName() {
+        return "none"; //TODO perhaps throw? This shouldn't happen.
+    }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
index 77609e6..20232bb 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
@@ -4,9 +4,11 @@
 
 public class PredicatePermission<T> implements Permission<T> {
 
+    private final String easyName;
     private final Predicate<T> predicate;
 
-    public PredicatePermission(Predicate<T> predicate) {
+    public PredicatePermission(String easyName, Predicate<T> predicate) {
+        this.easyName = easyName;
         this.predicate = predicate;
     }
 
@@ -14,4 +16,9 @@ public PredicatePermission(Predicate<T> predicate) {
     public boolean attempt(T sender, String alias, String[] args) {
         return predicate.test(sender);
     }
+
+    @Override
+    public String easyName() {
+        return easyName;
+    }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
index fc5a47e..4b635e2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
@@ -1,15 +1,32 @@
 package me.aurium.beetle.branch.fallback.strategies;
 
-import me.aurium.beetle.branch.interfacing.responses.common.NoPermissionResponse;
-import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.handlers.api.Execution;
-import me.aurium.beetle.branch.handlers.context.ContextProvider;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.common.NoPermissionResponse;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.nodes.results.model.Result;
 
+/**
+ * Fallback and processing strategy that does the following actions:
+ *
+ * Attempts to get a node via arguments search. It then checks if the user has permission to access the node.
+ * If they do not, it falls back a single node and checks again. This repeats until the user has permission or
+ * until the search reaches the base node, in which case a response is fired as a failure.
+ *
+ * In practice:
+ *
+ * Node tree looks like
+ *
+ * /kitpvp moderation ban
+ * /kitpvp moderation kick
+ *
+ * User has permissions for kitpvp.moderation but not kitpvp.moderation.ban and tries to execute kitpvp moderation ban
+ *
+ * Searcher sees no permissions for ban command and so it falls back to the no-args of /kitpvp moderation which is
+ * then executed.
+ *
+ * @param <T>
+ */
 public class OneBackStrategy<T> implements FallbackSearchStrategy<T> {
 
     @Override
@@ -25,7 +42,7 @@ public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[]
             //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
 
             if (toBeExecuted.resultingNode().equals(baseNode)) {
-                return Result.fail(new NoPermissionResponse(baseNode));
+                return Result.fail(new NoPermissionResponse(baseNode.getPermission().easyName()));
 
             } else {
                 toBeExecuted = baseNode.getSpecificNode(input.withoutTop()); //regress backwards a node
@@ -36,19 +53,6 @@ public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[]
     }
 
 
-    @Override
-    public Result<Execution> attemptExecution(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext, ContextProvider<T> producer) {
-        NodeContext<T> produced = producer.produce(sender,alias,args,baseNode, result, baseContext);
-
-        Result<Execution> info = result.resultingNode().getHandling().getExecution(produced);
-
-        if (!info.isSuccessful()) {
-            return info;
-        }
-
-        result.resultingNode().getHandling().getExecutionHandler().getExecution().orElseThrow().handle(produced); //this should never be null thanks to the preprocess
-    }
-
 
     //TODO old code - refer to it if you need to
     /*SearchInput input = SearchInput.of(args);
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
new file mode 100644
index 0000000..e283963
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
@@ -0,0 +1,26 @@
+package me.aurium.beetle.branch.fallback.strategies;
+
+import me.aurium.beetle.branch.interfacing.common.NoPermissionResponse;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.beetle.branch.nodes.results.SearchInput;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+
+/**
+ * Simple fallback strategy that if the sender has no permission to execute the command they are sent a failing response.
+ * @param <T>
+ */
+public class PermissionLockoutStrategy<T> implements FallbackSearchStrategy<T> {
+    @Override
+    public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode) {
+
+        SearchInput input = SearchInput.of(args);
+        SearchInfo<T> toBeExecuted = baseNode.getSpecificNode(input);
+
+        if (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args)) {
+            return Result.fail(new NoPermissionResponse(toBeExecuted.resultingNode().getPermission().easyName()));
+        }
+
+        return Result.success(toBeExecuted);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
index 3704010..631aaa2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
@@ -7,7 +7,7 @@
 
 public interface BranchHandler<T> {
 
-    Result<Execution> getExecution(NodeContext<T> context);
+    Result<Execution<T>> getExecution(NodeContext<T> context);
     List<String> getSuggestions(NodeContext<T> context);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
index c22d3d6..ec9af67 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
@@ -2,10 +2,18 @@
 
 import me.aurium.beetle.branch.handlers.context.NodeContext;
 
-public class Execution {
-    private final Runnable runnable;
+public class Execution<T> implements Runnable {
 
-    public Execution(Runnable runnable) {
-        this.runnable = runnable;
+    private final ExecutionHandler<T> handler;
+    private final NodeContext<T> node;
+
+    public Execution(ExecutionHandler<T> handler, NodeContext<T> node) {
+        this.handler = handler;
+        this.node = node;
+    }
+
+    @Override
+    public void run() {
+        handler.handle(node);
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
index 62a24a8..43e046f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.fallback.message.BaseContext;
+
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
@@ -12,14 +12,12 @@ public abstract class AbstractNodeContext<T> implements NodeContext<T> {
 
     private final CommandNode<T> baseNode;
     private final SearchInfo<T> searchInfo;
-    private final BaseContext<T> baseContext;
 
-    protected AbstractNodeContext(T t, String sender, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
-        this.sender = t;
-        this.alias = sender;
+    protected AbstractNodeContext(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result) {
+        this.sender = sender;
+        this.alias = alias;
         this.args = args;
 
-        this.baseContext = baseContext;
         this.searchInfo = result;
         this.baseNode = baseNode;
     }
@@ -49,8 +47,4 @@ public SearchInfo<T> getResults() {
         return searchInfo;
     }
 
-    @Override
-    public BaseContext<T> getBaseContext() {
-        return baseContext;
-    }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
index b9ec494..714f186 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
@@ -1,6 +1,5 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.fallback.message.BaseContext;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
@@ -9,6 +8,6 @@
  */
 public interface ContextProvider<T> {
 
-    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search, BaseContext<T> baseContext);
+    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
index b0cf26b..fc0927e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
@@ -1,8 +1,7 @@
 package me.aurium.beetle.branch.handlers.context;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
-import me.aurium.beetle.branch.fallback.message.BaseContext;
-import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
@@ -14,7 +13,6 @@ public interface NodeContext<T> {
     String[] getArgs();
     CommandNode<T> getBaseExecutedNode();
     SearchInfo<T> getResults();
-    BaseContext<T> getBaseContext();
 
     /**
      * Sends an ugly string to the player using the platform's message handler. Whatever floats your boat!
@@ -26,13 +24,13 @@ public interface NodeContext<T> {
      * Sends a fancy formatted message to a player using the bound platform's message-handler
      * @param message message
      */
-    void messageSender(Message<? extends T> message);
+    void messageSender(Message<T> message);
 
     /**
-     * Sends a fancy formatted failure to a player that is bound to a Message using the platform's message-handler
-     * @param failure the failure
+     * Sends a formatted response to a player coded to a key
+     * @param failure the response
      */
-    void failureSender(ExecutionResponse failure);
+    void response(Response failure);
 
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
deleted file mode 100644
index 8fc534b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/BlurbParser.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package me.aurium.beetle.branch.interfacing;
-
-public interface BlurbParser {
-
-    void parse(BlurbParser parser);
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
deleted file mode 100644
index 35a337d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/CoreKeys.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package me.aurium.beetle.branch.interfacing;
-
-import java.util.UUID;
-
-public class CoreKeys {
-
-    public static final UUID TOO_MANY_ARGS = UUID.randomUUID();
-    public static final UUID NO_INTEGRATED_NOARGS = UUID.randomUUID();
-
-    //When someone has no permissions to execute a node
-    public static final UUID NO_PERMISSIONS = UUID.randomUUID();
-    public static final UUID FAILED_ADAPTING = UUID.randomUUID();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
deleted file mode 100644
index 1ae0b2c..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/FallbackPair.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.interfacing;
-
-public interface FallbackPair {
-
-    //TODO make this liek have two things: fallback for the base and fallback pre-base (for shit like adapter fails)
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
deleted file mode 100644
index 695a43a..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/ResultInterfacer.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.interfacing;
-
-public interface ResultInterfacer {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
new file mode 100644
index 0000000..59886b0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
@@ -0,0 +1,27 @@
+package me.aurium.beetle.branch.interfacing.common;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+/**
+ * Represents a response to the scenario in which a certain object was attempted to be adapted to an extending type
+ * but it was not an instance of it (or similar scenarios, such as attempting to flatmap a certain type to another.)
+ */
+public class FailedAdaptingResponse implements Response {
+
+    private final Class<?> expectedClass;
+    private final Class<?> receivedClass;
+
+    public FailedAdaptingResponse(Class<?> expectedClass, Class<?> receivedClass) {
+        this.expectedClass = expectedClass;
+        this.receivedClass = receivedClass;
+    }
+
+    public Class<?> getExpectedClass() {
+        return expectedClass;
+    }
+
+    public Class<?> getReceivedClass() {
+        return receivedClass;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java
new file mode 100644
index 0000000..54037ff
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java
@@ -0,0 +1,36 @@
+package me.aurium.beetle.branch.interfacing.common;
+
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+import java.util.ArrayList;
+import java.util.List;
+
+//This can probably be improved
+
+/**
+ * Represents a response to the scenario in which not enough arguments were supplied to execute a splittable
+ * node, so all alternative commands are suggested. This needs work, however, as it cannot list all alternative commands
+ * and their arguments just yet. (logic for this must be some kind of greedy queue consumer with potentially dangerous loops)
+ */
+public class NoIntegratedArgsResponse implements Response {
+
+    private final List<String> alternativeCommands;
+
+    public NoIntegratedArgsResponse(List<String> alternativeCommands) {
+        this.alternativeCommands = alternativeCommands;
+    }
+
+    public List<String> getAlternativeCommands() {
+        return alternativeCommands;
+    }
+
+    /**
+     * Use a basic nodeContext to produce a simple no integrated args response
+     * @param context lah
+     * @return lah
+     */
+    public static NoIntegratedArgsResponse of(NodeContext<?> context) {
+        return new NoIntegratedArgsResponse(new ArrayList<>()); //TODO IMPLEMENT
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
new file mode 100644
index 0000000..fdfc797
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
@@ -0,0 +1,16 @@
+package me.aurium.beetle.branch.interfacing.common;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+public class NoPermissionResponse implements Response {
+
+    private final String lackingPermission;
+
+    public NoPermissionResponse(String lackingPermission) {
+        this.lackingPermission = lackingPermission;
+    }
+
+    public String getLackingPermission() {
+        return lackingPermission;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
new file mode 100644
index 0000000..219c1f1
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
@@ -0,0 +1,22 @@
+package me.aurium.beetle.branch.interfacing.common;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+public class TooManyArgsResponse implements Response {
+
+    private final int expectedArgs;
+    private final int suppliedArgs;
+
+    public TooManyArgsResponse(int expectedArgs, int suppliedArgs) {
+        this.expectedArgs = expectedArgs;
+        this.suppliedArgs = suppliedArgs;
+    }
+
+    public int getExpectedArgs() {
+        return expectedArgs;
+    }
+
+    public int getSuppliedArgs() {
+        return suppliedArgs;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
new file mode 100644
index 0000000..2f451b8
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
@@ -0,0 +1,26 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+import java.util.concurrent.FutureTask;
+
+public class CommonInterfacingHandler<T> implements InterfacingHandler<T> {
+
+    private final ResponseActionHandler<T> handler;
+
+    public CommonInterfacingHandler(ResponseActionHandler<T> provider) {
+        this.handler = provider;
+    }
+
+    @Override
+    public void sendMessage(T recipent, Message<T> message) {
+        message.accept(recipent);
+    }
+
+    @Override
+    public void sendMessage(T recipent, Response response) {
+        handler.getMessage(response).accept(recipent);
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
new file mode 100644
index 0000000..2acfe8b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
@@ -0,0 +1,22 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CommonMessageMap<T> implements MessageMap<T>, MessageProvider<T> {
+
+    private final Map<Class<? extends Response>,ResponseAction<T,? extends Response>> map = new HashMap<>();
+
+    @Override
+    public <F extends Response> void add(Class<F> key, ResponseAction<T, F> action) {
+        map.put(key,action); //TODO checks
+    }
+
+    @Override
+    public ResponseActionHandler<T> make() {
+        return new CommonResponseActionHandler<>(Map.copyOf(map));
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
new file mode 100644
index 0000000..0cf984f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
@@ -0,0 +1,32 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+
+import java.util.Map;
+
+public class CommonResponseActionHandler<T> implements ResponseActionHandler<T> {
+
+    private final Map<Class<? extends Response>, ResponseAction<T,? extends Response>> map;
+
+    CommonResponseActionHandler(Map<Class<? extends Response>, ResponseAction<T,? extends Response>> map) {
+        this.map = map;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <C extends Response> ResponseAction<T, C> get(Class<C> clazz) {
+        ResponseAction<T,C> action = (ResponseAction<T, C>) map.get(clazz);
+
+        if (action == null) throw new IllegalStateException("A response was requested but internal map had no binding!");
+
+        return action;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <C extends Response> Message<T> getMessage(C response) {
+        return get((Class<C>) response.getClass()).consume(response);
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
new file mode 100644
index 0000000..cc046ae
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
@@ -0,0 +1,15 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+/**
+ * Represents a centralized source for message providing as well as context creation. I am aware i spelled recipient wrong.
+ * @param <T> the type
+ */
+public interface InterfacingHandler<T> {
+
+    void sendMessage(T recipent, Message<T> message);
+    void sendMessage(T recipent, Response response);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
new file mode 100644
index 0000000..cfccf71
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
@@ -0,0 +1,11 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.handlers.ResponseActionHandler;
+import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+
+public interface MessageMap<T> {
+
+    <F extends Response> void add(Class<F> key, ResponseAction<T,F> action);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
new file mode 100644
index 0000000..6d726fd
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
@@ -0,0 +1,12 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+
+import java.util.Map;
+
+public interface MessageProvider<T> {
+
+    ResponseActionHandler<T> make();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
new file mode 100644
index 0000000..79c346d
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
@@ -0,0 +1,13 @@
+package me.aurium.beetle.branch.interfacing.handlers;
+
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+
+public interface ResponseActionHandler<T> {
+
+    <C extends Response> ResponseAction<T, C> get(Class<C> clazz);
+    <C extends Response> Message<T> getMessage(C response);
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
deleted file mode 100644
index 88c6a85..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Message.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message;
-
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-
-public interface Message<C> {
-
-    void accept(C sender);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
deleted file mode 100644
index 4de91fa..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/Requirement.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message;
-
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-
-/**
- * rename messageRequirement
- * @param <C>
- */
-public interface Requirement<C> {
-
-    Message<C> toMessage(MessageInfo... infos);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
deleted file mode 100644
index 2c14de4..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonMessageHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.impl;
-
-import me.aurium.beetle.branch.interfacing.message.model.InterfacingHandler;
-import me.aurium.beetle.branch.interfacing.message.Message;
-import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
-import me.aurium.beetle.branch.interfacing.message.model.ResponseHandler;
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
-
-public class CommonMessageHandler<T> implements InterfacingHandler<T> {
-
-    private final ResponseHandler<T> handler;
-
-    public CommonMessageHandler(MessageProvider<T> provider) {
-        this.handler = new CommonResponseHandler<>(provider);
-    }
-
-    public CommonMessageHandler(ResponseHandler<T> handler) {
-        this.handler = handler;
-    }
-
-    @Override
-    public void sendMessage(T recipent, Message<T> message) {
-        message.accept(recipent);
-    }
-
-    @Override
-    public void sendMessage(T recipent, ExecutionResponse response) {
-        handler.sendMessage(recipent,response);
-    }
-
-    @Override
-    public void sendMessage(T recipent, String message) {
-
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
deleted file mode 100644
index 8ab63a8..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/impl/CommonResponseHandler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.impl;
-
-import me.aurium.beetle.branch.interfacing.message.Requirement;
-import me.aurium.beetle.branch.interfacing.message.model.ResponseHandler;
-import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
-
-import java.util.Map;
-import java.util.UUID;
-
-public class CommonResponseHandler<T> implements ResponseHandler<T> {
-
-    private final Map<UUID, Requirement<T>> requirements;
-
-    public CommonResponseHandler(MessageProvider<T> requirements) {
-        this.requirements = requirements.make();
-    }
-
-    @Override
-    public void sendMessage(T sender, ExecutionResponse info) {
-        Requirement<T> requirement = requirements.get(info.getCorrelatedMessage());
-
-        if (requirement == null) throw new IllegalArgumentException("No message mapped to key!");
-
-        requirement.toMessage(info.getRequirements()).accept(sender);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
deleted file mode 100644
index 2f46895..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/InterfacingHandler.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.model;
-
-import me.aurium.beetle.branch.interfacing.message.Message;
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
-
-/**
- * Represents a centralized source for message providing as well as context creation. I am aware i spelled recipient wrong.
- * @param <T> the type
- */
-public interface InterfacingHandler<T> {
-
-    void sendMessage(T recipent, Message<T> message);
-    void sendMessage(T recipent, ExecutionResponse response);
-    void sendMessage(T recipent, String message);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
deleted file mode 100644
index 94dcd88..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageInfo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.model;
-
-public class MessageInfo {
-
-    private final String key;
-    private final String value;
-
-    public MessageInfo(String key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    public static MessageInfo of(String key, String value) {
-        return new MessageInfo(key, value);
-    }
-
-    public String getKey() {
-        return this.key;
-    }
-
-    public String getValue() {
-        return this.value;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
deleted file mode 100644
index d9d049b..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/MessageProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.model;
-
-import me.aurium.beetle.branch.interfacing.message.Message;
-import me.aurium.beetle.branch.interfacing.message.Requirement;
-
-import java.util.Map;
-import java.util.UUID;
-
-public interface MessageProvider<T> {
-
-    Map<UUID, Requirement<T>> make();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
deleted file mode 100644
index dc5191a..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/message/model/ResponseHandler.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.aurium.beetle.branch.interfacing.message.model;
-
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
-
-/**
- * Represents something that will handle the accessing of responses from the bound map and sending them.
- * @param <T> the type
- */
-public interface ResponseHandler<T> {
-
-    /**
-     * Sends a message bound to the execution response, or throws an exception if not present
-     * @param sender the sender
-     * @param key the response to send
-     */
-    void sendMessage(T sender, ExecutionResponse key);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
new file mode 100644
index 0000000..d97b2ad
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
@@ -0,0 +1,7 @@
+package me.aurium.beetle.branch.interfacing.model;
+
+public interface Message<C> {
+
+    void accept(C sender);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
new file mode 100644
index 0000000..528d185
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
@@ -0,0 +1,5 @@
+package me.aurium.beetle.branch.interfacing.model;
+
+public interface Response {
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
new file mode 100644
index 0000000..564c981
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
@@ -0,0 +1,9 @@
+package me.aurium.beetle.branch.interfacing.model;
+
+import me.aurium.beetle.branch.interfacing.model.Message;
+
+public interface ResponseAction<T,C extends Response> {
+
+    Message<T> consume(C response);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
deleted file mode 100644
index 7a336aa..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/ExecutionResponse.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package me.aurium.beetle.branch.interfacing.responses;
-
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-
-import java.util.UUID;
-
-/**
- * Represents a prebuilt response to a request or command that is bound to the handler.
- */
-public interface ExecutionResponse {
-
-    UUID getCorrelatedMessage();
-    MessageInfo[] getRequirements();
-
-    //TODO to throwable
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
deleted file mode 100644
index 61f8916..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/SendableResponse.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.interfacing.responses;
-
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-
-import java.util.UUID;
-
-public class SendableResponse implements ExecutionResponse {
-
-    private final UUID key;
-    private final MessageInfo[] requirements;
-
-    public SendableResponse(UUID key, MessageInfo... requirements) {
-        this.key = key;
-        this.requirements = requirements;
-    }
-
-    @Override
-    public UUID getCorrelatedMessage() {
-        return key;
-    }
-
-    @Override
-    public MessageInfo[] getRequirements() {
-        return requirements;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
deleted file mode 100644
index 0816cf5..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/common/NoPermissionResponse.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.aurium.beetle.branch.interfacing.responses.common;
-
-import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
-import me.aurium.beetle.branch.interfacing.CoreKeys;
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-
-public class NoPermissionResponse extends SendableResponse {
-
-    public NoPermissionResponse(CommandNode<?> node) {
-        super(CoreKeys.NO_PERMISSIONS, new NoPermissionInfo(node));
-    }
-
-    public static class NoPermissionInfo extends MessageInfo {
-
-        public NoPermissionInfo(CommandNode<?> node) {
-            super("permission", node.getPermission().easyName());
-        }
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
index b3ea0ff..eb63eba 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
@@ -7,15 +7,11 @@
 
 public class NodeBaseBuilder<T> {
 
-    private final ContextProvider<T> producer;
+    private ContextProvider<T> producer;
 
     private CommandNode<T> base;
     private FallbackSearchStrategy<T> strategy = new OneBackStrategy<>();
 
-    public <X> NodeBaseBuilder(ContextProvider<T> producer) {
-        this.producer = producer;
-    }
-
     public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
         this.base = node;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
index 82d7493..0353fff 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
@@ -1,7 +1,9 @@
 package me.aurium.beetle.branch.launchpoints.base;
 
+import me.aurium.beetle.branch.handlers.api.Execution;
 import me.aurium.beetle.branch.handlers.context.ContextProvider;
-import me.aurium.beetle.branch.interfacing.message.model.InterfacingHandler;
+import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
@@ -33,20 +35,21 @@ public void execute(C executor, String alias, String[] args) {
         Result<SearchInfo<C>> result = strategy.attemptPreprocess(executor,alias,args,baseNode);
 
         if (!result.isSuccessful()) {
-
             handler.sendMessage(executor, result.getFailure());
-
-            ha
             return;
         }
 
+        SearchInfo<C> info = result.getSuccess();
+        NodeContext<C> produced = provider.produce(executor,alias,args,baseNode,info);
+
+        Result<Execution<C>> execution = info.resultingNode().getHandling().getExecution(produced);
 
+        if (!execution.isSuccessful()) {
+            handler.sendMessage(executor, execution.getFailure());
+            return;
+        }
 
-                .ifPresentOrElse(
-                result -> strategy.attemptExecution(executor,alias,args,baseNode,result,baseContext, provider),
-                //else
-                () -> baseContext.getFallback().handle(provider.produce(executor, alias, args))
-        );
+        execution.getSuccess().run();
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
index cf328d3..84c01e3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
@@ -1,21 +1,26 @@
 package me.aurium.beetle.branch.launchpoints.typeadapter;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
+import me.aurium.beetle.branch.interfacing.model.Response;
 
+/**
+ * Represents an adapter that does not convert and simply returns the same object
+ * @param <T> the object type
+ */
 public interface CommonAdapter<T> extends ManagerAdapter<T,T> {
 
     @Override
-    default T adapt(T in) {
-        return in;
+    default T adapt(T input) {
+        return input;
     }
 
     @Override
-    default boolean canAdapt(T t) {
+    default boolean canAdapt(T input) {
         return true;
     }
 
     @Override
-    default ExecutionResponse failedAdaptAction() {
+    default FailedAdaptingResponse failedParseResponse(T input) {
         throw new IllegalStateException("How did you get here (Since canAdapt is always true this should never occur?)");
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
index 3e3ed1e..be6acdc 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
@@ -1,12 +1,17 @@
 package me.aurium.beetle.branch.launchpoints.typeadapter;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
 
+/**
+ * Represents something that can convert an object of a certain type to another object
+ * @param <INPUT> Input object type
+ * @param <OUTPUT> Output object type
+ */
 public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
 
     OUTPUT adapt(INPUT input);
     boolean canAdapt(INPUT input);
 
-    ExecutionResponse failedAdaptAction(INPUT input);
+    FailedAdaptingResponse failedParseResponse(INPUT input);
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 5867f29..1f92bf7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -1,16 +1,15 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
-import me.aurium.beetle.branch.interfacing.CoreKeys;
 import me.aurium.beetle.branch.handlers.api.BranchHandler;
 import me.aurium.beetle.branch.handlers.api.Execution;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.common.NoIntegratedArgsResponse;
 import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
 import me.aurium.beetle.branch.nodes.results.*;
 import me.aurium.beetle.branch.fallback.permissions.Permission;
 import me.aurium.beetle.branch.nodes.results.model.Result;
-import me.aurium.beetle.branch.fun.PreStoredHashSet;
+import me.aurium.beetle.branch.utility.PreStoredHashSet;
 
 import java.util.Deque;
 import java.util.List;
@@ -80,9 +79,9 @@ public BranchingHandler(PreStoredHashSet<IdentifiableNode<T>> nodeShit) {
 
 
         @Override
-        public Result<Execution> getExecution(NodeContext<T> context) {
+        public Result<Execution<T>> getExecution(NodeContext<T> context) {
             if (nodeShit.getAlreadyStored() == null) {
-                return Result.fail(new NoIntegratedNoArgsBlurb());
+                return Result.fail(NoIntegratedArgsResponse.of(context));
             } else {
                 return nodeShit.getAlreadyStored().getHandling().getExecution(context);
             }
@@ -97,12 +96,5 @@ public List<String> getSuggestions(NodeContext<T> context) {
 
     }
 
-    public static final class NoIntegratedNoArgsBlurb extends SendableResponse {
-
-        public NoIntegratedNoArgsBlurb() {
-            super(CoreKeys.NO_INTEGRATED_NOARGS);
-        }
-    }
-
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index 71d04a6..5ec3ce5 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -1,12 +1,11 @@
 package me.aurium.beetle.branch.nodes;
 
 import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
-import me.aurium.beetle.branch.interfacing.CoreKeys;
 import me.aurium.beetle.branch.handlers.api.BranchHandler;
 import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
 import me.aurium.beetle.branch.handlers.api.Execution;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.common.TooManyArgsResponse;
 import me.aurium.beetle.branch.nodes.model.EndpointNode;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
@@ -16,6 +15,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Represents a node that can do one action and takes no arguments and has no tabcompletion
+ * @param <T> the type of executor
+ */
 public class SingleNode<T> implements EndpointNode<T> {
 
     private final Block identifier;
@@ -62,16 +65,18 @@ public SingleHandler(ExecutionHandler<T> handler) {
         }
 
         @Override
-        public Result<Execution> getExecution(NodeContext<T> context) {
-            context.getResults().reducedPath().removeFirst();
+        public Result<Execution<T>> getExecution(NodeContext<T> context) {
+            SearchInfo<T> info = context.getResults();
 
-            if (context.getResults().hasMoreArguments()) {
-                return Result.fail(new TooManyArgumentsBlurb());
+            info.reducedPath().removeFirst();
+
+            if (info.hasMoreArguments()) {
+                return Result.fail(
+                        new TooManyArgsResponse(0,info.reducedPath().size()) //TODO change this so it actually reflects
+                );
             }
 
-            return Result.success(new Execution(() -> {
-                handler.handle(context);
-            }));
+            return Result.success(new Execution<>(handler,context));
         }
 
         @Override
@@ -81,13 +86,6 @@ public List<String> getSuggestions(NodeContext<T> context) {
 
     }
 
-    public static class TooManyArgumentsBlurb extends SendableResponse {
-
-        public TooManyArgumentsBlurb() {
-            super(CoreKeys.TOO_MANY_ARGS);
-        }
-
-    }
 
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
index ef31a7c..778fe2b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
@@ -8,7 +8,7 @@
 import me.aurium.beetle.branch.nodes.BranchingNode;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
-import me.aurium.beetle.branch.fun.PreStoredHashSet;
+import me.aurium.beetle.branch.utility.PreStoredHashSet;
 
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
deleted file mode 100644
index b475977..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/ExecutionResult.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package me.aurium.beetle.branch.nodes.results;
-
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-
-import java.util.Optional;
-
-public class ExecutionResult<T>{
-
-    private final ExecutionHandler<T> executionHandler;
-
-    public ExecutionResult(ExecutionHandler<T> executionHandler) {
-        this.executionHandler = executionHandler;
-    }
-
-    public Optional<ExecutionHandler<T>> getExecution() {
-        return Optional.ofNullable(executionHandler);
-    }
-
-    public static <C> ExecutionResult<C> empty() {
-        return new ExecutionResult<>(null);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
deleted file mode 100644
index ed2ddf9..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SuggestionResult.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.nodes.results;
-
-public class SuggestionResult {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
index 11eb7df..246bd0b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
@@ -1,12 +1,16 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.model.Response;
 
+/**
+ * A result that has failed
+ * @param <T> the response
+ */
 public class FailingResult<T> implements Result<T> {
 
-    private final ExecutionResponse failure;
+    private final Response failure;
 
-    public FailingResult(ExecutionResponse failure) {
+    public FailingResult(Response failure) {
         this.failure = failure;
     }
 
@@ -21,7 +25,8 @@ public T getSuccess() {
     }
 
     @Override
-    public ExecutionResponse getFailure() {
+    public Response getFailure() {
         return failure;
     }
+
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
index 9937e58..794900f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
@@ -1,20 +1,19 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.model.Response;
 
 public interface Result<T> {
 
     boolean isSuccessful();
 
     T getSuccess();
-    ExecutionResponse getFailure();
 
-    //wow this looks familiar (i liked the functionality shhhh)
+    Response getFailure();
+
     static <X> Result<X> success(X t) {
         return new SuccessfulResult<>(t);
     }
-
-    static <X> Result<X> fail(ExecutionResponse failure) {
+    static <X> Result<X> fail(Response failure) {
         return new FailingResult<>(failure);
     }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
index c75d457..70e481d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.model.Response;
 
 public class SuccessfulResult<T> implements Result<T> {
 
@@ -21,7 +21,7 @@ public T getSuccess() {
     }
 
     @Override
-    public ExecutionResponse getFailure() {
+    public Response getFailure() {
         throw new IllegalStateException("Attempted to get failure of a successful result!");
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
similarity index 96%
rename from core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java
rename to core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
index b8cb810..0cea68f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fun/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
@@ -1,7 +1,6 @@
-package me.aurium.beetle.branch.fun;
+package me.aurium.beetle.branch.utility;
 
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 
 /**
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index e5f8080..501aa9f 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -1,7 +1,10 @@
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.fallback.message.BaseContext;
+
 import me.aurium.beetle.branch.handlers.context.AbstractNodeContext;
+import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
+import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.model.Response;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.ChatColor;
@@ -10,15 +13,27 @@
 public class SpigotContext<T extends CommandSender> extends AbstractNodeContext<T> {
 
     private final T sender;
+    private final InterfacingHandler<T> handler;
 
-    protected SpigotContext(T t, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> result, BaseContext<T> baseContext) {
-        super(t, alias, strings, baseNode, result, baseContext);
+    protected SpigotContext(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, InterfacingHandler<T> handler) {
+        super(sender, alias, args, baseNode, result);
 
-        this.sender = t;
+        this.sender = sender;
+        this.handler = handler;
     }
 
     @Override
     public void stringSender(String string) {
-        sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string)); //TODO prettify (or just use ContextErrorMessage LMFAO)
+        this.sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string));
+    }
+
+    @Override
+    public void messageSender(Message<T> message) {
+        handler.sendMessage(sender,message);
+    }
+
+    @Override
+    public void response(Response failure) {
+        handler.sendMessage(sender,failure);
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
index 0c24248..7618597 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
@@ -1,9 +1,9 @@
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.fallback.message.BaseContext;
+
 import me.aurium.beetle.branch.handlers.context.ContextProvider;
 import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.launchpoints.IllegalSenderException;
+import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
@@ -12,27 +12,21 @@
 public class SpigotContextProvider<C extends CommandSender> implements ContextProvider<C> {
 
     private final ManagerAdapter<CommandSender,C> adapter;
+    private final InterfacingHandler<C> handler;
 
-    public <T> SpigotContextProvider(ManagerAdapter<CommandSender,C> adapter) {
+    public <T> SpigotContextProvider(ManagerAdapter<CommandSender, C> adapter, InterfacingHandler<C> handler) {
         this.adapter = adapter;
+        this.handler = handler;
     }
 
 
     @Override
-    public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> baseNode, SearchInfo<C> search, BaseContext<C> baseContext) {
+    public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> baseNode, SearchInfo<C> search) {
         if (!adapter.canAdapt(sender)) {
-            adapter.failedAdaptAction();
-
-            //delegate to baseContext's stuff
-
-            throw new IllegalSenderException("Sender is not instance of correct type!"); //TODO more fallback bullshit :)
+            r
         }
 
-        return new SpigotContext<>(adapter.adapt(sender),alias,strings,baseNode,search,baseContext);
-    }
 
-    @Override
-    public Context<C> produce(C sender, String alias, String[] strings) {
-        return produce(sender, alias, strings,null,null,null);
+        return new SpigotContext<>(sender,alias,strings,baseNode,search, handler);
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index 9f0723d..1ebc6dd 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -1,5 +1,7 @@
 package me.aurium.beetle.branch.spigot;
 
+import me.aurium.beetle.branch.interfacing.handlers.CommonInterfacingHandler;
+import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.launchpoints.CentralizedManager;
 import me.aurium.beetle.branch.launchpoints.CentralizedManagerBinder;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
@@ -23,7 +25,7 @@ public NodeBaseBuilder<CommandSender> newCommand() {
 
     @Override
     public <C extends CommandSender> NodeBaseBuilder<C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
-        return new NodeBaseBuilder<>(new SpigotContextProvider<>(adapter));
+        return new NodeBaseBuilder<>(new SpigotContextProvider<>(adapter, new CommonInterfacingHandler<>()));
     }
 
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
new file mode 100644
index 0000000..acfd592
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
@@ -0,0 +1,4 @@
+package me.aurium.beetle.branch.spigot.message;
+
+public class FancyTextMessage {
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
index 5471fc6..5e483a7 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
@@ -1,32 +1,20 @@
 package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.interfacing.CoreKeys;
-import me.aurium.beetle.branch.interfacing.message.Message;
-import me.aurium.beetle.branch.interfacing.message.Requirement;
-import me.aurium.beetle.branch.interfacing.message.model.MessageProvider;
-import org.bukkit.command.CommandSender;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
+import me.aurium.beetle.branch.interfacing.handlers.CommonMessageMap;
+import org.bukkit.command.CommandSender;
 
-public class SpigotMessageProvider<C extends CommandSender> implements MessageProvider<C> {
+public class SpigotMessageProvider<C extends CommandSender>{
 
-    private final Map<UUID, Requirement<C>> map = new HashMap<>();
+    private final CommonMessageMap<C> map = new CommonMessageMap<>();
 
     public SpigotMessageProvider() {
-        map.put(CoreKeys.TOO_MANY_ARGS, new TextMessage<>("&7HI THERE IDIOT FACE! You provided %args% args!"));
-    }
-
-    public SpigotMessageProvider<C> with(UUID uuid, Requirement<C> requirement) {
-        this.map.put(uuid,requirement);
-
-        return this;
-    }
-
+        map.add(FailedAdaptingResponse.class, response -> new TextMessage<>(
+                "Expected class: " + response.getExpectedClass().getName() + "Got class: " + response.getReceivedClass()
+        ));
 
-    public final Map<UUID, Requirement<C>>make() {
-        return map;
+        map.add(FailedAdaptingResponse.class, response -> new TextMessage<>());
     }
 
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
index 372a0b7..caf9f0d 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
@@ -1,18 +1,23 @@
 package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.interfacing.message.Message;
+import me.aurium.beetle.branch.interfacing.model.Message;
+import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
 public class TextMessage<C extends CommandSender> implements Message<C> {
 
-    private final String coloredStringToSend;
+    private final String[] coloredStringToSend;
 
-    public TextMessage(String coloredStringToSend) {
+    public TextMessage(String... coloredStringToSend) {
         this.coloredStringToSend = coloredStringToSend;
     }
 
     @Override
-    public void accept(C sender, Object... info) {
-        sender.sendMessage(String.format(coloredStringToSend,info));
+    public void accept(C sender) {
+
+        for (String string : coloredStringToSend) {
+            sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string));
+        }
+
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java
deleted file mode 100644
index dd221b6..0000000
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/FailedAdaptingResponse.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package me.aurium.beetle.branch.spigot.toPlayer;
-
-import me.aurium.beetle.branch.interfacing.CoreKeys;
-import me.aurium.beetle.branch.interfacing.message.model.MessageInfo;
-import me.aurium.beetle.branch.interfacing.responses.SendableResponse;
-
-import java.util.UUID;
-
-public class FailedAdaptingResponse extends SendableResponse {
-
-    public FailedAdaptingResponse(String expected_type, String actual_type) {
-        super(CoreKeys.FAILED_ADAPTING, new MessageInfo("expected_type",toAdapt.getClass().getName()), new MessageInfo("actual_type",));
-    }
-}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
index a68a81a..6970477 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
@@ -1,6 +1,6 @@
 package me.aurium.beetle.branch.spigot.toPlayer;
 
-import me.aurium.beetle.branch.interfacing.responses.ExecutionResponse;
+import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
 import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -18,8 +18,9 @@ public boolean canAdapt(CommandSender sender) {
     }
 
     @Override
-    public ExecutionResponse failedAdaptAction() {
-        return new FailedAdaptingResponse(null);
+    public FailedAdaptingResponse failedParseResponse(CommandSender sender) {
+        return new FailedAdaptingResponse(Player.class, CommandSender.class);
     }
 
+
 }

From 581b5e3ac5bafa8876f5a7dd7477fcc7aa9b7e8f Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Wed, 21 Apr 2021 18:21:02 -0700
Subject: [PATCH 37/56] re organize packages, add license

---
 .idea/jarRepositories.xml                     | 15 ++++
 .idea/misc.xml                                |  2 +-
 beetle-impl/beetle-impl.iml                   |  2 -
 beetle-impl/pom.xml                           | 59 -------------
 .../branch/converted/BranchCommand.java       | 15 ----
 .../launchpoints/AbstractBaseCommand.java     | 15 ----
 .../launchpoints/AbstractBranchCommand.java   | 41 ----------
 .../beetle/branch/tests/AbstractTests.java    | 18 ----
 .../branch/tests/BranchingNodeTests.java      | 50 -----------
 .../beetle/branch/tests/SingleNodeTests.java  | 37 ---------
 .../aurium/beetle/branch/tests/TestBase.java  |  7 --
 .../branch/tests/context/TestContext.java     | 11 ---
 .../tests/context/TestContextProducer.java    | 20 -----
 .../tests/mockups/BranchingCommand.java       | 82 -------------------
 .../BranchingImproperAnnotatedCommand.java    | 44 ----------
 .../mockups/ImproperAnnotatedCommand.java     | 14 ----
 .../tests/mockups/ProperAnnotatedCommand.java |  4 -
 .../branch/tests/mockups/SingleCommand.java   | 45 ----------
 branch.iml                                    |  2 -
 core/pom.xml                                  | 31 ++++---
 .../branch/annotate/AnnotateConstants.java    | 21 +++++
 .../branch/annotate/AnnotatedCommand.java     | 21 +++++
 .../branch/annotate/AnnotatedParser.java      | 21 +++++
 .../beetle/branch/annotate/ParserOptions.java | 21 +++++
 .../branch/annotate/ParsingException.java     | 21 +++++
 .../beetle/branch/annotate/TypeToken.java     | 21 +++++
 .../UncheckedInvocationException.java         | 21 +++++
 .../branch/annotate/marker/BranchCommand.java | 21 +++++
 .../branch/annotate/marker/BranchingNode.java | 21 +++++
 .../branch/annotate/marker/NoArgsNode.java    | 21 +++++
 .../branch/annotate/marker/SingleNode.java    | 21 +++++
 .../marker/permission/Permission.java         | 21 +++++
 .../marker/permission/StringPermChecker.java  | 21 +++++
 .../parsers/BranchingAnnotatedParser.java     | 21 +++++
 .../parsers/PermissionAnnotationParser.java   | 21 +++++
 .../parsers/SingleAnnotatedParser.java        | 25 +++++-
 .../me/aurium/beetle/branch/block/Block.java  | 10 ---
 .../beetle/branch/block/EmptyBlock.java       | 20 -----
 .../centralized/CentralizedManager.java       | 40 +++++++++
 .../centralized/CentralizedManagerBinder.java | 31 +++++++
 .../centralized/IllegalSenderException.java   | 30 +++++++
 .../branch/centralized/base/NodeBase.java     | 31 +++++++
 .../centralized/base/NodeBaseBuilder.java     | 48 +++++++++++
 .../base/SyncNodeBase.java                    | 32 ++++++--
 .../typeadapter/CommonAdapter.java            | 46 +++++++++++
 .../typeadapter/ManagerAdapter.java           | 40 +++++++++
 .../execution/EmptyExecutionHandler.java      | 32 ++++++++
 .../execution/EmptySuggestionHandler.java     | 39 +++++++++
 .../branch/execution/api/BranchHandler.java   | 34 ++++++++
 .../branch/execution/api/Execution.java       | 40 +++++++++
 .../execution/api/ExecutionHandler.java       | 30 +++++++
 .../execution/api/SuggestionHandler.java      | 33 ++++++++
 .../beetle/branch/execution/block/Block.java  | 31 +++++++
 .../branch/execution/block/EmptyBlock.java    | 41 ++++++++++
 .../{ => execution}/block/StringBlock.java    | 23 +++++-
 .../context/AbstractNodeContext.java          | 23 +++++-
 .../context/ContextErrorMessage.java          | 30 +++++++
 .../execution/context/ContextProvider.java    | 34 ++++++++
 .../context/NodeContext.java                  | 23 +++++-
 .../fallback/permissions/EmptyPermission.java | 21 +++++
 .../fallback/permissions/Permission.java      | 21 +++++
 .../permissions/PredicatePermission.java      | 21 +++++
 .../permissions/StringPermission.java         | 21 +++++
 .../strategies/FallbackSearchStrategy.java    | 21 +++++
 .../fallback/strategies/OneBackStrategy.java  | 23 +++++-
 .../strategies/PermissionLockoutStrategy.java | 23 +++++-
 .../handlers/EmptyExecutionHandler.java       | 11 ---
 .../handlers/EmptySuggestionHandler.java      | 18 ----
 .../branch/handlers/api/BranchHandler.java    | 13 ---
 .../beetle/branch/handlers/api/Execution.java | 19 -----
 .../branch/handlers/api/ExecutionHandler.java |  9 --
 .../handlers/api/SuggestionHandler.java       | 12 ---
 .../handlers/context/ContextErrorMessage.java |  9 --
 .../handlers/context/ContextProvider.java     | 13 ---
 .../branch/information/help/HelpEntry.java    | 25 ++++++
 .../information/suggestion/Suggestion.java    | 25 ++++++
 .../common/FailedAdaptingResponse.java        | 27 ------
 .../common/NoPermissionResponse.java          | 16 ----
 .../common/TooManyArgsResponse.java           | 22 -----
 .../handlers/CommonInterfacingHandler.java    | 21 +++++
 .../handlers/CommonMessageMap.java            | 21 +++++
 .../handlers/CommonResponseActionHandler.java | 21 +++++
 .../handlers/InterfacingHandler.java          | 21 +++++
 .../interfacing/handlers/MessageMap.java      | 21 +++++
 .../interfacing/handlers/MessageProvider.java | 21 +++++
 .../handlers/ResponseActionHandler.java       | 21 +++++
 .../branch/interfacing/model/Message.java     | 21 +++++
 .../branch/interfacing/model/Response.java    | 21 +++++
 .../interfacing/model/ResponseAction.java     | 21 +++++
 .../responses/FailedAdaptingResponse.java     | 48 +++++++++++
 .../NoIntegratedArgsResponse.java             | 25 +++++-
 .../responses/NoPermissionResponse.java       | 37 +++++++++
 .../responses/TooManyArgsResponse.java        | 43 ++++++++++
 .../launchpoints/CentralizedManager.java      | 19 -----
 .../CentralizedManagerBinder.java             | 10 ---
 .../launchpoints/IllegalSenderException.java  |  9 --
 .../branch/launchpoints/base/NodeBase.java    | 10 ---
 .../launchpoints/base/NodeBaseBuilder.java    | 27 ------
 .../typeadapter/CommonAdapter.java            | 26 ------
 .../typeadapter/ManagerAdapter.java           | 17 ----
 .../beetle/branch/nodes/ArgumentNode.java     | 21 +++++
 .../beetle/branch/nodes/BranchingNode.java    | 31 +++++--
 .../aurium/beetle/branch/nodes/HelpNode.java  | 28 +++++++
 .../beetle/branch/nodes/SingleNode.java       | 33 ++++++--
 .../beetle/branch/nodes/ValueContext.java     | 21 +++++
 .../branch/nodes/argument/Argument.java       | 25 +++++-
 .../nodes/argument/ArgumentContext.java       | 23 +++++-
 .../argument/ArgumentContextHandler.java      | 21 +++++
 .../nodes/argument/ArgumentConvertet.java     | 21 +++++
 .../branch/nodes/argument/Arguments.java      | 21 +++++
 .../branch/nodes/builders/AloneBuilder.java   | 21 +++++
 .../nodes/builders/BranchingBuilder.java      | 27 +++++-
 .../beetle/branch/nodes/builders/Builder.java | 21 +++++
 .../branch/nodes/builders/SingleBuilder.java  | 29 ++++++-
 .../branch/nodes/model/CommandNode.java       | 23 +++++-
 .../branch/nodes/model/EndpointNode.java      | 21 +++++
 .../branch/nodes/model/IdentifiableNode.java  | 23 +++++-
 .../branch/nodes/model/ResponseHandler.java   | 21 +++++
 .../branch/nodes/results/SearchInfo.java      | 23 +++++-
 .../branch/nodes/results/SearchInput.java     | 25 +++++-
 .../nodes/results/model/FailingResult.java    | 21 +++++
 .../branch/nodes/results/model/Result.java    | 21 +++++
 .../nodes/results/model/SuccessfulResult.java | 21 +++++
 .../branch/utility/PreStoredHashSet.java      | 21 +++++
 pom.xml                                       | 29 +++++--
 spigot-impl/pom.xml                           | 34 ++++++--
 spigot-impl/spigot-impl.iml                   |  2 -
 .../beetle/branch/spigot/SenderAdapter.java   | 23 +++++-
 .../beetle/branch/spigot/SpigotContext.java   | 23 +++++-
 .../branch/spigot/SpigotContextProvider.java  | 36 +++++---
 .../beetle/branch/spigot/SpigotManager.java   | 31 +++++--
 .../branch/spigot/SpigotManagerBinder.java    | 23 +++++-
 .../spigot/message/AdventureMessage.java      | 21 +++++
 .../spigot/message/FancyTextMessage.java      | 21 +++++
 .../branch/spigot/message/SpigotKeys.java     | 21 +++++
 .../spigot/message/SpigotMessageProvider.java | 24 +++++-
 .../branch/spigot/message/TextMessage.java    | 21 +++++
 .../branch/spigot/toPlayer/PlayerAdapter.java | 25 +++++-
 .../beetle/branch/spigot/ExampleBinding.java  | 21 +++++
 139 files changed, 2494 insertions(+), 870 deletions(-)
 delete mode 100644 beetle-impl/beetle-impl.iml
 delete mode 100644 beetle-impl/pom.xml
 delete mode 100644 beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
 delete mode 100644 beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
 delete mode 100644 beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
 delete mode 100644 beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
 delete mode 100644 branch.iml
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/Block.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
 rename core/src/main/java/me/aurium/beetle/branch/{launchpoints => centralized}/base/SyncNodeBase.java (60%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/CommonAdapter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/ManagerAdapter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/block/Block.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/block/EmptyBlock.java
 rename core/src/main/java/me/aurium/beetle/branch/{ => execution}/block/StringBlock.java (51%)
 rename core/src/main/java/me/aurium/beetle/branch/{handlers => execution}/context/AbstractNodeContext.java (55%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/context/ContextProvider.java
 rename core/src/main/java/me/aurium/beetle/branch/{handlers => execution}/context/NodeContext.java (52%)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/information/help/HelpEntry.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
 rename core/src/main/java/me/aurium/beetle/branch/interfacing/{common => responses}/NoIntegratedArgsResponse.java (56%)
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
 create mode 100644 core/src/main/java/me/aurium/beetle/branch/nodes/HelpNode.java
 delete mode 100644 spigot-impl/spigot-impl.iml

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 57772c7..bf6e201 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,16 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="aurium-libs-release" />
+      <option name="url" value="https://aurium.jfrog.io/artifactory/aurium-libs-release" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="spigot-repo" />
+      <option name="name" value="spigot-repo" />
+      <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
@@ -31,6 +41,11 @@
       <option name="name" value="aurium" />
       <option name="url" value="" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="snapshots" />
+      <option name="name" value="aurium-libs-snapshot" />
+      <option name="url" value="https://aurium.jfrog.io/artifactory/aurium-libs-snapshot" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="solar-releases" />
       <option name="name" value="solar-releases" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f109e37..99bc4db 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,7 +14,7 @@
       </set>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="16" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/beetle-impl/beetle-impl.iml b/beetle-impl/beetle-impl.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/beetle-impl/beetle-impl.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/beetle-impl/pom.xml b/beetle-impl/pom.xml
deleted file mode 100644
index 482dfb5..0000000
--- a/beetle-impl/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>branch</artifactId>
-        <groupId>me.aurium</groupId>
-        <version>0.1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <version>0.1.0</version>
-
-    <artifactId>branch-beetle-impl</artifactId>
-
-    <properties>
-        <maven.compiler.source>${compiler.version}</maven.compiler.source>
-        <maven.compiler.target>${compiler.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>me.aurium</groupId>
-            <artifactId>branch-core</artifactId>
-            <version>0.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>me.aurium</groupId>
-            <artifactId>beetle-core</artifactId>
-            <version>0.4.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.7.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>2.0.0-alpha1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.3.0-alpha5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
deleted file mode 100644
index 177f1f8..0000000
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/BranchCommand.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package me.aurium.beetle.branch.converted;
-
-import me.aurium.beetle.api.command.Command;
-import me.aurium.beetle.branch.context.Context;
-import me.aurium.beetle.branch.nodes.CommandNode;
-
-public interface BranchCommand<T> extends Command<T> {
-
-    CommandNode<T> getBaseNode();
-
-    default void noArgsMissingOrError(Context<T> context) {
-        context.messageSender("An error occurred while executing this command!");
-    }
-
-}
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
deleted file mode 100644
index acec904..0000000
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBaseCommand.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package me.aurium.beetle.branch.converted.launchpoints;
-
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.launchpoints.base.NodeBase;
-/*
-
-public abstract class AbstractBaseCommand<T> extends AbstractBranchCommand<T> {
-
-    protected AbstractBaseCommand(ContextProducer<T> factory) {
-        super(factory);
-    }
-
-    public abstract NodeBase<T,?> getBase();
-}
-*/
diff --git a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java b/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
deleted file mode 100644
index 3bfb7fe..0000000
--- a/beetle-impl/src/main/java/me/aurium/beetle/branch/converted/launchpoints/AbstractBranchCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package me.aurium.beetle.branch.converted.launchpoints;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.converted.BranchCommand;
-import me.aurium.beetle.branch.nodes.CommandNode;
-import me.aurium.beetle.branch.context.NodeContext;
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.block.CommonBlockPath;
-
-/*
-public abstract class AbstractBranchCommand<T> implements BranchCommand<T> {
-
-    private final ContextProducer<T> factory;
-
-    protected AbstractBranchCommand(ContextProducer<T> factory) {
-        this.factory = factory;
-    }
-
-    @Override
-    public boolean execute(T t, String s, String[] strings) {
-
-        BlockPath path = CommonBlockPath.of(strings);
-
-        CommandNode<T> baseNode = getBaseNode();
-
-        //this logic should be in a Base
-        GetNodeResult<T> result = baseNode.getSpecificNode(path);
-
-        result.resultingNode().ifPresentOrElse(node -> {
-
-            //TODO some kind of thing here
-            NodeContext<T> adapter = factory.produce(t,s,strings,node,baseNode,path, result.resultingPath());
-
-            node.getExecutionHandler().handle(adapter);
-
-        }, () -> noArgsMissingOrError(factory.produce(t,s,strings)));
-
-        return true;
-    }
-}
-*/
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
deleted file mode 100644
index b0147c7..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/AbstractTests.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.aurium.beetle.branch.tests;
-
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.tests.context.TestContextProducer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class AbstractTests {
-
-    protected final Logger logger = LoggerFactory.getLogger(AbstractTests.class);
-
-    protected final ContextProducer<String> adapter = new TestContextProducer();
-
-    protected final static String SENDER = "Tester";
-    protected final static String ALIAS = "TestCommand";
-
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
deleted file mode 100644
index 631daba..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/BranchingNodeTests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package me.aurium.beetle.branch.tests;
-
-import me.aurium.beetle.branch.tests.mockups.BranchingCommand;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
-
-public class BranchingNodeTests extends AbstractTests {
-
-    private final BranchingCommand command = new BranchingCommand(adapter);
-
-    @BeforeEach
-    public void logTestStarting(TestInfo info) {
-        logger.info("Starting test {}", info.getDisplayName());
-    }
-
-    @DisplayName("Test with no arguments")
-    @Test
-    public void testNoArgsExecution() {
-        command.execute(SENDER,ALIAS,new String[]{""});
-    }
-
-    @DisplayName("Test targetting the linked no-args node of a command")
-    @Test
-    public void testLinkedNodeExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"help"});
-    }
-
-    @DisplayName("Test targeting an unlinked no-args node")
-    @Test
-    public void testNotLinkedNodeExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"invites","nonexistent"});
-    }
-
-    @DisplayName("Test targetting a branching node")
-    @Test
-    public void testBranchingExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"join"});
-    }
-
-    @DisplayName("Test branch node inside of branch node")
-    @Test
-    public void testBranchInBranchExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"invites","on"});
-    }
-
-
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
deleted file mode 100644
index 403df29..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/SingleNodeTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package me.aurium.beetle.branch.tests;
-
-import me.aurium.beetle.branch.tests.mockups.SingleCommand;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
-
-public class SingleNodeTests extends AbstractTests {
-
-    private final SingleCommand command = new SingleCommand(adapter);
-
-    @BeforeEach
-    public void logTestStarting(TestInfo info) {
-        logger.info("Starting test {}", info.getDisplayName());
-    }
-
-    @DisplayName("Test command with single variable, single node")
-    @Test
-    public void testSingleVarExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"arg1"});
-    }
-
-    @DisplayName("Test command with no arguments, single node")
-    @Test
-    public void testNoArgsExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"join"});
-    }
-
-    @DisplayName("Test command with two arguments, single node")
-    @Test
-    public void testMultiArgsExecution() {
-        command.execute(SENDER,ALIAS,new String[]{"arg1","arg2"});
-    }
-
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java
deleted file mode 100644
index 1e2c434..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/TestBase.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.aurium.beetle.branch.tests;
-
-public class TestBase {
-
-
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
deleted file mode 100644
index 56c7810..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContext.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch.tests.context;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.context.AbstractNodeContext;
-import me.aurium.beetle.branch.nodes.CommandNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestContext extends AbstractNodeContext<String> {
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
deleted file mode 100644
index 9cc574c..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/context/TestContextProducer.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.aurium.beetle.branch.tests.context;
-
-import me.aurium.beetle.branch.block.BlockPath;
-import me.aurium.beetle.branch.context.Context;
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.context.NodeContext;
-import me.aurium.beetle.branch.nodes.CommandNode;
-
-public class TestContextProducer implements ContextProducer<String> {
-
-    @Override
-    public NodeContext<String> produce(String sender, String alias, String[] strings, CommandNode<String> executedNode, CommandNode<String> baseNode, BlockPath executedPath, BlockPath basePath) {
-        return new TestContext(sender,alias,strings,executedNode,baseNode, executedPath, basePath);
-    }
-
-    @Override
-    public Context<String> produce(String sender, String alias, String[] strings) {
-        return new TestContext(sender,alias,strings,null,null,null,null);
-    }
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
deleted file mode 100644
index 9996e5f..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingCommand.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-import me.aurium.beetle.branch.nodes.CommandNode;
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.builders.Base;
-import me.aurium.beetle.branch.nodes.builders.BranchingBuilder;
-import me.aurium.beetle.branch.nodes.builders.SingleBuilder;
-import me.aurium.beetle.branch.converted.launchpoints.AbstractBranchCommand;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A fake command pretending to be a kitpvp plugin command
- */
-public class BranchingCommand extends AbstractBranchCommand<String> {
-
-    private final Logger logger = LoggerFactory.getLogger(BranchingCommand.class);
-
-    public BranchingCommand(ContextProducer<String> factory) {
-        super(factory);
-    }
-
-    @Override
-    public CommandNode<String> getBaseNode() {
-        return Base.base(new BranchingBuilder<>(),kitpvp -> {
-
-            //argument /kitpvp join, which always prints that they joined the match
-            kitpvp.withNode(new SingleBuilder<>(), join -> {
-                join.withIdentifier("join");
-                join.withHandler(handler -> {
-                    logger.info(handler.getSender() + " joined the kitpvp match!");
-                    //logic
-                });
-            });
-            //argument /kitpvp invites <on/off>
-            kitpvp.withNode(new BranchingBuilder<>(), invites -> {
-                invites.withIdentifier("invites");
-                invites.withNode(new SingleBuilder<>(), on -> {
-                    on.withIdentifier("on");
-                    on.withHandler(text -> {
-                        logger.info("Invites toggled on!");
-                    });
-
-                });
-                invites.withNode(new SingleBuilder<>(), off -> {
-                    off.withIdentifier("on");
-                    off.withHandler(text -> {
-                        logger.info("Invites toggled on!");
-                    });
-                });
-                invites.withNoArgs(new SingleBuilder<>(), false, noArgs -> {
-                    noArgs.withIdentifier("unlinked");
-                    noArgs.withHandler(handler -> {
-                        logger.info("You must specify either on or off!");
-                    });
-                });
-            });
-            //argument /kitpvp help, which is the default
-            kitpvp.withNoArgs(new SingleBuilder<>(), true, help -> {
-                help.withIdentifier("help");
-                help.withHandler(handler -> {
-                    logger.info("Hey, " + handler.getSender() + ", here is some help from KitPVP!");
-                    logger.info("/kitpvp help");
-                    logger.info("/kitpvp join");
-                    logger.info("/kitpvp invites <on/off>");
-                });
-            });
-
-
-        });
-    }
-
-    @Override
-    public String getName() {
-        return "kitpvp";
-    }
-
-    @Override
-    public String getPermission() {
-        return "none";
-    }
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
deleted file mode 100644
index 6f55af5..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/BranchingImproperAnnotatedCommand.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-import me.aurium.beetle.branch.context.NodeContext;
-import me.aurium.beetle.branch.annotate.marker.BranchCommand;
-import me.aurium.beetle.branch.annotate.marker.BranchingNode;
-import me.aurium.beetle.branch.annotate.marker.SingleNode;
-
-//rule of thumb: If 1 alonenode is found in the class, it is considered an alone-node based class.
-//if more than 1 commandnode is found in the class, it is considered a branching node based class
-//if there is one branching node in the class, it is considered a branching node based class sans that branching node (it's identifier doesn't matter)
-
-@BranchCommand
-public class BranchingImproperAnnotatedCommand {
-
-    @SingleNode(identifier = "branch1")
-    public void branch1(NodeContext<String> nodeContext) {
-        nodeContext.getSender();
-
-        //do some action, command looks like this: /command branch1
-    }
-
-    @SingleNode(identifier = "branch2")
-    public void branch2(NodeContext<String> nodeContext) {
-        nodeContext.getSender();
-
-        //do some action here, command looks like this: /command branch2
-    }
-
-    @BranchingNode(identifier = "branching1")
-    public static class branching1 {
-
-        @SingleNode(identifier = "mee")
-        public void lol() {
-            //do some action here, command looks like this: /command branching1 mee
-        }
-
-        @SingleNode(identifier = "cringe")
-        public void haha(NodeContext<String> context) {
-            //do some action here, command looks like this /command branching1 cringe
-        }
-
-    }
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
deleted file mode 100644
index 2a39332..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ImproperAnnotatedCommand.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-import me.aurium.beetle.branch.annotate.marker.BranchCommand;
-import me.aurium.beetle.branch.annotate.marker.SingleNode;
-
-@BranchCommand
-public class ImproperAnnotatedCommand {
-
-    @SingleNode(identifier = "test")
-    public void someShit() {
-
-    }
-
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
deleted file mode 100644
index a7abd6e..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/ProperAnnotatedCommand.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-public class ProperAnnotatedCommand {
-}
diff --git a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java b/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
deleted file mode 100644
index 0db4b0f..0000000
--- a/beetle-impl/src/test/java/me/aurium/beetle/branch/tests/mockups/SingleCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package me.aurium.beetle.branch.tests.mockups;
-
-import me.aurium.beetle.branch.nodes.CommandNode;
-import me.aurium.beetle.branch.context.ContextProducer;
-import me.aurium.beetle.branch.builders.Base;
-import me.aurium.beetle.branch.nodes.builders.SingleBuilder;
-import me.aurium.beetle.branch.converted.launchpoints.AbstractBranchCommand;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-
-/**
- * Fake command representing something like /helloworld that always says helloworld
- */
-public class SingleCommand extends AbstractBranchCommand<String> {
-    private final Logger log = LoggerFactory.getLogger(SingleCommand.class);
-
-    public SingleCommand(ContextProducer<String> factory) {
-        super(factory);
-    }
-
-    @Override
-    public CommandNode<String> getBaseNode() {
-        return Base.base(new SingleBuilder<>(),builder -> {
-            builder.withHandler(context -> {
-                log.info("hello world!");
-
-                log.info("The sender is: " + context.getSender());
-                log.info("The arguments were: " + Arrays.toString(context.getArgs()));
-                log.info("The path was: " + context.executedPath());
-            });
-        });
-    }
-
-    @Override
-    public String getName() {
-        return "helloworld";
-    }
-
-    @Override
-    public String getPermission() {
-        return "testPermission";
-    }
-}
diff --git a/branch.iml b/branch.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/branch.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 1f7cb8a..0887e87 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~  Branch
+  ~  Copyright © 2021 Aurium
+  ~
+  ~  Branch is free software: you can redistribute it and/or modify
+  ~  It under the terms of the GNU Affero General Public License as
+  ~  published by the Free Software Foundation, either version 3 of the
+  ~  License, or (at your option) any later version.
+  ~
+  ~  Branch is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~  GNU Affero General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU Affero General Public License
+  ~  along with Branch. If not, see <https://www.gnu.org/licenses/>
+  ~  and navigate to version 3 of the GNU Affero General Public License.
+  ~
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -11,21 +32,11 @@
 
     <artifactId>branch-core</artifactId>
 
-    <version>0.1.1</version>
-
     <properties>
         <maven.compiler.source>${compiler.version}</maven.compiler.source>
         <maven.compiler.target>${compiler.version}</maven.compiler.target>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>me.aurium</groupId>
-            <artifactId>beetle-core</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java
index 06f573e..7195363 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 public class AnnotateConstants {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
index 757c480..d8c1954 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
index 7cd0c4d..d580008 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 import me.aurium.beetle.branch.nodes.model.CommandNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java b/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java
index 7319836..8c2091b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java b/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java
index 7ce0cab..99ccf73 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 public class ParsingException {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java b/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java
index 3fdb7b3..9c95f39 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 public class TypeToken<T> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java b/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java
index 98831f4..d22596c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate;
 
 public class UncheckedInvocationException extends RuntimeException{
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java
index e9e539b..c791a3f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java
index 0138275..bbaea3a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java
index 2d4e704..3cbf536 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker;
 
 public @interface NoArgsNode {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java
index 108b53e..142e26c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker;
 
 import me.aurium.beetle.branch.annotate.AnnotateConstants;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
index 7dc843c..0845118 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker.permission;
 
 import java.lang.annotation.ElementType;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
index 5009a76..75c4c91 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.marker.permission;
 
 import me.aurium.beetle.branch.fallback.permissions.StringPermission;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java
index d0e7051..7c87a00 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.parsers;
 
 public class BranchingAnnotatedParser {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
index 4b98904..0672408 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.parsers;
 
 import me.aurium.beetle.branch.annotate.marker.permission.Permission;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
index 8b87a8e..1148036 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
@@ -1,10 +1,31 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.annotate.parsers;
 
 import me.aurium.beetle.branch.annotate.AnnotatedCommand;
 import me.aurium.beetle.branch.annotate.UncheckedInvocationException;
 import me.aurium.beetle.branch.annotate.marker.SingleNode;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.api.ExecutionHandler;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/Block.java b/core/src/main/java/me/aurium/beetle/branch/block/Block.java
deleted file mode 100644
index e24b841..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/Block.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-public interface Block {
-
-    String getIdentifier();
-
-    boolean equals(Object object);
-    boolean isEmpty();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java b/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
deleted file mode 100644
index 58a704a..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/block/EmptyBlock.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.aurium.beetle.branch.block;
-
-public class EmptyBlock implements Block{
-
-    @Override
-    public String getIdentifier() {
-        throw new UnsupportedOperationException("Empty block should not exist in path!");
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return true;
-    }
-
-    public static EmptyBlock of() {
-        return new EmptyBlock();
-    }
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
new file mode 100644
index 0000000..20746cf
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
@@ -0,0 +1,40 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized;
+
+import me.aurium.beetle.branch.centralized.base.NodeBaseBuilder;
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
+
+/**
+ * Represents the utmost base part of a command
+ * @param <T> the input type, does not need to be of same type as the node bases it utilizes
+ * @param <V> the platform, void if there is none (how?)
+ */
+public interface CentralizedManager<T,V> {
+
+    CentralizedManagerBinder getBinder(V platform);
+
+    NodeBaseBuilder<T> newCommand();
+    <C extends T> NodeBaseBuilder<C> newCommand(ManagerAdapter<T,C> adapter);
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java
new file mode 100644
index 0000000..e26869b
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java
@@ -0,0 +1,31 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized;
+
+public interface CentralizedManagerBinder {
+
+    /**
+     * Register all commands to the platform
+     */
+    void bind();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java b/core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java
new file mode 100644
index 0000000..4fb7918
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java
@@ -0,0 +1,30 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized;
+
+public class IllegalSenderException extends RuntimeException{
+
+    public IllegalSenderException(String lmao) {
+        super(lmao);
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java
new file mode 100644
index 0000000..a378065
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java
@@ -0,0 +1,31 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized.base;
+
+import java.util.List;
+
+public interface NodeBase<T> {
+
+    void execute(T t, String alias, String[] args); //may execute instantly or take some time
+    List<String> suggest(T t, String alias, String[] args);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
new file mode 100644
index 0000000..d404015
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
@@ -0,0 +1,48 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized.base;
+
+import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
+import me.aurium.beetle.branch.execution.context.ContextProvider;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
+
+public class NodeBaseBuilder<T> {
+
+    private ContextProvider<T> producer;
+
+    private CommandNode<T> base;
+    private FallbackSearchStrategy<T> strategy = new OneBackStrategy<>();
+
+    public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
+        this.base = node;
+
+        return this;
+    }
+
+    public NodeBaseBuilder<T> withStrategy(FallbackSearchStrategy<T> strategy) {
+        this.strategy = strategy;
+
+        return this;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java
similarity index 60%
rename from core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
rename to core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java
index 0353fff..a7f6d46 100644
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/SyncNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java
@@ -1,8 +1,29 @@
-package me.aurium.beetle.branch.launchpoints.base;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized.base;
 
-import me.aurium.beetle.branch.handlers.api.Execution;
-import me.aurium.beetle.branch.handlers.context.ContextProvider;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.execution.api.Execution;
+import me.aurium.beetle.branch.execution.context.ContextProvider;
+import me.aurium.beetle.branch.execution.context.NodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
@@ -12,7 +33,8 @@
 import java.util.List;
 
 /**
- * Represents a nodebase that will perform it's executions synchronously
+ * Represents a nodebase that will search for executions synchronously
+ * it will also search for suggestions synchronously
  * @param <C>
  */
 public class SyncNodeBase<C> implements NodeBase<C> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/CommonAdapter.java b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/CommonAdapter.java
new file mode 100644
index 0000000..4ef8bde
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/CommonAdapter.java
@@ -0,0 +1,46 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized.typeadapter;
+
+import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
+
+/**
+ * Represents an adapter that does not convert and simply returns the same object
+ * @param <T> the object type
+ */
+public interface CommonAdapter<T> extends ManagerAdapter<T,T> {
+
+    @Override
+    default T adapt(T input) {
+        return input;
+    }
+
+    @Override
+    default boolean canAdapt(T input) {
+        return true;
+    }
+
+    @Override
+    default FailedAdaptingResponse failedParseResponse(T input) {
+        throw new IllegalStateException("How did you get here (Since canAdapt is always true this should never occur?)");
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/ManagerAdapter.java
new file mode 100644
index 0000000..c3001f6
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/ManagerAdapter.java
@@ -0,0 +1,40 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.centralized.typeadapter;
+
+import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
+
+/**
+ * Represents something that can convert an object of a certain type to another object
+ * It is used to enable the use of nodes of a unique type on a centralized manager of a separate type.
+ *
+ * @param <INPUT> Input object type
+ * @param <OUTPUT> Output object type
+ */
+public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
+
+    OUTPUT adapt(INPUT input);
+    boolean canAdapt(INPUT input);
+
+    FailedAdaptingResponse failedParseResponse(INPUT input);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java
new file mode 100644
index 0000000..f8c946c
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java
@@ -0,0 +1,32 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution;
+
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.api.ExecutionHandler;
+
+public class EmptyExecutionHandler<T> implements ExecutionHandler<T> {
+    @Override
+    public void handle(NodeContext<T> adapter) {
+
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java
new file mode 100644
index 0000000..b12f1a8
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java
@@ -0,0 +1,39 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution;
+
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.api.SuggestionHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EmptySuggestionHandler<T> implements SuggestionHandler<T> {
+
+    private final List<String> emptyList = new ArrayList<>();
+
+    @Override
+    public List<Block> handle(NodeContext<T> adapter) {
+        return List.of();
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java
new file mode 100644
index 0000000..10ee0cf
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java
@@ -0,0 +1,34 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.api;
+
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.nodes.results.model.Result;
+
+import java.util.List;
+
+public interface BranchHandler<T> {
+
+    Result<Execution<T>> getExecution(NodeContext<T> context);
+    List<String> getSuggestions(NodeContext<T> context);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java
new file mode 100644
index 0000000..8ec67e9
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java
@@ -0,0 +1,40 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.api;
+
+import me.aurium.beetle.branch.execution.context.NodeContext;
+
+public class Execution<T> implements Runnable {
+
+    private final ExecutionHandler<T> handler;
+    private final NodeContext<T> node;
+
+    public Execution(ExecutionHandler<T> handler, NodeContext<T> node) {
+        this.handler = handler;
+        this.node = node;
+    }
+
+    @Override
+    public void run() {
+        handler.handle(node);
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java
new file mode 100644
index 0000000..e334187
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java
@@ -0,0 +1,30 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.api;
+
+import me.aurium.beetle.branch.execution.context.NodeContext;
+
+public interface ExecutionHandler<T> {
+
+    void handle(NodeContext<T> context);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java
new file mode 100644
index 0000000..f243322
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java
@@ -0,0 +1,33 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.api;
+
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.context.NodeContext;
+
+import java.util.List;
+
+public interface SuggestionHandler<T> {
+
+    List<Block> handle(NodeContext<T> context);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/block/Block.java b/core/src/main/java/me/aurium/beetle/branch/execution/block/Block.java
new file mode 100644
index 0000000..58769a7
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/block/Block.java
@@ -0,0 +1,31 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.block;
+
+public interface Block {
+
+    String getIdentifier();
+
+    boolean equals(Object object);
+    boolean isEmpty();
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/block/EmptyBlock.java b/core/src/main/java/me/aurium/beetle/branch/execution/block/EmptyBlock.java
new file mode 100644
index 0000000..bcfb132
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/block/EmptyBlock.java
@@ -0,0 +1,41 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.block;
+
+public class EmptyBlock implements Block{
+
+    @Override
+    public String getIdentifier() {
+        throw new UnsupportedOperationException("Empty block should not exist in path!");
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return true;
+    }
+
+    public static EmptyBlock of() {
+        return new EmptyBlock();
+    }
+
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java b/core/src/main/java/me/aurium/beetle/branch/execution/block/StringBlock.java
similarity index 51%
rename from core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/block/StringBlock.java
index 6dc4374..eb83b29 100644
--- a/core/src/main/java/me/aurium/beetle/branch/block/StringBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/block/StringBlock.java
@@ -1,4 +1,25 @@
-package me.aurium.beetle.branch.block;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.block;
 
 public class StringBlock implements Block {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/AbstractNodeContext.java
similarity index 55%
rename from core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/context/AbstractNodeContext.java
index 43e046f..5f907fd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/AbstractNodeContext.java
@@ -1,4 +1,25 @@
-package me.aurium.beetle.branch.handlers.context;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.context;
 
 
 import me.aurium.beetle.branch.nodes.model.CommandNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java
new file mode 100644
index 0000000..9946584
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java
@@ -0,0 +1,30 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.context;
+
+/**
+ * easy to use interface that lets me give it a title, some strings, and let it be converted
+ *
+ * e.g. to prettified chatcolor output or to discord embed on discord-impl.
+ */
+public interface ContextErrorMessage {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextProvider.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextProvider.java
new file mode 100644
index 0000000..bc22d9f
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextProvider.java
@@ -0,0 +1,34 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.context;
+
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.beetle.branch.nodes.results.SearchInfo;
+
+/**
+ * Produces context adapters, like the stock ContextSource for contexts.
+ */
+public interface ContextProvider<T> {
+
+    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search);
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
similarity index 52%
rename from core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
index fc0927e..a49b82b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
@@ -1,4 +1,25 @@
-package me.aurium.beetle.branch.handlers.context;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.execution.context;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
index d6c4831..ddd4a37 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.permissions;
 
 public class EmptyPermission<T> implements Permission<T> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
index 464979a..dcc03e1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.permissions;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
index 20232bb..66bbbb6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.permissions;
 
 import java.util.function.Predicate;
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
index 836aa47..be5ecf4 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.permissions;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
index ef0d2fd..1cb419a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.strategies;
 
 import me.aurium.beetle.branch.nodes.model.CommandNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
index 4b635e2..3cf7c18 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.strategies;
 
-import me.aurium.beetle.branch.interfacing.common.NoPermissionResponse;
+import me.aurium.beetle.branch.interfacing.responses.NoPermissionResponse;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
index e283963..987e75f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.fallback.strategies;
 
-import me.aurium.beetle.branch.interfacing.common.NoPermissionResponse;
+import me.aurium.beetle.branch.interfacing.responses.NoPermissionResponse;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
deleted file mode 100644
index 6af79d2..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptyExecutionHandler.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package me.aurium.beetle.branch.handlers;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-
-public class EmptyExecutionHandler<T> implements ExecutionHandler<T> {
-    @Override
-    public void handle(NodeContext<T> adapter) {
-
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
deleted file mode 100644
index daac0e0..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/EmptySuggestionHandler.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.aurium.beetle.branch.handlers;
-
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.handlers.api.SuggestionHandler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class EmptySuggestionHandler<T> implements SuggestionHandler<T> {
-
-    private final List<String> emptyList = new ArrayList<>();
-
-    @Override
-    public List<Block> handle(NodeContext<T> adapter) {
-        return List.of();
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
deleted file mode 100644
index 631aaa2..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/BranchHandler.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.handlers.api;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.nodes.results.model.Result;
-
-import java.util.List;
-
-public interface BranchHandler<T> {
-
-    Result<Execution<T>> getExecution(NodeContext<T> context);
-    List<String> getSuggestions(NodeContext<T> context);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
deleted file mode 100644
index ec9af67..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/Execution.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package me.aurium.beetle.branch.handlers.api;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-
-public class Execution<T> implements Runnable {
-
-    private final ExecutionHandler<T> handler;
-    private final NodeContext<T> node;
-
-    public Execution(ExecutionHandler<T> handler, NodeContext<T> node) {
-        this.handler = handler;
-        this.node = node;
-    }
-
-    @Override
-    public void run() {
-        handler.handle(node);
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
deleted file mode 100644
index d32f48e..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/ExecutionHandler.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.handlers.api;
-
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-
-public interface ExecutionHandler<T> {
-
-    void handle(NodeContext<T> context);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
deleted file mode 100644
index b96c285..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/api/SuggestionHandler.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package me.aurium.beetle.branch.handlers.api;
-
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-
-import java.util.List;
-
-public interface SuggestionHandler<T> {
-
-    List<Block> handle(NodeContext<T> context);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
deleted file mode 100644
index 8da0bf0..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextErrorMessage.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.handlers.context;
-
-/**
- * easy to use interface that lets me give it a title, some strings, and let it be converted
- *
- * e.g. to prettified chatcolor output or to discord embed on discord-impl.
- */
-public interface ContextErrorMessage {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java b/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
deleted file mode 100644
index 714f186..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/handlers/context/ContextProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.aurium.beetle.branch.handlers.context;
-
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
-
-/**
- * Produces context adapters, like the stock ContextSource for contexts.
- */
-public interface ContextProvider<T> {
-
-    NodeContext<T> produce(T sender, String alias, String[] strings, CommandNode<T> baseNode, SearchInfo<T> search);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/information/help/HelpEntry.java b/core/src/main/java/me/aurium/beetle/branch/information/help/HelpEntry.java
new file mode 100644
index 0000000..8ac21a0
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/information/help/HelpEntry.java
@@ -0,0 +1,25 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.information.help;
+
+public interface HelpEntry {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java b/core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java
new file mode 100644
index 0000000..f90b5c2
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java
@@ -0,0 +1,25 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.information.suggestion;
+
+public class Suggestion {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
deleted file mode 100644
index 59886b0..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/FailedAdaptingResponse.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.interfacing.common;
-
-import me.aurium.beetle.branch.interfacing.model.Response;
-
-/**
- * Represents a response to the scenario in which a certain object was attempted to be adapted to an extending type
- * but it was not an instance of it (or similar scenarios, such as attempting to flatmap a certain type to another.)
- */
-public class FailedAdaptingResponse implements Response {
-
-    private final Class<?> expectedClass;
-    private final Class<?> receivedClass;
-
-    public FailedAdaptingResponse(Class<?> expectedClass, Class<?> receivedClass) {
-        this.expectedClass = expectedClass;
-        this.receivedClass = receivedClass;
-    }
-
-    public Class<?> getExpectedClass() {
-        return expectedClass;
-    }
-
-    public Class<?> getReceivedClass() {
-        return receivedClass;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
deleted file mode 100644
index fdfc797..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoPermissionResponse.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package me.aurium.beetle.branch.interfacing.common;
-
-import me.aurium.beetle.branch.interfacing.model.Response;
-
-public class NoPermissionResponse implements Response {
-
-    private final String lackingPermission;
-
-    public NoPermissionResponse(String lackingPermission) {
-        this.lackingPermission = lackingPermission;
-    }
-
-    public String getLackingPermission() {
-        return lackingPermission;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
deleted file mode 100644
index 219c1f1..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/TooManyArgsResponse.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package me.aurium.beetle.branch.interfacing.common;
-
-import me.aurium.beetle.branch.interfacing.model.Response;
-
-public class TooManyArgsResponse implements Response {
-
-    private final int expectedArgs;
-    private final int suppliedArgs;
-
-    public TooManyArgsResponse(int expectedArgs, int suppliedArgs) {
-        this.expectedArgs = expectedArgs;
-        this.suppliedArgs = suppliedArgs;
-    }
-
-    public int getExpectedArgs() {
-        return expectedArgs;
-    }
-
-    public int getSuppliedArgs() {
-        return suppliedArgs;
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
index 2f451b8..85f7d98 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
index 2acfe8b..8a14ab2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
index 0cf984f..e7a2a6b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
index cc046ae..cadee9e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
index cfccf71..e750542 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.handlers.ResponseActionHandler;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
index 6d726fd..ae0844b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
index 79c346d..dd5247d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.handlers;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
index d97b2ad..a8ba0cc 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.model;
 
 public interface Message<C> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
index 528d185..8d8730c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.model;
 
 public interface Response {
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
index 564c981..549c84e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.interfacing.model;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
new file mode 100644
index 0000000..e9e6ac3
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
@@ -0,0 +1,48 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.interfacing.responses;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+/**
+ * Represents a response to the scenario in which a certain object was attempted to be adapted to an extending type
+ * but it was not an instance of it (or similar scenarios, such as attempting to flatmap a certain type to another.)
+ */
+public class FailedAdaptingResponse implements Response {
+
+    private final Class<?> expectedClass;
+    private final Class<?> receivedClass;
+
+    public FailedAdaptingResponse(Class<?> expectedClass, Class<?> receivedClass) {
+        this.expectedClass = expectedClass;
+        this.receivedClass = receivedClass;
+    }
+
+    public Class<?> getExpectedClass() {
+        return expectedClass;
+    }
+
+    public Class<?> getReceivedClass() {
+        return receivedClass;
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
similarity index 56%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java
rename to core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
index 54037ff..995a360 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/common/NoIntegratedArgsResponse.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
@@ -1,6 +1,27 @@
-package me.aurium.beetle.branch.interfacing.common;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.execution.context.NodeContext;
 import me.aurium.beetle.branch.interfacing.model.Response;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
new file mode 100644
index 0000000..afb42ef
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
@@ -0,0 +1,37 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.interfacing.responses;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+public class NoPermissionResponse implements Response {
+
+    private final String lackingPermission;
+
+    public NoPermissionResponse(String lackingPermission) {
+        this.lackingPermission = lackingPermission;
+    }
+
+    public String getLackingPermission() {
+        return lackingPermission;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
new file mode 100644
index 0000000..ea3d965
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
@@ -0,0 +1,43 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.interfacing.responses;
+
+import me.aurium.beetle.branch.interfacing.model.Response;
+
+public class TooManyArgsResponse implements Response {
+
+    private final int expectedArgs;
+    private final int suppliedArgs;
+
+    public TooManyArgsResponse(int expectedArgs, int suppliedArgs) {
+        this.expectedArgs = expectedArgs;
+        this.suppliedArgs = suppliedArgs;
+    }
+
+    public int getExpectedArgs() {
+        return expectedArgs;
+    }
+
+    public int getSuppliedArgs() {
+        return suppliedArgs;
+    }
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
deleted file mode 100644
index 22b765d..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManager.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package me.aurium.beetle.branch.launchpoints;
-
-import me.aurium.beetle.branch.launchpoints.base.NodeBaseBuilder;
-import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
-
-/**
- * Represents the utmost base part of a command
- * @param <T> the input type, does not need to be of same type as the node bases it utilizes
- * @param <V> the platform, void if there is none (how?)
- */
-public interface CentralizedManager<T,V> {
-
-    CentralizedManagerBinder getBinder(V platform);
-
-    NodeBaseBuilder<T> newCommand();
-    <C extends T> NodeBaseBuilder<C> newCommand(ManagerAdapter<T,C> adapter);
-
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
deleted file mode 100644
index a83c4d1..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/CentralizedManagerBinder.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package me.aurium.beetle.branch.launchpoints;
-
-public interface CentralizedManagerBinder {
-
-    /**
-     * Register all commands to the platform
-     */
-    void bind();
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
deleted file mode 100644
index 10c29bc..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/IllegalSenderException.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.aurium.beetle.branch.launchpoints;
-
-public class IllegalSenderException extends RuntimeException{
-
-    public IllegalSenderException(String lmao) {
-        super(lmao);
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
deleted file mode 100644
index 83813b1..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBase.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.base;
-
-import java.util.List;
-
-public interface NodeBase<T> {
-
-    void execute(T t, String alias, String[] args); //may execute instantly or take some time
-    List<String> suggest(T t, String alias, String[] args);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
deleted file mode 100644
index eb63eba..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/base/NodeBaseBuilder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.base;
-
-import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
-import me.aurium.beetle.branch.handlers.context.ContextProvider;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
-
-public class NodeBaseBuilder<T> {
-
-    private ContextProvider<T> producer;
-
-    private CommandNode<T> base;
-    private FallbackSearchStrategy<T> strategy = new OneBackStrategy<>();
-
-    public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
-        this.base = node;
-
-        return this;
-    }
-
-    public NodeBaseBuilder<T> withStrategy(FallbackSearchStrategy<T> strategy) {
-        this.strategy = strategy;
-
-        return this;
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
deleted file mode 100644
index 84c01e3..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/CommonAdapter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.typeadapter;
-
-import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
-import me.aurium.beetle.branch.interfacing.model.Response;
-
-/**
- * Represents an adapter that does not convert and simply returns the same object
- * @param <T> the object type
- */
-public interface CommonAdapter<T> extends ManagerAdapter<T,T> {
-
-    @Override
-    default T adapt(T input) {
-        return input;
-    }
-
-    @Override
-    default boolean canAdapt(T input) {
-        return true;
-    }
-
-    @Override
-    default FailedAdaptingResponse failedParseResponse(T input) {
-        throw new IllegalStateException("How did you get here (Since canAdapt is always true this should never occur?)");
-    }
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
deleted file mode 100644
index be6acdc..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/launchpoints/typeadapter/ManagerAdapter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package me.aurium.beetle.branch.launchpoints.typeadapter;
-
-import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
-
-/**
- * Represents something that can convert an object of a certain type to another object
- * @param <INPUT> Input object type
- * @param <OUTPUT> Output object type
- */
-public interface ManagerAdapter<INPUT,OUTPUT extends INPUT> {
-
-    OUTPUT adapt(INPUT input);
-    boolean canAdapt(INPUT input);
-
-    FailedAdaptingResponse failedParseResponse(INPUT input);
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
index 5c0114f..b8b3422 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes;
 
 //kinda like a branching node except it throws forward and not to the sides
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 1f92bf7..937d14a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -1,10 +1,31 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.api.BranchHandler;
-import me.aurium.beetle.branch.handlers.api.Execution;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.interfacing.common.NoIntegratedArgsResponse;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.api.BranchHandler;
+import me.aurium.beetle.branch.execution.api.Execution;
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.responses.NoIntegratedArgsResponse;
 import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
 import me.aurium.beetle.branch.nodes.results.*;
 import me.aurium.beetle.branch.fallback.permissions.Permission;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/HelpNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/HelpNode.java
new file mode 100644
index 0000000..5a808f2
--- /dev/null
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/HelpNode.java
@@ -0,0 +1,28 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.nodes;
+
+/**
+ * Represents a node that pregenerates help entries based on the message context
+ */
+public class HelpNode {
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index 5ec3ce5..75656e3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -1,11 +1,32 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.api.BranchHandler;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
-import me.aurium.beetle.branch.handlers.api.Execution;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
-import me.aurium.beetle.branch.interfacing.common.TooManyArgsResponse;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.api.BranchHandler;
+import me.aurium.beetle.branch.execution.api.ExecutionHandler;
+import me.aurium.beetle.branch.execution.api.Execution;
+import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.interfacing.responses.TooManyArgsResponse;
 import me.aurium.beetle.branch.nodes.model.EndpointNode;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java
index 05abc88..c56d712 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
index 40fcee4..49cf101 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
@@ -1,7 +1,28 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.argument;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.context.NodeContext;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
index efb6561..bdf8815 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.argument;
 
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.execution.context.NodeContext;
 
 public interface ArgumentContext<T> extends NodeContext<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
index 70dd276..8861dbd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.argument;
 
 public interface ArgumentContextHandler<T> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
index 50de57a..95fe577 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.argument;
 
 public interface ArgumentConvertet {
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
index f8b17e0..f5afa2a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.argument;
 
 public class Arguments {
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java
index 3b65261..d5a4631 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.builders;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
index 778fe2b..6f82093 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
@@ -1,8 +1,29 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.builders;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.EmptyBlock;
-import me.aurium.beetle.branch.block.StringBlock;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.block.EmptyBlock;
+import me.aurium.beetle.branch.execution.block.StringBlock;
 import me.aurium.beetle.branch.fallback.permissions.Permission;
 import me.aurium.beetle.branch.fallback.permissions.EmptyPermission;
 import me.aurium.beetle.branch.nodes.BranchingNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
index eef2d03..ddebebd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.builders;
 
 import me.aurium.beetle.branch.nodes.model.CommandNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
index 8804bf6..1506e6f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
@@ -1,9 +1,30 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.builders;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.EmptyBlock;
-import me.aurium.beetle.branch.block.StringBlock;
-import me.aurium.beetle.branch.handlers.api.ExecutionHandler;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.block.EmptyBlock;
+import me.aurium.beetle.branch.execution.block.StringBlock;
+import me.aurium.beetle.branch.execution.api.ExecutionHandler;
 import me.aurium.beetle.branch.nodes.SingleNode;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.permissions.Permission;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
index 3bf26f8..7c96d57 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.model;
 
-import me.aurium.beetle.branch.handlers.api.BranchHandler;
+import me.aurium.beetle.branch.execution.api.BranchHandler;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.fallback.permissions.Permission;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
index ee3358e..9d05ff3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.model;
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
index f94d74d..9952479 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.model;
 
-import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.execution.block.Block;
 
 public interface IdentifiableNode<T> extends CommandNode<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
index 1988067..4112c07 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.model;
 
 public class ResponseHandler {
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
index 85c5e9c..fa0da4b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.results;
 
-import me.aurium.beetle.branch.block.Block;
+import me.aurium.beetle.branch.execution.block.Block;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 
 import java.util.Deque;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
index c3fbf13..89f0e7f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
@@ -1,7 +1,28 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.results;
 
-import me.aurium.beetle.branch.block.Block;
-import me.aurium.beetle.branch.block.StringBlock;
+import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.block.StringBlock;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
index 246bd0b..5e4a7b7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.results.model;
 
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
index 794900f..a3f47a0 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.results.model;
 
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
index 70e481d..e706a48 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.nodes.results.model;
 
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
index 0cea68f..8d58a42 100644
--- a/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.utility;
 
 import java.util.HashSet;
diff --git a/pom.xml b/pom.xml
index d5f662a..ea7a941 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~  Branch
+  ~  Copyright © 2021 Aurium
+  ~
+  ~  Branch is free software: you can redistribute it and/or modify
+  ~  It under the terms of the GNU Affero General Public License as
+  ~  published by the Free Software Foundation, either version 3 of the
+  ~  License, or (at your option) any later version.
+  ~
+  ~  Branch is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~  GNU Affero General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU Affero General Public License
+  ~  along with Branch. If not, see <https://www.gnu.org/licenses/>
+  ~  and navigate to version 3 of the GNU Affero General Public License.
+  ~
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>me.aurium</groupId>
     <artifactId>branch</artifactId>
     <packaging>pom</packaging>
     <version>0.1.0</version>
+
     <modules>
         <module>core</module>
         <module>beetle-impl</module>
         <module>spigot-impl</module>
     </modules>
 
-    <parent>
-        <artifactId>beetle</artifactId>
-        <groupId>me.aurium</groupId>
-        <version>0.2.0</version>
-    </parent>
-
     <properties>
         <maven.compiler.source>${compiler.version}</maven.compiler.source>
         <maven.compiler.target>${compiler.version}</maven.compiler.target>
diff --git a/spigot-impl/pom.xml b/spigot-impl/pom.xml
index 3f1e678..52fbc29 100644
--- a/spigot-impl/pom.xml
+++ b/spigot-impl/pom.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~  Branch
+  ~  Copyright © 2021 Aurium
+  ~
+  ~  Branch is free software: you can redistribute it and/or modify
+  ~  It under the terms of the GNU Affero General Public License as
+  ~  published by the Free Software Foundation, either version 3 of the
+  ~  License, or (at your option) any later version.
+  ~
+  ~  Branch is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~  GNU Affero General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU Affero General Public License
+  ~  along with Branch. If not, see <https://www.gnu.org/licenses/>
+  ~  and navigate to version 3 of the GNU Affero General Public License.
+  ~
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -17,11 +38,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>me.aurium</groupId>
-            <artifactId>beetle-spigot-impl</artifactId>
-            <version>0.4.1</version>
-        </dependency>
         <dependency>
             <groupId>me.aurium</groupId>
             <artifactId>branch-core</artifactId>
@@ -31,7 +47,15 @@
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
             <version>1.16.5-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
 </project>
\ No newline at end of file
diff --git a/spigot-impl/spigot-impl.iml b/spigot-impl/spigot-impl.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/spigot-impl/spigot-impl.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
index cda8236..c27acf2 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.launchpoints.typeadapter.CommonAdapter;
+import me.aurium.beetle.branch.centralized.typeadapter.CommonAdapter;
 import org.bukkit.command.CommandSender;
 
 public class SenderAdapter implements CommonAdapter<CommandSender> {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index 501aa9f..c531e06 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -1,7 +1,28 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
 
-import me.aurium.beetle.branch.handlers.context.AbstractNodeContext;
+import me.aurium.beetle.branch.execution.context.AbstractNodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.interfacing.model.Message;
 import me.aurium.beetle.branch.interfacing.model.Response;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
index 7618597..d42be67 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
@@ -1,32 +1,46 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
 
-import me.aurium.beetle.branch.handlers.context.ContextProvider;
-import me.aurium.beetle.branch.handlers.context.NodeContext;
+import me.aurium.beetle.branch.execution.context.ContextProvider;
+import me.aurium.beetle.branch.execution.context.NodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.command.CommandSender;
 
 public class SpigotContextProvider<C extends CommandSender> implements ContextProvider<C> {
 
-    private final ManagerAdapter<CommandSender,C> adapter;
     private final InterfacingHandler<C> handler;
 
-    public <T> SpigotContextProvider(ManagerAdapter<CommandSender, C> adapter, InterfacingHandler<C> handler) {
-        this.adapter = adapter;
+    public SpigotContextProvider(InterfacingHandler<C> handler) {
         this.handler = handler;
     }
 
 
     @Override
     public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> baseNode, SearchInfo<C> search) {
-        if (!adapter.canAdapt(sender)) {
-            r
-        }
-
-
         return new SpigotContext<>(sender,alias,strings,baseNode,search, handler);
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index 1ebc6dd..c466cb6 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -1,11 +1,32 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
 import me.aurium.beetle.branch.interfacing.handlers.CommonInterfacingHandler;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.launchpoints.CentralizedManager;
-import me.aurium.beetle.branch.launchpoints.CentralizedManagerBinder;
-import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
-import me.aurium.beetle.branch.launchpoints.base.NodeBaseBuilder;
+import me.aurium.beetle.branch.centralized.CentralizedManager;
+import me.aurium.beetle.branch.centralized.CentralizedManagerBinder;
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
+import me.aurium.beetle.branch.centralized.base.NodeBaseBuilder;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -25,7 +46,7 @@ public NodeBaseBuilder<CommandSender> newCommand() {
 
     @Override
     public <C extends CommandSender> NodeBaseBuilder<C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
-        return new NodeBaseBuilder<>(new SpigotContextProvider<>(adapter, new CommonInterfacingHandler<>()));
+        return null;
     }
 
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
index 4fe2850..5340b01 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
@@ -1,6 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.launchpoints.CentralizedManagerBinder;
+import me.aurium.beetle.branch.centralized.CentralizedManagerBinder;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class SpigotManagerBinder implements CentralizedManagerBinder {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
index 4d2ff65..650aecc 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot.message;
 
 public class AdventureMessage {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
index acfd592..a288cc7 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot.message;
 
 public class FancyTextMessage {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
index ffd8116..aefdf2d 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot.message;
 
 import java.util.UUID;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
index 5e483a7..b3e50c0 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
@@ -1,8 +1,28 @@
-package me.aurium.beetle.branch.spigot.message;
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
 
+package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
 import me.aurium.beetle.branch.interfacing.handlers.CommonMessageMap;
+import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
 import org.bukkit.command.CommandSender;
 
 public class SpigotMessageProvider<C extends CommandSender>{
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
index caf9f0d..0a7edf3 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot.message;
 
 import me.aurium.beetle.branch.interfacing.model.Message;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
index 6970477..5c40ade 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
@@ -1,7 +1,28 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot.toPlayer;
 
-import me.aurium.beetle.branch.interfacing.common.FailedAdaptingResponse;
-import me.aurium.beetle.branch.launchpoints.typeadapter.ManagerAdapter;
+import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
diff --git a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
index da76a28..2e77465 100644
--- a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
+++ b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
@@ -1,3 +1,24 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
 package me.aurium.beetle.branch.spigot;
 
 import org.bukkit.plugin.java.JavaPlugin;

From c54d7555173ee5b79b29eb65bd0b846a95ac77c8 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Wed, 21 Apr 2021 21:03:59 -0700
Subject: [PATCH 38/56] work on adapters (hint: adapters need to provide an
 interfacing handler)

---
 .idea/jarRepositories.xml                     |  5 ++
 .../centralized/CentralizedManager.java       |  7 ++-
 ...yncNodeBase.java => AdaptingNodeBase.java} | 43 ++++++-------
 .../centralized/base/NodeBaseBuilder.java     | 60 ++++++++++++++++---
 .../typeadapter/StandardCommonAdapter.java    |  9 +--
 .../branch/execution/context/NodeContext.java |  4 +-
 .../interfacing/{model => }/Message.java      |  2 +-
 .../interfacing/{model => }/Response.java     |  2 +-
 .../{model => }/ResponseAction.java           |  4 +-
 .../handlers/CommonInterfacingHandler.java    |  6 +-
 .../handlers/CommonMessageMap.java            |  4 +-
 .../handlers/CommonResponseActionHandler.java |  6 +-
 .../handlers/InterfacingHandler.java          |  4 +-
 .../interfacing/handlers/MessageMap.java      |  5 +-
 .../interfacing/handlers/MessageProvider.java |  5 --
 .../handlers/ResponseActionHandler.java       |  6 +-
 .../responses/FailedAdaptingResponse.java     |  2 +-
 .../responses/NoIntegratedArgsResponse.java   |  2 +-
 .../responses/NoPermissionResponse.java       |  2 +-
 .../responses/TooManyArgsResponse.java        |  2 +-
 .../nodes/results/model/FailingResult.java    |  2 +-
 .../branch/nodes/results/model/Result.java    |  2 +-
 .../nodes/results/model/SuccessfulResult.java |  2 +-
 spigot-impl/pom.xml                           |  8 +--
 .../beetle/branch/spigot/CommandWrapper.java  | 52 ++++++++++++++++
 .../beetle/branch/spigot/SpigotContext.java   |  4 +-
 .../branch/spigot/SpigotContextProvider.java  |  2 -
 .../beetle/branch/spigot/SpigotManager.java   | 35 ++++++++---
 .../branch/spigot/SpigotManagerBinder.java    | 20 +++++--
 .../{toPlayer => adapter}/PlayerAdapter.java  |  2 +-
 .../spigot/{ => adapter}/SenderAdapter.java   |  2 +-
 .../spigot/message/SpigotMessageProvider.java |  4 ++
 .../branch/spigot/message/TextMessage.java    |  2 +-
 .../beetle/branch/spigot/ExampleBinding.java  |  2 +-
 34 files changed, 220 insertions(+), 99 deletions(-)
 rename core/src/main/java/me/aurium/beetle/branch/centralized/base/{SyncNodeBase.java => AdaptingNodeBase.java} (66%)
 rename spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java => core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java (86%)
 rename core/src/main/java/me/aurium/beetle/branch/interfacing/{model => }/Message.java (94%)
 rename core/src/main/java/me/aurium/beetle/branch/interfacing/{model => }/Response.java (94%)
 rename core/src/main/java/me/aurium/beetle/branch/interfacing/{model => }/ResponseAction.java (88%)
 create mode 100644 spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/CommandWrapper.java
 rename spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/{toPlayer => adapter}/PlayerAdapter.java (96%)
 rename spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/{ => adapter}/SenderAdapter.java (95%)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index bf6e201..cc475cd 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="papermc" />
+      <option name="name" value="papermc" />
+      <option name="url" value="https://papermc.io/repo/repository/maven-public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="aurium-libs-release" />
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
index 20746cf..f37f5f7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
@@ -21,6 +21,7 @@
 
 package me.aurium.beetle.branch.centralized;
 
+import me.aurium.beetle.branch.centralized.base.NodeBase;
 import me.aurium.beetle.branch.centralized.base.NodeBaseBuilder;
 import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 
@@ -33,8 +34,10 @@ public interface CentralizedManager<T,V> {
 
     CentralizedManagerBinder getBinder(V platform);
 
-    NodeBaseBuilder<T> newCommand();
-    <C extends T> NodeBaseBuilder<C> newCommand(ManagerAdapter<T,C> adapter);
+    NodeBaseBuilder<T,T> newCommand();
+    <C extends T> NodeBaseBuilder<T,C> newCommand(ManagerAdapter<T,C> adapter);
+
+    void injectCommand(NodeBase<T> base);
 
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
similarity index 66%
rename from core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java
rename to core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
index a7f6d46..e8ba911 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/SyncNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
@@ -21,61 +21,64 @@
 
 package me.aurium.beetle.branch.centralized.base;
 
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.execution.api.Execution;
 import me.aurium.beetle.branch.execution.context.ContextProvider;
 import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.nodes.results.model.Result;
 
 import java.util.List;
 
-/**
- * Represents a nodebase that will search for executions synchronously
- * it will also search for suggestions synchronously
- * @param <C>
- */
-public class SyncNodeBase<C> implements NodeBase<C> {
+public class AdaptingNodeBase<T,C extends T> implements NodeBase<T> {
+
+    private final ManagerAdapter<T,C> adapter;
 
     private final CommandNode<C> baseNode;
     private final FallbackSearchStrategy<C> strategy;
-
     private final ContextProvider<C> provider;
-    private final InterfacingHandler<C> handler;
+    private final InterfacingHandler<T> handler;
 
-    public SyncNodeBase(CommandNode<C> baseNode, FallbackSearchStrategy<C> strategy, ContextProvider<C> provider, InterfacingHandler<C> handler) {
+    public AdaptingNodeBase(ManagerAdapter<T, C> adapter, CommandNode<C> baseNode, FallbackSearchStrategy<C> strategy, ContextProvider<C> provider, InterfacingHandler<T> handler) {
+        this.adapter = adapter;
         this.baseNode = baseNode;
-        this.provider = provider;
         this.strategy = strategy;
+        this.provider = provider;
         this.handler = handler;
     }
 
-    @Override
-    public void execute(C executor, String alias, String[] args) {
-        Result<SearchInfo<C>> result = strategy.attemptPreprocess(executor,alias,args,baseNode);
+    public void execute(T t, String alias, String[] args) {
+        if (!adapter.canAdapt(t)) {
+            handler.sendMessage(t,adapter.failedParseResponse(t));
+            return;
+        }
+
+        C adaptedSender = adapter.adapt(t);
+
+        Result<SearchInfo<C>> result = strategy.attemptPreprocess(adaptedSender,alias,args,baseNode);
 
         if (!result.isSuccessful()) {
-            handler.sendMessage(executor, result.getFailure());
+            handler.sendMessage(adaptedSender, result.getFailure());
             return;
         }
 
         SearchInfo<C> info = result.getSuccess();
-        NodeContext<C> produced = provider.produce(executor,alias,args,baseNode,info);
+        NodeContext<C> produced = provider.produce(adaptedSender,alias,args,baseNode,info);
 
         Result<Execution<C>> execution = info.resultingNode().getHandling().getExecution(produced);
 
         if (!execution.isSuccessful()) {
-            handler.sendMessage(executor, execution.getFailure());
+            handler.sendMessage(adaptedSender, execution.getFailure());
             return;
         }
 
         execution.getSuccess().run();
     }
 
-    @Override
-    public List<String> suggest(C c, String alias, String[] args) {
-        return null;
+    public List<String> suggest(T t, String alias, String[] args) {
+        return null; //TODO
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
index d404015..ea3d645 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
@@ -21,28 +21,70 @@
 
 package me.aurium.beetle.branch.centralized.base;
 
-import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
+import me.aurium.beetle.branch.centralized.CentralizedManager;
+import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.execution.context.ContextProvider;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
+import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
+import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
+import me.aurium.beetle.branch.nodes.model.CommandNode;
+
+import java.util.Objects;
+
+public class NodeBaseBuilder<T,C extends T> {
 
-public class NodeBaseBuilder<T> {
+    private final CentralizedManager<T,?> manager;
+    private final ManagerAdapter<T,C> adapter;
 
-    private ContextProvider<T> producer;
+    private CommandNode<C> node;
+    private FallbackSearchStrategy<C> strategy;
+    private ContextProvider<C> provider;
+    private InterfacingHandler<T> handler;
 
-    private CommandNode<T> base;
-    private FallbackSearchStrategy<T> strategy = new OneBackStrategy<>();
 
-    public NodeBaseBuilder<T> withBaseNode(CommandNode<T> node) {
-        this.base = node;
+    public NodeBaseBuilder(CentralizedManager<T, ?> manager, ManagerAdapter<T, C> adapter) {
+        this.manager = manager;
+        this.adapter = adapter;
+    }
+
+    public NodeBaseBuilder(CentralizedManager<T, ?> manager, ManagerAdapter<T, C> adapter, FallbackSearchStrategy<C> strategy, ContextProvider<C> provider, InterfacingHandler<T> handler) {
+        this.manager = manager;
+        this.adapter = adapter;
+        this.strategy = strategy;
+        this.provider = provider;
+        this.handler = handler;
+    }
+
+    public NodeBaseBuilder<T,C> setNode(CommandNode<C> node) {
+        this.node = node;
 
         return this;
     }
 
-    public NodeBaseBuilder<T> withStrategy(FallbackSearchStrategy<T> strategy) {
+    public NodeBaseBuilder<T,C> setStrategy(FallbackSearchStrategy<C> strategy) {
         this.strategy = strategy;
 
         return this;
     }
 
+    public NodeBaseBuilder<T,C> setProvider(ContextProvider<C> provider) {
+        this.provider = provider;
+
+        return this;
+    }
+
+    public NodeBaseBuilder<T,C> setHandler(InterfacingHandler<T> handler) {
+        this.handler = handler;
+
+        return this;
+    }
+
+    public void inject() {
+        Objects.requireNonNull(node);
+        Objects.requireNonNull(strategy);
+        Objects.requireNonNull(provider);
+        Objects.requireNonNull(handler);
+
+        manager.injectCommand(new AdaptingNodeBase<>(adapter,node,strategy,provider,handler));
+    }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java
similarity index 86%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
rename to core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java
index aefdf2d..816aac1 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotKeys.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java
@@ -19,12 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot.message;
-
-import java.util.UUID;
-
-public class SpigotKeys {
-
-
+package me.aurium.beetle.branch.centralized.typeadapter;
 
+public class StandardCommonAdapter implements CommonAdapter<Object> {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
index a49b82b..29d7ac7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
@@ -21,8 +21,8 @@
 
 package me.aurium.beetle.branch.execution.context;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
rename to core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java
index a8ba0cc..b898926 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Message.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.model;
+package me.aurium.beetle.branch.interfacing;
 
 public interface Message<C> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
rename to core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java
index 8d8730c..d55e2d1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/Response.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.model;
+package me.aurium.beetle.branch.interfacing;
 
 public interface Response {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java
similarity index 88%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
rename to core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java
index 549c84e..acbe657 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/model/ResponseAction.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java
@@ -19,9 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.model;
-
-import me.aurium.beetle.branch.interfacing.model.Message;
+package me.aurium.beetle.branch.interfacing;
 
 public interface ResponseAction<T,C extends Response> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
index 85f7d98..0ca6f44 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
@@ -21,10 +21,8 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
-
-import java.util.concurrent.FutureTask;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
 
 public class CommonInterfacingHandler<T> implements InterfacingHandler<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
index 8a14ab2..6b64eee 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
@@ -21,8 +21,8 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
-import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.beetle.branch.interfacing.ResponseAction;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
index e7a2a6b..a344cc7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
@@ -21,9 +21,9 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
-import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.beetle.branch.interfacing.ResponseAction;
 
 import java.util.Map;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
index cadee9e..bf7b24b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
@@ -21,8 +21,8 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
 
 /**
  * Represents a centralized source for message providing as well as context creation. I am aware i spelled recipient wrong.
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
index e750542..21a3059 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
@@ -21,9 +21,8 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.handlers.ResponseActionHandler;
-import me.aurium.beetle.branch.interfacing.model.Response;
-import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.beetle.branch.interfacing.ResponseAction;
 
 public interface MessageMap<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
index ae0844b..e322c1f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
@@ -21,11 +21,6 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
-import me.aurium.beetle.branch.interfacing.model.ResponseAction;
-
-import java.util.Map;
-
 public interface MessageProvider<T> {
 
     ResponseActionHandler<T> make();
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
index dd5247d..4939892 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
@@ -21,9 +21,9 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
-import me.aurium.beetle.branch.interfacing.model.ResponseAction;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.beetle.branch.interfacing.ResponseAction;
 
 public interface ResponseActionHandler<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
index e9e6ac3..e3b7672 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 /**
  * Represents a response to the scenario in which a certain object was attempted to be adapted to an extending type
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
index 995a360..355bc85 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
@@ -22,7 +22,7 @@
 package me.aurium.beetle.branch.interfacing.responses;
 
 import me.aurium.beetle.branch.execution.context.NodeContext;
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
index afb42ef..7d69c0c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 public class NoPermissionResponse implements Response {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
index ea3d965..c8423c6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 public class TooManyArgsResponse implements Response {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
index 5e4a7b7..23ea321 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 /**
  * A result that has failed
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
index a3f47a0..19ee4c7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 public interface Result<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
index e706a48..b714b85 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Response;
 
 public class SuccessfulResult<T> implements Result<T> {
 
diff --git a/spigot-impl/pom.xml b/spigot-impl/pom.xml
index 52fbc29..6092a45 100644
--- a/spigot-impl/pom.xml
+++ b/spigot-impl/pom.xml
@@ -44,8 +44,8 @@
             <version>0.1.1</version>
         </dependency>
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
+            <groupId>com.destroystokyo.paper</groupId>
+            <artifactId>paper-api</artifactId>
             <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
@@ -53,8 +53,8 @@
 
     <repositories>
         <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
     </repositories>
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/CommandWrapper.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/CommandWrapper.java
new file mode 100644
index 0000000..c5d5fd8
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/CommandWrapper.java
@@ -0,0 +1,52 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.beetle.branch.spigot;
+
+import me.aurium.beetle.branch.centralized.base.NodeBase;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class CommandWrapper extends Command {
+
+    private final NodeBase<CommandSender> base;
+
+    public CommandWrapper(NodeBase<CommandSender> base) {
+        super(null); //TODO description of base node, etc etc etc etc etc
+
+        this.base = base;
+    }
+
+    @Override
+    public boolean execute(@NotNull CommandSender commandSender, @NotNull String s, String[] strings) {
+        base.execute(commandSender, s, strings);
+
+        return true;
+    }
+
+    @Override
+    public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, String[] args) throws IllegalArgumentException {
+        return base.suggest(sender, alias, args);
+    }
+}
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index c531e06..ea01e94 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -24,8 +24,8 @@
 
 import me.aurium.beetle.branch.execution.context.AbstractNodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.interfacing.model.Message;
-import me.aurium.beetle.branch.interfacing.model.Response;
+import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.beetle.branch.interfacing.Response;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.ChatColor;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
index d42be67..8458955 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
@@ -25,7 +25,6 @@
 import me.aurium.beetle.branch.execution.context.ContextProvider;
 import me.aurium.beetle.branch.execution.context.NodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import org.bukkit.command.CommandSender;
@@ -38,7 +37,6 @@ public SpigotContextProvider(InterfacingHandler<C> handler) {
         this.handler = handler;
     }
 
-
     @Override
     public NodeContext<C> produce(C sender, String alias, String[] strings, CommandNode<C> baseNode, SearchInfo<C> search) {
         return new SpigotContext<>(sender,alias,strings,baseNode,search, handler);
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index c466cb6..04b286e 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -21,33 +21,52 @@
 
 package me.aurium.beetle.branch.spigot;
 
-import me.aurium.beetle.branch.interfacing.handlers.CommonInterfacingHandler;
-import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.centralized.CentralizedManager;
 import me.aurium.beetle.branch.centralized.CentralizedManagerBinder;
+import me.aurium.beetle.branch.centralized.base.NodeBase;
 import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.centralized.base.NodeBaseBuilder;
+import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
+import me.aurium.beetle.branch.interfacing.handlers.CommonInterfacingHandler;
+import me.aurium.beetle.branch.interfacing.handlers.ResponseActionHandler;
+import me.aurium.beetle.branch.spigot.adapter.SenderAdapter;
+import me.aurium.beetle.branch.spigot.message.SpigotMessageProvider;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class SpigotManager implements CentralizedManager<CommandSender, JavaPlugin> {
 
-    private final SenderAdapter adapter = new SenderAdapter();
+    private final static SenderAdapter senderAdapter = new SenderAdapter();
+
+    private final CommonInterfacingHandler<CommandSender> defaultInterfacing;
+    private final Set<NodeBase<CommandSender>> senders;
+
+    public SpigotManager(ResponseActionHandler<CommandSender> defaultResponser) {
+        this.defaultInterfacing = new CommonInterfacingHandler<>(defaultResponser);
+        this.senders = new HashSet<>();
+    }
 
     @Override
     public CentralizedManagerBinder getBinder(JavaPlugin platform) {
-        return new SpigotManagerBinder(platform);
+        return new SpigotManagerBinder(platform.getName(), platform.getServer().getCommandMap(), senders);
     }
 
     @Override
-    public NodeBaseBuilder<CommandSender> newCommand() {
-        return newCommand(adapter);
+    public NodeBaseBuilder<CommandSender, CommandSender> newCommand() {
+        return new NodeBaseBuilder<>(this, senderAdapter, new OneBackStrategy<>(), new SpigotContextProvider<>(defaultInterfacing), defaultInterfacing);
     }
 
     @Override
-    public <C extends CommandSender> NodeBaseBuilder<C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
-        return null;
+    public <C extends CommandSender> NodeBaseBuilder<CommandSender, C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
+        return new NodeBaseBuilder<>(this,adapter, new OneBackStrategy<>(), new SpigotContextProvider<>(null), defaultInterfacing);
     }
 
+    @Override
+    public void injectCommand(NodeBase<CommandSender> base) {
+        senders.add(base);
+    }
 
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
index 5340b01..0a5685f 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
@@ -22,18 +22,28 @@
 package me.aurium.beetle.branch.spigot;
 
 import me.aurium.beetle.branch.centralized.CentralizedManagerBinder;
-import org.bukkit.plugin.java.JavaPlugin;
+import me.aurium.beetle.branch.centralized.base.NodeBase;
+import org.bukkit.command.CommandMap;
+import org.bukkit.command.CommandSender;
+
+import java.util.Set;
 
 public class SpigotManagerBinder implements CentralizedManagerBinder {
 
-    private final JavaPlugin plugin;
+    private final String pluginName;
+    private final CommandMap map;
+    private final Set<NodeBase<CommandSender>> senders;
 
-    public SpigotManagerBinder(JavaPlugin plugin) {
-        this.plugin = plugin;
+    public SpigotManagerBinder(String pluginName, CommandMap map, Set<NodeBase<CommandSender>> senders) {
+        this.pluginName = pluginName;
+        this.map = map;
+        this.senders = senders;
     }
 
     @Override
     public void bind() { //TODO implement
-        plugin.getServer().getPluginManager();
+        for (NodeBase<CommandSender> node : senders) {
+            map.register(pluginName,new CommandWrapper(node));
+        }
     }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/PlayerAdapter.java
similarity index 96%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
rename to spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/PlayerAdapter.java
index 5c40ade..686401b 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/toPlayer/PlayerAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/PlayerAdapter.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot.toPlayer;
+package me.aurium.beetle.branch.spigot.adapter;
 
 import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
 import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/SenderAdapter.java
similarity index 95%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
rename to spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/SenderAdapter.java
index c27acf2..40ad889 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SenderAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/SenderAdapter.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot;
+package me.aurium.beetle.branch.spigot.adapter;
 
 import me.aurium.beetle.branch.centralized.typeadapter.CommonAdapter;
 import org.bukkit.command.CommandSender;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
index b3e50c0..99aba24 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
@@ -37,4 +37,8 @@ public SpigotMessageProvider() {
         map.add(FailedAdaptingResponse.class, response -> new TextMessage<>());
     }
 
+    public CommonMessageMap<C> build() {
+        return map;
+    }
+
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
index 0a7edf3..a2c4a61 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.spigot.message;
 
-import me.aurium.beetle.branch.interfacing.model.Message;
+import me.aurium.beetle.branch.interfacing.Message;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
diff --git a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
index 2e77465..44f3630 100644
--- a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
+++ b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
@@ -26,7 +26,7 @@
 public class ExampleBinding extends JavaPlugin {
 
 
-    private static final SpigotManager manager = new SpigotManager();
+    private static final SpigotManager manager = new SpigotManager(defaultResponser);
 
     @Override
     public void onEnable() {

From e8e9194b4127d7601c13e06224e63f30f93dfff8 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Wed, 21 Apr 2021 21:50:01 -0700
Subject: [PATCH 39/56] finish up with adapters

---
 .../beetle/branch/centralized/base/AdaptingNodeBase.java | 4 ++--
 .../beetle/branch/execution/context/NodeContext.java     | 6 ------
 .../me/aurium/beetle/branch/spigot/SpigotContext.java    | 9 ++-------
 .../beetle/branch/spigot/SpigotContextProvider.java      | 4 ++--
 .../me/aurium/beetle/branch/spigot/SpigotManager.java    | 2 +-
 5 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
index e8ba911..6d718fd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
@@ -61,7 +61,7 @@ public void execute(T t, String alias, String[] args) {
         Result<SearchInfo<C>> result = strategy.attemptPreprocess(adaptedSender,alias,args,baseNode);
 
         if (!result.isSuccessful()) {
-            handler.sendMessage(adaptedSender, result.getFailure());
+            handler.sendMessage(t, result.getFailure());
             return;
         }
 
@@ -71,7 +71,7 @@ public void execute(T t, String alias, String[] args) {
         Result<Execution<C>> execution = info.resultingNode().getHandling().getExecution(produced);
 
         if (!execution.isSuccessful()) {
-            handler.sendMessage(adaptedSender, execution.getFailure());
+            handler.sendMessage(t, execution.getFailure());
             return;
         }
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
index 29d7ac7..efa6b5d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
@@ -41,12 +41,6 @@ public interface NodeContext<T> {
      */
     void stringSender(String string);
 
-    /**
-     * Sends a fancy formatted message to a player using the bound platform's message-handler
-     * @param message message
-     */
-    void messageSender(Message<T> message);
-
     /**
      * Sends a formatted response to a player coded to a key
      * @param failure the response
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index ea01e94..2dd55e0 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -34,9 +34,9 @@
 public class SpigotContext<T extends CommandSender> extends AbstractNodeContext<T> {
 
     private final T sender;
-    private final InterfacingHandler<T> handler;
+    private final InterfacingHandler<CommandSender> handler;
 
-    protected SpigotContext(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, InterfacingHandler<T> handler) {
+    protected SpigotContext(T sender, String alias, String[] args, CommandNode<T> baseNode, SearchInfo<T> result, InterfacingHandler<CommandSender> handler) {
         super(sender, alias, args, baseNode, result);
 
         this.sender = sender;
@@ -48,11 +48,6 @@ public void stringSender(String string) {
         this.sender.sendMessage(ChatColor.translateAlternateColorCodes('&',string));
     }
 
-    @Override
-    public void messageSender(Message<T> message) {
-        handler.sendMessage(sender,message);
-    }
-
     @Override
     public void response(Response failure) {
         handler.sendMessage(sender,failure);
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
index 8458955..441571a 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
@@ -31,9 +31,9 @@
 
 public class SpigotContextProvider<C extends CommandSender> implements ContextProvider<C> {
 
-    private final InterfacingHandler<C> handler;
+    private final InterfacingHandler<CommandSender> handler;
 
-    public SpigotContextProvider(InterfacingHandler<C> handler) {
+    public SpigotContextProvider(InterfacingHandler<CommandSender> handler) {
         this.handler = handler;
     }
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
index 04b286e..7c4d889 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
@@ -61,7 +61,7 @@ public NodeBaseBuilder<CommandSender, CommandSender> newCommand() {
 
     @Override
     public <C extends CommandSender> NodeBaseBuilder<CommandSender, C> newCommand(ManagerAdapter<CommandSender, C> adapter) {
-        return new NodeBaseBuilder<>(this,adapter, new OneBackStrategy<>(), new SpigotContextProvider<>(null), defaultInterfacing);
+        return new NodeBaseBuilder<>(this,adapter, new OneBackStrategy<>(), new SpigotContextProvider<>(defaultInterfacing), defaultInterfacing);
     }
 
     @Override

From 2d8122ef471ce0de5fc7c24c6691d438a6c4d246 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Wed, 21 Apr 2021 22:05:32 -0700
Subject: [PATCH 40/56] randomshit

---
 .idea/encodings.xml                            |  4 ----
 .../Description.java}                          |  4 ++--
 pom.xml                                        | 18 ++++++++++++++++--
 spigot-impl/pom.xml                            |  1 -
 .../beetle/branch/spigot/ExampleBinding.java   |  5 -----
 5 files changed, 18 insertions(+), 14 deletions(-)
 rename core/src/main/java/me/aurium/beetle/branch/information/{suggestion/Suggestion.java => description/Description.java} (90%)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 71de4af..c57d607 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/beetle-impl/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/beetle-impl/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/spigot-impl/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/spigot-impl/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java b/core/src/main/java/me/aurium/beetle/branch/information/description/Description.java
similarity index 90%
rename from core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java
rename to core/src/main/java/me/aurium/beetle/branch/information/description/Description.java
index f90b5c2..24c5ec3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/information/suggestion/Suggestion.java
+++ b/core/src/main/java/me/aurium/beetle/branch/information/description/Description.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.information.suggestion;
+package me.aurium.beetle.branch.information.description;
 
-public class Suggestion {
+public class Description {
 }
diff --git a/pom.xml b/pom.xml
index ea7a941..9d1b34b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,14 +25,18 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>me.aurium</groupId>
     <artifactId>branch</artifactId>
     <packaging>pom</packaging>
     <version>0.1.0</version>
 
+    <parent>
+        <groupId>me.aurium</groupId>
+        <artifactId>insect</artifactId>
+        <version>0.2.1</version>
+    </parent>
+
     <modules>
         <module>core</module>
-        <module>beetle-impl</module>
         <module>spigot-impl</module>
     </modules>
 
@@ -41,4 +45,14 @@
         <maven.compiler.target>${compiler.version}</maven.compiler.target>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <artifactId>branch-core</artifactId>
+                <groupId>me.aurium</groupId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>
\ No newline at end of file
diff --git a/spigot-impl/pom.xml b/spigot-impl/pom.xml
index 6092a45..fe5896b 100644
--- a/spigot-impl/pom.xml
+++ b/spigot-impl/pom.xml
@@ -41,7 +41,6 @@
         <dependency>
             <groupId>me.aurium</groupId>
             <artifactId>branch-core</artifactId>
-            <version>0.1.1</version>
         </dependency>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
diff --git a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
index 44f3630..984079a 100644
--- a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
+++ b/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
@@ -25,13 +25,8 @@
 
 public class ExampleBinding extends JavaPlugin {
 
-
-    private static final SpigotManager manager = new SpigotManager(defaultResponser);
-
     @Override
     public void onEnable() {
-        manager.getBinder(this).bind();
-
 
 
 

From 75cffd4c5b48699a6a8964481331cfb2b879200a Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Wed, 21 Apr 2021 22:10:10 -0700
Subject: [PATCH 41/56] rebase onto current

---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9d1b34b..0e62919 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,4 +55,12 @@
         </dependencies>
     </dependencyManagement>
 
+    <repositories>
+        <repository>
+            <id>jfrog</id>
+            <name>a0phrw82hnl4g-artifactory-primary-0-releases</name>
+            <url>https://aurium.jfrog.io/artifactory/aurium-libs-release-local</url>
+        </repository>
+    </repositories>
+
 </project>
\ No newline at end of file

From cea4b40adcf291b022feed01db4525899f6fa43d Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Wed, 21 Apr 2021 22:31:48 -0700
Subject: [PATCH 42/56] add small amounts of documentation

---
 .idea/jarRepositories.xml                     | 41 +++++++++++--------
 .../parsers/SingleAnnotatedParser.java        |  2 +-
 .../centralized/CentralizedManager.java       |  4 +-
 .../centralized/CentralizedManagerBinder.java |  3 ++
 .../centralized/IllegalSenderException.java   | 30 --------------
 .../centralized/base/AdaptingNodeBase.java    |  9 +++-
 .../branch/centralized/base/NodeBase.java     |  4 ++
 .../centralized/base/NodeBaseBuilder.java     |  8 +++-
 .../typeadapter/StandardCommonAdapter.java    |  3 ++
 .../{context => }/AbstractNodeContext.java    |  6 ++-
 .../branch/execution/{block => }/Block.java   |  5 ++-
 .../{context => }/ContextProvider.java        |  4 +-
 .../execution/{block => }/EmptyBlock.java     |  5 ++-
 .../execution/EmptyExecutionHandler.java      |  1 -
 .../execution/EmptySuggestionHandler.java     |  2 -
 .../execution/{context => }/NodeContext.java  |  7 +++-
 .../execution/{block => }/StringBlock.java    |  5 ++-
 .../branch/execution/api/BranchHandler.java   |  6 ++-
 .../branch/execution/api/Execution.java       |  6 ++-
 .../execution/api/ExecutionHandler.java       |  7 +++-
 .../execution/api/SuggestionHandler.java      |  9 +++-
 .../context/ContextErrorMessage.java          | 30 --------------
 .../fallback/permissions/EmptyPermission.java |  4 ++
 .../fallback/permissions/Permission.java      |  2 +-
 .../permissions/PredicatePermission.java      |  4 ++
 .../strategies/FallbackSearchStrategy.java    |  7 ++++
 .../beetle/branch/interfacing/Message.java    |  4 ++
 .../beetle/branch/interfacing/Response.java   |  3 ++
 .../branch/interfacing/ResponseAction.java    |  5 +++
 .../interfacing/handlers/MessageProvider.java |  4 ++
 .../handlers/ResponseActionHandler.java       |  4 ++
 .../responses/NoIntegratedArgsResponse.java   |  2 +-
 .../beetle/branch/nodes/BranchingNode.java    |  4 +-
 .../beetle/branch/nodes/SingleNode.java       |  4 +-
 .../branch/nodes/argument/Argument.java       |  4 +-
 .../nodes/argument/ArgumentContext.java       |  2 +-
 .../nodes/builders/BranchingBuilder.java      |  6 +--
 .../branch/nodes/builders/SingleBuilder.java  |  6 +--
 .../branch/nodes/model/IdentifiableNode.java  |  2 +-
 .../branch/nodes/results/SearchInfo.java      |  2 +-
 .../branch/nodes/results/SearchInput.java     |  4 +-
 .../branch/utility/PreStoredHashSet.java      |  2 -
 .../beetle/branch/spigot/SpigotContext.java   |  3 +-
 .../branch/spigot/SpigotContextProvider.java  |  4 +-
 44 files changed, 154 insertions(+), 125 deletions(-)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java
 rename core/src/main/java/me/aurium/beetle/branch/execution/{context => }/AbstractNodeContext.java (94%)
 rename core/src/main/java/me/aurium/beetle/branch/execution/{block => }/Block.java (87%)
 rename core/src/main/java/me/aurium/beetle/branch/execution/{context => }/ContextProvider.java (89%)
 rename core/src/main/java/me/aurium/beetle/branch/execution/{block => }/EmptyBlock.java (92%)
 rename core/src/main/java/me/aurium/beetle/branch/execution/{context => }/NodeContext.java (84%)
 rename core/src/main/java/me/aurium/beetle/branch/execution/{block => }/StringBlock.java (94%)
 delete mode 100644 core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index cc475cd..253a261 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -16,11 +16,6 @@
       <option name="name" value="aurium-libs-release" />
       <option name="url" value="https://aurium.jfrog.io/artifactory/aurium-libs-release" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="spigot-repo" />
-      <option name="name" value="spigot-repo" />
-      <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
@@ -31,6 +26,26 @@
       <option name="name" value="solar-snapshots" />
       <option name="url" value="https://mvn-repo.platinum-mc.com/snapshots" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="snapshots" />
+      <option name="name" value="aurium-libs-snapshot" />
+      <option name="url" value="https://aurium.jfrog.io/artifactory/aurium-libs-snapshot" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="solar-releases" />
+      <option name="name" value="solar-releases" />
+      <option name="url" value="https://mvn-repo.platinum-mc.com/releases" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="repsy" />
+      <option name="name" value="repsy" />
+      <option name="url" value="https://repo.repsy.io/mvn/elytraforce/default" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="spigot-repo" />
+      <option name="name" value="spigot-repo" />
+      <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
@@ -47,19 +62,9 @@
       <option name="url" value="" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="snapshots" />
-      <option name="name" value="aurium-libs-snapshot" />
-      <option name="url" value="https://aurium.jfrog.io/artifactory/aurium-libs-snapshot" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="solar-releases" />
-      <option name="name" value="solar-releases" />
-      <option name="url" value="https://mvn-repo.platinum-mc.com/releases" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="repsy" />
-      <option name="name" value="repsy" />
-      <option name="url" value="https://repo.repsy.io/mvn/elytraforce/default" />
+      <option name="id" value="jfrog" />
+      <option name="name" value="a0phrw82hnl4g-artifactory-primary-0-releases" />
+      <option name="url" value="https://aurium.jfrog.io/artifactory/aurium-libs-release-local" />
     </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
index 1148036..687e4e7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
+++ b/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
@@ -24,7 +24,7 @@
 import me.aurium.beetle.branch.annotate.AnnotatedCommand;
 import me.aurium.beetle.branch.annotate.UncheckedInvocationException;
 import me.aurium.beetle.branch.annotate.marker.SingleNode;
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.NodeContext;
 import me.aurium.beetle.branch.execution.api.ExecutionHandler;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
index f37f5f7..3ac8bf2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
@@ -26,9 +26,9 @@
 import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 
 /**
- * Represents the utmost base part of a command
+ * Represents the utmost base part of the command framework which has the ability to bind any injected commands to a platform
  * @param <T> the input type, does not need to be of same type as the node bases it utilizes
- * @param <V> the platform, void if there is none (how?)
+ * @param <V> the platform
  */
 public interface CentralizedManager<T,V> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java
index e26869b..6b3b745 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java
@@ -21,6 +21,9 @@
 
 package me.aurium.beetle.branch.centralized;
 
+/**
+ * Represents a carrier vessel which is typically attached to the instance of a centralizedManagerBinder's platform
+ */
 public interface CentralizedManagerBinder {
 
     /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java b/core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java
deleted file mode 100644
index 4fb7918..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/IllegalSenderException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.beetle.branch.centralized;
-
-public class IllegalSenderException extends RuntimeException{
-
-    public IllegalSenderException(String lmao) {
-        super(lmao);
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
index 6d718fd..5dc4fdc 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
@@ -23,8 +23,8 @@
 
 import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.beetle.branch.execution.api.Execution;
-import me.aurium.beetle.branch.execution.context.ContextProvider;
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.ContextProvider;
+import me.aurium.beetle.branch.execution.NodeContext;
 import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
@@ -33,6 +33,11 @@
 
 import java.util.List;
 
+/**
+ * Represents a node base that has the ability to convert it's input sender to a sender of type C or fail with a result.
+ * @param <T> the input type of nodebase
+ * @param <C> the adapted adjusted type desired, based on a similar adapter.
+ */
 public class AdaptingNodeBase<T,C extends T> implements NodeBase<T> {
 
     private final ManagerAdapter<T,C> adapter;
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java
index a378065..3159aaa 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java
@@ -23,6 +23,10 @@
 
 import java.util.List;
 
+/**
+ * Represents a single command tree as a command
+ * @param <T> type of input sender
+ */
 public interface NodeBase<T> {
 
     void execute(T t, String alias, String[] args); //may execute instantly or take some time
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
index ea3d645..0ce2dc8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
@@ -23,14 +23,18 @@
 
 import me.aurium.beetle.branch.centralized.CentralizedManager;
 import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
-import me.aurium.beetle.branch.execution.context.ContextProvider;
+import me.aurium.beetle.branch.execution.ContextProvider;
 import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
-import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 
 import java.util.Objects;
 
+/**
+ * Class that produces adaptingNodeBases
+ * @param <T> Input type
+ * @param <C> Adapted type
+ */
 public class NodeBaseBuilder<T,C extends T> {
 
     private final CentralizedManager<T,?> manager;
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java
index 816aac1..9894ad1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java
+++ b/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java
@@ -21,5 +21,8 @@
 
 package me.aurium.beetle.branch.centralized.typeadapter;
 
+/**
+ * Simple implementation""
+ */
 public class StandardCommonAdapter implements CommonAdapter<Object> {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/AbstractNodeContext.java b/core/src/main/java/me/aurium/beetle/branch/execution/AbstractNodeContext.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/execution/context/AbstractNodeContext.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/AbstractNodeContext.java
index 5f907fd..d66e32e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/context/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/AbstractNodeContext.java
@@ -19,12 +19,16 @@
  *
  */
 
-package me.aurium.beetle.branch.execution.context;
+package me.aurium.beetle.branch.execution;
 
 
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
+/**
+ * Abstract implementation of a node context
+ * @param <T> type
+ */
 public abstract class AbstractNodeContext<T> implements NodeContext<T> {
 
     private final T sender;
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/block/Block.java b/core/src/main/java/me/aurium/beetle/branch/execution/Block.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/execution/block/Block.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/Block.java
index 58769a7..f6142c3 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/block/Block.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/Block.java
@@ -19,8 +19,11 @@
  *
  */
 
-package me.aurium.beetle.branch.execution.block;
+package me.aurium.beetle.branch.execution;
 
+/**
+ * Represents an unparsed component of a command argument input structure
+ */
 public interface Block {
 
     String getIdentifier();
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextProvider.java b/core/src/main/java/me/aurium/beetle/branch/execution/ContextProvider.java
similarity index 89%
rename from core/src/main/java/me/aurium/beetle/branch/execution/context/ContextProvider.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/ContextProvider.java
index bc22d9f..8ed783e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextProvider.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/ContextProvider.java
@@ -19,13 +19,13 @@
  *
  */
 
-package me.aurium.beetle.branch.execution.context;
+package me.aurium.beetle.branch.execution;
 
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
 /**
- * Produces context adapters, like the stock ContextSource for contexts.
+ * Represents something that produces specific context based on a platform
  */
 public interface ContextProvider<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/block/EmptyBlock.java b/core/src/main/java/me/aurium/beetle/branch/execution/EmptyBlock.java
similarity index 92%
rename from core/src/main/java/me/aurium/beetle/branch/execution/block/EmptyBlock.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/EmptyBlock.java
index bcfb132..3063168 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/block/EmptyBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/EmptyBlock.java
@@ -19,8 +19,11 @@
  *
  */
 
-package me.aurium.beetle.branch.execution.block;
+package me.aurium.beetle.branch.execution;
 
+/**
+ * Represents a block with no content
+ */
 public class EmptyBlock implements Block{
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java
index f8c946c..b68e528 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java
@@ -21,7 +21,6 @@
 
 package me.aurium.beetle.branch.execution;
 
-import me.aurium.beetle.branch.execution.context.NodeContext;
 import me.aurium.beetle.branch.execution.api.ExecutionHandler;
 
 public class EmptyExecutionHandler<T> implements ExecutionHandler<T> {
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java
index b12f1a8..ab2a93c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java
@@ -21,8 +21,6 @@
 
 package me.aurium.beetle.branch.execution;
 
-import me.aurium.beetle.branch.execution.block.Block;
-import me.aurium.beetle.branch.execution.context.NodeContext;
 import me.aurium.beetle.branch.execution.api.SuggestionHandler;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java b/core/src/main/java/me/aurium/beetle/branch/execution/NodeContext.java
similarity index 84%
rename from core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/NodeContext.java
index efa6b5d..6fa924b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/context/NodeContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/NodeContext.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.execution.context;
+package me.aurium.beetle.branch.execution;
 
 import me.aurium.beetle.branch.interfacing.Message;
 import me.aurium.beetle.branch.interfacing.Response;
@@ -27,6 +27,11 @@
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 
 
+/**
+ * Represents the in-context of an executed command -> Basically, all the important information gleaned from the execution of a command
+ * such as the sender, arguments as string, and all nodes involved.
+ * @param <T> the sender
+ */
 public interface NodeContext<T> {
 
     T getSender();
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/block/StringBlock.java b/core/src/main/java/me/aurium/beetle/branch/execution/StringBlock.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/execution/block/StringBlock.java
rename to core/src/main/java/me/aurium/beetle/branch/execution/StringBlock.java
index eb83b29..9b4cbc8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/block/StringBlock.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/StringBlock.java
@@ -19,8 +19,11 @@
  *
  */
 
-package me.aurium.beetle.branch.execution.block;
+package me.aurium.beetle.branch.execution;
 
+/**
+ * Represents a block that contains a string
+ */
 public class StringBlock implements Block {
 
     private final String identifier;
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java
index 10ee0cf..fdb791d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java
@@ -21,11 +21,15 @@
 
 package me.aurium.beetle.branch.execution.api;
 
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.NodeContext;
 import me.aurium.beetle.branch.nodes.results.model.Result;
 
 import java.util.List;
 
+/**
+ * Represents the actable behavior of a node once the node has been found - e.g. after the node's search logic is complete
+ * @param <T> sender
+ */
 public interface BranchHandler<T> {
 
     Result<Execution<T>> getExecution(NodeContext<T> context);
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java
index 8ec67e9..af5d522 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java
@@ -21,8 +21,12 @@
 
 package me.aurium.beetle.branch.execution.api;
 
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.NodeContext;
 
+/**
+ * Standin class for something more sophisticated - basically allows the controlled execution of the node to be submitted as a runnable
+ * @param <T> the type
+ */
 public class Execution<T> implements Runnable {
 
     private final ExecutionHandler<T> handler;
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java
index e334187..629a1d1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java
@@ -21,8 +21,13 @@
 
 package me.aurium.beetle.branch.execution.api;
 
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.NodeContext;
 
+/**
+ * Functional interface typically used in simple nodes that only need to do one action
+ * @param <T>
+ */
+@FunctionalInterface
 public interface ExecutionHandler<T> {
 
     void handle(NodeContext<T> context);
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java b/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java
index f243322..56775d9 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java
@@ -21,11 +21,16 @@
 
 package me.aurium.beetle.branch.execution.api;
 
-import me.aurium.beetle.branch.execution.block.Block;
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.Block;
+import me.aurium.beetle.branch.execution.NodeContext;
 
 import java.util.List;
 
+/**
+ * Simple functional interface that returns a string
+ * @param <T> sender
+ */
+@FunctionalInterface
 public interface SuggestionHandler<T> {
 
     List<Block> handle(NodeContext<T> context);
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java b/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java
deleted file mode 100644
index 9946584..0000000
--- a/core/src/main/java/me/aurium/beetle/branch/execution/context/ContextErrorMessage.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.beetle.branch.execution.context;
-
-/**
- * easy to use interface that lets me give it a title, some strings, and let it be converted
- *
- * e.g. to prettified chatcolor output or to discord embed on discord-impl.
- */
-public interface ContextErrorMessage {
-}
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
index ddd4a37..846fd16 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
@@ -21,6 +21,10 @@
 
 package me.aurium.beetle.branch.fallback.permissions;
 
+/**
+ * Represents a permission that is always true
+ * @param <T> sender
+ */
 public class EmptyPermission<T> implements Permission<T> {
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
index dcc03e1..4f7450c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
@@ -22,7 +22,7 @@
 package me.aurium.beetle.branch.fallback.permissions;
 
 /**
- *
+ * Represents the accessibility predicate of a command -> whether a command can be executed or not
  */
 public interface Permission<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
index 66bbbb6..4e7e242 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
@@ -23,6 +23,10 @@
 
 import java.util.function.Predicate;
 
+/**
+ * Permission that delegates to a predicate
+ * @param <T> t
+ */
 public class PredicatePermission<T> implements Permission<T> {
 
     private final String easyName;
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
index 1cb419a..60cacab 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
+++ b/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
@@ -25,6 +25,13 @@
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
 import me.aurium.beetle.branch.nodes.results.model.Result;
 
+/**
+ * A strategy to define
+ * - what happens if the user has no permission to execute a node
+ * - what happens if a node is inaccessible
+ * - what happens if a node is unusable
+ * @param <T>
+ */
 public interface FallbackSearchStrategy<T> {
 
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java
index b898926..67b94c9 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java
@@ -21,6 +21,10 @@
 
 package me.aurium.beetle.branch.interfacing;
 
+/**
+ * Represents the final stage of something that occur after a response has been consumed
+ * @param <C> t
+ */
 public interface Message<C> {
 
     void accept(C sender);
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java
index d55e2d1..ca1a06b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java
@@ -21,6 +21,9 @@
 
 package me.aurium.beetle.branch.interfacing;
 
+/**
+ * Marker interface for a data-carrying object that can be consumed by a responseActionhandler
+ */
 public interface Response {
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java
index acbe657..e6a8194 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java
@@ -21,6 +21,11 @@
 
 package me.aurium.beetle.branch.interfacing;
 
+/**
+ * Represents an action that is fired when a response is received
+ * @param <T> t
+ * @param <C>c
+ */
 public interface ResponseAction<T,C extends Response> {
 
     Message<T> consume(C response);
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
index e322c1f..4318e3e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
@@ -21,6 +21,10 @@
 
 package me.aurium.beetle.branch.interfacing.handlers;
 
+/**
+ * Represents something that generates a response action handler from it's internals
+ * @param <T>
+ */
 public interface MessageProvider<T> {
 
     ResponseActionHandler<T> make();
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
index 4939892..8ffdcf2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
@@ -25,6 +25,10 @@
 import me.aurium.beetle.branch.interfacing.Response;
 import me.aurium.beetle.branch.interfacing.ResponseAction;
 
+/**
+ * Something that consumes Responses and produces messages for interfacing with the player
+ * @param <T>
+ */
 public interface ResponseActionHandler<T> {
 
     <C extends Response> ResponseAction<T, C> get(Class<C> clazz);
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
index 355bc85..8b63e73 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
+++ b/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.NodeContext;
 import me.aurium.beetle.branch.interfacing.Response;
 
 import java.util.ArrayList;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
index 937d14a..c26252e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
@@ -21,10 +21,10 @@
 
 package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.Block;
 import me.aurium.beetle.branch.execution.api.BranchHandler;
 import me.aurium.beetle.branch.execution.api.Execution;
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.NodeContext;
 import me.aurium.beetle.branch.interfacing.responses.NoIntegratedArgsResponse;
 import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
 import me.aurium.beetle.branch.nodes.results.*;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
index 75656e3..23e90e5 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
@@ -21,11 +21,11 @@
 
 package me.aurium.beetle.branch.nodes;
 
-import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.Block;
 import me.aurium.beetle.branch.execution.api.BranchHandler;
 import me.aurium.beetle.branch.execution.api.ExecutionHandler;
 import me.aurium.beetle.branch.execution.api.Execution;
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.NodeContext;
 import me.aurium.beetle.branch.interfacing.responses.TooManyArgsResponse;
 import me.aurium.beetle.branch.nodes.model.EndpointNode;
 import me.aurium.beetle.branch.nodes.results.SearchInput;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
index 49cf101..f0d027b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
@@ -21,8 +21,8 @@
 
 package me.aurium.beetle.branch.nodes.argument;
 
-import me.aurium.beetle.branch.execution.block.Block;
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.Block;
+import me.aurium.beetle.branch.execution.NodeContext;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
index bdf8815..c8bdd55 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.nodes.argument;
 
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.NodeContext;
 
 public interface ArgumentContext<T> extends NodeContext<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
index 6f82093..9210d84 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
@@ -21,9 +21,9 @@
 
 package me.aurium.beetle.branch.nodes.builders;
 
-import me.aurium.beetle.branch.execution.block.Block;
-import me.aurium.beetle.branch.execution.block.EmptyBlock;
-import me.aurium.beetle.branch.execution.block.StringBlock;
+import me.aurium.beetle.branch.execution.Block;
+import me.aurium.beetle.branch.execution.EmptyBlock;
+import me.aurium.beetle.branch.execution.StringBlock;
 import me.aurium.beetle.branch.fallback.permissions.Permission;
 import me.aurium.beetle.branch.fallback.permissions.EmptyPermission;
 import me.aurium.beetle.branch.nodes.BranchingNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
index 1506e6f..995cdbe 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
@@ -21,9 +21,9 @@
 
 package me.aurium.beetle.branch.nodes.builders;
 
-import me.aurium.beetle.branch.execution.block.Block;
-import me.aurium.beetle.branch.execution.block.EmptyBlock;
-import me.aurium.beetle.branch.execution.block.StringBlock;
+import me.aurium.beetle.branch.execution.Block;
+import me.aurium.beetle.branch.execution.EmptyBlock;
+import me.aurium.beetle.branch.execution.StringBlock;
 import me.aurium.beetle.branch.execution.api.ExecutionHandler;
 import me.aurium.beetle.branch.nodes.SingleNode;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java b/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
index 9952479..20c9da0 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.nodes.model;
 
-import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.Block;
 
 public interface IdentifiableNode<T> extends CommandNode<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
index fa0da4b..27bafc1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
@@ -21,7 +21,7 @@
 
 package me.aurium.beetle.branch.nodes.results;
 
-import me.aurium.beetle.branch.execution.block.Block;
+import me.aurium.beetle.branch.execution.Block;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 
 import java.util.Deque;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
index 89f0e7f..6ac819b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
+++ b/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
@@ -21,8 +21,8 @@
 
 package me.aurium.beetle.branch.nodes.results;
 
-import me.aurium.beetle.branch.execution.block.Block;
-import me.aurium.beetle.branch.execution.block.StringBlock;
+import me.aurium.beetle.branch.execution.Block;
+import me.aurium.beetle.branch.execution.StringBlock;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
diff --git a/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java b/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
index 8d58a42..153bde8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
@@ -33,8 +33,6 @@ public class PreStoredHashSet<T> {
     private final Set<T> otherThingsInTheSet;
     private final boolean linked;
 
-    //fuck code in the constructor rules
-    //i don't care
     public PreStoredHashSet(T alreadyStored, boolean linked) {
         this.alreadyStored = alreadyStored;
         this.otherThingsInTheSet = new HashSet<>();
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
index 2dd55e0..c9bf986 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
@@ -22,9 +22,8 @@
 package me.aurium.beetle.branch.spigot;
 
 
-import me.aurium.beetle.branch.execution.context.AbstractNodeContext;
+import me.aurium.beetle.branch.execution.AbstractNodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.interfacing.Message;
 import me.aurium.beetle.branch.interfacing.Response;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
index 441571a..7cb0e0f 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
@@ -22,8 +22,8 @@
 package me.aurium.beetle.branch.spigot;
 
 
-import me.aurium.beetle.branch.execution.context.ContextProvider;
-import me.aurium.beetle.branch.execution.context.NodeContext;
+import me.aurium.beetle.branch.execution.ContextProvider;
+import me.aurium.beetle.branch.execution.NodeContext;
 import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.beetle.branch.nodes.model.CommandNode;
 import me.aurium.beetle.branch.nodes.results.SearchInfo;

From a185988088edb7c18d9eb22a8cf9a42830b3f413 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Thu, 22 Apr 2021 15:58:31 -0700
Subject: [PATCH 43/56] refactor - this isn't beetle anymore

---
 .idea/compiler.xml                            |  3 +-
 core-tests/core-tests.iml                     |  2 +
 core-tests/pom.xml                            | 64 +++++++++++++++++++
 .../java/me/aurium/branch/ExecutionTest.java  | 34 ++++++++++
 core/pom.xml                                  |  2 +
 .../branch/annotate/AnnotatedCommand.java     |  2 +-
 .../branch/annotate/AnnotatedParser.java      |  4 +-
 .../branch/annotate/ParserOptions.java        |  2 +-
 .../branch/annotate/ParsingException.java     |  2 +-
 .../branch/annotate/TypeToken.java            |  2 +-
 .../UncheckedInvocationException.java         |  2 +-
 .../branch/annotate/marker/BranchCommand.java |  2 +-
 .../branch/annotate/marker/BranchingNode.java |  2 +-
 .../annotate/marker/Description.java}         |  6 +-
 .../branch/annotate/marker/NoArgsNode.java    |  2 +-
 .../branch/annotate/marker/SingleNode.java    |  4 +-
 .../marker/permission/Permission.java         |  2 +-
 .../marker/permission/StringPermChecker.java  |  4 +-
 .../parsers/BranchingAnnotatedParser.java     |  2 +-
 .../parsers/PermissionAnnotationParser.java   | 10 +--
 .../parsers/SingleAnnotatedParser.java        | 16 ++---
 .../centralized/CentralizedManager.java       |  8 +--
 .../centralized/CentralizedManagerBinder.java |  2 +-
 .../centralized/base/AdaptingNodeBase.java    | 22 +++----
 .../branch/centralized/base/NodeBase.java     |  2 +-
 .../centralized/base/NodeBaseBuilder.java     | 16 ++---
 .../typeadapter/CommonAdapter.java            |  4 +-
 .../typeadapter/ManagerAdapter.java           |  4 +-
 .../typeadapter/StandardCommonAdapter.java    |  2 +-
 .../branch/execution/AbstractNodeContext.java |  6 +-
 .../{beetle => }/branch/execution/Block.java  |  2 +-
 .../branch/execution/ContextProvider.java     |  6 +-
 .../branch/execution/EmptyBlock.java          |  2 +-
 .../execution/EmptyExecutionHandler.java      |  4 +-
 .../execution/EmptySuggestionHandler.java     |  4 +-
 .../branch/execution/NodeContext.java         |  9 ++-
 .../branch/execution/StringBlock.java         |  2 +-
 .../branch/execution/api/BranchHandler.java   |  6 +-
 .../branch/execution/api/Execution.java       |  4 +-
 .../execution/api/ExecutionHandler.java       |  4 +-
 .../execution/api/SuggestionHandler.java      |  6 +-
 .../fallback/permissions/EmptyPermission.java |  2 +-
 .../fallback/permissions/Permission.java      |  2 +-
 .../permissions/PredicatePermission.java      |  2 +-
 .../permissions/StringPermission.java         |  2 +-
 .../strategies/FallbackSearchStrategy.java    |  8 +--
 .../fallback/strategies/OneBackStrategy.java  | 12 ++--
 .../strategies/PermissionLockoutStrategy.java | 12 ++--
 .../information/description/Description.java  |  2 +-
 .../branch/information/help/HelpEntry.java    |  2 +-
 .../aurium/branch/information/help/Shit.java  | 27 ++++++++
 .../branch/interfacing/Message.java           |  2 +-
 .../branch/interfacing/Response.java          |  2 +-
 .../branch/interfacing/ResponseAction.java    |  2 +-
 .../handlers/CommonInterfacingHandler.java    |  6 +-
 .../handlers/CommonMessageMap.java            |  6 +-
 .../handlers/CommonResponseActionHandler.java |  8 +--
 .../handlers/InterfacingHandler.java          |  6 +-
 .../interfacing/handlers/MessageMap.java      |  6 +-
 .../interfacing/handlers/MessageProvider.java |  2 +-
 .../handlers/ResponseActionHandler.java       |  8 +--
 .../responses/FailedAdaptingResponse.java     |  4 +-
 .../responses/NoIntegratedArgsResponse.java   |  6 +-
 .../responses/NoPermissionResponse.java       |  4 +-
 .../responses/TooManyArgsResponse.java        |  4 +-
 .../branch/nodes/ArgumentNode.java            |  2 +-
 .../branch/nodes/BranchingNode.java           | 47 ++++++++------
 .../{beetle => }/branch/nodes/HelpNode.java   |  2 +-
 .../{beetle => }/branch/nodes/SingleNode.java | 34 +++++-----
 .../branch/nodes/ValueContext.java            |  2 +-
 .../branch/nodes/argument/Argument.java       |  6 +-
 .../nodes/argument/ArgumentContext.java       |  4 +-
 .../argument/ArgumentContextHandler.java      |  2 +-
 .../nodes/argument/ArgumentConvertet.java     |  2 +-
 .../branch/nodes/argument/Arguments.java      |  2 +-
 .../branch/nodes/builders/AloneBuilder.java   |  2 +-
 .../nodes/builders/BranchingBuilder.java      | 22 +++----
 .../branch/nodes/builders/Builder.java        |  6 +-
 .../branch/nodes/builders/SingleBuilder.java  | 18 +++---
 .../branch/nodes/model/CommandNode.java       | 10 +--
 .../branch/nodes/model/EndpointNode.java      |  2 +-
 .../branch/nodes/model/IdentifiableNode.java  |  4 +-
 .../branch/nodes/model/ResponseHandler.java   |  2 +-
 .../branch/nodes/results/SearchInfo.java      | 27 ++++----
 .../branch/nodes/results/SearchInput.java     | 15 +++--
 .../nodes/results/model/FailingResult.java    |  4 +-
 .../branch/nodes/results/model/Result.java    |  4 +-
 .../nodes/results/model/SuccessfulResult.java |  4 +-
 .../branch/utility/PreStoredHashSet.java      |  2 +-
 pom.xml                                       |  1 +
 .../branch/spigot/CommandWrapper.java         |  4 +-
 .../branch/spigot/SpigotContext.java          | 12 ++--
 .../branch/spigot/SpigotContextProvider.java  | 12 ++--
 .../branch/spigot/SpigotManager.java          | 21 +++---
 .../branch/spigot/SpigotManagerBinder.java    |  6 +-
 .../branch/spigot/adapter/PlayerAdapter.java  |  6 +-
 .../branch/spigot/adapter/SenderAdapter.java  |  4 +-
 .../spigot/message/AdventureMessage.java      |  2 +-
 .../spigot/message/FancyTextMessage.java      |  2 +-
 .../spigot/message/SpigotMessageProvider.java |  6 +-
 .../branch/spigot/message/TextMessage.java    |  4 +-
 .../branch/spigot/ExampleBinding.java         |  2 +-
 102 files changed, 434 insertions(+), 294 deletions(-)
 create mode 100644 core-tests/core-tests.iml
 create mode 100644 core-tests/pom.xml
 create mode 100644 core-tests/src/test/java/me/aurium/branch/ExecutionTest.java
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/AnnotatedCommand.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/AnnotatedParser.java (90%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/ParserOptions.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/ParsingException.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/TypeToken.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/UncheckedInvocationException.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/marker/BranchCommand.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/marker/BranchingNode.java (95%)
 rename core/src/main/java/me/aurium/{beetle/branch/annotate/AnnotateConstants.java => branch/annotate/marker/Description.java} (85%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/marker/NoArgsNode.java (94%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/marker/SingleNode.java (91%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/marker/permission/Permission.java (94%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/marker/permission/StringPermChecker.java (87%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/parsers/BranchingAnnotatedParser.java (94%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/parsers/PermissionAnnotationParser.java (78%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/annotate/parsers/SingleAnnotatedParser.java (84%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/centralized/CentralizedManager.java (84%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/centralized/CentralizedManagerBinder.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/centralized/base/AdaptingNodeBase.java (81%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/centralized/base/NodeBase.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/centralized/base/NodeBaseBuilder.java (85%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/centralized/typeadapter/CommonAdapter.java (90%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/centralized/typeadapter/ManagerAdapter.java (90%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/centralized/typeadapter/StandardCommonAdapter.java (94%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/AbstractNodeContext.java (92%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/Block.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/ContextProvider.java (86%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/EmptyBlock.java (96%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/EmptyExecutionHandler.java (89%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/EmptySuggestionHandler.java (90%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/NodeContext.java (85%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/StringBlock.java (97%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/api/BranchHandler.java (87%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/api/Execution.java (92%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/api/ExecutionHandler.java (90%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/execution/api/SuggestionHandler.java (87%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/fallback/permissions/EmptyPermission.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/fallback/permissions/Permission.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/fallback/permissions/PredicatePermission.java (96%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/fallback/permissions/StringPermission.java (94%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/fallback/strategies/FallbackSearchStrategy.java (83%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/fallback/strategies/OneBackStrategy.java (91%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/fallback/strategies/PermissionLockoutStrategy.java (81%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/information/description/Description.java (93%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/information/help/HelpEntry.java (94%)
 create mode 100644 core/src/main/java/me/aurium/branch/information/help/Shit.java
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/Message.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/Response.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/ResponseAction.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/handlers/CommonInterfacingHandler.java (89%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/handlers/CommonMessageMap.java (88%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/handlers/CommonResponseActionHandler.java (88%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/handlers/InterfacingHandler.java (87%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/handlers/MessageMap.java (84%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/handlers/MessageProvider.java (94%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/handlers/ResponseActionHandler.java (83%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/responses/FailedAdaptingResponse.java (93%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/responses/NoIntegratedArgsResponse.java (92%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/responses/NoPermissionResponse.java (91%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/interfacing/responses/TooManyArgsResponse.java (91%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/ArgumentNode.java (98%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/BranchingNode.java (71%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/HelpNode.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/SingleNode.java (75%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/ValueContext.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/argument/Argument.java (88%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/argument/ArgumentContext.java (89%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/argument/ArgumentContextHandler.java (94%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/argument/ArgumentConvertet.java (94%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/argument/Arguments.java (94%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/builders/AloneBuilder.java (94%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/builders/BranchingBuilder.java (85%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/builders/Builder.java (84%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/builders/SingleBuilder.java (78%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/model/CommandNode.java (81%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/model/EndpointNode.java (95%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/model/IdentifiableNode.java (90%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/model/ResponseHandler.java (94%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/results/SearchInfo.java (67%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/results/SearchInput.java (75%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/results/model/FailingResult.java (92%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/results/model/Result.java (91%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/nodes/results/model/SuccessfulResult.java (92%)
 rename core/src/main/java/me/aurium/{beetle => }/branch/utility/PreStoredHashSet.java (98%)
 rename spigot-impl/src/main/java/me/aurium/{beetle => }/branch/spigot/CommandWrapper.java (94%)
 rename spigot-impl/src/main/java/me/aurium/{beetle => }/branch/spigot/SpigotContext.java (82%)
 rename spigot-impl/src/main/java/me/aurium/{beetle => }/branch/spigot/SpigotContextProvider.java (79%)
 rename spigot-impl/src/main/java/me/aurium/{beetle => }/branch/spigot/SpigotManager.java (76%)
 rename spigot-impl/src/main/java/me/aurium/{beetle => }/branch/spigot/SpigotManagerBinder.java (89%)
 rename spigot-impl/src/main/java/me/aurium/{beetle => }/branch/spigot/adapter/PlayerAdapter.java (87%)
 rename spigot-impl/src/main/java/me/aurium/{beetle => }/branch/spigot/adapter/SenderAdapter.java (88%)
 rename spigot-impl/src/main/java/me/aurium/{beetle => }/branch/spigot/message/AdventureMessage.java (94%)
 rename spigot-impl/src/main/java/me/aurium/{beetle => }/branch/spigot/message/FancyTextMessage.java (94%)
 rename spigot-impl/src/main/java/me/aurium/{beetle => }/branch/spigot/message/SpigotMessageProvider.java (87%)
 rename spigot-impl/src/main/java/me/aurium/{beetle => }/branch/spigot/message/TextMessage.java (92%)
 rename spigot-impl/src/test/java/me/aurium/{beetle => }/branch/spigot/ExampleBinding.java (95%)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index c4429a4..a904258 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,9 +6,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="spigot-impl" />
+        <module name="core-tests" />
         <module name="tests" />
         <module name="branch-core" />
+        <module name="spigot-impl" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
diff --git a/core-tests/core-tests.iml b/core-tests/core-tests.iml
new file mode 100644
index 0000000..78b2cc5
--- /dev/null
+++ b/core-tests/core-tests.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/core-tests/pom.xml b/core-tests/pom.xml
new file mode 100644
index 0000000..0451456
--- /dev/null
+++ b/core-tests/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~  Branch
+  ~  Copyright © 2021 Aurium
+  ~
+  ~  Branch is free software: you can redistribute it and/or modify
+  ~  It under the terms of the GNU Affero General Public License as
+  ~  published by the Free Software Foundation, either version 3 of the
+  ~  License, or (at your option) any later version.
+  ~
+  ~  Branch is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~  GNU Affero General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU Affero General Public License
+  ~  along with Branch. If not, see <https://www.gnu.org/licenses/>
+  ~  and navigate to version 3 of the GNU Affero General Public License.
+  ~
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>me.aurium</groupId>
+    <artifactId>branch-core-tests</artifactId>
+    <version>0.1.0</version>
+
+    <properties>
+        <maven.compiler.source>${compiler.version}</maven.compiler.source>
+        <maven.compiler.target>${compiler.version}</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.7.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.0-alpha1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.3.0-alpha5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/core-tests/src/test/java/me/aurium/branch/ExecutionTest.java b/core-tests/src/test/java/me/aurium/branch/ExecutionTest.java
new file mode 100644
index 0000000..1b0d380
--- /dev/null
+++ b/core-tests/src/test/java/me/aurium/branch/ExecutionTest.java
@@ -0,0 +1,34 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.branch;
+
+import me.aurium.branch.nodes.BranchingNode;
+import me.aurium.branch.nodes.builders.BranchingBuilder;
+import me.aurium.branch.nodes.builders.SingleBuilder;
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
+
+public class ExecutionTest {
+
+    private final static Logger logger = LoggerFactory.getLogger(ExecutionTest.class);
+
+}
diff --git a/core/pom.xml b/core/pom.xml
index 0887e87..b7479b7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -51,4 +51,6 @@
     </build>
 
 
+
+
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java b/core/src/main/java/me/aurium/branch/annotate/AnnotatedCommand.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
rename to core/src/main/java/me/aurium/branch/annotate/AnnotatedCommand.java
index d8c1954..193a72c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedCommand.java
+++ b/core/src/main/java/me/aurium/branch/annotate/AnnotatedCommand.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate;
+package me.aurium.branch.annotate;
 
 /**
  * Marker interface for annotated commands:
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java b/core/src/main/java/me/aurium/branch/annotate/AnnotatedParser.java
similarity index 90%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
rename to core/src/main/java/me/aurium/branch/annotate/AnnotatedParser.java
index d580008..424587d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotatedParser.java
+++ b/core/src/main/java/me/aurium/branch/annotate/AnnotatedParser.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate;
+package me.aurium.branch.annotate;
 
-import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.model.CommandNode;
 
 public interface AnnotatedParser<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java b/core/src/main/java/me/aurium/branch/annotate/ParserOptions.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java
rename to core/src/main/java/me/aurium/branch/annotate/ParserOptions.java
index 8c2091b..da8a0be 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/ParserOptions.java
+++ b/core/src/main/java/me/aurium/branch/annotate/ParserOptions.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate;
+package me.aurium.branch.annotate;
 
 /**
  * This exists solely so we can register new Arguments
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java b/core/src/main/java/me/aurium/branch/annotate/ParsingException.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java
rename to core/src/main/java/me/aurium/branch/annotate/ParsingException.java
index 99ccf73..b4f5c4a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/ParsingException.java
+++ b/core/src/main/java/me/aurium/branch/annotate/ParsingException.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate;
+package me.aurium.branch.annotate;
 
 public class ParsingException {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java b/core/src/main/java/me/aurium/branch/annotate/TypeToken.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java
rename to core/src/main/java/me/aurium/branch/annotate/TypeToken.java
index 9c95f39..278c6d6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/TypeToken.java
+++ b/core/src/main/java/me/aurium/branch/annotate/TypeToken.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate;
+package me.aurium.branch.annotate;
 
 public class TypeToken<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java b/core/src/main/java/me/aurium/branch/annotate/UncheckedInvocationException.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java
rename to core/src/main/java/me/aurium/branch/annotate/UncheckedInvocationException.java
index d22596c..90bf321 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/UncheckedInvocationException.java
+++ b/core/src/main/java/me/aurium/branch/annotate/UncheckedInvocationException.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate;
+package me.aurium.branch.annotate;
 
 public class UncheckedInvocationException extends RuntimeException{
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java b/core/src/main/java/me/aurium/branch/annotate/marker/BranchCommand.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java
rename to core/src/main/java/me/aurium/branch/annotate/marker/BranchCommand.java
index c791a3f..b2cd6ae 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchCommand.java
+++ b/core/src/main/java/me/aurium/branch/annotate/marker/BranchCommand.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate.marker;
+package me.aurium.branch.annotate.marker;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java b/core/src/main/java/me/aurium/branch/annotate/marker/BranchingNode.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java
rename to core/src/main/java/me/aurium/branch/annotate/marker/BranchingNode.java
index bbaea3a..1dcfc68 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/BranchingNode.java
+++ b/core/src/main/java/me/aurium/branch/annotate/marker/BranchingNode.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate.marker;
+package me.aurium.branch.annotate.marker;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java b/core/src/main/java/me/aurium/branch/annotate/marker/Description.java
similarity index 85%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java
rename to core/src/main/java/me/aurium/branch/annotate/marker/Description.java
index 7195363..576172b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/AnnotateConstants.java
+++ b/core/src/main/java/me/aurium/branch/annotate/marker/Description.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate;
+package me.aurium.branch.annotate.marker;
 
-public class AnnotateConstants {
+public @interface Description {
 
-    public static final String EMPTY_IDENTIFIER_NODE = "NONE";
+    String getDescriptionContent();
 
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java b/core/src/main/java/me/aurium/branch/annotate/marker/NoArgsNode.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java
rename to core/src/main/java/me/aurium/branch/annotate/marker/NoArgsNode.java
index 3cbf536..7e6dfce 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/NoArgsNode.java
+++ b/core/src/main/java/me/aurium/branch/annotate/marker/NoArgsNode.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate.marker;
+package me.aurium.branch.annotate.marker;
 
 public @interface NoArgsNode {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java b/core/src/main/java/me/aurium/branch/annotate/marker/SingleNode.java
similarity index 91%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java
rename to core/src/main/java/me/aurium/branch/annotate/marker/SingleNode.java
index 142e26c..330af04 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/SingleNode.java
+++ b/core/src/main/java/me/aurium/branch/annotate/marker/SingleNode.java
@@ -19,9 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate.marker;
-
-import me.aurium.beetle.branch.annotate.AnnotateConstants;
+package me.aurium.branch.annotate.marker;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java b/core/src/main/java/me/aurium/branch/annotate/marker/permission/Permission.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
rename to core/src/main/java/me/aurium/branch/annotate/marker/permission/Permission.java
index 0845118..e63e8e6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/Permission.java
+++ b/core/src/main/java/me/aurium/branch/annotate/marker/permission/Permission.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate.marker.permission;
+package me.aurium.branch.annotate.marker.permission;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java b/core/src/main/java/me/aurium/branch/annotate/marker/permission/StringPermChecker.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
rename to core/src/main/java/me/aurium/branch/annotate/marker/permission/StringPermChecker.java
index 75c4c91..01425d1 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/marker/permission/StringPermChecker.java
+++ b/core/src/main/java/me/aurium/branch/annotate/marker/permission/StringPermChecker.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate.marker.permission;
+package me.aurium.branch.annotate.marker.permission;
 
-import me.aurium.beetle.branch.fallback.permissions.StringPermission;
+import me.aurium.branch.fallback.permissions.StringPermission;
 
 public interface StringPermChecker {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java b/core/src/main/java/me/aurium/branch/annotate/parsers/BranchingAnnotatedParser.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java
rename to core/src/main/java/me/aurium/branch/annotate/parsers/BranchingAnnotatedParser.java
index 7c87a00..a92103a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/BranchingAnnotatedParser.java
+++ b/core/src/main/java/me/aurium/branch/annotate/parsers/BranchingAnnotatedParser.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate.parsers;
+package me.aurium.branch.annotate.parsers;
 
 public class BranchingAnnotatedParser {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java b/core/src/main/java/me/aurium/branch/annotate/parsers/PermissionAnnotationParser.java
similarity index 78%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
rename to core/src/main/java/me/aurium/branch/annotate/parsers/PermissionAnnotationParser.java
index 0672408..7d89a67 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/PermissionAnnotationParser.java
+++ b/core/src/main/java/me/aurium/branch/annotate/parsers/PermissionAnnotationParser.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate.parsers;
+package me.aurium.branch.annotate.parsers;
 
-import me.aurium.beetle.branch.annotate.marker.permission.Permission;
-import me.aurium.beetle.branch.fallback.permissions.StringPermission;
+import me.aurium.branch.annotate.marker.permission.Permission;
+import me.aurium.branch.fallback.permissions.StringPermission;
 
 import java.lang.annotation.Annotation;
 
@@ -30,7 +30,7 @@
 public class PermissionAnnotationParser<T> {
 
 
-    me.aurium.beetle.branch.fallback.permissions.Permission<T> parse(Annotation annotate) throws IllegalAccessException, InstantiationException {
+    me.aurium.branch.fallback.permissions.Permission<T> parse(Annotation annotate) throws IllegalAccessException, InstantiationException {
 
         if (!annotate.annotationType().equals(Permission.class)) throw new PermissionParsingException("Annotation must be of type Permission");
 
@@ -42,7 +42,7 @@ me.aurium.beetle.branch.fallback.permissions.Permission<T> parse(Annotation anno
         StringPermission<?> perm = permission.getRelativeChecker().newInstance().get(permission.permission());
 
 
-        return (me.aurium.beetle.branch.fallback.permissions.Permission<T>) perm;
+        return (me.aurium.branch.fallback.permissions.Permission<T>) perm;
     }
 
     public static class PermissionParsingException extends RuntimeException {
diff --git a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java b/core/src/main/java/me/aurium/branch/annotate/parsers/SingleAnnotatedParser.java
similarity index 84%
rename from core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
rename to core/src/main/java/me/aurium/branch/annotate/parsers/SingleAnnotatedParser.java
index 687e4e7..cb6b8f4 100644
--- a/core/src/main/java/me/aurium/beetle/branch/annotate/parsers/SingleAnnotatedParser.java
+++ b/core/src/main/java/me/aurium/branch/annotate/parsers/SingleAnnotatedParser.java
@@ -19,13 +19,13 @@
  *
  */
 
-package me.aurium.beetle.branch.annotate.parsers;
+package me.aurium.branch.annotate.parsers;
 
-import me.aurium.beetle.branch.annotate.AnnotatedCommand;
-import me.aurium.beetle.branch.annotate.UncheckedInvocationException;
-import me.aurium.beetle.branch.annotate.marker.SingleNode;
-import me.aurium.beetle.branch.execution.NodeContext;
-import me.aurium.beetle.branch.execution.api.ExecutionHandler;
+import me.aurium.branch.annotate.AnnotatedCommand;
+import me.aurium.branch.annotate.UncheckedInvocationException;
+import me.aurium.branch.annotate.marker.SingleNode;
+import me.aurium.branch.execution.NodeContext;
+import me.aurium.branch.execution.api.ExecutionHandler;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -43,9 +43,9 @@ public SingleAnnotatedParser(Class<T> senderClass) {
         this.senderClass = senderClass;
     }
 
-    public List<me.aurium.beetle.branch.nodes.SingleNode<T>> parse(Class<? extends AnnotatedCommand> command) {
+    public List<me.aurium.branch.nodes.SingleNode<T>> parse(Class<? extends AnnotatedCommand> command) {
 
-        List<me.aurium.beetle.branch.nodes.SingleNode<T>> nodes = new ArrayList<>();
+        List<me.aurium.branch.nodes.SingleNode<T>> nodes = new ArrayList<>();
 
         for (Method method : command.getMethods()) {
             if (method.isAnnotationPresent(SingleNode.class)) {
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java b/core/src/main/java/me/aurium/branch/centralized/CentralizedManager.java
similarity index 84%
rename from core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
rename to core/src/main/java/me/aurium/branch/centralized/CentralizedManager.java
index 3ac8bf2..e0ae54d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManager.java
+++ b/core/src/main/java/me/aurium/branch/centralized/CentralizedManager.java
@@ -19,11 +19,11 @@
  *
  */
 
-package me.aurium.beetle.branch.centralized;
+package me.aurium.branch.centralized;
 
-import me.aurium.beetle.branch.centralized.base.NodeBase;
-import me.aurium.beetle.branch.centralized.base.NodeBaseBuilder;
-import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
+import me.aurium.branch.centralized.base.NodeBase;
+import me.aurium.branch.centralized.base.NodeBaseBuilder;
+import me.aurium.branch.centralized.typeadapter.ManagerAdapter;
 
 /**
  * Represents the utmost base part of the command framework which has the ability to bind any injected commands to a platform
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java b/core/src/main/java/me/aurium/branch/centralized/CentralizedManagerBinder.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java
rename to core/src/main/java/me/aurium/branch/centralized/CentralizedManagerBinder.java
index 6b3b745..2c16ed7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/CentralizedManagerBinder.java
+++ b/core/src/main/java/me/aurium/branch/centralized/CentralizedManagerBinder.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.centralized;
+package me.aurium.branch.centralized;
 
 /**
  * Represents a carrier vessel which is typically attached to the instance of a centralizedManagerBinder's platform
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java b/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
similarity index 81%
rename from core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
rename to core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
index 5dc4fdc..058fcc2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/AdaptingNodeBase.java
+++ b/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
@@ -19,17 +19,17 @@
  *
  */
 
-package me.aurium.beetle.branch.centralized.base;
-
-import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
-import me.aurium.beetle.branch.execution.api.Execution;
-import me.aurium.beetle.branch.execution.ContextProvider;
-import me.aurium.beetle.branch.execution.NodeContext;
-import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
-import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
-import me.aurium.beetle.branch.nodes.results.model.Result;
+package me.aurium.branch.centralized.base;
+
+import me.aurium.branch.centralized.typeadapter.ManagerAdapter;
+import me.aurium.branch.execution.api.Execution;
+import me.aurium.branch.execution.ContextProvider;
+import me.aurium.branch.execution.NodeContext;
+import me.aurium.branch.fallback.strategies.FallbackSearchStrategy;
+import me.aurium.branch.interfacing.handlers.InterfacingHandler;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.results.SearchInfo;
+import me.aurium.branch.nodes.results.model.Result;
 
 import java.util.List;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java b/core/src/main/java/me/aurium/branch/centralized/base/NodeBase.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java
rename to core/src/main/java/me/aurium/branch/centralized/base/NodeBase.java
index 3159aaa..7289683 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBase.java
+++ b/core/src/main/java/me/aurium/branch/centralized/base/NodeBase.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.centralized.base;
+package me.aurium.branch.centralized.base;
 
 import java.util.List;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/branch/centralized/base/NodeBaseBuilder.java
similarity index 85%
rename from core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
rename to core/src/main/java/me/aurium/branch/centralized/base/NodeBaseBuilder.java
index 0ce2dc8..10100a8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/branch/centralized/base/NodeBaseBuilder.java
@@ -19,14 +19,14 @@
  *
  */
 
-package me.aurium.beetle.branch.centralized.base;
-
-import me.aurium.beetle.branch.centralized.CentralizedManager;
-import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
-import me.aurium.beetle.branch.execution.ContextProvider;
-import me.aurium.beetle.branch.fallback.strategies.FallbackSearchStrategy;
-import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
+package me.aurium.branch.centralized.base;
+
+import me.aurium.branch.centralized.CentralizedManager;
+import me.aurium.branch.centralized.typeadapter.ManagerAdapter;
+import me.aurium.branch.execution.ContextProvider;
+import me.aurium.branch.fallback.strategies.FallbackSearchStrategy;
+import me.aurium.branch.interfacing.handlers.InterfacingHandler;
+import me.aurium.branch.nodes.model.CommandNode;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/CommonAdapter.java b/core/src/main/java/me/aurium/branch/centralized/typeadapter/CommonAdapter.java
similarity index 90%
rename from core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/CommonAdapter.java
rename to core/src/main/java/me/aurium/branch/centralized/typeadapter/CommonAdapter.java
index 4ef8bde..fb18fcd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/CommonAdapter.java
+++ b/core/src/main/java/me/aurium/branch/centralized/typeadapter/CommonAdapter.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.centralized.typeadapter;
+package me.aurium.branch.centralized.typeadapter;
 
-import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
+import me.aurium.branch.interfacing.responses.FailedAdaptingResponse;
 
 /**
  * Represents an adapter that does not convert and simply returns the same object
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/ManagerAdapter.java b/core/src/main/java/me/aurium/branch/centralized/typeadapter/ManagerAdapter.java
similarity index 90%
rename from core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/ManagerAdapter.java
rename to core/src/main/java/me/aurium/branch/centralized/typeadapter/ManagerAdapter.java
index c3001f6..56e51f9 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/ManagerAdapter.java
+++ b/core/src/main/java/me/aurium/branch/centralized/typeadapter/ManagerAdapter.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.centralized.typeadapter;
+package me.aurium.branch.centralized.typeadapter;
 
-import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
+import me.aurium.branch.interfacing.responses.FailedAdaptingResponse;
 
 /**
  * Represents something that can convert an object of a certain type to another object
diff --git a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java b/core/src/main/java/me/aurium/branch/centralized/typeadapter/StandardCommonAdapter.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java
rename to core/src/main/java/me/aurium/branch/centralized/typeadapter/StandardCommonAdapter.java
index 9894ad1..bee22dd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/centralized/typeadapter/StandardCommonAdapter.java
+++ b/core/src/main/java/me/aurium/branch/centralized/typeadapter/StandardCommonAdapter.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.centralized.typeadapter;
+package me.aurium.branch.centralized.typeadapter;
 
 /**
  * Simple implementation""
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/AbstractNodeContext.java b/core/src/main/java/me/aurium/branch/execution/AbstractNodeContext.java
similarity index 92%
rename from core/src/main/java/me/aurium/beetle/branch/execution/AbstractNodeContext.java
rename to core/src/main/java/me/aurium/branch/execution/AbstractNodeContext.java
index d66e32e..8da9652 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/branch/execution/AbstractNodeContext.java
@@ -19,11 +19,11 @@
  *
  */
 
-package me.aurium.beetle.branch.execution;
+package me.aurium.branch.execution;
 
 
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.results.SearchInfo;
 
 /**
  * Abstract implementation of a node context
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/Block.java b/core/src/main/java/me/aurium/branch/execution/Block.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/execution/Block.java
rename to core/src/main/java/me/aurium/branch/execution/Block.java
index f6142c3..af22b32 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/Block.java
+++ b/core/src/main/java/me/aurium/branch/execution/Block.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.execution;
+package me.aurium.branch.execution;
 
 /**
  * Represents an unparsed component of a command argument input structure
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/ContextProvider.java b/core/src/main/java/me/aurium/branch/execution/ContextProvider.java
similarity index 86%
rename from core/src/main/java/me/aurium/beetle/branch/execution/ContextProvider.java
rename to core/src/main/java/me/aurium/branch/execution/ContextProvider.java
index 8ed783e..2bacdf6 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/ContextProvider.java
+++ b/core/src/main/java/me/aurium/branch/execution/ContextProvider.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.execution;
+package me.aurium.branch.execution;
 
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.results.SearchInfo;
 
 /**
  * Represents something that produces specific context based on a platform
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/EmptyBlock.java b/core/src/main/java/me/aurium/branch/execution/EmptyBlock.java
similarity index 96%
rename from core/src/main/java/me/aurium/beetle/branch/execution/EmptyBlock.java
rename to core/src/main/java/me/aurium/branch/execution/EmptyBlock.java
index 3063168..99a2c1e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/EmptyBlock.java
+++ b/core/src/main/java/me/aurium/branch/execution/EmptyBlock.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.execution;
+package me.aurium.branch.execution;
 
 /**
  * Represents a block with no content
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java b/core/src/main/java/me/aurium/branch/execution/EmptyExecutionHandler.java
similarity index 89%
rename from core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java
rename to core/src/main/java/me/aurium/branch/execution/EmptyExecutionHandler.java
index b68e528..3ba74c8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/EmptyExecutionHandler.java
+++ b/core/src/main/java/me/aurium/branch/execution/EmptyExecutionHandler.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.execution;
+package me.aurium.branch.execution;
 
-import me.aurium.beetle.branch.execution.api.ExecutionHandler;
+import me.aurium.branch.execution.api.ExecutionHandler;
 
 public class EmptyExecutionHandler<T> implements ExecutionHandler<T> {
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/branch/execution/EmptySuggestionHandler.java
similarity index 90%
rename from core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java
rename to core/src/main/java/me/aurium/branch/execution/EmptySuggestionHandler.java
index ab2a93c..be22d9b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/EmptySuggestionHandler.java
+++ b/core/src/main/java/me/aurium/branch/execution/EmptySuggestionHandler.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.execution;
+package me.aurium.branch.execution;
 
-import me.aurium.beetle.branch.execution.api.SuggestionHandler;
+import me.aurium.branch.execution.api.SuggestionHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/NodeContext.java b/core/src/main/java/me/aurium/branch/execution/NodeContext.java
similarity index 85%
rename from core/src/main/java/me/aurium/beetle/branch/execution/NodeContext.java
rename to core/src/main/java/me/aurium/branch/execution/NodeContext.java
index 6fa924b..f4ee8c7 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/NodeContext.java
+++ b/core/src/main/java/me/aurium/branch/execution/NodeContext.java
@@ -19,12 +19,11 @@
  *
  */
 
-package me.aurium.beetle.branch.execution;
+package me.aurium.branch.execution;
 
-import me.aurium.beetle.branch.interfacing.Message;
-import me.aurium.beetle.branch.interfacing.Response;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.branch.interfacing.Response;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.results.SearchInfo;
 
 
 /**
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/StringBlock.java b/core/src/main/java/me/aurium/branch/execution/StringBlock.java
similarity index 97%
rename from core/src/main/java/me/aurium/beetle/branch/execution/StringBlock.java
rename to core/src/main/java/me/aurium/branch/execution/StringBlock.java
index 9b4cbc8..2f9b36b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/StringBlock.java
+++ b/core/src/main/java/me/aurium/branch/execution/StringBlock.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.execution;
+package me.aurium.branch.execution;
 
 /**
  * Represents a block that contains a string
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java b/core/src/main/java/me/aurium/branch/execution/api/BranchHandler.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java
rename to core/src/main/java/me/aurium/branch/execution/api/BranchHandler.java
index fdb791d..218b3b2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/api/BranchHandler.java
+++ b/core/src/main/java/me/aurium/branch/execution/api/BranchHandler.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.execution.api;
+package me.aurium.branch.execution.api;
 
-import me.aurium.beetle.branch.execution.NodeContext;
-import me.aurium.beetle.branch.nodes.results.model.Result;
+import me.aurium.branch.execution.NodeContext;
+import me.aurium.branch.nodes.results.model.Result;
 
 import java.util.List;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java b/core/src/main/java/me/aurium/branch/execution/api/Execution.java
similarity index 92%
rename from core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java
rename to core/src/main/java/me/aurium/branch/execution/api/Execution.java
index af5d522..5ec4c5f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/api/Execution.java
+++ b/core/src/main/java/me/aurium/branch/execution/api/Execution.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.execution.api;
+package me.aurium.branch.execution.api;
 
-import me.aurium.beetle.branch.execution.NodeContext;
+import me.aurium.branch.execution.NodeContext;
 
 /**
  * Standin class for something more sophisticated - basically allows the controlled execution of the node to be submitted as a runnable
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java b/core/src/main/java/me/aurium/branch/execution/api/ExecutionHandler.java
similarity index 90%
rename from core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java
rename to core/src/main/java/me/aurium/branch/execution/api/ExecutionHandler.java
index 629a1d1..e4e2a1c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/api/ExecutionHandler.java
+++ b/core/src/main/java/me/aurium/branch/execution/api/ExecutionHandler.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.execution.api;
+package me.aurium.branch.execution.api;
 
-import me.aurium.beetle.branch.execution.NodeContext;
+import me.aurium.branch.execution.NodeContext;
 
 /**
  * Functional interface typically used in simple nodes that only need to do one action
diff --git a/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java b/core/src/main/java/me/aurium/branch/execution/api/SuggestionHandler.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java
rename to core/src/main/java/me/aurium/branch/execution/api/SuggestionHandler.java
index 56775d9..cac21fc 100644
--- a/core/src/main/java/me/aurium/beetle/branch/execution/api/SuggestionHandler.java
+++ b/core/src/main/java/me/aurium/branch/execution/api/SuggestionHandler.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.execution.api;
+package me.aurium.branch.execution.api;
 
-import me.aurium.beetle.branch.execution.Block;
-import me.aurium.beetle.branch.execution.NodeContext;
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.execution.NodeContext;
 
 import java.util.List;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/branch/fallback/permissions/EmptyPermission.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
rename to core/src/main/java/me/aurium/branch/fallback/permissions/EmptyPermission.java
index 846fd16..ef42a1c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/branch/fallback/permissions/EmptyPermission.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.fallback.permissions;
+package me.aurium.branch.fallback.permissions;
 
 /**
  * Represents a permission that is always true
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java b/core/src/main/java/me/aurium/branch/fallback/permissions/Permission.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
rename to core/src/main/java/me/aurium/branch/fallback/permissions/Permission.java
index 4f7450c..5d2e029 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/Permission.java
+++ b/core/src/main/java/me/aurium/branch/fallback/permissions/Permission.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.fallback.permissions;
+package me.aurium.branch.fallback.permissions;
 
 /**
  * Represents the accessibility predicate of a command -> whether a command can be executed or not
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java b/core/src/main/java/me/aurium/branch/fallback/permissions/PredicatePermission.java
similarity index 96%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
rename to core/src/main/java/me/aurium/branch/fallback/permissions/PredicatePermission.java
index 4e7e242..e55a827 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/PredicatePermission.java
+++ b/core/src/main/java/me/aurium/branch/fallback/permissions/PredicatePermission.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.fallback.permissions;
+package me.aurium.branch.fallback.permissions;
 
 import java.util.function.Predicate;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java b/core/src/main/java/me/aurium/branch/fallback/permissions/StringPermission.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
rename to core/src/main/java/me/aurium/branch/fallback/permissions/StringPermission.java
index be5ecf4..2aae21a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/permissions/StringPermission.java
+++ b/core/src/main/java/me/aurium/branch/fallback/permissions/StringPermission.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.fallback.permissions;
+package me.aurium.branch.fallback.permissions;
 
 /**
  * Represents a permission that is controlled by a string identifier
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java b/core/src/main/java/me/aurium/branch/fallback/strategies/FallbackSearchStrategy.java
similarity index 83%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
rename to core/src/main/java/me/aurium/branch/fallback/strategies/FallbackSearchStrategy.java
index 60cacab..4dc5d56 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/FallbackSearchStrategy.java
+++ b/core/src/main/java/me/aurium/branch/fallback/strategies/FallbackSearchStrategy.java
@@ -19,11 +19,11 @@
  *
  */
 
-package me.aurium.beetle.branch.fallback.strategies;
+package me.aurium.branch.fallback.strategies;
 
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
-import me.aurium.beetle.branch.nodes.results.model.Result;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.results.SearchInfo;
+import me.aurium.branch.nodes.results.model.Result;
 
 /**
  * A strategy to define
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java b/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
similarity index 91%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
rename to core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
index 3cf7c18..5492bc8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/OneBackStrategy.java
+++ b/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
@@ -19,13 +19,13 @@
  *
  */
 
-package me.aurium.beetle.branch.fallback.strategies;
+package me.aurium.branch.fallback.strategies;
 
-import me.aurium.beetle.branch.interfacing.responses.NoPermissionResponse;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInput;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
-import me.aurium.beetle.branch.nodes.results.model.Result;
+import me.aurium.branch.interfacing.responses.NoPermissionResponse;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.results.SearchInput;
+import me.aurium.branch.nodes.results.SearchInfo;
+import me.aurium.branch.nodes.results.model.Result;
 
 /**
  * Fallback and processing strategy that does the following actions:
diff --git a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java b/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
similarity index 81%
rename from core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
rename to core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
index 987e75f..7511667 100644
--- a/core/src/main/java/me/aurium/beetle/branch/fallback/strategies/PermissionLockoutStrategy.java
+++ b/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
@@ -19,13 +19,13 @@
  *
  */
 
-package me.aurium.beetle.branch.fallback.strategies;
+package me.aurium.branch.fallback.strategies;
 
-import me.aurium.beetle.branch.interfacing.responses.NoPermissionResponse;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
-import me.aurium.beetle.branch.nodes.results.SearchInput;
-import me.aurium.beetle.branch.nodes.results.model.Result;
+import me.aurium.branch.interfacing.responses.NoPermissionResponse;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.results.SearchInfo;
+import me.aurium.branch.nodes.results.SearchInput;
+import me.aurium.branch.nodes.results.model.Result;
 
 /**
  * Simple fallback strategy that if the sender has no permission to execute the command they are sent a failing response.
diff --git a/core/src/main/java/me/aurium/beetle/branch/information/description/Description.java b/core/src/main/java/me/aurium/branch/information/description/Description.java
similarity index 93%
rename from core/src/main/java/me/aurium/beetle/branch/information/description/Description.java
rename to core/src/main/java/me/aurium/branch/information/description/Description.java
index 24c5ec3..2e10973 100644
--- a/core/src/main/java/me/aurium/beetle/branch/information/description/Description.java
+++ b/core/src/main/java/me/aurium/branch/information/description/Description.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.information.description;
+package me.aurium.branch.information.description;
 
 public class Description {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/information/help/HelpEntry.java b/core/src/main/java/me/aurium/branch/information/help/HelpEntry.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/information/help/HelpEntry.java
rename to core/src/main/java/me/aurium/branch/information/help/HelpEntry.java
index 8ac21a0..65cf9c9 100644
--- a/core/src/main/java/me/aurium/beetle/branch/information/help/HelpEntry.java
+++ b/core/src/main/java/me/aurium/branch/information/help/HelpEntry.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.information.help;
+package me.aurium.branch.information.help;
 
 public interface HelpEntry {
 }
diff --git a/core/src/main/java/me/aurium/branch/information/help/Shit.java b/core/src/main/java/me/aurium/branch/information/help/Shit.java
new file mode 100644
index 0000000..4ad9f20
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/information/help/Shit.java
@@ -0,0 +1,27 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.branch.information.help;
+
+public class Shit {
+
+    //commandnodes or maybe their branchhandlers all need to return a Description
+}
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java b/core/src/main/java/me/aurium/branch/interfacing/Message.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java
rename to core/src/main/java/me/aurium/branch/interfacing/Message.java
index 67b94c9..11653ca 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/Message.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/Message.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing;
+package me.aurium.branch.interfacing;
 
 /**
  * Represents the final stage of something that occur after a response has been consumed
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java b/core/src/main/java/me/aurium/branch/interfacing/Response.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java
rename to core/src/main/java/me/aurium/branch/interfacing/Response.java
index ca1a06b..ad1b88a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/Response.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/Response.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing;
+package me.aurium.branch.interfacing;
 
 /**
  * Marker interface for a data-carrying object that can be consumed by a responseActionhandler
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java b/core/src/main/java/me/aurium/branch/interfacing/ResponseAction.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java
rename to core/src/main/java/me/aurium/branch/interfacing/ResponseAction.java
index e6a8194..b6a0e8a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/ResponseAction.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/ResponseAction.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing;
+package me.aurium.branch.interfacing;
 
 /**
  * Represents an action that is fired when a response is received
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonInterfacingHandler.java
similarity index 89%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
rename to core/src/main/java/me/aurium/branch/interfacing/handlers/CommonInterfacingHandler.java
index 0ca6f44..443e93e 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonInterfacingHandler.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonInterfacingHandler.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.handlers;
+package me.aurium.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.Message;
-import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.branch.interfacing.Message;
+import me.aurium.branch.interfacing.Response;
 
 public class CommonInterfacingHandler<T> implements InterfacingHandler<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonMessageMap.java
similarity index 88%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
rename to core/src/main/java/me/aurium/branch/interfacing/handlers/CommonMessageMap.java
index 6b64eee..3bdecbd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonMessageMap.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonMessageMap.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.handlers;
+package me.aurium.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.Response;
-import me.aurium.beetle.branch.interfacing.ResponseAction;
+import me.aurium.branch.interfacing.Response;
+import me.aurium.branch.interfacing.ResponseAction;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonResponseActionHandler.java
similarity index 88%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
rename to core/src/main/java/me/aurium/branch/interfacing/handlers/CommonResponseActionHandler.java
index a344cc7..34e9e21 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/CommonResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonResponseActionHandler.java
@@ -19,11 +19,11 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.handlers;
+package me.aurium.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.Message;
-import me.aurium.beetle.branch.interfacing.Response;
-import me.aurium.beetle.branch.interfacing.ResponseAction;
+import me.aurium.branch.interfacing.Message;
+import me.aurium.branch.interfacing.Response;
+import me.aurium.branch.interfacing.ResponseAction;
 
 import java.util.Map;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/InterfacingHandler.java
similarity index 87%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
rename to core/src/main/java/me/aurium/branch/interfacing/handlers/InterfacingHandler.java
index bf7b24b..b65c93f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/InterfacingHandler.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/handlers/InterfacingHandler.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.handlers;
+package me.aurium.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.Message;
-import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.branch.interfacing.Message;
+import me.aurium.branch.interfacing.Response;
 
 /**
  * Represents a centralized source for message providing as well as context creation. I am aware i spelled recipient wrong.
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/MessageMap.java
similarity index 84%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
rename to core/src/main/java/me/aurium/branch/interfacing/handlers/MessageMap.java
index 21a3059..8062368 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageMap.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/handlers/MessageMap.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.handlers;
+package me.aurium.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.Response;
-import me.aurium.beetle.branch.interfacing.ResponseAction;
+import me.aurium.branch.interfacing.Response;
+import me.aurium.branch.interfacing.ResponseAction;
 
 public interface MessageMap<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/MessageProvider.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
rename to core/src/main/java/me/aurium/branch/interfacing/handlers/MessageProvider.java
index 4318e3e..5146fa8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/MessageProvider.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/handlers/MessageProvider.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.handlers;
+package me.aurium.branch.interfacing.handlers;
 
 /**
  * Represents something that generates a response action handler from it's internals
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/ResponseActionHandler.java
similarity index 83%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
rename to core/src/main/java/me/aurium/branch/interfacing/handlers/ResponseActionHandler.java
index 8ffdcf2..448e8ee 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/handlers/ResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/handlers/ResponseActionHandler.java
@@ -19,11 +19,11 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.handlers;
+package me.aurium.branch.interfacing.handlers;
 
-import me.aurium.beetle.branch.interfacing.Message;
-import me.aurium.beetle.branch.interfacing.Response;
-import me.aurium.beetle.branch.interfacing.ResponseAction;
+import me.aurium.branch.interfacing.Message;
+import me.aurium.branch.interfacing.Response;
+import me.aurium.branch.interfacing.ResponseAction;
 
 /**
  * Something that consumes Responses and produces messages for interfacing with the player
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java b/core/src/main/java/me/aurium/branch/interfacing/responses/FailedAdaptingResponse.java
similarity index 93%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
rename to core/src/main/java/me/aurium/branch/interfacing/responses/FailedAdaptingResponse.java
index e3b7672..6bf9ddd 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/FailedAdaptingResponse.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/responses/FailedAdaptingResponse.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.responses;
+package me.aurium.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.branch.interfacing.Response;
 
 /**
  * Represents a response to the scenario in which a certain object was attempted to be adapted to an extending type
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java b/core/src/main/java/me/aurium/branch/interfacing/responses/NoIntegratedArgsResponse.java
similarity index 92%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
rename to core/src/main/java/me/aurium/branch/interfacing/responses/NoIntegratedArgsResponse.java
index 8b63e73..100b2e5 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoIntegratedArgsResponse.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/responses/NoIntegratedArgsResponse.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.responses;
+package me.aurium.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.execution.NodeContext;
-import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.branch.execution.NodeContext;
+import me.aurium.branch.interfacing.Response;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java b/core/src/main/java/me/aurium/branch/interfacing/responses/NoPermissionResponse.java
similarity index 91%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
rename to core/src/main/java/me/aurium/branch/interfacing/responses/NoPermissionResponse.java
index 7d69c0c..dc50a4f 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/NoPermissionResponse.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/responses/NoPermissionResponse.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.responses;
+package me.aurium.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.branch.interfacing.Response;
 
 public class NoPermissionResponse implements Response {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java b/core/src/main/java/me/aurium/branch/interfacing/responses/TooManyArgsResponse.java
similarity index 91%
rename from core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
rename to core/src/main/java/me/aurium/branch/interfacing/responses/TooManyArgsResponse.java
index c8423c6..12b79b8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/interfacing/responses/TooManyArgsResponse.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/responses/TooManyArgsResponse.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.interfacing.responses;
+package me.aurium.branch.interfacing.responses;
 
-import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.branch.interfacing.Response;
 
 public class TooManyArgsResponse implements Response {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java b/core/src/main/java/me/aurium/branch/nodes/ArgumentNode.java
similarity index 98%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
rename to core/src/main/java/me/aurium/branch/nodes/ArgumentNode.java
index b8b3422..a623a7a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ArgumentNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/ArgumentNode.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes;
+package me.aurium.branch.nodes;
 
 //kinda like a branching node except it throws forward and not to the sides
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/branch/nodes/BranchingNode.java
similarity index 71%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
rename to core/src/main/java/me/aurium/branch/nodes/BranchingNode.java
index c26252e..782a174 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/BranchingNode.java
@@ -19,20 +19,20 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes;
-
-import me.aurium.beetle.branch.execution.Block;
-import me.aurium.beetle.branch.execution.api.BranchHandler;
-import me.aurium.beetle.branch.execution.api.Execution;
-import me.aurium.beetle.branch.execution.NodeContext;
-import me.aurium.beetle.branch.interfacing.responses.NoIntegratedArgsResponse;
-import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
-import me.aurium.beetle.branch.nodes.results.*;
-import me.aurium.beetle.branch.fallback.permissions.Permission;
-import me.aurium.beetle.branch.nodes.results.model.Result;
-import me.aurium.beetle.branch.utility.PreStoredHashSet;
-
-import java.util.Deque;
+package me.aurium.branch.nodes;
+
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.execution.api.BranchHandler;
+import me.aurium.branch.execution.api.Execution;
+import me.aurium.branch.execution.NodeContext;
+import me.aurium.branch.interfacing.responses.NoIntegratedArgsResponse;
+import me.aurium.branch.nodes.model.IdentifiableNode;
+import me.aurium.branch.fallback.permissions.Permission;
+import me.aurium.branch.nodes.results.model.Result;
+import me.aurium.branch.utility.PreStoredHashSet;
+import me.aurium.branch.nodes.results.SearchInfo;
+import me.aurium.branch.nodes.results.SearchInput;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -64,20 +64,25 @@ public Block getIdentifier() {
         return path;
     }
 
+    //args[] = join aMatch
+    //let's say this is the base
     @Override
     public SearchInfo<T> getSpecificNode(SearchInput input) {
+        //if there is something left, the first thing in the queue is our argument
+        //if there is nothing left no args time
 
-        Deque<Block> blockPath = input.getReducablePath();
-
-        for (IdentifiableNode<T> node : nodes.getContents()) {
-            if (blockPath.getFirst().equals(node.getIdentifier())) {
-                blockPath.removeFirst(); //consume
+        if (!input.getReducablePath().isEmpty()) {
+            Block block = input.getReducablePath().getFirst(); //reveal
 
-                return node.getSpecificNode(input);
+            for (IdentifiableNode<T> node : nodes.getContents()) {
+                if (node.getIdentifier().equals(block)) {
+                    return node.getSpecificNode(input); //consume
+                }
             }
+
         }
 
-        return new SearchInfo<>(this, input); //empty handling is in the strategy
+        return new SearchInfo<>(this,input);
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/HelpNode.java b/core/src/main/java/me/aurium/branch/nodes/HelpNode.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/HelpNode.java
rename to core/src/main/java/me/aurium/branch/nodes/HelpNode.java
index 5a808f2..cc28054 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/HelpNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/HelpNode.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes;
+package me.aurium.branch.nodes;
 
 /**
  * Represents a node that pregenerates help entries based on the message context
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/branch/nodes/SingleNode.java
similarity index 75%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
rename to core/src/main/java/me/aurium/branch/nodes/SingleNode.java
index 23e90e5..61610c5 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/SingleNode.java
@@ -19,19 +19,19 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes;
-
-import me.aurium.beetle.branch.execution.Block;
-import me.aurium.beetle.branch.execution.api.BranchHandler;
-import me.aurium.beetle.branch.execution.api.ExecutionHandler;
-import me.aurium.beetle.branch.execution.api.Execution;
-import me.aurium.beetle.branch.execution.NodeContext;
-import me.aurium.beetle.branch.interfacing.responses.TooManyArgsResponse;
-import me.aurium.beetle.branch.nodes.model.EndpointNode;
-import me.aurium.beetle.branch.nodes.results.SearchInput;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
-import me.aurium.beetle.branch.fallback.permissions.Permission;
-import me.aurium.beetle.branch.nodes.results.model.Result;
+package me.aurium.branch.nodes;
+
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.execution.api.BranchHandler;
+import me.aurium.branch.execution.api.ExecutionHandler;
+import me.aurium.branch.execution.api.Execution;
+import me.aurium.branch.execution.NodeContext;
+import me.aurium.branch.interfacing.responses.TooManyArgsResponse;
+import me.aurium.branch.nodes.model.EndpointNode;
+import me.aurium.branch.nodes.results.SearchInput;
+import me.aurium.branch.nodes.results.SearchInfo;
+import me.aurium.branch.fallback.permissions.Permission;
+import me.aurium.branch.nodes.results.model.Result;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,8 +61,6 @@ public Block getIdentifier() {
 
     @Override
     public SearchInfo<T> getSpecificNode(SearchInput input) {
-        input.getReducablePath().removeFirst(); //consume
-
         return new SearchInfo<>(this,input);
     }
 
@@ -89,13 +87,11 @@ public SingleHandler(ExecutionHandler<T> handler) {
         public Result<Execution<T>> getExecution(NodeContext<T> context) {
             SearchInfo<T> info = context.getResults();
 
-            info.reducedPath().removeFirst();
-
-            if (info.hasMoreArguments()) {
+            /*if (info.hasMoreArguments()) {
                 return Result.fail(
                         new TooManyArgsResponse(0,info.reducedPath().size()) //TODO change this so it actually reflects
                 );
-            }
+            }*/
 
             return Result.success(new Execution<>(handler,context));
         }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java b/core/src/main/java/me/aurium/branch/nodes/ValueContext.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java
rename to core/src/main/java/me/aurium/branch/nodes/ValueContext.java
index c56d712..b5ae18c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/ValueContext.java
+++ b/core/src/main/java/me/aurium/branch/nodes/ValueContext.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes;
+package me.aurium.branch.nodes;
 
 /**
  * MORE FUCKING WRAPPERS
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java b/core/src/main/java/me/aurium/branch/nodes/argument/Argument.java
similarity index 88%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
rename to core/src/main/java/me/aurium/branch/nodes/argument/Argument.java
index f0d027b..c12c17b 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Argument.java
+++ b/core/src/main/java/me/aurium/branch/nodes/argument/Argument.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.argument;
+package me.aurium.branch.nodes.argument;
 
-import me.aurium.beetle.branch.execution.Block;
-import me.aurium.beetle.branch.execution.NodeContext;
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.execution.NodeContext;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java b/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentContext.java
similarity index 89%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
rename to core/src/main/java/me/aurium/branch/nodes/argument/ArgumentContext.java
index c8bdd55..a44e3db 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContext.java
+++ b/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentContext.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.argument;
+package me.aurium.branch.nodes.argument;
 
-import me.aurium.beetle.branch.execution.NodeContext;
+import me.aurium.branch.execution.NodeContext;
 
 public interface ArgumentContext<T> extends NodeContext<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java b/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentContextHandler.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
rename to core/src/main/java/me/aurium/branch/nodes/argument/ArgumentContextHandler.java
index 8861dbd..f51351c 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentContextHandler.java
+++ b/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentContextHandler.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.argument;
+package me.aurium.branch.nodes.argument;
 
 public interface ArgumentContextHandler<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java b/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConvertet.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
rename to core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConvertet.java
index 95fe577..6d2c91d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/ArgumentConvertet.java
+++ b/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConvertet.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.argument;
+package me.aurium.branch.nodes.argument;
 
 public interface ArgumentConvertet {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java b/core/src/main/java/me/aurium/branch/nodes/argument/Arguments.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
rename to core/src/main/java/me/aurium/branch/nodes/argument/Arguments.java
index f5afa2a..47d9327 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/argument/Arguments.java
+++ b/core/src/main/java/me/aurium/branch/nodes/argument/Arguments.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.argument;
+package me.aurium.branch.nodes.argument;
 
 public class Arguments {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java b/core/src/main/java/me/aurium/branch/nodes/builders/AloneBuilder.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java
rename to core/src/main/java/me/aurium/branch/nodes/builders/AloneBuilder.java
index d5a4631..686beaf 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/AloneBuilder.java
+++ b/core/src/main/java/me/aurium/branch/nodes/builders/AloneBuilder.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.builders;
+package me.aurium.branch.nodes.builders;
 
 /**
  * yet another marker interface
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/branch/nodes/builders/BranchingBuilder.java
similarity index 85%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
rename to core/src/main/java/me/aurium/branch/nodes/builders/BranchingBuilder.java
index 9210d84..6bdd1f9 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/BranchingBuilder.java
+++ b/core/src/main/java/me/aurium/branch/nodes/builders/BranchingBuilder.java
@@ -19,17 +19,17 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.builders;
-
-import me.aurium.beetle.branch.execution.Block;
-import me.aurium.beetle.branch.execution.EmptyBlock;
-import me.aurium.beetle.branch.execution.StringBlock;
-import me.aurium.beetle.branch.fallback.permissions.Permission;
-import me.aurium.beetle.branch.fallback.permissions.EmptyPermission;
-import me.aurium.beetle.branch.nodes.BranchingNode;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
-import me.aurium.beetle.branch.utility.PreStoredHashSet;
+package me.aurium.branch.nodes.builders;
+
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.execution.EmptyBlock;
+import me.aurium.branch.execution.StringBlock;
+import me.aurium.branch.fallback.permissions.Permission;
+import me.aurium.branch.fallback.permissions.EmptyPermission;
+import me.aurium.branch.nodes.BranchingNode;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.model.IdentifiableNode;
+import me.aurium.branch.utility.PreStoredHashSet;
 
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java b/core/src/main/java/me/aurium/branch/nodes/builders/Builder.java
similarity index 84%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
rename to core/src/main/java/me/aurium/branch/nodes/builders/Builder.java
index ddebebd..c67e454 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/Builder.java
+++ b/core/src/main/java/me/aurium/branch/nodes/builders/Builder.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.builders;
+package me.aurium.branch.nodes.builders;
 
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.model.IdentifiableNode;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.model.IdentifiableNode;
 
 public interface Builder<C>{
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java b/core/src/main/java/me/aurium/branch/nodes/builders/SingleBuilder.java
similarity index 78%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
rename to core/src/main/java/me/aurium/branch/nodes/builders/SingleBuilder.java
index 995cdbe..4c4864d 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/branch/nodes/builders/SingleBuilder.java
@@ -19,16 +19,16 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.builders;
+package me.aurium.branch.nodes.builders;
 
-import me.aurium.beetle.branch.execution.Block;
-import me.aurium.beetle.branch.execution.EmptyBlock;
-import me.aurium.beetle.branch.execution.StringBlock;
-import me.aurium.beetle.branch.execution.api.ExecutionHandler;
-import me.aurium.beetle.branch.nodes.SingleNode;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.fallback.permissions.Permission;
-import me.aurium.beetle.branch.fallback.permissions.EmptyPermission;
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.execution.EmptyBlock;
+import me.aurium.branch.execution.StringBlock;
+import me.aurium.branch.execution.api.ExecutionHandler;
+import me.aurium.branch.nodes.SingleNode;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.fallback.permissions.Permission;
+import me.aurium.branch.fallback.permissions.EmptyPermission;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java b/core/src/main/java/me/aurium/branch/nodes/model/CommandNode.java
similarity index 81%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
rename to core/src/main/java/me/aurium/branch/nodes/model/CommandNode.java
index 7c96d57..3f1bb40 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/CommandNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/model/CommandNode.java
@@ -19,12 +19,12 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.model;
+package me.aurium.branch.nodes.model;
 
-import me.aurium.beetle.branch.execution.api.BranchHandler;
-import me.aurium.beetle.branch.nodes.results.SearchInput;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
-import me.aurium.beetle.branch.fallback.permissions.Permission;
+import me.aurium.branch.execution.api.BranchHandler;
+import me.aurium.branch.nodes.results.SearchInput;
+import me.aurium.branch.nodes.results.SearchInfo;
+import me.aurium.branch.fallback.permissions.Permission;
 
 /**
  * Base object
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java b/core/src/main/java/me/aurium/branch/nodes/model/EndpointNode.java
similarity index 95%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
rename to core/src/main/java/me/aurium/branch/nodes/model/EndpointNode.java
index 9d05ff3..843a6d2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/EndpointNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/model/EndpointNode.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.model;
+package me.aurium.branch.nodes.model;
 
 /**
  * Marker interface for a node that is alone (so not branching, but not merging either)
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java b/core/src/main/java/me/aurium/branch/nodes/model/IdentifiableNode.java
similarity index 90%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
rename to core/src/main/java/me/aurium/branch/nodes/model/IdentifiableNode.java
index 20c9da0..f9280bc 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/IdentifiableNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/model/IdentifiableNode.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.model;
+package me.aurium.branch.nodes.model;
 
-import me.aurium.beetle.branch.execution.Block;
+import me.aurium.branch.execution.Block;
 
 public interface IdentifiableNode<T> extends CommandNode<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java b/core/src/main/java/me/aurium/branch/nodes/model/ResponseHandler.java
similarity index 94%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
rename to core/src/main/java/me/aurium/branch/nodes/model/ResponseHandler.java
index 4112c07..42deea8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/model/ResponseHandler.java
+++ b/core/src/main/java/me/aurium/branch/nodes/model/ResponseHandler.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.model;
+package me.aurium.branch.nodes.model;
 
 public class ResponseHandler {
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java b/core/src/main/java/me/aurium/branch/nodes/results/SearchInfo.java
similarity index 67%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
rename to core/src/main/java/me/aurium/branch/nodes/results/SearchInfo.java
index 27bafc1..ca4bad8 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInfo.java
+++ b/core/src/main/java/me/aurium/branch/nodes/results/SearchInfo.java
@@ -19,36 +19,41 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.results;
+package me.aurium.branch.nodes.results;
 
-import me.aurium.beetle.branch.execution.Block;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.nodes.model.CommandNode;
 
-import java.util.Deque;
+import java.util.List;
 
 public class SearchInfo<T> {
 
     private final CommandNode<T> calculatedNode;
-    private final SearchInput input;
+
+    private final List<Block> initialPath;
+    private final List<Block> reducedPath;
 
     public SearchInfo(CommandNode<T> calculatedNode, SearchInput input) {
         this.calculatedNode = calculatedNode;
-        this.input = input;
+
+        this.initialPath = List.copyOf(input.getInitialPath());
+        this.reducedPath = List.copyOf(input.getReducablePath());
+
     }
 
     public CommandNode<T> resultingNode() {
         return calculatedNode;
     }
 
-    public Deque<Block> initialPath() {
-        return input.getInitialPath();
+    public List<Block> initialPath() {
+        return initialPath;
     }
 
-    public Deque<Block> reducedPath() {
-        return input.getReducablePath();
+    public List<Block> reducedPath() {
+        return reducedPath;
     }
 
     public boolean hasMoreArguments() {
-        return !input.getReducablePath().isEmpty();
+        return initialPath.isEmpty();
     }
 }
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java b/core/src/main/java/me/aurium/branch/nodes/results/SearchInput.java
similarity index 75%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
rename to core/src/main/java/me/aurium/branch/nodes/results/SearchInput.java
index 6ac819b..95dcfb9 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/SearchInput.java
+++ b/core/src/main/java/me/aurium/branch/nodes/results/SearchInput.java
@@ -19,17 +19,17 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.results;
+package me.aurium.branch.nodes.results;
 
-import me.aurium.beetle.branch.execution.Block;
-import me.aurium.beetle.branch.execution.StringBlock;
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.execution.StringBlock;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 
 public class SearchInput {
 
-    private final Deque<Block> initialPath;
+    private final Deque<Block> initialPath; //TODO make list or something - i don't care but it must be immutable
     private final Deque<Block> reducablePath;
 
     public SearchInput(Deque<Block> initialPath, Deque<Block> reducablePath) {
@@ -45,6 +45,13 @@ public Deque<Block> getReducablePath() {
         return reducablePath;
     }
 
+    /**
+     * TODO: remove or fix this: i'd preferably like the internal ""initial"" deque to be sealed and immutable
+     *  It would be nice to enforce immutability on reducablePath except the fact is the reducable path exists
+     *  to be immutable and edited, so maybe not? Please advise.
+     *
+     * @return new input
+     */
     public SearchInput withoutTop() {
         Deque<Block> newBase = new ArrayDeque<>(initialPath);
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java b/core/src/main/java/me/aurium/branch/nodes/results/model/FailingResult.java
similarity index 92%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
rename to core/src/main/java/me/aurium/branch/nodes/results/model/FailingResult.java
index 23ea321..0a21da9 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/FailingResult.java
+++ b/core/src/main/java/me/aurium/branch/nodes/results/model/FailingResult.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.results.model;
+package me.aurium.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.branch.interfacing.Response;
 
 /**
  * A result that has failed
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java b/core/src/main/java/me/aurium/branch/nodes/results/model/Result.java
similarity index 91%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
rename to core/src/main/java/me/aurium/branch/nodes/results/model/Result.java
index 19ee4c7..8653301 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/Result.java
+++ b/core/src/main/java/me/aurium/branch/nodes/results/model/Result.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.results.model;
+package me.aurium.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.branch.interfacing.Response;
 
 public interface Result<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java b/core/src/main/java/me/aurium/branch/nodes/results/model/SuccessfulResult.java
similarity index 92%
rename from core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
rename to core/src/main/java/me/aurium/branch/nodes/results/model/SuccessfulResult.java
index b714b85..25174f2 100644
--- a/core/src/main/java/me/aurium/beetle/branch/nodes/results/model/SuccessfulResult.java
+++ b/core/src/main/java/me/aurium/branch/nodes/results/model/SuccessfulResult.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.nodes.results.model;
+package me.aurium.branch.nodes.results.model;
 
-import me.aurium.beetle.branch.interfacing.Response;
+import me.aurium.branch.interfacing.Response;
 
 public class SuccessfulResult<T> implements Result<T> {
 
diff --git a/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java b/core/src/main/java/me/aurium/branch/utility/PreStoredHashSet.java
similarity index 98%
rename from core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
rename to core/src/main/java/me/aurium/branch/utility/PreStoredHashSet.java
index 153bde8..8702a8a 100644
--- a/core/src/main/java/me/aurium/beetle/branch/utility/PreStoredHashSet.java
+++ b/core/src/main/java/me/aurium/branch/utility/PreStoredHashSet.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.utility;
+package me.aurium.branch.utility;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/pom.xml b/pom.xml
index 0e62919..31d7368 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
 
     <modules>
         <module>core</module>
+        <module>core-tests</module>
         <module>spigot-impl</module>
     </modules>
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/CommandWrapper.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/CommandWrapper.java
similarity index 94%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/CommandWrapper.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/CommandWrapper.java
index c5d5fd8..90b6bd3 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/CommandWrapper.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/CommandWrapper.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot;
+package me.aurium.branch.spigot;
 
-import me.aurium.beetle.branch.centralized.base.NodeBase;
+import me.aurium.branch.centralized.base.NodeBase;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContext.java
similarity index 82%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContext.java
index c9bf986..b0ce76d 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContext.java
@@ -19,14 +19,14 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot;
+package me.aurium.branch.spigot;
 
 
-import me.aurium.beetle.branch.execution.AbstractNodeContext;
-import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.interfacing.Response;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.branch.execution.AbstractNodeContext;
+import me.aurium.branch.interfacing.handlers.InterfacingHandler;
+import me.aurium.branch.interfacing.Response;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.results.SearchInfo;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContextProvider.java
similarity index 79%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContextProvider.java
index 7cb0e0f..ef9c972 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotContextProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContextProvider.java
@@ -19,14 +19,14 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot;
+package me.aurium.branch.spigot;
 
 
-import me.aurium.beetle.branch.execution.ContextProvider;
-import me.aurium.beetle.branch.execution.NodeContext;
-import me.aurium.beetle.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.beetle.branch.nodes.model.CommandNode;
-import me.aurium.beetle.branch.nodes.results.SearchInfo;
+import me.aurium.branch.execution.ContextProvider;
+import me.aurium.branch.execution.NodeContext;
+import me.aurium.branch.interfacing.handlers.InterfacingHandler;
+import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.results.SearchInfo;
 import org.bukkit.command.CommandSender;
 
 public class SpigotContextProvider<C extends CommandSender> implements ContextProvider<C> {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManager.java
similarity index 76%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManager.java
index 7c4d889..9082477 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManager.java
@@ -19,18 +19,17 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot;
+package me.aurium.branch.spigot;
 
-import me.aurium.beetle.branch.centralized.CentralizedManager;
-import me.aurium.beetle.branch.centralized.CentralizedManagerBinder;
-import me.aurium.beetle.branch.centralized.base.NodeBase;
-import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
-import me.aurium.beetle.branch.centralized.base.NodeBaseBuilder;
-import me.aurium.beetle.branch.fallback.strategies.OneBackStrategy;
-import me.aurium.beetle.branch.interfacing.handlers.CommonInterfacingHandler;
-import me.aurium.beetle.branch.interfacing.handlers.ResponseActionHandler;
-import me.aurium.beetle.branch.spigot.adapter.SenderAdapter;
-import me.aurium.beetle.branch.spigot.message.SpigotMessageProvider;
+import me.aurium.branch.centralized.CentralizedManager;
+import me.aurium.branch.centralized.CentralizedManagerBinder;
+import me.aurium.branch.centralized.base.NodeBase;
+import me.aurium.branch.centralized.typeadapter.ManagerAdapter;
+import me.aurium.branch.centralized.base.NodeBaseBuilder;
+import me.aurium.branch.fallback.strategies.OneBackStrategy;
+import me.aurium.branch.interfacing.handlers.CommonInterfacingHandler;
+import me.aurium.branch.interfacing.handlers.ResponseActionHandler;
+import me.aurium.branch.spigot.adapter.SenderAdapter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManagerBinder.java
similarity index 89%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManagerBinder.java
index 0a5685f..0b69afb 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/SpigotManagerBinder.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManagerBinder.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot;
+package me.aurium.branch.spigot;
 
-import me.aurium.beetle.branch.centralized.CentralizedManagerBinder;
-import me.aurium.beetle.branch.centralized.base.NodeBase;
+import me.aurium.branch.centralized.CentralizedManagerBinder;
+import me.aurium.branch.centralized.base.NodeBase;
 import org.bukkit.command.CommandMap;
 import org.bukkit.command.CommandSender;
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/adapter/PlayerAdapter.java
similarity index 87%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/PlayerAdapter.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/adapter/PlayerAdapter.java
index 686401b..70e48f9 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/PlayerAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/adapter/PlayerAdapter.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot.adapter;
+package me.aurium.branch.spigot.adapter;
 
-import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
-import me.aurium.beetle.branch.centralized.typeadapter.ManagerAdapter;
+import me.aurium.branch.interfacing.responses.FailedAdaptingResponse;
+import me.aurium.branch.centralized.typeadapter.ManagerAdapter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/SenderAdapter.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/adapter/SenderAdapter.java
similarity index 88%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/SenderAdapter.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/adapter/SenderAdapter.java
index 40ad889..aeb67fd 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/adapter/SenderAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/adapter/SenderAdapter.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot.adapter;
+package me.aurium.branch.spigot.adapter;
 
-import me.aurium.beetle.branch.centralized.typeadapter.CommonAdapter;
+import me.aurium.branch.centralized.typeadapter.CommonAdapter;
 import org.bukkit.command.CommandSender;
 
 public class SenderAdapter implements CommonAdapter<CommandSender> {
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/AdventureMessage.java
similarity index 94%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/message/AdventureMessage.java
index 650aecc..6c01148 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/AdventureMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/AdventureMessage.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot.message;
+package me.aurium.branch.spigot.message;
 
 public class AdventureMessage {
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/FancyTextMessage.java
similarity index 94%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/message/FancyTextMessage.java
index a288cc7..c681f93 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/FancyTextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/FancyTextMessage.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot.message;
+package me.aurium.branch.spigot.message;
 
 public class FancyTextMessage {
 }
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/SpigotMessageProvider.java
similarity index 87%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/message/SpigotMessageProvider.java
index 99aba24..334ebdf 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/SpigotMessageProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/SpigotMessageProvider.java
@@ -19,10 +19,10 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot.message;
+package me.aurium.branch.spigot.message;
 
-import me.aurium.beetle.branch.interfacing.handlers.CommonMessageMap;
-import me.aurium.beetle.branch.interfacing.responses.FailedAdaptingResponse;
+import me.aurium.branch.interfacing.handlers.CommonMessageMap;
+import me.aurium.branch.interfacing.responses.FailedAdaptingResponse;
 import org.bukkit.command.CommandSender;
 
 public class SpigotMessageProvider<C extends CommandSender>{
diff --git a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/TextMessage.java
similarity index 92%
rename from spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/message/TextMessage.java
index a2c4a61..846e202 100644
--- a/spigot-impl/src/main/java/me/aurium/beetle/branch/spigot/message/TextMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/TextMessage.java
@@ -19,9 +19,9 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot.message;
+package me.aurium.branch.spigot.message;
 
-import me.aurium.beetle.branch.interfacing.Message;
+import me.aurium.branch.interfacing.Message;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
diff --git a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java b/spigot-impl/src/test/java/me/aurium/branch/spigot/ExampleBinding.java
similarity index 95%
rename from spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
rename to spigot-impl/src/test/java/me/aurium/branch/spigot/ExampleBinding.java
index 984079a..5f755a6 100644
--- a/spigot-impl/src/test/java/me/aurium/beetle/branch/spigot/ExampleBinding.java
+++ b/spigot-impl/src/test/java/me/aurium/branch/spigot/ExampleBinding.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.beetle.branch.spigot;
+package me.aurium.branch.spigot;
 
 import org.bukkit.plugin.java.JavaPlugin;
 

From 8eafb93a0c305c9cccfc396c3de34c78ee2fb0f7 Mon Sep 17 00:00:00 2001
From: "Aurium_ @SolarMC" <aukrais@gmail.com>
Date: Fri, 23 Apr 2021 17:45:33 -0700
Subject: [PATCH 44/56] Update
 core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConvertet.java

Co-authored-by: A248 <anandebeh@gmail.com>
---
 .../java/me/aurium/branch/nodes/argument/ArgumentConvertet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConvertet.java b/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConvertet.java
index 6d2c91d..0c944e6 100644
--- a/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConvertet.java
+++ b/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConvertet.java
@@ -21,5 +21,5 @@
 
 package me.aurium.branch.nodes.argument;
 
-public interface ArgumentConvertet {
+public interface ArgumentConverter {
 }

From c0b60a73118ff97db104281b8ad8bca7ae301ae2 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Mon, 26 Apr 2021 17:42:12 -0700
Subject: [PATCH 45/56] compress messageprovider and MessageMap into one class

---
 .idea/encodings.xml                           |  2 +
 core-tests/pom.xml                            | 13 ++++-
 .../me/aurium/branch/tests/StringAdapter.java |  6 ++-
 .../me/aurium/branch/tests/StringManager.java | 52 ++++++++++++++++++
 .../java/me/aurium/branch/ExecutionTest.java  |  6 +--
 .../handlers/CommonInterfacingHandler.java    | 24 +++++++--
 .../handlers/CommonResponseActionHandler.java | 53 -------------------
 ...Handler.java => DelegatingDefaultMap.java} | 21 +++++---
 .../{CommonMessageMap.java => InnerMap.java}  | 12 +++--
 .../interfacing/handlers/MessageMap.java      |  5 +-
 .../interfacing/handlers/MessageProvider.java | 32 -----------
 spigot-impl/pom.xml                           |  5 ++
 .../aurium/branch/spigot/SpigotManager.java   | 25 +++++----
 ...tureMessage.java => FormattedMessage.java} | 14 ++++-
 ...ageProvider.java => SpigotMessageMap.java} | 26 +++++----
 15 files changed, 168 insertions(+), 128 deletions(-)
 rename spigot-impl/src/main/java/me/aurium/branch/spigot/message/FancyTextMessage.java => core-tests/src/main/java/me/aurium/branch/tests/StringAdapter.java (83%)
 create mode 100644 core-tests/src/main/java/me/aurium/branch/tests/StringManager.java
 delete mode 100644 core/src/main/java/me/aurium/branch/interfacing/handlers/CommonResponseActionHandler.java
 rename core/src/main/java/me/aurium/branch/interfacing/handlers/{ResponseActionHandler.java => DelegatingDefaultMap.java} (67%)
 rename core/src/main/java/me/aurium/branch/interfacing/handlers/{CommonMessageMap.java => InnerMap.java} (77%)
 delete mode 100644 core/src/main/java/me/aurium/branch/interfacing/handlers/MessageProvider.java
 rename spigot-impl/src/main/java/me/aurium/branch/spigot/message/{AdventureMessage.java => FormattedMessage.java} (70%)
 rename spigot-impl/src/main/java/me/aurium/branch/spigot/message/{SpigotMessageProvider.java => SpigotMessageMap.java} (65%)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index c57d607..ad39ff7 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/core-tests/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/core-tests/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/spigot-impl/src/main/java" charset="UTF-8" />
   </component>
diff --git a/core-tests/pom.xml b/core-tests/pom.xml
index 0451456..341cfa7 100644
--- a/core-tests/pom.xml
+++ b/core-tests/pom.xml
@@ -25,7 +25,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>me.aurium</groupId>
+    <parent>
+        <artifactId>branch</artifactId>
+        <groupId>me.aurium</groupId>
+        <version>0.1.0</version>
+    </parent>
+
     <artifactId>branch-core-tests</artifactId>
     <version>0.1.0</version>
 
@@ -35,6 +40,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <artifactId>branch-core</artifactId>
+            <groupId>me.aurium</groupId>
+            <version>0.1.0</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
@@ -59,6 +69,7 @@
             <version>1.2.3</version>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/spigot-impl/src/main/java/me/aurium/branch/spigot/message/FancyTextMessage.java b/core-tests/src/main/java/me/aurium/branch/tests/StringAdapter.java
similarity index 83%
rename from spigot-impl/src/main/java/me/aurium/branch/spigot/message/FancyTextMessage.java
rename to core-tests/src/main/java/me/aurium/branch/tests/StringAdapter.java
index c681f93..3795f71 100644
--- a/spigot-impl/src/main/java/me/aurium/branch/spigot/message/FancyTextMessage.java
+++ b/core-tests/src/main/java/me/aurium/branch/tests/StringAdapter.java
@@ -19,7 +19,9 @@
  *
  */
 
-package me.aurium.branch.spigot.message;
+package me.aurium.branch.tests;
 
-public class FancyTextMessage {
+import me.aurium.branch.centralized.typeadapter.CommonAdapter;
+
+public class StringAdapter implements CommonAdapter<String> {
 }
diff --git a/core-tests/src/main/java/me/aurium/branch/tests/StringManager.java b/core-tests/src/main/java/me/aurium/branch/tests/StringManager.java
new file mode 100644
index 0000000..69f8b4e
--- /dev/null
+++ b/core-tests/src/main/java/me/aurium/branch/tests/StringManager.java
@@ -0,0 +1,52 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.branch.tests;
+
+import me.aurium.branch.centralized.*;
+import me.aurium.branch.centralized.base.NodeBase;
+import me.aurium.branch.centralized.base.NodeBaseBuilder;
+import me.aurium.branch.centralized.typeadapter.ManagerAdapter;
+
+public class StringManager implements CentralizedManager<String,Void> {
+
+    private final static StringAdapter defaultAdapter = new StringAdapter();
+
+    @Override
+    public CentralizedManagerBinder getBinder(Void platform) {
+        throw new IllegalStateException("StringManager is for tests!");
+    }
+
+    @Override
+    public NodeBaseBuilder<String, String> newCommand() {
+        return new NodeBaseBuilder<>(this,defaultAdapter);
+    }
+
+    @Override
+    public <C extends String> NodeBaseBuilder<String, C> newCommand(ManagerAdapter<String, C> adapter) {
+        return new NodeBaseBuilder<>(this,adapter);
+    }
+
+    @Override
+    public void injectCommand(NodeBase<String> base) {
+        throw new IllegalStateException("StringManager is for tests!");
+    }
+}
diff --git a/core-tests/src/test/java/me/aurium/branch/ExecutionTest.java b/core-tests/src/test/java/me/aurium/branch/ExecutionTest.java
index 1b0d380..5ebc147 100644
--- a/core-tests/src/test/java/me/aurium/branch/ExecutionTest.java
+++ b/core-tests/src/test/java/me/aurium/branch/ExecutionTest.java
@@ -21,9 +21,7 @@
 
 package me.aurium.branch;
 
-import me.aurium.branch.nodes.BranchingNode;
-import me.aurium.branch.nodes.builders.BranchingBuilder;
-import me.aurium.branch.nodes.builders.SingleBuilder;
+import me.aurium.branch.tests.StringManager;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 
@@ -31,4 +29,6 @@ public class ExecutionTest {
 
     private final static Logger logger = LoggerFactory.getLogger(ExecutionTest.class);
 
+    private final StringManager manager = new StringManager();
+
 }
diff --git a/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonInterfacingHandler.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonInterfacingHandler.java
index 443e93e..f7cfc0c 100644
--- a/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonInterfacingHandler.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonInterfacingHandler.java
@@ -23,13 +23,16 @@
 
 import me.aurium.branch.interfacing.Message;
 import me.aurium.branch.interfacing.Response;
+import me.aurium.branch.interfacing.ResponseAction;
+
+import java.util.Map;
 
 public class CommonInterfacingHandler<T> implements InterfacingHandler<T> {
 
-    private final ResponseActionHandler<T> handler;
+    private final Map<Class<? extends Response>, ResponseAction<T,? extends Response>> map;
 
-    public CommonInterfacingHandler(ResponseActionHandler<T> provider) {
-        this.handler = provider;
+    CommonInterfacingHandler(Map<Class<? extends Response>, ResponseAction<T, ? extends Response>> map) {
+        this.map = map;
     }
 
     @Override
@@ -39,7 +42,20 @@ public void sendMessage(T recipent, Message<T> message) {
 
     @Override
     public void sendMessage(T recipent, Response response) {
-        handler.getMessage(response).accept(recipent);
+        getMessage(response).accept(recipent);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <C extends Response> ResponseAction<T, C> get(Class<C> clazz) {
+        ResponseAction<T,C> action = (ResponseAction<T, C>) map.get(clazz);
+
+        if (action == null) throw new IllegalStateException("A response was requested but internal map had no binding!");
+
+        return action;
     }
 
+    @SuppressWarnings("unchecked")
+    private  <C extends Response> Message<T> getMessage(C response) {
+        return get((Class<C>) response.getClass()).consume(response);
+    }
 }
diff --git a/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonResponseActionHandler.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonResponseActionHandler.java
deleted file mode 100644
index 34e9e21..0000000
--- a/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonResponseActionHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.interfacing.handlers;
-
-import me.aurium.branch.interfacing.Message;
-import me.aurium.branch.interfacing.Response;
-import me.aurium.branch.interfacing.ResponseAction;
-
-import java.util.Map;
-
-public class CommonResponseActionHandler<T> implements ResponseActionHandler<T> {
-
-    private final Map<Class<? extends Response>, ResponseAction<T,? extends Response>> map;
-
-    CommonResponseActionHandler(Map<Class<? extends Response>, ResponseAction<T,? extends Response>> map) {
-        this.map = map;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <C extends Response> ResponseAction<T, C> get(Class<C> clazz) {
-        ResponseAction<T,C> action = (ResponseAction<T, C>) map.get(clazz);
-
-        if (action == null) throw new IllegalStateException("A response was requested but internal map had no binding!");
-
-        return action;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <C extends Response> Message<T> getMessage(C response) {
-        return get((Class<C>) response.getClass()).consume(response);
-    }
-
-
-}
diff --git a/core/src/main/java/me/aurium/branch/interfacing/handlers/ResponseActionHandler.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/DelegatingDefaultMap.java
similarity index 67%
rename from core/src/main/java/me/aurium/branch/interfacing/handlers/ResponseActionHandler.java
rename to core/src/main/java/me/aurium/branch/interfacing/handlers/DelegatingDefaultMap.java
index 448e8ee..6316231 100644
--- a/core/src/main/java/me/aurium/branch/interfacing/handlers/ResponseActionHandler.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/handlers/DelegatingDefaultMap.java
@@ -21,18 +21,23 @@
 
 package me.aurium.branch.interfacing.handlers;
 
-import me.aurium.branch.interfacing.Message;
 import me.aurium.branch.interfacing.Response;
 import me.aurium.branch.interfacing.ResponseAction;
 
-/**
- * Something that consumes Responses and produces messages for interfacing with the player
- * @param <T>
- */
-public interface ResponseActionHandler<T> {
+public abstract class DelegatingDefaultMap<T> implements MessageMap<T> {
+
+    private final InnerMap<T> delegate = defaultMap();
+    protected abstract InnerMap<T> defaultMap();
 
-    <C extends Response> ResponseAction<T, C> get(Class<C> clazz);
-    <C extends Response> Message<T> getMessage(C response);
+    @Override
+    public <F extends Response> DelegatingDefaultMap<T> add(Class<F> key, ResponseAction<T, F> action) {
+        delegate.add(key,action);
 
+        return this;
+    }
 
+    @Override
+    public InterfacingHandler<T> make() {
+        return delegate.make();
+    }
 }
diff --git a/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonMessageMap.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/InnerMap.java
similarity index 77%
rename from core/src/main/java/me/aurium/branch/interfacing/handlers/CommonMessageMap.java
rename to core/src/main/java/me/aurium/branch/interfacing/handlers/InnerMap.java
index 3bdecbd..bd0e569 100644
--- a/core/src/main/java/me/aurium/branch/interfacing/handlers/CommonMessageMap.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/handlers/InnerMap.java
@@ -27,17 +27,19 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class CommonMessageMap<T> implements MessageMap<T>, MessageProvider<T> {
+public class InnerMap<T> implements MessageMap<T> {
 
     private final Map<Class<? extends Response>,ResponseAction<T,? extends Response>> map = new HashMap<>();
 
     @Override
-    public <F extends Response> void add(Class<F> key, ResponseAction<T, F> action) {
-        map.put(key,action); //TODO checks
+    public <F extends Response> InnerMap<T> add(Class<F> key, ResponseAction<T, F> action) {
+        this.map.put(key,action);
+
+        return this;
     }
 
     @Override
-    public ResponseActionHandler<T> make() {
-        return new CommonResponseActionHandler<>(Map.copyOf(map));
+    public InterfacingHandler<T> make() {
+        return new CommonInterfacingHandler<>(map);
     }
 }
diff --git a/core/src/main/java/me/aurium/branch/interfacing/handlers/MessageMap.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/MessageMap.java
index 8062368..481f808 100644
--- a/core/src/main/java/me/aurium/branch/interfacing/handlers/MessageMap.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/handlers/MessageMap.java
@@ -21,11 +21,14 @@
 
 package me.aurium.branch.interfacing.handlers;
 
+import me.aurium.branch.interfacing.Message;
 import me.aurium.branch.interfacing.Response;
 import me.aurium.branch.interfacing.ResponseAction;
 
 public interface MessageMap<T> {
 
-    <F extends Response> void add(Class<F> key, ResponseAction<T,F> action);
+    <F extends Response> MessageMap<T> add(Class<F> key, ResponseAction<T,F> action);
+
+    InterfacingHandler<T> make();
 
 }
diff --git a/core/src/main/java/me/aurium/branch/interfacing/handlers/MessageProvider.java b/core/src/main/java/me/aurium/branch/interfacing/handlers/MessageProvider.java
deleted file mode 100644
index 5146fa8..0000000
--- a/core/src/main/java/me/aurium/branch/interfacing/handlers/MessageProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.interfacing.handlers;
-
-/**
- * Represents something that generates a response action handler from it's internals
- * @param <T>
- */
-public interface MessageProvider<T> {
-
-    ResponseActionHandler<T> make();
-
-}
diff --git a/spigot-impl/pom.xml b/spigot-impl/pom.xml
index fe5896b..a4e66d9 100644
--- a/spigot-impl/pom.xml
+++ b/spigot-impl/pom.xml
@@ -48,6 +48,11 @@
             <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <repositories>
diff --git a/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManager.java
index 9082477..6b02f73 100644
--- a/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManager.java
@@ -27,9 +27,10 @@
 import me.aurium.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.branch.centralized.base.NodeBaseBuilder;
 import me.aurium.branch.fallback.strategies.OneBackStrategy;
-import me.aurium.branch.interfacing.handlers.CommonInterfacingHandler;
-import me.aurium.branch.interfacing.handlers.ResponseActionHandler;
+import me.aurium.branch.interfacing.handlers.InterfacingHandler;
+import me.aurium.branch.interfacing.handlers.MessageMap;
 import me.aurium.branch.spigot.adapter.SenderAdapter;
+import me.aurium.branch.spigot.message.SpigotMessageMap;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -38,14 +39,20 @@
 
 public class SpigotManager implements CentralizedManager<CommandSender, JavaPlugin> {
 
-    private final static SenderAdapter senderAdapter = new SenderAdapter();
+    private final static SenderAdapter defaultAdapter = new SenderAdapter();
 
-    private final CommonInterfacingHandler<CommandSender> defaultInterfacing;
-    private final Set<NodeBase<CommandSender>> senders;
+    private final InterfacingHandler<CommandSender> defaultInterfacing;
+    private final Set<NodeBase<CommandSender>> senders = new HashSet<>();
 
-    public SpigotManager(ResponseActionHandler<CommandSender> defaultResponser) {
-        this.defaultInterfacing = new CommonInterfacingHandler<>(defaultResponser);
-        this.senders = new HashSet<>();
+    //fuck code in the constructor rules
+    // (This can be easily fixed if you give a shit but i happen to not care - make a pr if you do!)
+
+    public SpigotManager(MessageMap<CommandSender> defaultResponser) {
+        this.defaultInterfacing = defaultResponser.make();
+    }
+
+    public SpigotManager() {
+        this.defaultInterfacing = new SpigotMessageMap<>().make();
     }
 
     @Override
@@ -55,7 +62,7 @@ public CentralizedManagerBinder getBinder(JavaPlugin platform) {
 
     @Override
     public NodeBaseBuilder<CommandSender, CommandSender> newCommand() {
-        return new NodeBaseBuilder<>(this, senderAdapter, new OneBackStrategy<>(), new SpigotContextProvider<>(defaultInterfacing), defaultInterfacing);
+        return new NodeBaseBuilder<>(this, defaultAdapter, new OneBackStrategy<>(), new SpigotContextProvider<>(defaultInterfacing), defaultInterfacing);
     }
 
     @Override
diff --git a/spigot-impl/src/main/java/me/aurium/branch/spigot/message/AdventureMessage.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/FormattedMessage.java
similarity index 70%
rename from spigot-impl/src/main/java/me/aurium/branch/spigot/message/AdventureMessage.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/message/FormattedMessage.java
index 6c01148..fad79d9 100644
--- a/spigot-impl/src/main/java/me/aurium/branch/spigot/message/AdventureMessage.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/FormattedMessage.java
@@ -21,5 +21,17 @@
 
 package me.aurium.branch.spigot.message;
 
-public class AdventureMessage {
+import me.aurium.branch.interfacing.Message;
+import org.bukkit.command.CommandSender;
+
+public abstract class FormattedMessage<C extends CommandSender> implements Message<C> {
+
+    //TODO private final Formatter formatter;
+
+    protected abstract void accept(C sender, String postFormatted);
+
+    @Override
+    public void accept(C sender) {
+
+    }
 }
diff --git a/spigot-impl/src/main/java/me/aurium/branch/spigot/message/SpigotMessageProvider.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/SpigotMessageMap.java
similarity index 65%
rename from spigot-impl/src/main/java/me/aurium/branch/spigot/message/SpigotMessageProvider.java
rename to spigot-impl/src/main/java/me/aurium/branch/spigot/message/SpigotMessageMap.java
index 334ebdf..bff08f2 100644
--- a/spigot-impl/src/main/java/me/aurium/branch/spigot/message/SpigotMessageProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/message/SpigotMessageMap.java
@@ -21,24 +21,32 @@
 
 package me.aurium.branch.spigot.message;
 
-import me.aurium.branch.interfacing.handlers.CommonMessageMap;
+import me.aurium.branch.interfacing.Response;
+import me.aurium.branch.interfacing.ResponseAction;
+import me.aurium.branch.interfacing.handlers.DelegatingDefaultMap;
+import me.aurium.branch.interfacing.handlers.InnerMap;
 import me.aurium.branch.interfacing.responses.FailedAdaptingResponse;
 import org.bukkit.command.CommandSender;
 
-public class SpigotMessageProvider<C extends CommandSender>{
+/**
+ * Spigot message defaults
+ * @param <C>
+ */
+public class SpigotMessageMap<C extends CommandSender> extends DelegatingDefaultMap<C> {
+
+    @Override
+    public <F extends Response> SpigotMessageMap<C> add(Class<F> key, ResponseAction<C, F> action) {
+        return (SpigotMessageMap<C>) super.add(key, action);
+    }
 
-    private final CommonMessageMap<C> map = new CommonMessageMap<>();
+    @Override
+    protected InnerMap<C> defaultMap() {
+        InnerMap<C> map = new InnerMap<>();
 
-    public SpigotMessageProvider() {
         map.add(FailedAdaptingResponse.class, response -> new TextMessage<>(
                 "Expected class: " + response.getExpectedClass().getName() + "Got class: " + response.getReceivedClass()
         ));
 
-        map.add(FailedAdaptingResponse.class, response -> new TextMessage<>());
-    }
-
-    public CommonMessageMap<C> build() {
         return map;
     }
-
 }

From 85d44191f48564a6c5f5ca2191fa45b6d58d3be6 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Mon, 26 Apr 2021 17:48:27 -0700
Subject: [PATCH 46/56] fix various build failures

---
 .../branch/annotate/marker/SingleNode.java    |  2 +-
 ...tConvertet.java => ArgumentConverter.java} |  0
 .../branch/nodes/results/ReduxInput.java      | 25 +++++++++++++++++++
 .../branch/nodes/results/SearchInput.java     |  8 ------
 4 files changed, 26 insertions(+), 9 deletions(-)
 rename core/src/main/java/me/aurium/branch/nodes/argument/{ArgumentConvertet.java => ArgumentConverter.java} (100%)
 create mode 100644 core/src/main/java/me/aurium/branch/nodes/results/ReduxInput.java

diff --git a/core/src/main/java/me/aurium/branch/annotate/marker/SingleNode.java b/core/src/main/java/me/aurium/branch/annotate/marker/SingleNode.java
index 330af04..d738c23 100644
--- a/core/src/main/java/me/aurium/branch/annotate/marker/SingleNode.java
+++ b/core/src/main/java/me/aurium/branch/annotate/marker/SingleNode.java
@@ -30,6 +30,6 @@
 @Target(ElementType.METHOD)
 public @interface SingleNode {
 
-    String identifier() default AnnotateConstants.EMPTY_IDENTIFIER_NODE;
+    String identifier();
 
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConvertet.java b/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConverter.java
similarity index 100%
rename from core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConvertet.java
rename to core/src/main/java/me/aurium/branch/nodes/argument/ArgumentConverter.java
diff --git a/core/src/main/java/me/aurium/branch/nodes/results/ReduxInput.java b/core/src/main/java/me/aurium/branch/nodes/results/ReduxInput.java
new file mode 100644
index 0000000..e84f0ba
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/nodes/results/ReduxInput.java
@@ -0,0 +1,25 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.branch.nodes.results;
+
+public class ReduxInput {
+}
diff --git a/core/src/main/java/me/aurium/branch/nodes/results/SearchInput.java b/core/src/main/java/me/aurium/branch/nodes/results/SearchInput.java
index 95dcfb9..4b7b60e 100644
--- a/core/src/main/java/me/aurium/branch/nodes/results/SearchInput.java
+++ b/core/src/main/java/me/aurium/branch/nodes/results/SearchInput.java
@@ -40,18 +40,10 @@ public SearchInput(Deque<Block> initialPath, Deque<Block> reducablePath) {
     public Deque<Block> getInitialPath() {
         return initialPath;
     }
-
     public Deque<Block> getReducablePath() {
         return reducablePath;
     }
 
-    /**
-     * TODO: remove or fix this: i'd preferably like the internal ""initial"" deque to be sealed and immutable
-     *  It would be nice to enforce immutability on reducablePath except the fact is the reducable path exists
-     *  to be immutable and edited, so maybe not? Please advise.
-     *
-     * @return new input
-     */
     public SearchInput withoutTop() {
         Deque<Block> newBase = new ArrayDeque<>(initialPath);
 

From 51b300af69e72b4aad6ce5e7de0b0946b840f1b2 Mon Sep 17 00:00:00 2001
From: "Aurium_ @SolarMC" <aukrais@gmail.com>
Date: Mon, 26 Apr 2021 17:49:21 -0700
Subject: [PATCH 47/56] Delete .idea directory

---
 .idea/.gitignore          |   3 -
 .idea/compiler.xml        |  22 -------
 .idea/encodings.xml       |   9 ---
 .idea/jarRepositories.xml |  70 ---------------------
 .idea/misc.xml            |  20 ------
 .idea/uiDesigner.xml      | 124 --------------------------------------
 .idea/vcs.xml             |   6 --
 7 files changed, 254 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/jarRepositories.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/uiDesigner.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index a904258..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="core-tests" />
-        <module name="tests" />
-        <module name="branch-core" />
-        <module name="spigot-impl" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="beetle-impl" target="11" />
-      <module name="branch-tests" target="11" />
-      <module name="core" target="11" />
-      <module name="tests" target="11" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index ad39ff7..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/core-tests/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-tests/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/spigot-impl/src/main/java" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index 253a261..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="papermc" />
-      <option name="name" value="papermc" />
-      <option name="url" value="https://papermc.io/repo/repository/maven-public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="aurium-libs-release" />
-      <option name="url" value="https://aurium.jfrog.io/artifactory/aurium-libs-release" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="solar-snapshots" />
-      <option name="name" value="solar-snapshots" />
-      <option name="url" value="https://mvn-repo.platinum-mc.com/snapshots" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="snapshots" />
-      <option name="name" value="aurium-libs-snapshot" />
-      <option name="url" value="https://aurium.jfrog.io/artifactory/aurium-libs-snapshot" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="solar-releases" />
-      <option name="name" value="solar-releases" />
-      <option name="url" value="https://mvn-repo.platinum-mc.com/releases" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="repsy" />
-      <option name="name" value="repsy" />
-      <option name="url" value="https://repo.repsy.io/mvn/elytraforce/default" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="spigot-repo" />
-      <option name="name" value="spigot-repo" />
-      <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="snapshots" />
-      <option name="name" value="snapshots" />
-      <option name="url" value="https://repo.repsy.io/mvn/elytraforce/snapshots" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="aurium" />
-      <option name="name" value="aurium" />
-      <option name="url" value="" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jfrog" />
-      <option name="name" value="a0phrw82hnl4g-artifactory-primary-0-releases" />
-      <option name="url" value="https://aurium.jfrog.io/artifactory/aurium-libs-release-local" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 99bc4db..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-    <option name="ignoredFiles">
-      <set>
-        <option value="$PROJECT_DIR$/beetle-impl/pom.xml" />
-        <option value="$PROJECT_DIR$/tests/pom.xml" />
-      </set>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="16" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

From 088ac9c7e70d4686461132cc72c4bdc9b6f98bfd Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Mon, 26 Apr 2021 17:51:38 -0700
Subject: [PATCH 48/56] remove annotation stuff (for now)

---
 .../branch/annotate/AnnotatedCommand.java     | 28 ------
 .../branch/annotate/AnnotatedParser.java      | 31 ------
 .../aurium/branch/annotate/ParserOptions.java | 31 ------
 .../branch/annotate/ParsingException.java     | 25 -----
 .../me/aurium/branch/annotate/TypeToken.java  | 36 -------
 .../UncheckedInvocationException.java         | 30 ------
 .../branch/annotate/marker/BranchCommand.java | 32 -------
 .../branch/annotate/marker/BranchingNode.java | 35 -------
 .../branch/annotate/marker/Description.java   | 28 ------
 .../branch/annotate/marker/NoArgsNode.java    | 25 -----
 .../branch/annotate/marker/SingleNode.java    | 35 -------
 .../marker/permission/Permission.java         | 34 -------
 .../marker/permission/StringPermChecker.java  | 30 ------
 .../parsers/BranchingAnnotatedParser.java     | 25 -----
 .../parsers/PermissionAnnotationParser.java   | 55 -----------
 .../parsers/SingleAnnotatedParser.java        | 95 -------------------
 16 files changed, 575 deletions(-)
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/AnnotatedCommand.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/AnnotatedParser.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/ParserOptions.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/ParsingException.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/TypeToken.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/UncheckedInvocationException.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/marker/BranchCommand.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/marker/BranchingNode.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/marker/Description.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/marker/NoArgsNode.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/marker/SingleNode.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/marker/permission/Permission.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/marker/permission/StringPermChecker.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/parsers/BranchingAnnotatedParser.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/parsers/PermissionAnnotationParser.java
 delete mode 100644 core/src/main/java/me/aurium/branch/annotate/parsers/SingleAnnotatedParser.java

diff --git a/core/src/main/java/me/aurium/branch/annotate/AnnotatedCommand.java b/core/src/main/java/me/aurium/branch/annotate/AnnotatedCommand.java
deleted file mode 100644
index 193a72c..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/AnnotatedCommand.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate;
-
-/**
- * Marker interface for annotated commands:
- */
-public interface AnnotatedCommand {
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/AnnotatedParser.java b/core/src/main/java/me/aurium/branch/annotate/AnnotatedParser.java
deleted file mode 100644
index 424587d..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/AnnotatedParser.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate;
-
-import me.aurium.branch.nodes.model.CommandNode;
-
-public interface AnnotatedParser<T> {
-
-    CommandNode<T> parse(Class<AnnotatedCommand> command);
-    CommandNode<T> parser(Class<AnnotatedCommand> command, ParserOptions options);
-
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/ParserOptions.java b/core/src/main/java/me/aurium/branch/annotate/ParserOptions.java
deleted file mode 100644
index da8a0be..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/ParserOptions.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate;
-
-/**
- * This exists solely so we can register new Arguments
- */
-public interface ParserOptions {
-
-    void registerArgument(String aaaaaaa);
-
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/ParsingException.java b/core/src/main/java/me/aurium/branch/annotate/ParsingException.java
deleted file mode 100644
index b4f5c4a..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/ParsingException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate;
-
-public class ParsingException {
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/TypeToken.java b/core/src/main/java/me/aurium/branch/annotate/TypeToken.java
deleted file mode 100644
index 278c6d6..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/TypeToken.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate;
-
-public class TypeToken<T> {
-
-    private final Class<T> type;
-
-    public <X> TypeToken(Class<T> type) {
-        this.type = type;
-    }
-    public Class<T> getType() {
-        return type;
-    }
-
-
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/UncheckedInvocationException.java b/core/src/main/java/me/aurium/branch/annotate/UncheckedInvocationException.java
deleted file mode 100644
index 90bf321..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/UncheckedInvocationException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate;
-
-public class UncheckedInvocationException extends RuntimeException{
-
-    public UncheckedInvocationException(Throwable throwable) {
-        super(throwable);
-    }
-
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/marker/BranchCommand.java b/core/src/main/java/me/aurium/branch/annotate/marker/BranchCommand.java
deleted file mode 100644
index b2cd6ae..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/marker/BranchCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate.marker;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE) //TOOD fix this
-public @interface BranchCommand {
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/marker/BranchingNode.java b/core/src/main/java/me/aurium/branch/annotate/marker/BranchingNode.java
deleted file mode 100644
index 1dcfc68..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/marker/BranchingNode.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate.marker;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE) //refer to dazzleconf for interesting ideas
-public @interface BranchingNode {
-
-    String identifier();
-
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/marker/Description.java b/core/src/main/java/me/aurium/branch/annotate/marker/Description.java
deleted file mode 100644
index 576172b..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/marker/Description.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate.marker;
-
-public @interface Description {
-
-    String getDescriptionContent();
-
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/marker/NoArgsNode.java b/core/src/main/java/me/aurium/branch/annotate/marker/NoArgsNode.java
deleted file mode 100644
index 7e6dfce..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/marker/NoArgsNode.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate.marker;
-
-public @interface NoArgsNode {
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/marker/SingleNode.java b/core/src/main/java/me/aurium/branch/annotate/marker/SingleNode.java
deleted file mode 100644
index d738c23..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/marker/SingleNode.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate.marker;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface SingleNode {
-
-    String identifier();
-
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/marker/permission/Permission.java b/core/src/main/java/me/aurium/branch/annotate/marker/permission/Permission.java
deleted file mode 100644
index e63e8e6..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/marker/permission/Permission.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate.marker.permission;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD,ElementType.CONSTRUCTOR})
-public @interface Permission {
-
-    Class<? extends StringPermChecker> getRelativeChecker();
-
-    String permission();
-
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/marker/permission/StringPermChecker.java b/core/src/main/java/me/aurium/branch/annotate/marker/permission/StringPermChecker.java
deleted file mode 100644
index 01425d1..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/marker/permission/StringPermChecker.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate.marker.permission;
-
-import me.aurium.branch.fallback.permissions.StringPermission;
-
-public interface StringPermChecker {
-
-    StringPermission<?> get(String identifierToMakeWith);
-
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/parsers/BranchingAnnotatedParser.java b/core/src/main/java/me/aurium/branch/annotate/parsers/BranchingAnnotatedParser.java
deleted file mode 100644
index a92103a..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/parsers/BranchingAnnotatedParser.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate.parsers;
-
-public class BranchingAnnotatedParser {
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/parsers/PermissionAnnotationParser.java b/core/src/main/java/me/aurium/branch/annotate/parsers/PermissionAnnotationParser.java
deleted file mode 100644
index 7d89a67..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/parsers/PermissionAnnotationParser.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate.parsers;
-
-import me.aurium.branch.annotate.marker.permission.Permission;
-import me.aurium.branch.fallback.permissions.StringPermission;
-
-import java.lang.annotation.Annotation;
-
-//TODO fix all of this bullshit - we need checks - this class only exists to tell me what i need to do in the future.
-public class PermissionAnnotationParser<T> {
-
-
-    me.aurium.branch.fallback.permissions.Permission<T> parse(Annotation annotate) throws IllegalAccessException, InstantiationException {
-
-        if (!annotate.annotationType().equals(Permission.class)) throw new PermissionParsingException("Annotation must be of type Permission");
-
-        Permission permission = (Permission) annotate;
-
-        //TODO checks
-
-        //TODO fix this shit
-        StringPermission<?> perm = permission.getRelativeChecker().newInstance().get(permission.permission());
-
-
-        return (me.aurium.branch.fallback.permissions.Permission<T>) perm;
-    }
-
-    public static class PermissionParsingException extends RuntimeException {
-        public PermissionParsingException(String lol ) {
-            super(lol);
-        }
-    }
-
-
-}
diff --git a/core/src/main/java/me/aurium/branch/annotate/parsers/SingleAnnotatedParser.java b/core/src/main/java/me/aurium/branch/annotate/parsers/SingleAnnotatedParser.java
deleted file mode 100644
index cb6b8f4..0000000
--- a/core/src/main/java/me/aurium/branch/annotate/parsers/SingleAnnotatedParser.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.annotate.parsers;
-
-import me.aurium.branch.annotate.AnnotatedCommand;
-import me.aurium.branch.annotate.UncheckedInvocationException;
-import me.aurium.branch.annotate.marker.SingleNode;
-import me.aurium.branch.execution.NodeContext;
-import me.aurium.branch.execution.api.ExecutionHandler;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.lang.reflect.ParameterizedType;
-import java.util.ArrayList;
-import java.util.List;
-
-//TODO one of these days refactor, but right now i really don't care.
-public class SingleAnnotatedParser<T> {
-
-    private final Class<T> senderClass;
-
-    public SingleAnnotatedParser(Class<T> senderClass) {
-        this.senderClass = senderClass;
-    }
-
-    public List<me.aurium.branch.nodes.SingleNode<T>> parse(Class<? extends AnnotatedCommand> command) {
-
-        List<me.aurium.branch.nodes.SingleNode<T>> nodes = new ArrayList<>();
-
-        for (Method method : command.getMethods()) {
-            if (method.isAnnotationPresent(SingleNode.class)) {
-                //This method is a SingleNode, verify the argument signature of the command
-                SingleNode annotate = method.getAnnotation(SingleNode.class);
-                Parameter[] parameters = method.getParameters();
-
-                if (!method.getReturnType().equals(Void.TYPE)) throw new SingleNodeParsingException("Annotation return must be void");
-                if (parameters.length != 1 || !parameters[0].getType().isAssignableFrom(NodeContext.class)) throw new SingleNodeParsingException("Method signature length must be one argument!");
-
-                if (parameters[0].getParameterizedType() instanceof ParameterizedType) {
-
-                }
-
-
-                //all of this is really really stupid lmfao we should be working with an instance of the class
-
-                if (parameters[0].getType().isAssignableFrom(NodeContext.class)) {
-
-
-                    ExecutionHandler<T> handler = (context) -> {
-                        try {
-                            method.invoke(command,context);
-                        } catch (IllegalAccessException | InvocationTargetException e) {
-                            throw new UncheckedInvocationException(e);
-                        }
-
-                    };
-
-                } else {
-                    throw new SingleNodeParsingException("The method signature of a single-node must only contain a single NodeContext!");
-                }
-            }
-        }
-
-        return null;
-    }
-
-    public static class SingleNodeParsingException extends RuntimeException {
-
-        SingleNodeParsingException(String error) {
-            super(error);
-        }
-    }
-
-
-}

From cf61edc5dd3ce1cfe99af3166ee267dfea17bd96 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Mon, 26 Apr 2021 17:58:27 -0700
Subject: [PATCH 49/56] fix further pr issues

---
 .../me/aurium/branch/execution/EmptySuggestionHandler.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/me/aurium/branch/execution/EmptySuggestionHandler.java b/core/src/main/java/me/aurium/branch/execution/EmptySuggestionHandler.java
index be22d9b..f819a89 100644
--- a/core/src/main/java/me/aurium/branch/execution/EmptySuggestionHandler.java
+++ b/core/src/main/java/me/aurium/branch/execution/EmptySuggestionHandler.java
@@ -28,10 +28,10 @@
 
 public class EmptySuggestionHandler<T> implements SuggestionHandler<T> {
 
-    private final List<String> emptyList = new ArrayList<>();
+    private static final List<Block> empty = new ArrayList<>();
 
     @Override
     public List<Block> handle(NodeContext<T> adapter) {
-        return List.of();
+        return empty;
     }
 }

From 10ca0bac00a594c48d281b040eca083e541b73b1 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Wed, 28 Apr 2021 00:39:17 -0700
Subject: [PATCH 50/56] there is no such thing as an EmptyBlock

---
 .../centralized/base/AdaptingNodeBase.java    |   2 +-
 .../centralized/base/NodeBaseBuilder.java     |   2 +-
 .../branch/execution/AbstractNodeContext.java |   2 +-
 .../me/aurium/branch/execution/Block.java     |   2 +-
 .../branch/execution/ContextProvider.java     |   2 +-
 .../aurium/branch/execution/NodeContext.java  |   2 +-
 .../aurium/branch/execution/StringBlock.java  |   4 +-
 .../fallback/permissions/EmptyPermission.java |   2 +-
 .../strategies/FallbackSearchStrategy.java    |   2 +-
 .../fallback/strategies/OneBackStrategy.java  |   2 +-
 .../strategies/PermissionLockoutStrategy.java |   2 +-
 .../branch/nodes/{builders => }/Builder.java  |   9 +-
 .../branch/nodes/{model => }/CommandNode.java |   2 +-
 .../nodes/{model => }/IdentifiableNode.java   |   2 +-
 .../me/aurium/branch/nodes/ProxyNode.java     |   7 +
 .../nodes/{model => }/ResponseHandler.java    |   2 +-
 .../me/aurium/branch/nodes/ValueContext.java  |  28 ----
 .../nodes/{ => argument}/ArgumentNode.java    |   2 +-
 .../nodes/{ => branching}/BranchingNode.java  |  19 ++-
 .../branching/ExclusiveBranchingBuilder.java  |  69 +++++++++
 .../branching/ExclusivePrestoredSet.java      |  27 ++++
 .../branching/InclusiveBranchingBuilder.java  |  91 ++++++++++++
 .../branching/InclusivePrestoredSet.java      |  31 ++++
 .../branch/nodes/branching/PrestoredSet.java  |  13 ++
 .../branch/nodes/builders/AloneBuilder.java   |  29 ----
 .../nodes/builders/BranchingBuilder.java      | 134 ------------------
 .../branch/nodes/model/EndpointNode.java      |  30 ----
 .../branch/nodes/results/SearchInfo.java      |   2 +-
 .../single/EndpointNode.java}                 |  24 ++--
 .../branch/nodes/{ => single}/HelpNode.java   |  23 ++-
 .../{builders => single}/SingleBuilder.java   |  19 +--
 .../branch/nodes/{ => single}/SingleNode.java |  12 +-
 .../branch/utility/PreStoredHashSet.java      |  81 -----------
 .../aurium/branch/spigot/SpigotContext.java   |   2 +-
 .../branch/spigot/SpigotContextProvider.java  |   2 +-
 35 files changed, 306 insertions(+), 378 deletions(-)
 rename core/src/main/java/me/aurium/branch/nodes/{builders => }/Builder.java (75%)
 rename core/src/main/java/me/aurium/branch/nodes/{model => }/CommandNode.java (97%)
 rename core/src/main/java/me/aurium/branch/nodes/{model => }/IdentifiableNode.java (96%)
 create mode 100644 core/src/main/java/me/aurium/branch/nodes/ProxyNode.java
 rename core/src/main/java/me/aurium/branch/nodes/{model => }/ResponseHandler.java (95%)
 delete mode 100644 core/src/main/java/me/aurium/branch/nodes/ValueContext.java
 rename core/src/main/java/me/aurium/branch/nodes/{ => argument}/ArgumentNode.java (98%)
 rename core/src/main/java/me/aurium/branch/nodes/{ => branching}/BranchingNode.java (81%)
 create mode 100644 core/src/main/java/me/aurium/branch/nodes/branching/ExclusiveBranchingBuilder.java
 create mode 100644 core/src/main/java/me/aurium/branch/nodes/branching/ExclusivePrestoredSet.java
 create mode 100644 core/src/main/java/me/aurium/branch/nodes/branching/InclusiveBranchingBuilder.java
 create mode 100644 core/src/main/java/me/aurium/branch/nodes/branching/InclusivePrestoredSet.java
 create mode 100644 core/src/main/java/me/aurium/branch/nodes/branching/PrestoredSet.java
 delete mode 100644 core/src/main/java/me/aurium/branch/nodes/builders/AloneBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/branch/nodes/builders/BranchingBuilder.java
 delete mode 100644 core/src/main/java/me/aurium/branch/nodes/model/EndpointNode.java
 rename core/src/main/java/me/aurium/branch/{execution/EmptyBlock.java => nodes/single/EndpointNode.java} (63%)
 rename core/src/main/java/me/aurium/branch/nodes/{ => single}/HelpNode.java (61%)
 rename core/src/main/java/me/aurium/branch/nodes/{builders => single}/SingleBuilder.java (79%)
 rename core/src/main/java/me/aurium/branch/nodes/{ => single}/SingleNode.java (89%)
 delete mode 100644 core/src/main/java/me/aurium/branch/utility/PreStoredHashSet.java

diff --git a/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java b/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
index 058fcc2..e29aeca 100644
--- a/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
+++ b/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
@@ -27,7 +27,7 @@
 import me.aurium.branch.execution.NodeContext;
 import me.aurium.branch.fallback.strategies.FallbackSearchStrategy;
 import me.aurium.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.nodes.results.SearchInfo;
 import me.aurium.branch.nodes.results.model.Result;
 
diff --git a/core/src/main/java/me/aurium/branch/centralized/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/branch/centralized/base/NodeBaseBuilder.java
index 10100a8..e970f3c 100644
--- a/core/src/main/java/me/aurium/branch/centralized/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/branch/centralized/base/NodeBaseBuilder.java
@@ -26,7 +26,7 @@
 import me.aurium.branch.execution.ContextProvider;
 import me.aurium.branch.fallback.strategies.FallbackSearchStrategy;
 import me.aurium.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.CommandNode;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/me/aurium/branch/execution/AbstractNodeContext.java b/core/src/main/java/me/aurium/branch/execution/AbstractNodeContext.java
index 8da9652..71bc2a6 100644
--- a/core/src/main/java/me/aurium/branch/execution/AbstractNodeContext.java
+++ b/core/src/main/java/me/aurium/branch/execution/AbstractNodeContext.java
@@ -22,7 +22,7 @@
 package me.aurium.branch.execution;
 
 
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.nodes.results.SearchInfo;
 
 /**
diff --git a/core/src/main/java/me/aurium/branch/execution/Block.java b/core/src/main/java/me/aurium/branch/execution/Block.java
index af22b32..b8048c1 100644
--- a/core/src/main/java/me/aurium/branch/execution/Block.java
+++ b/core/src/main/java/me/aurium/branch/execution/Block.java
@@ -29,6 +29,6 @@ public interface Block {
     String getIdentifier();
 
     boolean equals(Object object);
-    boolean isEmpty();
+    boolean isVisual();
 
 }
diff --git a/core/src/main/java/me/aurium/branch/execution/ContextProvider.java b/core/src/main/java/me/aurium/branch/execution/ContextProvider.java
index 2bacdf6..4c6056d 100644
--- a/core/src/main/java/me/aurium/branch/execution/ContextProvider.java
+++ b/core/src/main/java/me/aurium/branch/execution/ContextProvider.java
@@ -21,7 +21,7 @@
 
 package me.aurium.branch.execution;
 
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.nodes.results.SearchInfo;
 
 /**
diff --git a/core/src/main/java/me/aurium/branch/execution/NodeContext.java b/core/src/main/java/me/aurium/branch/execution/NodeContext.java
index f4ee8c7..467e7df 100644
--- a/core/src/main/java/me/aurium/branch/execution/NodeContext.java
+++ b/core/src/main/java/me/aurium/branch/execution/NodeContext.java
@@ -22,7 +22,7 @@
 package me.aurium.branch.execution;
 
 import me.aurium.branch.interfacing.Response;
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.nodes.results.SearchInfo;
 
 
diff --git a/core/src/main/java/me/aurium/branch/execution/StringBlock.java b/core/src/main/java/me/aurium/branch/execution/StringBlock.java
index 2f9b36b..6bcb746 100644
--- a/core/src/main/java/me/aurium/branch/execution/StringBlock.java
+++ b/core/src/main/java/me/aurium/branch/execution/StringBlock.java
@@ -52,8 +52,8 @@ public boolean equals(Object o) {
     }
 
     @Override
-    public boolean isEmpty() {
-        return false;
+    public boolean isVisual() {
+        return true;
     }
 
     @Override
diff --git a/core/src/main/java/me/aurium/branch/fallback/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/branch/fallback/permissions/EmptyPermission.java
index ef42a1c..7e0752c 100644
--- a/core/src/main/java/me/aurium/branch/fallback/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/branch/fallback/permissions/EmptyPermission.java
@@ -34,6 +34,6 @@ public boolean attempt(T sender, String alias, String[] args) {
 
     @Override
     public String easyName() {
-        return "none"; //TODO perhaps throw? This shouldn't happen.
+        return "none";
     }
 }
diff --git a/core/src/main/java/me/aurium/branch/fallback/strategies/FallbackSearchStrategy.java b/core/src/main/java/me/aurium/branch/fallback/strategies/FallbackSearchStrategy.java
index 4dc5d56..53898d0 100644
--- a/core/src/main/java/me/aurium/branch/fallback/strategies/FallbackSearchStrategy.java
+++ b/core/src/main/java/me/aurium/branch/fallback/strategies/FallbackSearchStrategy.java
@@ -21,7 +21,7 @@
 
 package me.aurium.branch.fallback.strategies;
 
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.nodes.results.SearchInfo;
 import me.aurium.branch.nodes.results.model.Result;
 
diff --git a/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java b/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
index 5492bc8..c2f8e2e 100644
--- a/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
+++ b/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
@@ -22,7 +22,7 @@
 package me.aurium.branch.fallback.strategies;
 
 import me.aurium.branch.interfacing.responses.NoPermissionResponse;
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.nodes.results.SearchInput;
 import me.aurium.branch.nodes.results.SearchInfo;
 import me.aurium.branch.nodes.results.model.Result;
diff --git a/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java b/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
index 7511667..ae43c49 100644
--- a/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
+++ b/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
@@ -22,7 +22,7 @@
 package me.aurium.branch.fallback.strategies;
 
 import me.aurium.branch.interfacing.responses.NoPermissionResponse;
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.nodes.results.SearchInfo;
 import me.aurium.branch.nodes.results.SearchInput;
 import me.aurium.branch.nodes.results.model.Result;
diff --git a/core/src/main/java/me/aurium/branch/nodes/builders/Builder.java b/core/src/main/java/me/aurium/branch/nodes/Builder.java
similarity index 75%
rename from core/src/main/java/me/aurium/branch/nodes/builders/Builder.java
rename to core/src/main/java/me/aurium/branch/nodes/Builder.java
index c67e454..92f4a21 100644
--- a/core/src/main/java/me/aurium/branch/nodes/builders/Builder.java
+++ b/core/src/main/java/me/aurium/branch/nodes/Builder.java
@@ -19,14 +19,11 @@
  *
  */
 
-package me.aurium.branch.nodes.builders;
+package me.aurium.branch.nodes;
 
-import me.aurium.branch.nodes.model.CommandNode;
-import me.aurium.branch.nodes.model.IdentifiableNode;
 
-public interface Builder<C>{
+public interface Builder<T>{
 
-    IdentifiableNode<C> build();
-    CommandNode<C> buildWithoutIdentifier();
+    CommandNode<T> build();
 
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/model/CommandNode.java b/core/src/main/java/me/aurium/branch/nodes/CommandNode.java
similarity index 97%
rename from core/src/main/java/me/aurium/branch/nodes/model/CommandNode.java
rename to core/src/main/java/me/aurium/branch/nodes/CommandNode.java
index 3f1bb40..1677fde 100644
--- a/core/src/main/java/me/aurium/branch/nodes/model/CommandNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/CommandNode.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.branch.nodes.model;
+package me.aurium.branch.nodes;
 
 import me.aurium.branch.execution.api.BranchHandler;
 import me.aurium.branch.nodes.results.SearchInput;
diff --git a/core/src/main/java/me/aurium/branch/nodes/model/IdentifiableNode.java b/core/src/main/java/me/aurium/branch/nodes/IdentifiableNode.java
similarity index 96%
rename from core/src/main/java/me/aurium/branch/nodes/model/IdentifiableNode.java
rename to core/src/main/java/me/aurium/branch/nodes/IdentifiableNode.java
index f9280bc..08b1798 100644
--- a/core/src/main/java/me/aurium/branch/nodes/model/IdentifiableNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/IdentifiableNode.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.branch.nodes.model;
+package me.aurium.branch.nodes;
 
 import me.aurium.branch.execution.Block;
 
diff --git a/core/src/main/java/me/aurium/branch/nodes/ProxyNode.java b/core/src/main/java/me/aurium/branch/nodes/ProxyNode.java
new file mode 100644
index 0000000..565307d
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/nodes/ProxyNode.java
@@ -0,0 +1,7 @@
+package me.aurium.branch.nodes;
+
+/**
+ * Represents a node that can dynamically convert a specified ProxyInterface into arguments
+ */
+public class ProxyNode {
+}
diff --git a/core/src/main/java/me/aurium/branch/nodes/model/ResponseHandler.java b/core/src/main/java/me/aurium/branch/nodes/ResponseHandler.java
similarity index 95%
rename from core/src/main/java/me/aurium/branch/nodes/model/ResponseHandler.java
rename to core/src/main/java/me/aurium/branch/nodes/ResponseHandler.java
index 42deea8..561b9f7 100644
--- a/core/src/main/java/me/aurium/branch/nodes/model/ResponseHandler.java
+++ b/core/src/main/java/me/aurium/branch/nodes/ResponseHandler.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.branch.nodes.model;
+package me.aurium.branch.nodes;
 
 public class ResponseHandler {
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/ValueContext.java b/core/src/main/java/me/aurium/branch/nodes/ValueContext.java
deleted file mode 100644
index b5ae18c..0000000
--- a/core/src/main/java/me/aurium/branch/nodes/ValueContext.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.nodes;
-
-/**
- * MORE FUCKING WRAPPERS
- */
-public class ValueContext {
-}
diff --git a/core/src/main/java/me/aurium/branch/nodes/ArgumentNode.java b/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentNode.java
similarity index 98%
rename from core/src/main/java/me/aurium/branch/nodes/ArgumentNode.java
rename to core/src/main/java/me/aurium/branch/nodes/argument/ArgumentNode.java
index a623a7a..290b736 100644
--- a/core/src/main/java/me/aurium/branch/nodes/ArgumentNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/argument/ArgumentNode.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.branch.nodes;
+package me.aurium.branch.nodes.argument;
 
 //kinda like a branching node except it throws forward and not to the sides
 
diff --git a/core/src/main/java/me/aurium/branch/nodes/BranchingNode.java b/core/src/main/java/me/aurium/branch/nodes/branching/BranchingNode.java
similarity index 81%
rename from core/src/main/java/me/aurium/branch/nodes/BranchingNode.java
rename to core/src/main/java/me/aurium/branch/nodes/branching/BranchingNode.java
index 782a174..c814b18 100644
--- a/core/src/main/java/me/aurium/branch/nodes/BranchingNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/branching/BranchingNode.java
@@ -19,17 +19,16 @@
  *
  */
 
-package me.aurium.branch.nodes;
+package me.aurium.branch.nodes.branching;
 
 import me.aurium.branch.execution.Block;
 import me.aurium.branch.execution.api.BranchHandler;
 import me.aurium.branch.execution.api.Execution;
 import me.aurium.branch.execution.NodeContext;
 import me.aurium.branch.interfacing.responses.NoIntegratedArgsResponse;
-import me.aurium.branch.nodes.model.IdentifiableNode;
+import me.aurium.branch.nodes.IdentifiableNode;
 import me.aurium.branch.fallback.permissions.Permission;
 import me.aurium.branch.nodes.results.model.Result;
-import me.aurium.branch.utility.PreStoredHashSet;
 import me.aurium.branch.nodes.results.SearchInfo;
 import me.aurium.branch.nodes.results.SearchInput;
 
@@ -37,21 +36,19 @@
 import java.util.stream.Collectors;
 
 /**
- * TODO: missing a Node for noargs will cause it to rely on fallback rather than throwning exceptions and being bad (DONE - ish)
- *
  * Nodes should always assume that the first block in the blockpath is theirs to consume
  *
  * @param <T>
  */
 public class BranchingNode<T> implements IdentifiableNode<T> {
 
-    private final PreStoredHashSet<IdentifiableNode<T>> nodes;
+    private final PrestoredSet<T> nodes;
     private final Block path;
     private final BranchHandler<T> handler;
 
     private final Permission<T> permission;
 
-    public BranchingNode(PreStoredHashSet<IdentifiableNode<T>> nodes, Block path, Permission<T> permission) {
+    public BranchingNode(PrestoredSet<T> nodes, Block path, Permission<T> permission) {
         this.nodes = nodes;
         this.path = path;
         this.permission = permission;
@@ -97,19 +94,19 @@ public Permission<T> getPermission() {
 
     public static final class BranchingHandler<T> implements BranchHandler<T> {
 
-        private final PreStoredHashSet<IdentifiableNode<T>> nodeShit;
+        private final PrestoredSet<T> nodeShit;
 
-        public BranchingHandler(PreStoredHashSet<IdentifiableNode<T>> nodeShit) {
+        public BranchingHandler(PrestoredSet<T> nodeShit) {
             this.nodeShit = nodeShit;
         }
 
 
         @Override
         public Result<Execution<T>> getExecution(NodeContext<T> context) {
-            if (nodeShit.getAlreadyStored() == null) {
+            if (nodeShit.getSideNode() == null) {
                 return Result.fail(NoIntegratedArgsResponse.of(context));
             } else {
-                return nodeShit.getAlreadyStored().getHandling().getExecution(context);
+                return nodeShit.getSideNode().getHandling().getExecution(context);
             }
         }
 
diff --git a/core/src/main/java/me/aurium/branch/nodes/branching/ExclusiveBranchingBuilder.java b/core/src/main/java/me/aurium/branch/nodes/branching/ExclusiveBranchingBuilder.java
new file mode 100644
index 0000000..f7393eb
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/nodes/branching/ExclusiveBranchingBuilder.java
@@ -0,0 +1,69 @@
+package me.aurium.branch.nodes.branching;
+
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.execution.StringBlock;
+import me.aurium.branch.fallback.permissions.EmptyPermission;
+import me.aurium.branch.fallback.permissions.Permission;
+import me.aurium.branch.nodes.single.HelpNode;
+import me.aurium.branch.nodes.Builder;
+import me.aurium.branch.nodes.CommandNode;
+import me.aurium.branch.nodes.IdentifiableNode;
+
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+public class ExclusiveBranchingBuilder<T> implements Builder<T> {
+
+    private final Set<IdentifiableNode<T>> commands;
+
+    private Block block;
+    private CommandNode<T> noArgs;
+    private Permission<T> permission;
+
+    public ExclusiveBranchingBuilder() {
+        this.commands = new HashSet<>();
+        this.permission = new EmptyPermission<>();
+        this.noArgs = new HelpNode<>();
+    }
+
+    public ExclusiveBranchingBuilder<T> withIdentifier(Block block) {
+        this.block = block;
+
+        return this;
+    }
+
+    public ExclusiveBranchingBuilder<T> withIdentifier(String string) {
+        this.block = StringBlock.of(string);
+
+        return this;
+    }
+
+    public ExclusiveBranchingBuilder<T> withPermission(Permission<T> permission) {
+        this.permission = permission;
+
+        return this;
+    }
+
+    public ExclusiveBranchingBuilder<T> withNode(IdentifiableNode<T> node) {
+        commands.add(node);
+
+        return this;
+    }
+
+    public ExclusiveBranchingBuilder<T> withNoArgs(CommandNode<T> node) {
+        this.noArgs = node;
+
+        return this;
+    }
+
+    public CommandNode<T> build() {
+
+        Objects.requireNonNull(block);
+        Objects.requireNonNull(permission);
+        Objects.requireNonNull(noArgs);
+
+        return new BranchingNode<>(new ExclusivePrestoredSet<>(noArgs,commands),block,permission);
+    }
+
+}
diff --git a/core/src/main/java/me/aurium/branch/nodes/branching/ExclusivePrestoredSet.java b/core/src/main/java/me/aurium/branch/nodes/branching/ExclusivePrestoredSet.java
new file mode 100644
index 0000000..89ac489
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/nodes/branching/ExclusivePrestoredSet.java
@@ -0,0 +1,27 @@
+package me.aurium.branch.nodes.branching;
+
+import me.aurium.branch.nodes.CommandNode;
+import me.aurium.branch.nodes.IdentifiableNode;
+
+import java.util.Set;
+
+public class ExclusivePrestoredSet<T> implements PrestoredSet<T> {
+
+    private final CommandNode<T> commandNode;
+    private final Set<IdentifiableNode<T>> otherNodes;
+
+    public ExclusivePrestoredSet(CommandNode<T> commandNode, Set<IdentifiableNode<T>> otherNodes) {
+        this.commandNode = commandNode;
+        this.otherNodes = otherNodes;
+    }
+
+    @Override
+    public Set<IdentifiableNode<T>> getContents() {
+        return otherNodes;
+    }
+
+    @Override
+    public CommandNode<T> getSideNode() {
+        return commandNode;
+    }
+}
diff --git a/core/src/main/java/me/aurium/branch/nodes/branching/InclusiveBranchingBuilder.java b/core/src/main/java/me/aurium/branch/nodes/branching/InclusiveBranchingBuilder.java
new file mode 100644
index 0000000..18140bd
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/nodes/branching/InclusiveBranchingBuilder.java
@@ -0,0 +1,91 @@
+/*
+ *
+ *  Branch
+ *  Copyright © 2021 Aurium
+ *
+ *  Branch is free software: you can redistribute it and/or modify
+ *  It under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  Branch is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with Branch. If not, see <https://www.gnu.org/licenses/>
+ *  and navigate to version 3 of the GNU Affero General Public License.
+ *
+ */
+
+package me.aurium.branch.nodes.branching;
+
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.execution.StringBlock;
+import me.aurium.branch.fallback.permissions.Permission;
+import me.aurium.branch.fallback.permissions.EmptyPermission;
+import me.aurium.branch.nodes.single.EndpointNode;
+import me.aurium.branch.nodes.single.HelpNode;
+import me.aurium.branch.nodes.Builder;
+import me.aurium.branch.nodes.CommandNode;
+import me.aurium.branch.nodes.IdentifiableNode;
+
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+public class InclusiveBranchingBuilder<T> implements Builder<T> {
+
+    private final Set<IdentifiableNode<T>> commands;
+
+    private Block block;
+    private EndpointNode<T> noArgs;
+    private Permission<T> permission;
+
+    public InclusiveBranchingBuilder() {
+        this.commands = new HashSet<>();
+        this.permission = new EmptyPermission<>();
+        this.noArgs = new HelpNode<>();
+    }
+
+    public InclusiveBranchingBuilder<T> withIdentifier(Block block) {
+        this.block = block;
+
+        return this;
+    }
+
+    public InclusiveBranchingBuilder<T> withIdentifier(String string) {
+        this.block = StringBlock.of(string);
+
+        return this;
+    }
+
+    public InclusiveBranchingBuilder<T> withPermission(Permission<T> permission) {
+        this.permission = permission;
+
+        return this;
+    }
+
+    public InclusiveBranchingBuilder<T> withNode(IdentifiableNode<T> node) {
+        commands.add(node);
+
+        return this;
+    }
+
+    public InclusiveBranchingBuilder<T> withNoArgs(EndpointNode<T> node) {
+        this.noArgs = node;
+
+        return this;
+    }
+
+    public CommandNode<T> build() {
+
+        Objects.requireNonNull(block);
+        Objects.requireNonNull(permission);
+        Objects.requireNonNull(noArgs);
+
+        return new BranchingNode<>(new InclusivePrestoredSet<>(noArgs,commands),block,permission);
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/branch/nodes/branching/InclusivePrestoredSet.java b/core/src/main/java/me/aurium/branch/nodes/branching/InclusivePrestoredSet.java
new file mode 100644
index 0000000..cadde13
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/nodes/branching/InclusivePrestoredSet.java
@@ -0,0 +1,31 @@
+package me.aurium.branch.nodes.branching;
+
+import me.aurium.branch.nodes.IdentifiableNode;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class InclusivePrestoredSet<T> implements PrestoredSet<T> {
+
+    private final IdentifiableNode<T> alreadyStored;
+    private final Set<IdentifiableNode<T>> otherThingsInTheSet;
+
+    public InclusivePrestoredSet(IdentifiableNode<T> alreadyStored, Set<IdentifiableNode<T>> otherThingsInTheSet) {
+        this.alreadyStored = alreadyStored;
+        this.otherThingsInTheSet = otherThingsInTheSet;
+    }
+
+    @Override
+    public Set<IdentifiableNode<T>> getContents() {
+        Set<IdentifiableNode<T>> pas = new HashSet<>(otherThingsInTheSet);
+
+        pas.add(alreadyStored);
+
+        return Set.copyOf(pas);
+    }
+
+    @Override
+    public IdentifiableNode<T> getSideNode() {
+        return alreadyStored;
+    }
+}
diff --git a/core/src/main/java/me/aurium/branch/nodes/branching/PrestoredSet.java b/core/src/main/java/me/aurium/branch/nodes/branching/PrestoredSet.java
new file mode 100644
index 0000000..bc164f2
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/nodes/branching/PrestoredSet.java
@@ -0,0 +1,13 @@
+package me.aurium.branch.nodes.branching;
+
+import me.aurium.branch.nodes.CommandNode;
+import me.aurium.branch.nodes.IdentifiableNode;
+
+import java.util.Set;
+
+public interface PrestoredSet<T> {
+
+    Set<IdentifiableNode<T>> getContents();
+    CommandNode<T> getSideNode();
+
+}
diff --git a/core/src/main/java/me/aurium/branch/nodes/builders/AloneBuilder.java b/core/src/main/java/me/aurium/branch/nodes/builders/AloneBuilder.java
deleted file mode 100644
index 686beaf..0000000
--- a/core/src/main/java/me/aurium/branch/nodes/builders/AloneBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.nodes.builders;
-
-/**
- * yet another marker interface
- * @param <C>
- */
-public interface AloneBuilder<C> extends Builder<C> {
-}
diff --git a/core/src/main/java/me/aurium/branch/nodes/builders/BranchingBuilder.java b/core/src/main/java/me/aurium/branch/nodes/builders/BranchingBuilder.java
deleted file mode 100644
index 6bdd1f9..0000000
--- a/core/src/main/java/me/aurium/branch/nodes/builders/BranchingBuilder.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.nodes.builders;
-
-import me.aurium.branch.execution.Block;
-import me.aurium.branch.execution.EmptyBlock;
-import me.aurium.branch.execution.StringBlock;
-import me.aurium.branch.fallback.permissions.Permission;
-import me.aurium.branch.fallback.permissions.EmptyPermission;
-import me.aurium.branch.nodes.BranchingNode;
-import me.aurium.branch.nodes.model.CommandNode;
-import me.aurium.branch.nodes.model.IdentifiableNode;
-import me.aurium.branch.utility.PreStoredHashSet;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Consumer;
-
-public class BranchingBuilder<T> implements Builder<T> {
-
-    private final Set<IdentifiableNode<T>> commands;
-
-    private Block block;
-    private IdentifiableNode<T> noArgs;
-
-    private boolean linked;
-
-    private Permission<T> permission;
-
-    public BranchingBuilder() {
-        this.commands = new HashSet<>();
-
-/*        this.noArgs = new SingleNode<>(new EmptyBlock(), messageProvider::handleDefaultBranching, new EmptyPermission<>());*/
-        this.linked = false;
-
-        this.permission = new EmptyPermission<>();
-    }
-
-    public void withIdentifier(Block block) {
-        this.block = block;
-    }
-
-    public void withIdentifier(String string) {
-        this.block = StringBlock.of(string);
-    }
-
-    public void withPermission(Permission<T> permission) {
-        this.permission = permission;
-    }
-
-    public BranchingBuilder<T> addNode(IdentifiableNode<T> node) {
-        commands.add(node);
-
-        return this;
-    }
-
-    public <C extends Builder<T>> void withNode(C key, Consumer<C> consumer) {
-        consumer.accept(key);
-
-        commands.add(key.build());
-    }
-
-    public <C extends SingleBuilder<T>> void withNoArgs(C key, boolean linked, Consumer<C> consumer) {
-        consumer.accept(key);
-
-        this.noArgs = key.build();
-        this.linked = linked;
-    }
-
-
-    @Override
-    public BranchingNode<T> build() {
-
-        Objects.requireNonNull(block);
-
-        PreStoredHashSet<IdentifiableNode<T>> set;
-
-
-
-        if (noArgs == null) {
-            if (linked) {
-                throw new IllegalStateException("Attempted link without no-arguments handler!");
-            } else {
-                set = new PreStoredHashSet<>(commands,false);
-            }
-        } else {
-            set = new PreStoredHashSet<>(noArgs,commands,linked);
-        }
-
-        return new BranchingNode<>(set,block, permission);
-    }
-
-    @Override
-    public CommandNode<T> buildWithoutIdentifier() {
-
-        PreStoredHashSet<IdentifiableNode<T>> set;
-
-        if (noArgs == null) {
-            if (linked) {
-                throw new IllegalStateException("Attempted link without no-arguments handler!");
-            } else {
-                set = new PreStoredHashSet<>(commands,false);
-            }
-        } else {
-            set = new PreStoredHashSet<>(noArgs,commands,linked);
-        }
-
-        return new BranchingNode<>(set, EmptyBlock.of(), permission);
-    }
-
-    public static <C> BranchingBuilder<C> make() {
-        return new BranchingBuilder<>();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/branch/nodes/model/EndpointNode.java b/core/src/main/java/me/aurium/branch/nodes/model/EndpointNode.java
deleted file mode 100644
index 843a6d2..0000000
--- a/core/src/main/java/me/aurium/branch/nodes/model/EndpointNode.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.nodes.model;
-
-/**
- * Marker interface for a node that is alone (so not branching, but not merging either)
- *
- * This usually means the end of whatever branch it is connected to.
- */
-public interface EndpointNode<T> extends IdentifiableNode<T> {
-}
diff --git a/core/src/main/java/me/aurium/branch/nodes/results/SearchInfo.java b/core/src/main/java/me/aurium/branch/nodes/results/SearchInfo.java
index ca4bad8..abd6061 100644
--- a/core/src/main/java/me/aurium/branch/nodes/results/SearchInfo.java
+++ b/core/src/main/java/me/aurium/branch/nodes/results/SearchInfo.java
@@ -22,7 +22,7 @@
 package me.aurium.branch.nodes.results;
 
 import me.aurium.branch.execution.Block;
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.CommandNode;
 
 import java.util.List;
 
diff --git a/core/src/main/java/me/aurium/branch/execution/EmptyBlock.java b/core/src/main/java/me/aurium/branch/nodes/single/EndpointNode.java
similarity index 63%
rename from core/src/main/java/me/aurium/branch/execution/EmptyBlock.java
rename to core/src/main/java/me/aurium/branch/nodes/single/EndpointNode.java
index 99a2c1e..b50edf7 100644
--- a/core/src/main/java/me/aurium/branch/execution/EmptyBlock.java
+++ b/core/src/main/java/me/aurium/branch/nodes/single/EndpointNode.java
@@ -19,26 +19,20 @@
  *
  */
 
-package me.aurium.branch.execution;
+package me.aurium.branch.nodes.single;
+
+import me.aurium.branch.nodes.IdentifiableNode;
+import me.aurium.branch.nodes.results.SearchInfo;
+import me.aurium.branch.nodes.results.SearchInput;
 
 /**
- * Represents a block with no content
+ * A node that cannot point to any node other than itself (and therefore ends the branching of a node-path)
  */
-public class EmptyBlock implements Block{
-
-    @Override
-    public String getIdentifier() {
-        throw new UnsupportedOperationException("Empty block should not exist in path!");
-    }
+public abstract class EndpointNode<T> implements IdentifiableNode<T> {
 
     @Override
-    public boolean isEmpty() {
-        return true;
+    public final SearchInfo<T> getSpecificNode(SearchInput input) {
+        return new SearchInfo<>(this,input);
     }
 
-    public static EmptyBlock of() {
-        return new EmptyBlock();
-    }
-
-
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/HelpNode.java b/core/src/main/java/me/aurium/branch/nodes/single/HelpNode.java
similarity index 61%
rename from core/src/main/java/me/aurium/branch/nodes/HelpNode.java
rename to core/src/main/java/me/aurium/branch/nodes/single/HelpNode.java
index cc28054..2efd64f 100644
--- a/core/src/main/java/me/aurium/branch/nodes/HelpNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/single/HelpNode.java
@@ -19,10 +19,29 @@
  *
  */
 
-package me.aurium.branch.nodes;
+package me.aurium.branch.nodes.single;
+
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.execution.api.BranchHandler;
+import me.aurium.branch.fallback.permissions.Permission;
+import me.aurium.branch.nodes.single.EndpointNode;
 
 /**
  * Represents a node that pregenerates help entries based on the message context
  */
-public class HelpNode {
+public class HelpNode<T> extends EndpointNode<T> {
+    @Override
+    public BranchHandler<T> getHandling() {
+        return null;
+    }
+
+    @Override
+    public Permission<T> getPermission() {
+        return null;
+    }
+
+    @Override
+    public Block getIdentifier() {
+        return null;
+    }
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/builders/SingleBuilder.java b/core/src/main/java/me/aurium/branch/nodes/single/SingleBuilder.java
similarity index 79%
rename from core/src/main/java/me/aurium/branch/nodes/builders/SingleBuilder.java
rename to core/src/main/java/me/aurium/branch/nodes/single/SingleBuilder.java
index 4c4864d..bf81ae6 100644
--- a/core/src/main/java/me/aurium/branch/nodes/builders/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/branch/nodes/single/SingleBuilder.java
@@ -19,20 +19,20 @@
  *
  */
 
-package me.aurium.branch.nodes.builders;
+package me.aurium.branch.nodes.single;
 
 import me.aurium.branch.execution.Block;
-import me.aurium.branch.execution.EmptyBlock;
 import me.aurium.branch.execution.StringBlock;
 import me.aurium.branch.execution.api.ExecutionHandler;
-import me.aurium.branch.nodes.SingleNode;
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.single.SingleNode;
+import me.aurium.branch.nodes.Builder;
+import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.fallback.permissions.Permission;
 import me.aurium.branch.fallback.permissions.EmptyPermission;
 
 import java.util.Objects;
 
-public class SingleBuilder<C> implements AloneBuilder<C> {
+public class SingleBuilder<C> implements Builder<C> {
 
     private Block block;
     private ExecutionHandler<C> contextHandler;
@@ -54,18 +54,11 @@ public void withPermission(Permission<C> permission) {
         this.permission = permission;
     }
 
-    public SingleNode<C> build() {
+    public CommandNode<C> build() {
         Objects.requireNonNull(block);
         Objects.requireNonNull(contextHandler);
 
         return new SingleNode<>(block, contextHandler, permission);
     }
 
-    @Override
-    public CommandNode<C> buildWithoutIdentifier() {
-        Objects.requireNonNull(contextHandler);
-
-        return new SingleNode<>(EmptyBlock.of(),contextHandler, permission);
-    }
-
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/SingleNode.java b/core/src/main/java/me/aurium/branch/nodes/single/SingleNode.java
similarity index 89%
rename from core/src/main/java/me/aurium/branch/nodes/SingleNode.java
rename to core/src/main/java/me/aurium/branch/nodes/single/SingleNode.java
index 61610c5..e984dfe 100644
--- a/core/src/main/java/me/aurium/branch/nodes/SingleNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/single/SingleNode.java
@@ -19,15 +19,13 @@
  *
  */
 
-package me.aurium.branch.nodes;
+package me.aurium.branch.nodes.single;
 
 import me.aurium.branch.execution.Block;
 import me.aurium.branch.execution.api.BranchHandler;
 import me.aurium.branch.execution.api.ExecutionHandler;
 import me.aurium.branch.execution.api.Execution;
 import me.aurium.branch.execution.NodeContext;
-import me.aurium.branch.interfacing.responses.TooManyArgsResponse;
-import me.aurium.branch.nodes.model.EndpointNode;
 import me.aurium.branch.nodes.results.SearchInput;
 import me.aurium.branch.nodes.results.SearchInfo;
 import me.aurium.branch.fallback.permissions.Permission;
@@ -40,7 +38,7 @@
  * Represents a node that can do one action and takes no arguments and has no tabcompletion
  * @param <T> the type of executor
  */
-public class SingleNode<T> implements EndpointNode<T> {
+public class SingleNode<T> extends EndpointNode<T> {
 
     private final Block identifier;
     private final Permission<T> permission;
@@ -59,17 +57,11 @@ public Block getIdentifier() {
         return identifier;
     }
 
-    @Override
-    public SearchInfo<T> getSpecificNode(SearchInput input) {
-        return new SearchInfo<>(this,input);
-    }
-
     @Override
     public BranchHandler<T> getHandling() {
         return handler;
     }
 
-
     @Override
     public Permission<T> getPermission() {
         return permission;
diff --git a/core/src/main/java/me/aurium/branch/utility/PreStoredHashSet.java b/core/src/main/java/me/aurium/branch/utility/PreStoredHashSet.java
deleted file mode 100644
index 8702a8a..0000000
--- a/core/src/main/java/me/aurium/branch/utility/PreStoredHashSet.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.utility;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Represents a set that already has an element in it
- */
-public class PreStoredHashSet<T> {
-
-    private final T alreadyStored;
-    private final Set<T> otherThingsInTheSet;
-    private final boolean linked;
-
-    public PreStoredHashSet(T alreadyStored, boolean linked) {
-        this.alreadyStored = alreadyStored;
-        this.otherThingsInTheSet = new HashSet<>();
-        this.linked = linked;
-    }
-    public PreStoredHashSet(T alreadyStored, Set<T> set, boolean linked) {
-        this.alreadyStored = alreadyStored;
-        this.otherThingsInTheSet = set;
-        this.linked = linked;
-    }
-
-    public PreStoredHashSet(Set<T> set, boolean linked) {
-        this.alreadyStored = null;
-        this.otherThingsInTheSet = set;
-        this.linked = linked;
-    }
-
-    /**
-     * Returns an immutable collection of T (plus already stored variable if it is present)
-     * @return an immutable collection of T
-     */
-    public Set<T> getContents() {
-        if (linked) {
-            if (alreadyStored == null) {
-                return Set.copyOf(otherThingsInTheSet);
-            } else {
-                Set<T> set = new HashSet<>(otherThingsInTheSet);
-
-                set.add(alreadyStored);
-
-                return Set.copyOf(set);
-            }
-        } else {
-            return Set.copyOf(otherThingsInTheSet);
-        }
-    }
-
-    /**
-     * get already store thing
-     * @return already stored thing or null
-     */
-    public T getAlreadyStored() {
-        return alreadyStored;
-    }
-
-}
diff --git a/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContext.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContext.java
index b0ce76d..b1eb1c2 100644
--- a/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContext.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContext.java
@@ -25,7 +25,7 @@
 import me.aurium.branch.execution.AbstractNodeContext;
 import me.aurium.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.branch.interfacing.Response;
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.nodes.results.SearchInfo;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
diff --git a/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContextProvider.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContextProvider.java
index ef9c972..6080886 100644
--- a/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContextProvider.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotContextProvider.java
@@ -25,7 +25,7 @@
 import me.aurium.branch.execution.ContextProvider;
 import me.aurium.branch.execution.NodeContext;
 import me.aurium.branch.interfacing.handlers.InterfacingHandler;
-import me.aurium.branch.nodes.model.CommandNode;
+import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.nodes.results.SearchInfo;
 import org.bukkit.command.CommandSender;
 

From e6eda3783cea62a0278d4b9169276dceb0e58f42 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Fri, 7 May 2021 11:44:45 -0700
Subject: [PATCH 51/56] preeedit fixes

---
 .../centralized/CentralizedManager.java       |  1 +
 .../branch/centralized/CommonNodeSource.java  | 14 ++++
 .../centralized/base/AdaptingNodeBase.java    |  4 +-
 .../centralized/base/DelegatingNodeBase.java  | 35 +++++++++
 .../branch/centralized/base/NodeBase.java     | 10 +++
 .../centralized/base/NodeBaseBuilder.java     | 10 ++-
 .../fallback/permissions/EmptyPermission.java |  4 +-
 .../fallback/permissions/Permission.java      | 19 ++++-
 .../permissions/PredicatePermission.java      |  2 +-
 .../permissions/StringPermission.java         | 32 --------
 .../fallback/strategies/OneBackStrategy.java  |  2 +-
 .../strategies/PermissionLockoutStrategy.java |  2 +-
 .../information/description/Description.java  |  5 +-
 .../description/StringDescription.java        | 14 ++++
 .../me/aurium/branch/nodes/CommandNode.java   |  5 ++
 .../aurium/branch/nodes/IdentifiableNode.java |  2 +
 .../aurium/branch/nodes/argument/ArgNode.java | 74 +++++++++++++++++++
 .../nodes/argument/{ => types}/Argument.java  | 11 ++-
 .../argument/types/UncalculatingArgument.java |  4 +
 .../branch/nodes/branching/BranchingNode.java | 23 +++++-
 .../branching/ExclusiveBranchingBuilder.java  | 13 +++-
 .../branching/InclusiveBranchingBuilder.java  | 13 +++-
 .../branch/nodes/results/ReduxInput.java      | 25 -------
 .../branch/nodes/results/SearchInput.java     | 26 +++----
 .../aurium/branch/nodes/single/HelpNode.java  |  7 ++
 .../branch/nodes/single/SingleBuilder.java    | 12 ++-
 .../branch/nodes/single/SingleNode.java       | 12 ++-
 .../aurium/branch/spigot/CommandWrapper.java  |  3 +-
 .../branch/spigot/adapter/PlayerAdapter.java  |  4 +
 .../spigot/permisison/SpigotPermission.java   | 23 ++++++
 30 files changed, 314 insertions(+), 97 deletions(-)
 create mode 100644 core/src/main/java/me/aurium/branch/centralized/CommonNodeSource.java
 create mode 100644 core/src/main/java/me/aurium/branch/centralized/base/DelegatingNodeBase.java
 delete mode 100644 core/src/main/java/me/aurium/branch/fallback/permissions/StringPermission.java
 create mode 100644 core/src/main/java/me/aurium/branch/information/description/StringDescription.java
 create mode 100644 core/src/main/java/me/aurium/branch/nodes/argument/ArgNode.java
 rename core/src/main/java/me/aurium/branch/nodes/argument/{ => types}/Argument.java (83%)
 create mode 100644 core/src/main/java/me/aurium/branch/nodes/argument/types/UncalculatingArgument.java
 delete mode 100644 core/src/main/java/me/aurium/branch/nodes/results/ReduxInput.java
 create mode 100644 spigot-impl/src/main/java/me/aurium/branch/spigot/permisison/SpigotPermission.java

diff --git a/core/src/main/java/me/aurium/branch/centralized/CentralizedManager.java b/core/src/main/java/me/aurium/branch/centralized/CentralizedManager.java
index e0ae54d..333914e 100644
--- a/core/src/main/java/me/aurium/branch/centralized/CentralizedManager.java
+++ b/core/src/main/java/me/aurium/branch/centralized/CentralizedManager.java
@@ -33,6 +33,7 @@
 public interface CentralizedManager<T,V> {
 
     CentralizedManagerBinder getBinder(V platform);
+    CommonNodeSource<T> getSource();
 
     NodeBaseBuilder<T,T> newCommand();
     <C extends T> NodeBaseBuilder<T,C> newCommand(ManagerAdapter<T,C> adapter);
diff --git a/core/src/main/java/me/aurium/branch/centralized/CommonNodeSource.java b/core/src/main/java/me/aurium/branch/centralized/CommonNodeSource.java
new file mode 100644
index 0000000..9002714
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/centralized/CommonNodeSource.java
@@ -0,0 +1,14 @@
+package me.aurium.branch.centralized;
+
+import me.aurium.branch.nodes.branching.ExclusiveBranchingBuilder;
+import me.aurium.branch.nodes.branching.InclusiveBranchingBuilder;
+import me.aurium.branch.nodes.single.SingleBuilder;
+
+public interface CommonNodeSource<T> {
+
+    SingleBuilder<T> single();
+    InclusiveBranchingBuilder<T> inclusiveBranching();
+    ExclusiveBranchingBuilder<T> exclusiveBranching();
+    //TODO help and argument
+
+}
diff --git a/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java b/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
index e29aeca..59b36f7 100644
--- a/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
+++ b/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
@@ -26,6 +26,7 @@
 import me.aurium.branch.execution.ContextProvider;
 import me.aurium.branch.execution.NodeContext;
 import me.aurium.branch.fallback.strategies.FallbackSearchStrategy;
+import me.aurium.branch.information.description.Description;
 import me.aurium.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.nodes.results.SearchInfo;
@@ -38,7 +39,7 @@
  * @param <T> the input type of nodebase
  * @param <C> the adapted adjusted type desired, based on a similar adapter.
  */
-public class AdaptingNodeBase<T,C extends T> implements NodeBase<T> {
+public abstract class AdaptingNodeBase<T,C extends T> implements NodeBase<T> {
 
     private final ManagerAdapter<T,C> adapter;
 
@@ -86,4 +87,5 @@ public void execute(T t, String alias, String[] args) {
     public List<String> suggest(T t, String alias, String[] args) {
         return null; //TODO
     }
+
 }
diff --git a/core/src/main/java/me/aurium/branch/centralized/base/DelegatingNodeBase.java b/core/src/main/java/me/aurium/branch/centralized/base/DelegatingNodeBase.java
new file mode 100644
index 0000000..cddf7e0
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/centralized/base/DelegatingNodeBase.java
@@ -0,0 +1,35 @@
+package me.aurium.branch.centralized.base;
+
+import me.aurium.branch.centralized.typeadapter.ManagerAdapter;
+import me.aurium.branch.execution.ContextProvider;
+import me.aurium.branch.fallback.strategies.FallbackSearchStrategy;
+import me.aurium.branch.information.description.Description;
+import me.aurium.branch.interfacing.handlers.InterfacingHandler;
+import me.aurium.branch.nodes.CommandNode;
+import me.aurium.branch.nodes.IdentifiableNode;
+
+/**
+ * Adapting node base that delegates identifier calls to the first node in the base stack.
+ * @param <T> t
+ * @param <C> c
+ */
+public class DelegatingNodeBase<T,C extends T> extends AdaptingNodeBase<T,C> {
+
+    private final IdentifiableNode<C> baseNode;
+
+    public DelegatingNodeBase(ManagerAdapter<T, C> adapter, IdentifiableNode<C> baseNode, FallbackSearchStrategy<C> strategy, ContextProvider<C> provider, InterfacingHandler<T> handler) {
+        super(adapter, baseNode, strategy, provider, handler);
+
+        this.baseNode = baseNode;
+    }
+
+    @Override
+    public Description getDescription() {
+        return baseNode.getDescription();
+    }
+
+    @Override
+    public String getIdentifier() {
+        return baseNode.getIdentifier().getIdentifier();
+    }
+}
diff --git a/core/src/main/java/me/aurium/branch/centralized/base/NodeBase.java b/core/src/main/java/me/aurium/branch/centralized/base/NodeBase.java
index 7289683..4323616 100644
--- a/core/src/main/java/me/aurium/branch/centralized/base/NodeBase.java
+++ b/core/src/main/java/me/aurium/branch/centralized/base/NodeBase.java
@@ -21,6 +21,9 @@
 
 package me.aurium.branch.centralized.base;
 
+import me.aurium.branch.information.description.Description;
+
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -32,4 +35,11 @@ public interface NodeBase<T> {
     void execute(T t, String alias, String[] args); //may execute instantly or take some time
     List<String> suggest(T t, String alias, String[] args);
 
+    Description getDescription();
+    String getIdentifier();
+
+    default List<String> getAliases() {
+        return Collections.emptyList();
+    }
+
 }
diff --git a/core/src/main/java/me/aurium/branch/centralized/base/NodeBaseBuilder.java b/core/src/main/java/me/aurium/branch/centralized/base/NodeBaseBuilder.java
index e970f3c..42154c0 100644
--- a/core/src/main/java/me/aurium/branch/centralized/base/NodeBaseBuilder.java
+++ b/core/src/main/java/me/aurium/branch/centralized/base/NodeBaseBuilder.java
@@ -27,11 +27,13 @@
 import me.aurium.branch.fallback.strategies.FallbackSearchStrategy;
 import me.aurium.branch.interfacing.handlers.InterfacingHandler;
 import me.aurium.branch.nodes.CommandNode;
+import me.aurium.branch.nodes.IdentifiableNode;
 
 import java.util.Objects;
 
 /**
- * Class that produces adaptingNodeBases
+ * Default implementation of a class that produces adaptingNodeBases
+ *
  * @param <T> Input type
  * @param <C> Adapted type
  */
@@ -40,7 +42,7 @@ public class NodeBaseBuilder<T,C extends T> {
     private final CentralizedManager<T,?> manager;
     private final ManagerAdapter<T,C> adapter;
 
-    private CommandNode<C> node;
+    private IdentifiableNode<C> node;
     private FallbackSearchStrategy<C> strategy;
     private ContextProvider<C> provider;
     private InterfacingHandler<T> handler;
@@ -59,7 +61,7 @@ public NodeBaseBuilder(CentralizedManager<T, ?> manager, ManagerAdapter<T, C> ad
         this.handler = handler;
     }
 
-    public NodeBaseBuilder<T,C> setNode(CommandNode<C> node) {
+    public NodeBaseBuilder<T,C> setNode(IdentifiableNode<C> node) {
         this.node = node;
 
         return this;
@@ -89,6 +91,6 @@ public void inject() {
         Objects.requireNonNull(provider);
         Objects.requireNonNull(handler);
 
-        manager.injectCommand(new AdaptingNodeBase<>(adapter,node,strategy,provider,handler));
+        manager.injectCommand(new DelegatingNodeBase<>(adapter,node,strategy,provider,handler));
     }
 }
diff --git a/core/src/main/java/me/aurium/branch/fallback/permissions/EmptyPermission.java b/core/src/main/java/me/aurium/branch/fallback/permissions/EmptyPermission.java
index 7e0752c..01c9677 100644
--- a/core/src/main/java/me/aurium/branch/fallback/permissions/EmptyPermission.java
+++ b/core/src/main/java/me/aurium/branch/fallback/permissions/EmptyPermission.java
@@ -33,7 +33,7 @@ public boolean attempt(T sender, String alias, String[] args) {
     }
 
     @Override
-    public String easyName() {
-        return "none";
+    public String failureIdentifiableName() {
+        return "None";
     }
 }
diff --git a/core/src/main/java/me/aurium/branch/fallback/permissions/Permission.java b/core/src/main/java/me/aurium/branch/fallback/permissions/Permission.java
index 5d2e029..ab13801 100644
--- a/core/src/main/java/me/aurium/branch/fallback/permissions/Permission.java
+++ b/core/src/main/java/me/aurium/branch/fallback/permissions/Permission.java
@@ -21,13 +21,30 @@
 
 package me.aurium.branch.fallback.permissions;
 
+import me.aurium.branch.execution.NodeContext;
+
 /**
  * Represents the accessibility predicate of a command -> whether a command can be executed or not
  */
 public interface Permission<T> {
 
+   /**
+    * Checks whether the sender has acccess or not
+    * @param sender sender
+    * @param alias alias
+    * @param args args
+    * @return true if so, false if not
+    */
    boolean attempt(T sender, String alias, String[] args); //because fuck you
 
-   String easyName();
+   default boolean attempt(NodeContext<T> nodeContext) {
+      return attempt(nodeContext.getSender(),nodeContext.getAlias(), nodeContext.getArgs());
+   }
+
+   /**
+    * Represents the name shown when the permission fails.
+    * @return the name shown if the permission fails, injected into a Result.
+    */
+   String failureIdentifiableName();
 
 }
diff --git a/core/src/main/java/me/aurium/branch/fallback/permissions/PredicatePermission.java b/core/src/main/java/me/aurium/branch/fallback/permissions/PredicatePermission.java
index e55a827..53c55b3 100644
--- a/core/src/main/java/me/aurium/branch/fallback/permissions/PredicatePermission.java
+++ b/core/src/main/java/me/aurium/branch/fallback/permissions/PredicatePermission.java
@@ -43,7 +43,7 @@ public boolean attempt(T sender, String alias, String[] args) {
     }
 
     @Override
-    public String easyName() {
+    public String failureIdentifiableName() {
         return easyName;
     }
 }
diff --git a/core/src/main/java/me/aurium/branch/fallback/permissions/StringPermission.java b/core/src/main/java/me/aurium/branch/fallback/permissions/StringPermission.java
deleted file mode 100644
index 2aae21a..0000000
--- a/core/src/main/java/me/aurium/branch/fallback/permissions/StringPermission.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.fallback.permissions;
-
-/**
- * Represents a permission that is controlled by a string identifier
- * @param <T> the string identifier, duh
- */
-public interface StringPermission<T> extends Permission<T> {
-
-    String permissionIdentifier();
-
-}
diff --git a/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java b/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
index c2f8e2e..f231a79 100644
--- a/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
+++ b/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
@@ -63,7 +63,7 @@ public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[]
             //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
 
             if (toBeExecuted.resultingNode().equals(baseNode)) {
-                return Result.fail(new NoPermissionResponse(baseNode.getPermission().easyName()));
+                return Result.fail(new NoPermissionResponse(baseNode.getPermission().failureIdentifiableName()));
 
             } else {
                 toBeExecuted = baseNode.getSpecificNode(input.withoutTop()); //regress backwards a node
diff --git a/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java b/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
index ae43c49..e78bc86 100644
--- a/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
+++ b/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
@@ -39,7 +39,7 @@ public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[]
         SearchInfo<T> toBeExecuted = baseNode.getSpecificNode(input);
 
         if (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args)) {
-            return Result.fail(new NoPermissionResponse(toBeExecuted.resultingNode().getPermission().easyName()));
+            return Result.fail(new NoPermissionResponse(toBeExecuted.resultingNode().getPermission().failureIdentifiableName()));
         }
 
         return Result.success(toBeExecuted);
diff --git a/core/src/main/java/me/aurium/branch/information/description/Description.java b/core/src/main/java/me/aurium/branch/information/description/Description.java
index 2e10973..f5904d9 100644
--- a/core/src/main/java/me/aurium/branch/information/description/Description.java
+++ b/core/src/main/java/me/aurium/branch/information/description/Description.java
@@ -21,5 +21,8 @@
 
 package me.aurium.branch.information.description;
 
-public class Description {
+public interface Description {
+
+    String getTextDescription();
+
 }
diff --git a/core/src/main/java/me/aurium/branch/information/description/StringDescription.java b/core/src/main/java/me/aurium/branch/information/description/StringDescription.java
new file mode 100644
index 0000000..ae7d769
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/information/description/StringDescription.java
@@ -0,0 +1,14 @@
+package me.aurium.branch.information.description;
+
+public class StringDescription implements Description {
+
+    private final String textDescription;
+
+    public StringDescription(String textDescription) {
+        this.textDescription = textDescription;
+    }
+
+    public String getTextDescription() {
+        return textDescription;
+    }
+}
diff --git a/core/src/main/java/me/aurium/branch/nodes/CommandNode.java b/core/src/main/java/me/aurium/branch/nodes/CommandNode.java
index 1677fde..145ad26 100644
--- a/core/src/main/java/me/aurium/branch/nodes/CommandNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/CommandNode.java
@@ -22,6 +22,7 @@
 package me.aurium.branch.nodes;
 
 import me.aurium.branch.execution.api.BranchHandler;
+import me.aurium.branch.information.description.Description;
 import me.aurium.branch.nodes.results.SearchInput;
 import me.aurium.branch.nodes.results.SearchInfo;
 import me.aurium.branch.fallback.permissions.Permission;
@@ -32,6 +33,8 @@
  */
 public interface CommandNode<T> {
 
+    //int getExpectedConsumeAmount() //used to check how much was expected as you pass through vs how much was received, among other htings.
+
     SearchInfo<T> getSpecificNode(SearchInput path);
     BranchHandler<T> getHandling();
 
@@ -41,4 +44,6 @@ public interface CommandNode<T> {
      * @return the permission binding
      */
     Permission<T> getPermission();
+    Description getDescription();
+
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/IdentifiableNode.java b/core/src/main/java/me/aurium/branch/nodes/IdentifiableNode.java
index 08b1798..f454cab 100644
--- a/core/src/main/java/me/aurium/branch/nodes/IdentifiableNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/IdentifiableNode.java
@@ -22,9 +22,11 @@
 package me.aurium.branch.nodes;
 
 import me.aurium.branch.execution.Block;
+import me.aurium.branch.information.description.Description;
 
 public interface IdentifiableNode<T> extends CommandNode<T> {
 
     Block getIdentifier();
 
+
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/argument/ArgNode.java b/core/src/main/java/me/aurium/branch/nodes/argument/ArgNode.java
new file mode 100644
index 0000000..d284b51
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/nodes/argument/ArgNode.java
@@ -0,0 +1,74 @@
+package me.aurium.branch.nodes.argument;
+
+import me.aurium.branch.execution.Block;
+import me.aurium.branch.execution.NodeContext;
+import me.aurium.branch.execution.api.BranchHandler;
+import me.aurium.branch.execution.api.Execution;
+import me.aurium.branch.fallback.permissions.Permission;
+import me.aurium.branch.information.description.Description;
+import me.aurium.branch.nodes.argument.types.Argument;
+import me.aurium.branch.nodes.results.model.Result;
+import me.aurium.branch.nodes.single.EndpointNode;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.List;
+
+public class ArgNode<T> extends EndpointNode<T> {
+
+    private final Block identifier;
+    private final Permission<T> permission;
+    private final Description description;
+    private final List<Argument<T>> arguments;
+
+    public ArgNode(Block identifier, Permission<T> permission, Description description, List<Argument<T>> arguments) {
+        this.identifier = identifier;
+        this.permission = permission;
+        this.description = description;
+        this.arguments = arguments;
+    }
+
+    @Override
+    public BranchHandler<T> getHandling() {
+        return null;
+    }
+
+    @Override
+    public Permission<T> getPermission() {
+        return permission;
+    }
+
+    @Override
+    public Description getDescription() {
+        return description;
+    }
+
+    @Override
+    public Block getIdentifier() {
+        return identifier;
+    }
+
+    public static final class ArgHandler<T> implements BranchHandler<T> {
+
+        private final List<Argument<T>> arguments;
+
+        public ArgHandler(List<Argument<T>> arguments) {
+            this.arguments = arguments;
+        }
+
+        @Override
+        public Result<Execution<T>> getExecution(NodeContext<T> context) {
+
+            Deque<Block> subdeque = new ArrayDeque<>(context.getResults().reducedPath());
+
+
+
+            return null;
+        }
+
+        @Override
+        public List<String> getSuggestions(NodeContext<T> context) {
+            return null;
+        }
+    }
+}
diff --git a/core/src/main/java/me/aurium/branch/nodes/argument/Argument.java b/core/src/main/java/me/aurium/branch/nodes/argument/types/Argument.java
similarity index 83%
rename from core/src/main/java/me/aurium/branch/nodes/argument/Argument.java
rename to core/src/main/java/me/aurium/branch/nodes/argument/types/Argument.java
index c12c17b..9665d8b 100644
--- a/core/src/main/java/me/aurium/branch/nodes/argument/Argument.java
+++ b/core/src/main/java/me/aurium/branch/nodes/argument/types/Argument.java
@@ -19,7 +19,7 @@
  *
  */
 
-package me.aurium.branch.nodes.argument;
+package me.aurium.branch.nodes.argument.types;
 
 import me.aurium.branch.execution.Block;
 import me.aurium.branch.execution.NodeContext;
@@ -35,8 +35,17 @@
  */
 public interface Argument<T> {
 
+    /**
+     * What the argument identifies as
+     * @return what it identifies as
+     */
     String getLabel();
 
+    /**
+     * Gets the bounds of the object
+     * @param context the context used to calculate
+     * @return
+     */
     List<String> getBounds(NodeContext<T> context);
 
     boolean check(Block toParse);
diff --git a/core/src/main/java/me/aurium/branch/nodes/argument/types/UncalculatingArgument.java b/core/src/main/java/me/aurium/branch/nodes/argument/types/UncalculatingArgument.java
new file mode 100644
index 0000000..8ea5b75
--- /dev/null
+++ b/core/src/main/java/me/aurium/branch/nodes/argument/types/UncalculatingArgument.java
@@ -0,0 +1,4 @@
+package me.aurium.branch.nodes.argument.types;
+
+public interface UncalculatingArgument<T> {
+}
diff --git a/core/src/main/java/me/aurium/branch/nodes/branching/BranchingNode.java b/core/src/main/java/me/aurium/branch/nodes/branching/BranchingNode.java
index c814b18..39314c0 100644
--- a/core/src/main/java/me/aurium/branch/nodes/branching/BranchingNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/branching/BranchingNode.java
@@ -25,6 +25,7 @@
 import me.aurium.branch.execution.api.BranchHandler;
 import me.aurium.branch.execution.api.Execution;
 import me.aurium.branch.execution.NodeContext;
+import me.aurium.branch.information.description.Description;
 import me.aurium.branch.interfacing.responses.NoIntegratedArgsResponse;
 import me.aurium.branch.nodes.IdentifiableNode;
 import me.aurium.branch.fallback.permissions.Permission;
@@ -32,8 +33,8 @@
 import me.aurium.branch.nodes.results.SearchInfo;
 import me.aurium.branch.nodes.results.SearchInput;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Nodes should always assume that the first block in the blockpath is theirs to consume
@@ -45,12 +46,14 @@ public class BranchingNode<T> implements IdentifiableNode<T> {
     private final PrestoredSet<T> nodes;
     private final Block path;
     private final BranchHandler<T> handler;
+    private final Description description;
 
     private final Permission<T> permission;
 
-    public BranchingNode(PrestoredSet<T> nodes, Block path, Permission<T> permission) {
+    public BranchingNode(PrestoredSet<T> nodes, Block path, Description description, Permission<T> permission) {
         this.nodes = nodes;
         this.path = path;
+        this.description = description;
         this.permission = permission;
 
         this.handler = new BranchingHandler<>(nodes);
@@ -61,6 +64,11 @@ public Block getIdentifier() {
         return path;
     }
 
+    @Override
+    public Description getDescription() {
+        return description;
+    }
+
     //args[] = join aMatch
     //let's say this is the base
     @Override
@@ -113,8 +121,15 @@ public Result<Execution<T>> getExecution(NodeContext<T> context) {
         @Override
         public List<String> getSuggestions(NodeContext<T> context) {
 
-            //TODO fix this bullshit, add close-to-queue
-            return nodeShit.getContents().stream().map(s -> s.getIdentifier().getIdentifier()).collect(Collectors.toList());
+            List<String> strings = new ArrayList<>();
+
+            for (IdentifiableNode<T> node : nodeShit.getContents()) {
+                if (node.getPermission().attempt(context) && node.getIdentifier().isVisual()) {
+                    strings.add(node.getIdentifier().getIdentifier());
+                }
+            }
+
+            return strings;
         }
 
     }
diff --git a/core/src/main/java/me/aurium/branch/nodes/branching/ExclusiveBranchingBuilder.java b/core/src/main/java/me/aurium/branch/nodes/branching/ExclusiveBranchingBuilder.java
index f7393eb..5f4cb7a 100644
--- a/core/src/main/java/me/aurium/branch/nodes/branching/ExclusiveBranchingBuilder.java
+++ b/core/src/main/java/me/aurium/branch/nodes/branching/ExclusiveBranchingBuilder.java
@@ -4,6 +4,8 @@
 import me.aurium.branch.execution.StringBlock;
 import me.aurium.branch.fallback.permissions.EmptyPermission;
 import me.aurium.branch.fallback.permissions.Permission;
+import me.aurium.branch.information.description.Description;
+import me.aurium.branch.information.description.StringDescription;
 import me.aurium.branch.nodes.single.HelpNode;
 import me.aurium.branch.nodes.Builder;
 import me.aurium.branch.nodes.CommandNode;
@@ -20,6 +22,7 @@ public class ExclusiveBranchingBuilder<T> implements Builder<T> {
     private Block block;
     private CommandNode<T> noArgs;
     private Permission<T> permission;
+    private Description description;
 
     public ExclusiveBranchingBuilder() {
         this.commands = new HashSet<>();
@@ -45,6 +48,12 @@ public ExclusiveBranchingBuilder<T> withPermission(Permission<T> permission) {
         return this;
     }
 
+    public ExclusiveBranchingBuilder<T> withDescription(Description description) {
+        this.description = description;
+
+        return this;
+    }
+
     public ExclusiveBranchingBuilder<T> withNode(IdentifiableNode<T> node) {
         commands.add(node);
 
@@ -63,7 +72,9 @@ public CommandNode<T> build() {
         Objects.requireNonNull(permission);
         Objects.requireNonNull(noArgs);
 
-        return new BranchingNode<>(new ExclusivePrestoredSet<>(noArgs,commands),block,permission);
+        Description returned = Objects.requireNonNullElse(description,new StringDescription("Default description for subcommand " + block.getIdentifier()));
+
+        return new BranchingNode<>(new ExclusivePrestoredSet<>(noArgs,commands),block, returned, permission);
     }
 
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/branching/InclusiveBranchingBuilder.java b/core/src/main/java/me/aurium/branch/nodes/branching/InclusiveBranchingBuilder.java
index 18140bd..4700a4f 100644
--- a/core/src/main/java/me/aurium/branch/nodes/branching/InclusiveBranchingBuilder.java
+++ b/core/src/main/java/me/aurium/branch/nodes/branching/InclusiveBranchingBuilder.java
@@ -25,6 +25,8 @@
 import me.aurium.branch.execution.StringBlock;
 import me.aurium.branch.fallback.permissions.Permission;
 import me.aurium.branch.fallback.permissions.EmptyPermission;
+import me.aurium.branch.information.description.Description;
+import me.aurium.branch.information.description.StringDescription;
 import me.aurium.branch.nodes.single.EndpointNode;
 import me.aurium.branch.nodes.single.HelpNode;
 import me.aurium.branch.nodes.Builder;
@@ -42,6 +44,7 @@ public class InclusiveBranchingBuilder<T> implements Builder<T> {
     private Block block;
     private EndpointNode<T> noArgs;
     private Permission<T> permission;
+    private Description description;
 
     public InclusiveBranchingBuilder() {
         this.commands = new HashSet<>();
@@ -79,13 +82,21 @@ public InclusiveBranchingBuilder<T> withNoArgs(EndpointNode<T> node) {
         return this;
     }
 
+    public InclusiveBranchingBuilder<T> withDescription(Description description) {
+        this.description = description;
+
+        return this;
+    }
+
     public CommandNode<T> build() {
 
         Objects.requireNonNull(block);
         Objects.requireNonNull(permission);
         Objects.requireNonNull(noArgs);
 
-        return new BranchingNode<>(new InclusivePrestoredSet<>(noArgs,commands),block,permission);
+        Description returned = Objects.requireNonNullElse(description,new StringDescription("Default description for subcommand " + block.getIdentifier()));
+
+        return new BranchingNode<>(new InclusivePrestoredSet<>(noArgs,commands),block, returned, permission);
     }
 
 }
\ No newline at end of file
diff --git a/core/src/main/java/me/aurium/branch/nodes/results/ReduxInput.java b/core/src/main/java/me/aurium/branch/nodes/results/ReduxInput.java
deleted file mode 100644
index e84f0ba..0000000
--- a/core/src/main/java/me/aurium/branch/nodes/results/ReduxInput.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *
- *  Branch
- *  Copyright © 2021 Aurium
- *
- *  Branch is free software: you can redistribute it and/or modify
- *  It under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  Branch is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with Branch. If not, see <https://www.gnu.org/licenses/>
- *  and navigate to version 3 of the GNU Affero General Public License.
- *
- */
-
-package me.aurium.branch.nodes.results;
-
-public class ReduxInput {
-}
diff --git a/core/src/main/java/me/aurium/branch/nodes/results/SearchInput.java b/core/src/main/java/me/aurium/branch/nodes/results/SearchInput.java
index 4b7b60e..d44ea2d 100644
--- a/core/src/main/java/me/aurium/branch/nodes/results/SearchInput.java
+++ b/core/src/main/java/me/aurium/branch/nodes/results/SearchInput.java
@@ -25,44 +25,42 @@
 import me.aurium.branch.execution.StringBlock;
 
 import java.util.ArrayDeque;
+import java.util.ArrayList;
 import java.util.Deque;
+import java.util.List;
 
 public class SearchInput {
 
-    private final Deque<Block> initialPath; //TODO make list or something - i don't care but it must be immutable
+    private final List<Block> initialPath; //TODO make list or something - i don't care but it must be immutable
     private final Deque<Block> reducablePath;
 
-    public SearchInput(Deque<Block> initialPath, Deque<Block> reducablePath) {
+    public SearchInput(List<Block> initialPath, Deque<Block> reducablePath) {
         this.initialPath = initialPath;
         this.reducablePath = reducablePath;
     }
 
-    public Deque<Block> getInitialPath() {
-        return initialPath;
+    public List<Block> getInitialPath() {
+        return List.copyOf(initialPath);
     }
     public Deque<Block> getReducablePath() {
         return reducablePath;
     }
 
     public SearchInput withoutTop() {
-        Deque<Block> newBase = new ArrayDeque<>(initialPath);
+        List<Block> newBase = new ArrayList<>(initialPath);
 
-        newBase.removeLast();
+        newBase.remove(newBase.size() - 1);
 
-        return of(newBase);
-    }
-
-    public static SearchInput of(Deque<Block> initialPath) {
-        return new SearchInput(initialPath,new ArrayDeque<>(initialPath));
+        return new SearchInput(newBase, new ArrayDeque<>(newBase));
     }
 
     public static SearchInput of(String[] args) {
-        Deque<Block> blocks = new ArrayDeque<>();
+        List<Block> blocks = new ArrayList<>();
 
         for (String string : args) {
-            blocks.addLast(StringBlock.of(string));
+            blocks.add(StringBlock.of(string));
         }
 
-        return of(blocks);
+        return new SearchInput(blocks, new ArrayDeque<>(blocks));
     }
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/single/HelpNode.java b/core/src/main/java/me/aurium/branch/nodes/single/HelpNode.java
index 2efd64f..0b402b0 100644
--- a/core/src/main/java/me/aurium/branch/nodes/single/HelpNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/single/HelpNode.java
@@ -24,12 +24,14 @@
 import me.aurium.branch.execution.Block;
 import me.aurium.branch.execution.api.BranchHandler;
 import me.aurium.branch.fallback.permissions.Permission;
+import me.aurium.branch.information.description.Description;
 import me.aurium.branch.nodes.single.EndpointNode;
 
 /**
  * Represents a node that pregenerates help entries based on the message context
  */
 public class HelpNode<T> extends EndpointNode<T> {
+
     @Override
     public BranchHandler<T> getHandling() {
         return null;
@@ -44,4 +46,9 @@ public Permission<T> getPermission() {
     public Block getIdentifier() {
         return null;
     }
+
+    @Override
+    public Description getDescription() {
+        return null;
+    }
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/single/SingleBuilder.java b/core/src/main/java/me/aurium/branch/nodes/single/SingleBuilder.java
index bf81ae6..1f8af5b 100644
--- a/core/src/main/java/me/aurium/branch/nodes/single/SingleBuilder.java
+++ b/core/src/main/java/me/aurium/branch/nodes/single/SingleBuilder.java
@@ -24,7 +24,8 @@
 import me.aurium.branch.execution.Block;
 import me.aurium.branch.execution.StringBlock;
 import me.aurium.branch.execution.api.ExecutionHandler;
-import me.aurium.branch.nodes.single.SingleNode;
+import me.aurium.branch.information.description.Description;
+import me.aurium.branch.information.description.StringDescription;
 import me.aurium.branch.nodes.Builder;
 import me.aurium.branch.nodes.CommandNode;
 import me.aurium.branch.fallback.permissions.Permission;
@@ -37,6 +38,7 @@ public class SingleBuilder<C> implements Builder<C> {
     private Block block;
     private ExecutionHandler<C> contextHandler;
     private Permission<C> permission = new EmptyPermission<>();
+    private Description description;
 
     public void withIdentifier(Block identifier) {
         this.block = identifier;
@@ -54,11 +56,17 @@ public void withPermission(Permission<C> permission) {
         this.permission = permission;
     }
 
+    public void withDescription(Description description) {
+        this.description = description;
+    }
+
     public CommandNode<C> build() {
         Objects.requireNonNull(block);
         Objects.requireNonNull(contextHandler);
 
-        return new SingleNode<>(block, contextHandler, permission);
+        Description returned = Objects.requireNonNullElse(description,new StringDescription("Default description for subcommand " + block.getIdentifier()));
+
+        return new SingleNode<>(block, contextHandler, permission, returned);
     }
 
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/single/SingleNode.java b/core/src/main/java/me/aurium/branch/nodes/single/SingleNode.java
index e984dfe..8947d9d 100644
--- a/core/src/main/java/me/aurium/branch/nodes/single/SingleNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/single/SingleNode.java
@@ -26,7 +26,7 @@
 import me.aurium.branch.execution.api.ExecutionHandler;
 import me.aurium.branch.execution.api.Execution;
 import me.aurium.branch.execution.NodeContext;
-import me.aurium.branch.nodes.results.SearchInput;
+import me.aurium.branch.information.description.Description;
 import me.aurium.branch.nodes.results.SearchInfo;
 import me.aurium.branch.fallback.permissions.Permission;
 import me.aurium.branch.nodes.results.model.Result;
@@ -42,14 +42,15 @@ public class SingleNode<T> extends EndpointNode<T> {
 
     private final Block identifier;
     private final Permission<T> permission;
-
     private final SingleHandler<T> handler;
+    private final Description description;
 
-    public SingleNode(Block identifier, ExecutionHandler<T> executionHandler, Permission<T> permission) {
+    public SingleNode(Block identifier, ExecutionHandler<T> executionHandler, Permission<T> permission, Description description) {
         this.identifier = identifier;
 
         this.handler = new SingleHandler<>(executionHandler);
         this.permission = permission;
+        this.description = description;
     }
 
     @Override
@@ -57,6 +58,11 @@ public Block getIdentifier() {
         return identifier;
     }
 
+    @Override
+    public Description getDescription() {
+        return description;
+    }
+
     @Override
     public BranchHandler<T> getHandling() {
         return handler;
diff --git a/spigot-impl/src/main/java/me/aurium/branch/spigot/CommandWrapper.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/CommandWrapper.java
index 90b6bd3..a30ae1e 100644
--- a/spigot-impl/src/main/java/me/aurium/branch/spigot/CommandWrapper.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/CommandWrapper.java
@@ -33,8 +33,7 @@ public class CommandWrapper extends Command {
     private final NodeBase<CommandSender> base;
 
     public CommandWrapper(NodeBase<CommandSender> base) {
-        super(null); //TODO description of base node, etc etc etc etc etc
-
+        super(base.getIdentifier(),base.getDescription().getTextDescription(), base.getDescription().getTextDescription(), base.getAliases());
         this.base = base;
     }
 
diff --git a/spigot-impl/src/main/java/me/aurium/branch/spigot/adapter/PlayerAdapter.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/adapter/PlayerAdapter.java
index 70e48f9..ce98e38 100644
--- a/spigot-impl/src/main/java/me/aurium/branch/spigot/adapter/PlayerAdapter.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/adapter/PlayerAdapter.java
@@ -28,6 +28,10 @@
 
 public class PlayerAdapter implements ManagerAdapter<CommandSender, Player> {
 
+    public static PlayerAdapter INSTANCE = new PlayerAdapter();
+
+    PlayerAdapter(){}
+
     @Override
     public Player adapt(CommandSender sender) {
         return (Player) sender;
diff --git a/spigot-impl/src/main/java/me/aurium/branch/spigot/permisison/SpigotPermission.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/permisison/SpigotPermission.java
new file mode 100644
index 0000000..e23d7b4
--- /dev/null
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/permisison/SpigotPermission.java
@@ -0,0 +1,23 @@
+package me.aurium.branch.spigot.permisison;
+
+import me.aurium.branch.fallback.permissions.Permission;
+import org.bukkit.command.CommandSender;
+
+public class SpigotPermission implements Permission<CommandSender> {
+
+    private final String permission;
+
+    public SpigotPermission(String permission) {
+        this.permission = permission;
+    }
+
+    @Override
+    public boolean attempt(CommandSender sender, String alias, String[] args) {
+        return sender.hasPermission(permission);
+    }
+
+    @Override
+    public String failureIdentifiableName() {
+        return "'"  + permission + "'";
+    }
+}

From 9e23547a9845cfd5c2f18cadb20316eeb42669d7 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Fri, 7 May 2021 14:11:14 -0700
Subject: [PATCH 52/56] set up basic documentation, modify nodes

---
 .../centralized/base/AdaptingNodeBase.java    |   9 +----
 .../branch/execution/api/BranchHandler.java   |   2 +-
 .../fallback/strategies/OneBackStrategy.java  |  11 ++++--
 .../strategies/PermissionLockoutStrategy.java |   9 +++--
 .../responses/NoIntegratedArgsResponse.java   |   8 ----
 .../me/aurium/branch/nodes/CommandNode.java   |   3 +-
 .../branch/nodes/branching/BranchingNode.java |  10 ++---
 .../branch/nodes/single/EndpointNode.java     |   5 ++-
 .../branch/nodes/single/SingleNode.java       |   6 +--
 docs/.nojekyll                                |   0
 docs/README.md                                |  35 ++++++++++++++++++
 docs/_coverpage.md                            |  13 +++++++
 docs/_sidebar.md                              |  32 ++++++++++++++++
 docs/index.html                               |  26 +++++++++++++
 docs/media/branch.png                         | Bin 0 -> 2008 bytes
 15 files changed, 132 insertions(+), 37 deletions(-)
 create mode 100644 docs/.nojekyll
 create mode 100644 docs/README.md
 create mode 100644 docs/_coverpage.md
 create mode 100644 docs/_sidebar.md
 create mode 100644 docs/index.html
 create mode 100644 docs/media/branch.png

diff --git a/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java b/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
index 59b36f7..4f0e0c9 100644
--- a/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
+++ b/core/src/main/java/me/aurium/branch/centralized/base/AdaptingNodeBase.java
@@ -74,14 +74,9 @@ public void execute(T t, String alias, String[] args) {
         SearchInfo<C> info = result.getSuccess();
         NodeContext<C> produced = provider.produce(adaptedSender,alias,args,baseNode,info);
 
-        Result<Execution<C>> execution = info.resultingNode().getHandling().getExecution(produced);
+        Execution<C> execution = info.resultingNode().getHandling().getExecution(produced);
 
-        if (!execution.isSuccessful()) {
-            handler.sendMessage(t, execution.getFailure());
-            return;
-        }
-
-        execution.getSuccess().run();
+        execution.run();
     }
 
     public List<String> suggest(T t, String alias, String[] args) {
diff --git a/core/src/main/java/me/aurium/branch/execution/api/BranchHandler.java b/core/src/main/java/me/aurium/branch/execution/api/BranchHandler.java
index 218b3b2..ac450b6 100644
--- a/core/src/main/java/me/aurium/branch/execution/api/BranchHandler.java
+++ b/core/src/main/java/me/aurium/branch/execution/api/BranchHandler.java
@@ -32,7 +32,7 @@
  */
 public interface BranchHandler<T> {
 
-    Result<Execution<T>> getExecution(NodeContext<T> context);
+    Execution<T> getExecution(NodeContext<T> context);
     List<String> getSuggestions(NodeContext<T> context);
 
 }
diff --git a/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java b/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
index f231a79..9f0e971 100644
--- a/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
+++ b/core/src/main/java/me/aurium/branch/fallback/strategies/OneBackStrategy.java
@@ -28,6 +28,9 @@
 import me.aurium.branch.nodes.results.model.Result;
 
 /**
+ *
+ * /// FIXME: 5/7/2021 This strat is possibly broken thanks to the update that changes nodes to return execution results.
+ *
  * Fallback and processing strategy that does the following actions:
  *
  * Attempts to get a node via arguments search. It then checks if the user has permission to access the node.
@@ -54,15 +57,15 @@ public class OneBackStrategy<T> implements FallbackSearchStrategy<T> {
     public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode) {
 
         SearchInput input = SearchInput.of(args);
-        SearchInfo<T> toBeExecuted = baseNode.getSpecificNode(input);
+        Result<SearchInfo<T>> toBeExecuted = baseNode.getSpecificNode(input);
 
 
         //1. Check permissions and access (preprocessing)
 
-        while (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args)) {
+        while (toBeExecuted.isSuccessful() && !toBeExecuted.getSuccess().resultingNode().getPermission().attempt(sender, alias, args)) {
             //something is wrong with the execution (e.g. wrong args or you did something bad), pass above one.
 
-            if (toBeExecuted.resultingNode().equals(baseNode)) {
+            if (toBeExecuted.getSuccess().resultingNode().equals(baseNode)) {
                 return Result.fail(new NoPermissionResponse(baseNode.getPermission().failureIdentifiableName()));
 
             } else {
@@ -70,7 +73,7 @@ public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[]
             }
         }
 
-        return Result.success(toBeExecuted);
+        return toBeExecuted;
     }
 
 
diff --git a/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java b/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
index e78bc86..0b67c80 100644
--- a/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
+++ b/core/src/main/java/me/aurium/branch/fallback/strategies/PermissionLockoutStrategy.java
@@ -36,12 +36,13 @@ public class PermissionLockoutStrategy<T> implements FallbackSearchStrategy<T> {
     public Result<SearchInfo<T>> attemptPreprocess(T sender, String alias, String[] args, CommandNode<T> baseNode) {
 
         SearchInput input = SearchInput.of(args);
-        SearchInfo<T> toBeExecuted = baseNode.getSpecificNode(input);
+        Result<SearchInfo<T>> toBeExecuted = baseNode.getSpecificNode(input);
 
-        if (!toBeExecuted.resultingNode().getPermission().attempt(sender, alias, args)) {
-            return Result.fail(new NoPermissionResponse(toBeExecuted.resultingNode().getPermission().failureIdentifiableName()));
+        //peak object oriented code
+        if (toBeExecuted.isSuccessful() && !toBeExecuted.getSuccess().resultingNode().getPermission().attempt(sender, alias, args)) {
+            return Result.fail(new NoPermissionResponse(toBeExecuted.getSuccess().resultingNode().getPermission().failureIdentifiableName()));
         }
 
-        return Result.success(toBeExecuted);
+        return toBeExecuted;
     }
 }
diff --git a/core/src/main/java/me/aurium/branch/interfacing/responses/NoIntegratedArgsResponse.java b/core/src/main/java/me/aurium/branch/interfacing/responses/NoIntegratedArgsResponse.java
index 100b2e5..fe37378 100644
--- a/core/src/main/java/me/aurium/branch/interfacing/responses/NoIntegratedArgsResponse.java
+++ b/core/src/main/java/me/aurium/branch/interfacing/responses/NoIntegratedArgsResponse.java
@@ -46,12 +46,4 @@ public List<String> getAlternativeCommands() {
         return alternativeCommands;
     }
 
-    /**
-     * Use a basic nodeContext to produce a simple no integrated args response
-     * @param context lah
-     * @return lah
-     */
-    public static NoIntegratedArgsResponse of(NodeContext<?> context) {
-        return new NoIntegratedArgsResponse(new ArrayList<>()); //TODO IMPLEMENT
-    }
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/CommandNode.java b/core/src/main/java/me/aurium/branch/nodes/CommandNode.java
index 145ad26..f02b322 100644
--- a/core/src/main/java/me/aurium/branch/nodes/CommandNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/CommandNode.java
@@ -26,6 +26,7 @@
 import me.aurium.branch.nodes.results.SearchInput;
 import me.aurium.branch.nodes.results.SearchInfo;
 import me.aurium.branch.fallback.permissions.Permission;
+import me.aurium.branch.nodes.results.model.Result;
 
 /**
  * Base object
@@ -35,7 +36,7 @@ public interface CommandNode<T> {
 
     //int getExpectedConsumeAmount() //used to check how much was expected as you pass through vs how much was received, among other htings.
 
-    SearchInfo<T> getSpecificNode(SearchInput path);
+    Result<SearchInfo<T>> getSpecificNode(SearchInput path);
     BranchHandler<T> getHandling();
 
 
diff --git a/core/src/main/java/me/aurium/branch/nodes/branching/BranchingNode.java b/core/src/main/java/me/aurium/branch/nodes/branching/BranchingNode.java
index 39314c0..c9cde4b 100644
--- a/core/src/main/java/me/aurium/branch/nodes/branching/BranchingNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/branching/BranchingNode.java
@@ -72,7 +72,7 @@ public Description getDescription() {
     //args[] = join aMatch
     //let's say this is the base
     @Override
-    public SearchInfo<T> getSpecificNode(SearchInput input) {
+    public Result<SearchInfo<T>> getSpecificNode(SearchInput input) {
         //if there is something left, the first thing in the queue is our argument
         //if there is nothing left no args time
 
@@ -87,7 +87,7 @@ public SearchInfo<T> getSpecificNode(SearchInput input) {
 
         }
 
-        return new SearchInfo<>(this,input);
+        return Result.success(new SearchInfo<>(this,input));
     }
 
     @Override
@@ -110,12 +110,8 @@ public BranchingHandler(PrestoredSet<T> nodeShit) {
 
 
         @Override
-        public Result<Execution<T>> getExecution(NodeContext<T> context) {
-            if (nodeShit.getSideNode() == null) {
-                return Result.fail(NoIntegratedArgsResponse.of(context));
-            } else {
+        public Execution<T> getExecution(NodeContext<T> context) {
                 return nodeShit.getSideNode().getHandling().getExecution(context);
-            }
         }
 
         @Override
diff --git a/core/src/main/java/me/aurium/branch/nodes/single/EndpointNode.java b/core/src/main/java/me/aurium/branch/nodes/single/EndpointNode.java
index b50edf7..5a08eff 100644
--- a/core/src/main/java/me/aurium/branch/nodes/single/EndpointNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/single/EndpointNode.java
@@ -24,6 +24,7 @@
 import me.aurium.branch.nodes.IdentifiableNode;
 import me.aurium.branch.nodes.results.SearchInfo;
 import me.aurium.branch.nodes.results.SearchInput;
+import me.aurium.branch.nodes.results.model.Result;
 
 /**
  * A node that cannot point to any node other than itself (and therefore ends the branching of a node-path)
@@ -31,8 +32,8 @@
 public abstract class EndpointNode<T> implements IdentifiableNode<T> {
 
     @Override
-    public final SearchInfo<T> getSpecificNode(SearchInput input) {
-        return new SearchInfo<>(this,input);
+    public final Result<SearchInfo<T>> getSpecificNode(SearchInput input) {
+        return Result.success(new SearchInfo<>(this,input));
     }
 
 }
diff --git a/core/src/main/java/me/aurium/branch/nodes/single/SingleNode.java b/core/src/main/java/me/aurium/branch/nodes/single/SingleNode.java
index 8947d9d..67ff1be 100644
--- a/core/src/main/java/me/aurium/branch/nodes/single/SingleNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/single/SingleNode.java
@@ -82,16 +82,16 @@ public SingleHandler(ExecutionHandler<T> handler) {
         }
 
         @Override
-        public Result<Execution<T>> getExecution(NodeContext<T> context) {
+        public Execution<T> getExecution(NodeContext<T> context) {
             SearchInfo<T> info = context.getResults();
 
             /*if (info.hasMoreArguments()) {
                 return Result.fail(
-                        new TooManyArgsResponse(0,info.reducedPath().size()) //TODO change this so it actually reflects
+                        new TooManyArgsResponse(0,info.reducedPath().size()) //TODO move this to search details
                 );
             }*/
 
-            return Result.success(new Execution<>(handler,context));
+            return new Execution<>(handler,context);
         }
 
         @Override
diff --git a/docs/.nojekyll b/docs/.nojekyll
new file mode 100644
index 0000000..e69de29
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 0000000..a4d69e6
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,35 @@
+# Branch
+
+An opinionated command framework based around the concept of an argument handling node
+
+Has support for both builder format and annotation format
+
+Built for use with Beetle but can be used independently 
+
+## How can I ask for support?
+
+DM **Aesthetik#9784** on discord!
+
+## Contributing
+
+Make pull requests that arent bad and I accept them. It's about that simple!
+
+## Repositories
+
+```
+    <dependencies>
+        <dependency>
+            <groupId>me.aurium</groupId>
+            <artifactId>branch-core</artifactId>
+            <version>0.1.0</version>
+        </dependency>
+    </dependencies>
+```
+```
+    <repositories>
+        <repository>
+            <id>aurium</id>
+            <url>https://repo.repsy.io/mvn/elytraforce/default</url>
+        </repository>
+    </repositories>
+```
diff --git a/docs/_coverpage.md b/docs/_coverpage.md
new file mode 100644
index 0000000..fa401c7
--- /dev/null
+++ b/docs/_coverpage.md
@@ -0,0 +1,13 @@
+![logo](media/branch.png)
+
+# branch framework <small>1.0</small>
+
+> A powerful Java command framework
+
+- Versatile and object oriented
+- Many implementations, including ones for Spigot and Velocity
+- Annotations, or builder format
+- Easy for beginners, flexible enough for experienced devs
+
+[GitHub](https://github.com/docsifyjs/docsify/)
+[Get Started](#docsify)
\ No newline at end of file
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
new file mode 100644
index 0000000..98fcd8b
--- /dev/null
+++ b/docs/_sidebar.md
@@ -0,0 +1,32 @@
+- Branch Framework
+
+  - [Introduction](README.md)
+  
+- Getting Started
+
+  - [Key Concepts](info/concepts.md)
+  - [Basic Example](info/example.md)
+  
+- Nodes
+
+  - [What is a node?](info/nodes.md)
+  - [The Argument Node](info/argumentnode.md)
+  - Other Nodes
+    - [The Single Node](info/singlenode.md)
+    - [The Branching Node](info/branchingnode.md)
+    - [The Help Node](info/helpnode.md)
+    - [Implementing your own](info/implementingnode.md)
+  
+- Central
+
+  - Core Management
+    - [The Centralized Manager](info/centralizedmanager.md)
+    - [Type Adapters](info/typeadapter.md)
+	- [Node Bases](info/nodebase.md)
+	- [Fallback Strategies](info/fallback.md)
+  - Messaging and Responses
+    - [Response Handling](info/responses.md)
+	- [Descriptions and Help](info/descriptions.md)
+  
+  
+
diff --git a/docs/index.html b/docs/index.html
new file mode 100644
index 0000000..d753f72
--- /dev/null
+++ b/docs/index.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Document</title>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+  <meta name="description" content="Description">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
+  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css">
+</head>
+<body>
+  <div id="app"></div>
+  <script>
+    window.$docsify = {
+	  loadSidebar: true,
+	  coverpage: true,
+	  themeColor: '#3F51B5',
+	  subMaxLevel: 2,
+      name: '',
+      repo: ''
+    }
+  </script>
+  <!-- Docsify v4 -->
+  <script src="//cdn.jsdelivr.net/npm/docsify@4"></script>
+</body>
+</html>
diff --git a/docs/media/branch.png b/docs/media/branch.png
new file mode 100644
index 0000000000000000000000000000000000000000..f97d1f02ad15a7ce0e2dfbb8c1d6852339d1ac7a
GIT binary patch
literal 2008
zcmZ`)YcvxK7~a^L4UIO9+>))iw2XvJVwuaRxn*d=a-EM{TPVI!MDEunG{q8WZeJKB
zB(dDer7u)&MJ4GXMETawetge4@B5tRJ@0eQd!9dUiapgz8nz1t005*Z)?`N!vwxQa
zNYt5zm1ZIW`IC;30KlYD-Gu^Akrq2;YefcZUCQixAX1P>$}tPb8!!ZkM{$O9+C>v7
z3Yl~~YW!mfJqYP6|M>6L30$5>xx02FsM69r1>R$EtGmlO8?qzKLbaSs-tiEjduQ)e
z`D~PDBDQR(3wfj*n4lrg9cqOA<6z^oL;cFOzck*B4+S?Rvd+c^#NRJ294IV|V8Ol`
zhYUB&8^7M_D<(9p!w&y}OeLU;4b-XcXhIsoo73F+BT2(&XEa(KBXnH?a~^9|MQ30&
z_GTJyK0Y(f<fU?+@KN@UY^!~s5u6SqhnRQe`K%w5mY^ql<n%-1<$Kfec6Vwv+Am(^
zoeCsSOjGvJb;sAU9{nic_R@Z#uQ^|bFfSsi!=_~=Yp>3V6{?mSp(?#^Qdj32G8wsA
zFKtbNu!}v8oU;pcUQEu<eM4`4?P)s@yfLD0Exz7}d*d`1oLVrW<eR;H)s_%cXM@lb
z?k|ELVV@-Pf|UI-0$0r!ech`ZDL-!2`QA=COtGC^#FW$6(qy!DKAIxw`>a41P{+{h
z+?Ky|CA8a;m(#_}Y8>?va4B{bnhx0Z4>xPn8%8LCJYG04_{8Npx9+Sy1mdkXO=2r&
ziWs~}x_HVD8qvqgr9$aNFG%)lS0qqIR&a(2g2iXd6r<HJO%?^={ZoRCG@CC_$DR{c
z6%cO&b7YLW)EElhO1`*6P;W(!$+n+QoeQc$RSk5t@P?eHv<8AkH4P<+qidDfx^|QN
zD&}DI7f2+&gF&TiDao}mq<$MQ-+kvRtoA<o3ALb!(^?0<yooS#t%&(R1>f<PV|lCV
zM;OkI%TXo6cT%LBQI6>5m?Uilm!<GLS<(PZP7HLhp*6nR1{j%ZLXxKRZBGULw8%M4
z8qk)K;P0fXo)b<2;g~V7^$t0ATz|}dU=;`_<KI(%N3EmEk?osMoSz5dTh`qp?}>nH
zsyEZx3#zHhnjQ$^sQ(K`u6=cS0(JQq3`7XAj>5#>eeR{1F7&vN&itr6XL7%WG#fvp
zqE$#zv8Z-BBojzgkcj1<+l{>0>$RyoujOylq4P~~PQHvP95WDC$o&>kpuXAe{IJ&%
z5giC(_rqWNSZC~@PE;Lt_X{#e!B#x9pIrybp1W;VP}hKF4g2xNBAlM(Bw=(l4lZ0z
z&l#|IYTn7n{?LO<eQp}`WTy0-_go9u_Ti#`+y2!K;h1aMY&DDd*W$l<bZ`2~>GWgv
zBopP%{b9*YBQ4E@6J3gXi^`<+zHSA@medt<L3Xd8@6m7L#xzPVquhFPb0=mme0xSI
z8vYnoaiN>k4R*P7(o`9s{?9Nq*$vqeZFc0vEjQV)8=YsM6KmQ>1bj1oVTKq;Lg4c0
z-53P9taor9gH4N@^W)zZPfdilUPZoi^F7}`^fSdyaa6$atO0x_6zd{e`dX~4*wN>;
z<zqZ&60OVubsH*KW|@HQrFnNTWid`G*Bd$_iNCu+$TzzS7@Hit4hjU<F2&`bO9WYF
zJV5x;{K9^FEc@ODA=@k;@O^SH9ux?w{nYlo%`6cxF!}sEs#%8}v3l2Lsu8f%T;m{i
z792YG6AB$WsssG8?pV7LrX#&vGxc7^@F?2IbcLaya|cRm=npM>YrqYsh2H1Fn*&^D
zv>NTOKo5#BtYqmI_B>`X0lI8#EbwuCdppTDhRSA7Z+~sFD!%POtJj|RwUIh3*jg{(
zeVf9(6h?l4DE#OKoHFe2;L5G`qZfAT#e&ufJ%d|9&>gs4`EgG&CT7|51g@hH_sZ@?
zGZdD|{9Ybwbbs&cs&NJXQWGnQ7?pa~ZBXn~WN6mT-tWd&R?cBm?RfRY9;8+!Zq=uQ
zYVAQnx2#cp+7h7QwRZbva$3=6aUamo#kMuzHKf^VU4k8~R40y&1rMQ2cbCXmfq0$~
z;p732gWn#(tt*ln66#xni_Ope-Y+~Z`M{ESX8q&=FmV=A?qt(Y>*MV2Aobgs53ptG
zM=i6A&rtmCA#c*w@>S3a(>j)#yvu@4rNR25?esg&?Ro}Z(rVQ|R*Y5x^f-^<9MU!B
zCL0t+*JOlymgon_SQw?MPQ_hzxIG+O@mYM*?y=HQ!BUy%yoqniiHcTVM!Vo^biu}j
z#p!#B;AkeLk7&Ng>n*u4(glw?QMu8ymK=Nf{64kRX2hZ0$*QG%MB1?Mhx^N>ff<OA
zowxf9(&`*m?&}&55uZ0EI4rYke!FZ-z>SP>lnZBXwkH0ldWhs!PU)p5<mkyzjYHjs
zi_E86rJh>p$fj<H+dM^?wwEoWsZKeFqFL4uMG%FI{VaYc^>>sQl%l$dx#uPT?nJuJ
z2wnMfGF`P)W`26bg_`tSr%<Zq?{wBU^5XN=TL8qNHHhTHuH&jUpZ`Qy&(^<WqYaRW
z{8!Pd#6()SM*1)!eTm-Tz9ItX;q`QJ_=7mS;c-1YQQwHDcR(ADC*tw%0!zC8Fa(GA
YF#V$c-@q}%#E1+4iUpO-KjM|}A1BF$-v9sr

literal 0
HcmV?d00001


From 70c26f6e53629506fa5a7381e6ff0947b12a54ca Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Fri, 7 May 2021 14:24:57 -0700
Subject: [PATCH 53/56] resolve build errors

---
 core/src/main/java/me/aurium/branch/nodes/argument/ArgNode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/me/aurium/branch/nodes/argument/ArgNode.java b/core/src/main/java/me/aurium/branch/nodes/argument/ArgNode.java
index d284b51..24b2cdd 100644
--- a/core/src/main/java/me/aurium/branch/nodes/argument/ArgNode.java
+++ b/core/src/main/java/me/aurium/branch/nodes/argument/ArgNode.java
@@ -57,7 +57,7 @@ public ArgHandler(List<Argument<T>> arguments) {
         }
 
         @Override
-        public Result<Execution<T>> getExecution(NodeContext<T> context) {
+        public Execution<T> getExecution(NodeContext<T> context) {
 
             Deque<Block> subdeque = new ArrayDeque<>(context.getResults().reducedPath());
 

From 0dc3c5a1b8203f8a5b1e0958f7aad4eaec38a669 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Fri, 7 May 2021 14:26:20 -0700
Subject: [PATCH 54/56] add logo to docs

---
 docs/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/index.html b/docs/index.html
index d753f72..de14ede 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2,11 +2,12 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <title>Document</title>
+  <title>Branch Framework</title>
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="description" content="Description">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
   <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css">
+  <link rel="icon" href="media/branch.png">
 </head>
 <body>
   <div id="app"></div>

From aa4bb68f0523a16e68a1b393d4c087278af37d07 Mon Sep 17 00:00:00 2001
From: Matt <aukrais@gmail.com>
Date: Fri, 7 May 2021 14:34:22 -0700
Subject: [PATCH 55/56] build success

---
 .../src/main/java/me/aurium/branch/tests/StringManager.java | 5 +++++
 .../me/aurium/branch/centralized/CentralizedManager.java    | 2 +-
 .../centralized/{CommonNodeSource.java => NodeSource.java}  | 2 +-
 .../main/java/me/aurium/branch/spigot/SpigotManager.java    | 6 ++++++
 4 files changed, 13 insertions(+), 2 deletions(-)
 rename core/src/main/java/me/aurium/branch/centralized/{CommonNodeSource.java => NodeSource.java} (91%)

diff --git a/core-tests/src/main/java/me/aurium/branch/tests/StringManager.java b/core-tests/src/main/java/me/aurium/branch/tests/StringManager.java
index 69f8b4e..229da42 100644
--- a/core-tests/src/main/java/me/aurium/branch/tests/StringManager.java
+++ b/core-tests/src/main/java/me/aurium/branch/tests/StringManager.java
@@ -35,6 +35,11 @@ public CentralizedManagerBinder getBinder(Void platform) {
         throw new IllegalStateException("StringManager is for tests!");
     }
 
+    @Override
+    public NodeSource<String> getSource() {
+        return null;
+    }
+
     @Override
     public NodeBaseBuilder<String, String> newCommand() {
         return new NodeBaseBuilder<>(this,defaultAdapter);
diff --git a/core/src/main/java/me/aurium/branch/centralized/CentralizedManager.java b/core/src/main/java/me/aurium/branch/centralized/CentralizedManager.java
index 333914e..cac406a 100644
--- a/core/src/main/java/me/aurium/branch/centralized/CentralizedManager.java
+++ b/core/src/main/java/me/aurium/branch/centralized/CentralizedManager.java
@@ -33,7 +33,7 @@
 public interface CentralizedManager<T,V> {
 
     CentralizedManagerBinder getBinder(V platform);
-    CommonNodeSource<T> getSource();
+    NodeSource<T> getSource();
 
     NodeBaseBuilder<T,T> newCommand();
     <C extends T> NodeBaseBuilder<T,C> newCommand(ManagerAdapter<T,C> adapter);
diff --git a/core/src/main/java/me/aurium/branch/centralized/CommonNodeSource.java b/core/src/main/java/me/aurium/branch/centralized/NodeSource.java
similarity index 91%
rename from core/src/main/java/me/aurium/branch/centralized/CommonNodeSource.java
rename to core/src/main/java/me/aurium/branch/centralized/NodeSource.java
index 9002714..e7867be 100644
--- a/core/src/main/java/me/aurium/branch/centralized/CommonNodeSource.java
+++ b/core/src/main/java/me/aurium/branch/centralized/NodeSource.java
@@ -4,7 +4,7 @@
 import me.aurium.branch.nodes.branching.InclusiveBranchingBuilder;
 import me.aurium.branch.nodes.single.SingleBuilder;
 
-public interface CommonNodeSource<T> {
+public interface NodeSource<T> {
 
     SingleBuilder<T> single();
     InclusiveBranchingBuilder<T> inclusiveBranching();
diff --git a/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManager.java b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManager.java
index 6b02f73..a6629e9 100644
--- a/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManager.java
+++ b/spigot-impl/src/main/java/me/aurium/branch/spigot/SpigotManager.java
@@ -23,6 +23,7 @@
 
 import me.aurium.branch.centralized.CentralizedManager;
 import me.aurium.branch.centralized.CentralizedManagerBinder;
+import me.aurium.branch.centralized.NodeSource;
 import me.aurium.branch.centralized.base.NodeBase;
 import me.aurium.branch.centralized.typeadapter.ManagerAdapter;
 import me.aurium.branch.centralized.base.NodeBaseBuilder;
@@ -60,6 +61,11 @@ public CentralizedManagerBinder getBinder(JavaPlugin platform) {
         return new SpigotManagerBinder(platform.getName(), platform.getServer().getCommandMap(), senders);
     }
 
+    @Override
+    public NodeSource<CommandSender> getSource() {
+        return null;
+    }
+
     @Override
     public NodeBaseBuilder<CommandSender, CommandSender> newCommand() {
         return new NodeBaseBuilder<>(this, defaultAdapter, new OneBackStrategy<>(), new SpigotContextProvider<>(defaultInterfacing), defaultInterfacing);

From 812d41f863953b7e89a56dd9e3eebd3f804dea62 Mon Sep 17 00:00:00 2001
From: "Aurium_ @SolarMC" <aukrais@gmail.com>
Date: Wed, 16 Jun 2021 10:52:28 -0700
Subject: [PATCH 56/56] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 9ec4aaa..d6bc020 100644
--- a/readme.md
+++ b/readme.md
@@ -8,7 +8,7 @@ Built for use with Beetle but can be used independently
 
 # How can I ask for support?
 
-DM **Aesthetik#9784** on discord!
+DM **Auriium#0001** on discord!
 
 # Contributing