diff --git a/AliPresents.jar b/AliPresents.jar
index f138d86..0a43358 100644
Binary files a/AliPresents.jar and b/AliPresents.jar differ
diff --git a/plugin.yml b/plugin.yml
index 6d46464..a1932dd 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -10,4 +10,4 @@ commands:
   setalilink:
     description: Creates an Ali Link setalilink frequency
   setFlairDoorColour:
-  	description: Sets the flair door colour mode, when lighting portals
\ No newline at end of file
+    description: Sets the flair door colour mode, when lighting portals
\ No newline at end of file
diff --git a/src/alisolarflare/flairdoors/FlairDoorsSubPlug.java b/src/alisolarflare/flairdoors/FlairDoorsSubPlug.java
index 70ac438..9e3bfce 100644
--- a/src/alisolarflare/flairdoors/FlairDoorsSubPlug.java
+++ b/src/alisolarflare/flairdoors/FlairDoorsSubPlug.java
@@ -1,7 +1,5 @@
 package alisolarflare.flairdoors;
 
-import org.bukkit.plugin.java.JavaPlugin;
-
 import alisolarflare.AliPresents;
 
 public class FlairDoorsSubPlug{
@@ -19,7 +17,7 @@ public class FlairDoorsSubPlug{
 	}
 	private void registerEvents() {
 		// TODO Auto-generated method stub
-		plugin.getServer().getPluginManager().registerEvents(new PortalLightListener(), plugin);
+		plugin.getServer().getPluginManager().registerEvents(new PortalListener(plugin), plugin);
 
 	}
 }
diff --git a/src/alisolarflare/flairdoors/PortalLightListener.java b/src/alisolarflare/flairdoors/PortalLightListener.java
deleted file mode 100644
index abb087e..0000000
--- a/src/alisolarflare/flairdoors/PortalLightListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package alisolarflare.flairdoors;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityCreatePortalEvent;
-import org.bukkit.event.entity.EntityPortalEvent;
-
-public class PortalLightListener implements Listener{
-	
-	//TODO: CREATE - LIST OF PORTALS (only x-z values)
-	
-	
-	@EventHandler
-	public void onPortalLight(EntityCreatePortalEvent event){
-		
-		//SANITATION - entity > player
-		if(!(event.getEntity() instanceof Player)){return;}
-		Player player = (Player) event.getEntity();
-		
-		//SANITIATION - player > alisolarflare
-		if(!(player.getName() == "alisolarflare")){return;}
-		
-		//TODO: MARK PORTAL
-		if (SetFlairDoorColour.FlairDoorColorMode == "null"){
-			player.sendMessage("Your Colour mode is set to Null, use /SetFlairDoorColour [Color] to specify a colour for this portal");
-			return;
-		}
-		//TODO: SAVE PORTAL
-	}
-	
-	@EventHandler
-	public void onPortalEnter(EntityPortalEvent event){
-		event.setCancelled(false);
-		
-		//TODO: IF PLAYER LOCATION IS INSIDE A COLOUR PORTAL
-		//TODO: IF PLAYER NOT FLAIRED
-		//TODO: IF PLAYERSTATE IS TRUE
-		//TODO: CHANGE CUSTOM DISPLAY NAME
-		//TODO: TELEPORT TO SPAWN
-		//TODO: MARK PLAYER AS COLOURED
-		
-	}
-}
diff --git a/src/alisolarflare/flairdoors/PortalListener.java b/src/alisolarflare/flairdoors/PortalListener.java
new file mode 100644
index 0000000..1b51c9e
--- /dev/null
+++ b/src/alisolarflare/flairdoors/PortalListener.java
@@ -0,0 +1,68 @@
+package alisolarflare.flairdoors;
+
+import java.util.AbstractMap;
+import java.util.HashMap;
+
+import org.bukkit.Location;
+import org.bukkit.block.BlockState;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityCreatePortalEvent;
+
+import alisolarflare.AliPresents;
+
+public class PortalListener implements Listener{
+	AbstractMap<String,Location> portalMap = new HashMap<String,Location>();
+	private AliPresents plugin;
+	
+	//TODO: CREATE - LIST OF PORTALS (only x-z values)
+	
+	
+	public PortalListener(AliPresents plugin) {
+		this.plugin = plugin;
+	}
+
+	@EventHandler
+	public void onPortalLight(EntityCreatePortalEvent event){
+		plugin.getServer().broadcastMessage("PORTAL LIT WHOOP WHOOP");
+		plugin.getServer().broadcastMessage(event.getEntity().getName());
+		//SANITATION - entity > player
+		if(!(event.getEntity() instanceof Player)){return;}
+		Player player = (Player) event.getEntity();
+		event.getEntity().getServer().broadcastMessage(player.getName());
+		
+		//SANITIATION - player > alisolarflare
+		if(!(player.getName() == "alisolarflare")){return;}
+		event.getEntity().getServer().broadcastMessage(SetFlairDoorColour.FlairDoorColorMode);
+		//SANITATION - FlairDoorColourMode
+		if (SetFlairDoorColour.FlairDoorColorMode == "null"){
+			player.sendMessage("Your Colour mode is set to Null, use /SetFlairDoorColour [Color] to specify a colour for this portal");
+			return;
+		}
+
+		//INIT - colourMode, portalLocation
+		String colourMode = SetFlairDoorColour.FlairDoorColorMode;
+		Location portalLocation = event.getBlocks().get(0).getBlock().getLocation();
+		event.getEntity().getServer().broadcastMessage(portalLocation.toString()); 
+		//SAVE - Portal
+		if(SetFlairDoorColour.COLOURMODES.contains(colourMode)){
+			for (BlockState blockstate : event.getBlocks()){
+				player.sendMessage(blockstate.getBlock().getLocation().toString());
+			}
+			portalMap.put(colourMode, portalLocation);
+		}
+	}
+	/*
+	@EventHandler
+	public void onPortalEnter(EntityPortalEvent event){
+		//TODO: IF PLAYER LOCATION IS INSIDE A COLOUR PORTAL
+		//TODO: IF PLAYER NOT FLAIRED
+		//TODO: IF PLAYERSTATE IS TRUE
+		//TODO: CHANGE CUSTOM DISPLAY NAME
+		//TODO: TELEPORT TO SPAWN
+		//TODO: MARK PLAYER AS COLOURED
+		
+	}
+	*/
+}
diff --git a/src/alisolarflare/flairdoors/SetFlairDoorColour.java b/src/alisolarflare/flairdoors/SetFlairDoorColour.java
index 69df081..d3d349d 100644
--- a/src/alisolarflare/flairdoors/SetFlairDoorColour.java
+++ b/src/alisolarflare/flairdoors/SetFlairDoorColour.java
@@ -1,11 +1,15 @@
 package alisolarflare.flairdoors;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
 public class SetFlairDoorColour implements CommandExecutor {
 	public static String FlairDoorColorMode = "null";
+	public static final List<String> COLOURMODES = Arrays.asList("red", "orange", "yellow", "green", "blue", "purple", "gray");
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 		if (args.length > 1){
@@ -15,7 +19,7 @@ public class SetFlairDoorColour implements CommandExecutor {
 		String firstCommand = args[0];
 		firstCommand = firstCommand.toLowerCase();
 		if(firstCommand.startsWith("e")|| firstCommand.startsWith("gra")|| firstCommand.startsWith("grey")){
-			sender.sendMessage("Flair Door Colour Mode set to grey");
+			sender.sendMessage("Flair Door Colour Mode set to gray");
 			FlairDoorColorMode = "gray";
 		}else if(firstCommand.startsWith("r")){
 			sender.sendMessage("Flair Door Colour Mode set to Red");