diff --git a/src/com/sekwah/advancedportals/core/api/events/PortalsLoadedEvent.java b/src/com/sekwah/advancedportals/core/api/events/PortalsLoadedEvent.java
index 1fb73a6..e696118 100644
--- a/src/com/sekwah/advancedportals/core/api/events/PortalsLoadedEvent.java
+++ b/src/com/sekwah/advancedportals/core/api/events/PortalsLoadedEvent.java
@@ -1,16 +1,16 @@
 package com.sekwah.advancedportals.core.api.events;
 
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
 
 /**
  * Triggered once all the portals are loaded
  *
+ * TODO Need to make a custom event handler to be able to register against
+ *
  * @author sekwah41
  */
-public class PortalsLoadedEvent extends Event {
-    @Override
+public class PortalsLoadedEvent/* extends Event*/ {
+    /*@Override
     public HandlerList getHandlers() {
         return null;
-    }
+    }*/
 }
diff --git a/src/com/sekwah/advancedportals/core/api/events/WarpEvent.java b/src/com/sekwah/advancedportals/core/api/events/WarpEvent.java
index d2f6052..29ea786 100644
--- a/src/com/sekwah/advancedportals/core/api/events/WarpEvent.java
+++ b/src/com/sekwah/advancedportals/core/api/events/WarpEvent.java
@@ -1,17 +1,16 @@
-package com.sekwah.advancedportals.api.events;
+package com.sekwah.advancedportals.core.api.events;
 
-import com.sekwah.advancedportals.api.portal.Portal;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
+import com.sekwah.advancedportals.core.api.portal.Portal;
 
 /**
  * Trigered whenever a player activates the warp after the tags are handled.
+ *
+ *
+ * TODO Need to make a custom event handler to be able to register against or something similar like a general events data
  */
-public class WarpEvent extends Event implements Cancellable {
+public class WarpEvent /*extends Event implements Cancellable*/ {
 
-    private static HandlerList handlers = new HandlerList();
+    /*private static HandlerList handlers = new HandlerList();
 
     private boolean cancelled = false;
 
@@ -21,20 +20,20 @@ public class WarpEvent extends Event implements Cancellable {
 
     private boolean hasWarped = false;
 
-    /*public WarpEvent(Player player, AdvancedPortal portalData) {
+    *//*public WarpEvent(Player player, AdvancedPortal portalData) {
         this.player = player;
         this.portalData = portalData;
-    }*/
+    }*//*
 
     public static HandlerList getHandlerList() {
         return handlers;
     }
 
-    /**
+    *//**
      * Returns if the event has been cancelled
      *
      * @return cancelled
-     */
+     *//*
     public boolean isCancelled() {
         return cancelled;
     }
@@ -43,24 +42,24 @@ public class WarpEvent extends Event implements Cancellable {
         cancelled = cancel;
     }
 
-    /*public AdvancedPortal getPortalData() {
+    *//*public AdvancedPortal getPortalData() {
         return portalData;
-    }*/
+    }*//*
 
-    /**
+    *//**
      * This will return true if another plugin has warped the player(and set this to true)
      *
      * @return hasWarped
-     */
+     *//*
     public boolean getHasWarped() {
         return hasWarped;
     }
 
-    /**
+    *//**
      * If the
      *
      * @param warped
-     */
+     *//*
     public void setHasWarped(boolean warped) {
         this.hasWarped = warped;
     }
@@ -71,5 +70,5 @@ public class WarpEvent extends Event implements Cancellable {
 
     public HandlerList getHandlers() {
         return handlers;
-    }
+    }*/
 }
\ No newline at end of file