diff --git a/src/main/java/com/zerohighdef/geoffrey/GeoffreyMC.java b/src/main/java/com/zerohighdef/geoffrey/GeoffreyMC.java
index c4e2d47..feac043 100644
--- a/src/main/java/com/zerohighdef/geoffrey/GeoffreyMC.java
+++ b/src/main/java/com/zerohighdef/geoffrey/GeoffreyMC.java
@@ -50,6 +50,12 @@ public final class GeoffreyMC extends JavaPlugin {
 
             AddResourceCommand addResourceCommand = new AddResourceCommand(this);
             this.getCommand("geoffrey_add_resource").setExecutor(addResourceCommand);
+
+            AddTunnelCommand addTunnelCommand = new AddTunnelCommand(this);
+            this.getCommand("geoffrey_add_tunnel").setExecutor(addTunnelCommand);
+
+            DeleteCommand deleteCommand = new DeleteCommand(this);
+            this.getCommand("geoffrey_delete").setExecutor(deleteCommand);
         }
 
     }
diff --git a/src/main/java/com/zerohighdef/geoffrey/Objects/GeoffreyAPICallback.java b/src/main/java/com/zerohighdef/geoffrey/Objects/GeoffreyAPICallback.java
index 1c2628a..3e23f16 100644
--- a/src/main/java/com/zerohighdef/geoffrey/Objects/GeoffreyAPICallback.java
+++ b/src/main/java/com/zerohighdef/geoffrey/Objects/GeoffreyAPICallback.java
@@ -25,8 +25,8 @@ public abstract class GeoffreyAPICallback implements ICallback {
         errors.put("PlayerNotFound", "You are not in the database, you must register first!");
         errors.put("NoLocationsInDatabase", "You have no locations in the database, you must add some first!");
         errors.put("DataError", "Slow down their slugger, that's a long word or number you are trying to cram into me, try again with something smaller, please");
-        errors.put("LocationHasTunnelError", "that location already has a tunnel you goober.");
-        errors.put( "EntryNameNotUniqueError", "that name has already been used, be more creative dingus kong");
+        errors.put("LocationHasTunnelError", "That location already has a tunnel you goober.");
+        errors.put( "EntryNameNotUniqueError", "That name has already been used, be more creative dingus kong");
     }
 
     protected JsonElement parseJSON(String string) throws GeoffreyCommandError {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 16cbd15..ba88f28 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -71,6 +71,16 @@ commands:
     aliases: [add_resource]
     permission: geoffrey.add
     usage: /add_resource [resource name] [farm name]
+  geoffrey_add_tunnel:
+    description: Adds a tunnel to a location
+    aliases: [add_tunnel]
+    permission: geoffrey.add
+    usage: /add_tunnel [tunnel direction] [tunnel number] [location name]
+  geoffrey_delete:
+    description: Deletes a location in Geoffrey
+    aliases: [delete]
+    permission: geoffrey.add
+    usage: /delete [location name]
 
 permissions:
   add: