diff --git a/build.gradle b/build.gradle
index ddd460e..abbaaa4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,8 +16,8 @@ tasks.withType(JavaCompile) {
 }
 
 repositories {
-     maven { url "http://repo.maven.apache.org/maven2" }
-     maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
+    maven { url "http://repo.maven.apache.org/maven2" }
+    maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
 }
 
 configurations {
@@ -38,14 +38,15 @@ jar {
     from configurations.includeLibs.collect { it.isDirectory() ? it : zipTree(it) }
 }
 
-
 // Set SPIGOT_LOC to the location of your server and SPIGOT_JAR as the name of the jar file in the server you want to run
 // DIReallyKnowWhatIAmDoingISwear is to remove the stupid pause spigot has at the start
-task runJar() << {
-    javaexec {
-        main "-jar"
-        args "${System.env.MC_SERVER_LOC}\\${System.env.MC_SERVER_JAR}.jar"
-        jvmArgs "-DIReallyKnowWhatIAmDoingISwear=true"
-        workingDir "${System.env.MC_SERVER_LOC}"
+task runJar() {
+    doLast {
+        javaexec {
+            main "-jar"
+            args "${System.env.MC_SERVER_LOC}\\${System.env.MC_SERVER_JAR}.jar"
+            jvmArgs "-DIReallyKnowWhatIAmDoingISwear=true"
+            workingDir "${System.env.MC_SERVER_LOC}"
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java b/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java
index 1157fde..6143f56 100644
--- a/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java
+++ b/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java
@@ -1,6 +1,9 @@
 package com.sekwah.advancedportals.spigot;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import com.sekwah.advancedportals.core.AdvancedPortalsCore;
+import com.sekwah.advancedportals.core.config.RepositoryModule;
 import com.sekwah.advancedportals.core.data.DataStorage;
 import com.sekwah.advancedportals.coreconnector.ConnectorDataCollector;
 import com.sekwah.advancedportals.coreconnector.command.CommandRegister;
@@ -10,11 +13,17 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
 
     private AdvancedPortalsCore portalsCore;
 
+    /**
+     * Readd this when the injector is actually needed.
+     */
+    //private Injector injector;
+
     public void onEnable() {
         // TODO actually get the minecraft version
         this.portalsCore = new AdvancedPortalsCore(new DataStorage(this.getDataFolder()),
                 new SpigotInfoLogger(this), new CommandRegister(this), new ConnectorDataCollector(), new int[]{1,12,2});
-        this.getServer().getPluginManager().registerEvents(new Listeners(this), this);
+        //injector = Guice.createInjector(new RepositoryModule(this.portalsCore));
+        this.getServer().getPluginManager().registerEvents(new Listeners(), this);
     }
 
     public void onDisable() {
diff --git a/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java b/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java
index 6f66054..7227eb9 100644
--- a/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java
+++ b/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java
@@ -1,5 +1,7 @@
 package com.sekwah.advancedportals.spigot;
 
+import com.google.inject.name.Named;
+import com.sekwah.advancedportals.core.AdvancedPortalsCore;
 import com.sekwah.advancedportals.core.CoreListeners;
 import com.sekwah.advancedportals.core.entities.PortalLocation;
 import com.sekwah.advancedportals.coreconnector.container.PlayerContainer;
@@ -11,22 +13,24 @@ import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+import javax.inject.Inject;
 
 public class Listeners implements Listener {
 
-    private final AdvancedPortalsPlugin plugin;
-    private final CoreListeners coreListeners;
-
-    public Listeners(AdvancedPortalsPlugin plugin) {
-        this.plugin = plugin;
-        this.coreListeners = plugin.getPortalsCore().getCoreListeners();
-    }
+    private CoreListeners coreListeners = AdvancedPortalsCore.getCoreListeners();
 
     @EventHandler
     public void onJoinEvent(PlayerJoinEvent event) {
         coreListeners.playerJoin(new PlayerContainer(event.getPlayer()));
     }
 
+    @EventHandler
+    public void onJoinEvent(PlayerQuitEvent event) {
+        coreListeners.playerLeave(new PlayerContainer(event.getPlayer()));
+    }
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockPlace(BlockPlaceEvent event) {
         if (!event.isCancelled()) {