diff --git a/.gitignore b/.gitignore
index 970fac184..36fe02146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ zSotanna2
 /.recommenders/index/http___download_eclipse_org_recommenders_models_mars_/segments.gen
 /.recommenders/index/http___download_eclipse_org_recommenders_models_mars_/segments_1
 /.recommenders/index/http___download_eclipse_org_recommenders_models_mars_/write.lock
+/Pocket
diff --git a/Art/MS SMoke.psd b/Art/MS SMoke.psd
new file mode 100644
index 000000000..cfddd9d8c
Binary files /dev/null and b/Art/MS SMoke.psd differ
diff --git a/Patches/Bukkit-Patches/0031-EntityDismountEvent.patch b/Patches/Bukkit-Patches/0031-EntityDismountEvent.patch
new file mode 100644
index 000000000..72f7c9718
--- /dev/null
+++ b/Patches/Bukkit-Patches/0031-EntityDismountEvent.patch
@@ -0,0 +1,47 @@
+From c6e51ae8ffc31d0fc059d33ca159df31c2b7a83e Mon Sep 17 00:00:00 2001
+From: libraryaddict <libraryaddict115@yahoo.co.nz>
+Date: Sun, 22 Nov 2015 14:37:11 +1300
+Subject: [PATCH] EntityDismountEvent
+
+
+diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
+index 24d4942..02943d6 100644
+--- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
++++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
+@@ -2,13 +2,14 @@ package org.spigotmc.event.entity;
+ 
+ import org.bukkit.entity.Entity;
+ import org.bukkit.event.HandlerList;
++import org.bukkit.event.Cancellable;
+ import org.bukkit.event.entity.EntityEvent;
+ 
+ /**
+  * Called when an entity stops riding another entity.
+  *
+  */
+-public class EntityDismountEvent extends EntityEvent
++public class EntityDismountEvent extends EntityEvent implements Cancellable
+ {
+ 
+     private static final HandlerList handlers = new HandlerList();
+@@ -36,4 +37,17 @@ public class EntityDismountEvent extends EntityEvent
+     {
+         return handlers;
+     }
++
++    @Override
++    public boolean isCancelled()
++    {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel)
++    {
++        this.cancelled = cancel;
++    }
++
+ }
+-- 
+1.9.5.msysgit.0
+
diff --git a/Patches/CraftBukkit-Patches/0176-EntityDismountEvent-teleport-crash-fix.patch b/Patches/CraftBukkit-Patches/0176-EntityDismountEvent-teleport-crash-fix.patch
new file mode 100644
index 000000000..6a7278e9a
--- /dev/null
+++ b/Patches/CraftBukkit-Patches/0176-EntityDismountEvent-teleport-crash-fix.patch
@@ -0,0 +1,159 @@
+From bc86c3b02f2efa4c1194fc908e8d1ee8723f62c5 Mon Sep 17 00:00:00 2001
+From: libraryaddict <libraryaddict115@yahoo.co.nz>
+Date: Sun, 22 Nov 2015 14:41:11 +1300
+Subject: [PATCH] EntityDismountEvent & teleport crash fix
+
+
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index 81ca499..7165579 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -23,6 +23,8 @@ import org.bukkit.event.painting.PaintingBreakByEntityEvent;
+ import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
+ import org.bukkit.event.vehicle.VehicleEnterEvent;
+ import org.bukkit.event.vehicle.VehicleExitEvent;
++import org.spigotmc.event.entity.EntityDismountEvent;
++import org.spigotmc.event.entity.EntityMountEvent;
+ import org.bukkit.craftbukkit.CraftWorld;
+ import org.bukkit.craftbukkit.entity.CraftEntity;
+ import org.bukkit.craftbukkit.entity.CraftPlayer;
+@@ -1591,7 +1593,12 @@ public abstract class Entity implements ICommandListener {
+                     }
+                 }
+                 // CraftBukkit end
+-                pluginManager.callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot
++                EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent(this.getBukkitEntity(), this.vehicle.getBukkitEntity());
++                pluginManager.callEvent(event); // Spigot
++                
++                if (event.isCancelled() || vehicle != originalVehicle) {
++                    return;
++                } // Spigot
+                 this.setPositionRotation(this.vehicle.locX, this.vehicle.getBoundingBox().b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
+                 this.vehicle.passenger = null;
+             }
+@@ -1599,44 +1606,45 @@ public abstract class Entity implements ICommandListener {
+             this.vehicle = null;
+         } else {
+             // CraftBukkit start
+-            if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle) && entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, true)) {
++            if (entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, true)) {
+                 // It's possible to move from one vehicle to another.  We need to check if they're already in a vehicle, and fire an exit event if they are.
+                 VehicleExitEvent exitEvent = null;
++                EntityDismountEvent exitEvent1 = null;
+                 if (this.vehicle != null) {
+-                    exitEvent = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
++                    if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle))
++                        exitEvent = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
+                     pluginManager.callEvent(exitEvent);
+ 
+                     if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
+                         return;
+                     }
++                    
++                    exitEvent1 = new EntityDismountEvent(this.vehicle.getBukkitEntity(), this.bukkitEntity);
++
++                    pluginManager.callEvent(exitEvent1);
++
++                    if (exitEvent1.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
++                        return;
++                    }
+                 }
+ 
+-                VehicleEnterEvent event = new VehicleEnterEvent((Vehicle) entity.getBukkitEntity(), this.bukkitEntity);
+-                pluginManager.callEvent(event);
++                if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle)) {
++                    VehicleEnterEvent event = new VehicleEnterEvent((Vehicle) entity.getBukkitEntity(), this.bukkitEntity);
++                    pluginManager.callEvent(event);
+ 
+-                // If a plugin messes with the vehicle or the vehicle's passenger
+-                if (event.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
+-                    // If we only cancelled the enterevent then we need to put the player in a decent position.
+-                    if (exitEvent != null && this.vehicle == originalVehicle && this.vehicle != null && this.vehicle.passenger == originalPassenger) {
+-                        this.setPositionRotation(this.vehicle.locX, this.vehicle.getBoundingBox().b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
+-                        this.vehicle.passenger = null;
+-                        this.vehicle = null;
++                    // If a plugin messes with the vehicle or the vehicle's passenger
++                    if (event.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
++                        // If we only cancelled the enterevent then we need to put the player in a decent position.
++                        if (exitEvent != null && this.vehicle == originalVehicle && this.vehicle != null && this.vehicle.passenger == originalPassenger) {
++                            this.setPositionRotation(this.vehicle.locX, this.vehicle.getBoundingBox().b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
++                            this.vehicle.passenger = null;
++                            this.vehicle = null;
++                        }
++                        return;
+                     }
+-                    return;
+                 }
+             }
+             // CraftBukkit end
+-            // Spigot Start
+-            if ( entity.world.isChunkLoaded( (int) entity.locX >> 4, (int) entity.locZ >> 4, true ) )
+-            {
+-                org.spigotmc.event.entity.EntityMountEvent event = new org.spigotmc.event.entity.EntityMountEvent( this.getBukkitEntity(), entity.getBukkitEntity() );
+-                pluginManager.callEvent( event );
+-                if ( event.isCancelled() )
+-                {
+-                    return;
+-                }
+-            }
+-            // Spigot End
+ 
+             if (this.vehicle != null) {
+                 this.vehicle.passenger = null;
+diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
+index b861dbe..96b3905 100644
+--- a/src/main/java/net/minecraft/server/EntityLiving.java
++++ b/src/main/java/net/minecraft/server/EntityLiving.java
+@@ -21,6 +21,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
+ import org.bukkit.event.entity.EntityDamageEvent.DamageModifier;
+ import org.bukkit.event.entity.EntityRegainHealthEvent;
+ import org.bukkit.event.vehicle.VehicleExitEvent;
++import org.spigotmc.event.entity.EntityDismountEvent;
+ // CraftBukkit end
+ 
+ import org.bukkit.craftbukkit.SpigotTimings; // Spigot
+@@ -1725,8 +1726,15 @@ public abstract class EntityLiving extends Entity {
+                     return;
+                 }
+             }
++
++            EntityDismountEvent event = new EntityDismountEvent(this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
++            getBukkitEntity().getServer().getPluginManager().callEvent(event);
++
++            if (event.isCancelled() || vehicle != originalVehicle) {
++                return;
++            }
+             // CraftBukkit end
+-            
++
+             if (!this.world.isClientSide) {
+                 this.q(this.vehicle);
+             }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+index efbf1a8..dbc7b54 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -1,6 +1,7 @@
+ package org.bukkit.craftbukkit.entity;
+ 
+ import com.google.common.base.Preconditions;
++import com.google.common.primitives.Doubles;
+ import java.util.ArrayList;
+ import java.util.Collection;
+ import java.util.List;
+@@ -234,6 +235,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+         // If this entity is riding another entity, we must dismount before teleporting.
+         entity.mount(null);
+ 
++        if (!Doubles.isFinite(location.getX()) || !Doubles.isFinite(location.getY()) || !Doubles.isFinite(location.getZ()))
++        {
++            Thread.dumpStack();
++            return false;
++        }
++        
+         // Spigot start
+         if (!location.getWorld().equals(getWorld())) {
+           entity.teleportTo(location, cause.equals(TeleportCause.NETHER_PORTAL));
+-- 
+1.9.5.msysgit.0
+
diff --git a/Plugins/.idea/artifacts/Mineplex_Game_Clans_jar.xml b/Plugins/.idea/artifacts/Mineplex_Game_Clans_jar.xml
index d88c9bbd4..d44ba58ec 100644
--- a/Plugins/.idea/artifacts/Mineplex_Game_Clans_jar.xml
+++ b/Plugins/.idea/artifacts/Mineplex_Game_Clans_jar.xml
@@ -18,6 +18,9 @@
       <element id="file-copy" path="$PROJECT_DIR$/Mineplex.Game.Clans/plugin.yml" />
       <element id="module-output" name="Mineplex.ServerData" />
       <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
+      <element id="module-output" name="Mineplex.Game.Clans.Core" />
+      <element id="module-output" name="Mineplex.PlayerCache" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml b/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
index 370ba8bd7..55d803b0b 100644
--- a/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
+++ b/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
@@ -21,6 +21,7 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
       <element id="module-output" name="Mineplex.PlayerCache" />
+      <element id="module-output" name="Mineplex.Game.Clans.Core" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/Plugins/.idea/codeStyleSettings.xml b/Plugins/.idea/codeStyleSettings.xml
index 44295e3d8..f750af4b9 100644
--- a/Plugins/.idea/codeStyleSettings.xml
+++ b/Plugins/.idea/codeStyleSettings.xml
@@ -7,6 +7,14 @@
         <option name="STATIC_FIELD_NAME_PREFIX" value="_" />
         <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="20" />
         <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10" />
+        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+          <value>
+            <package name="java.awt" withSubpackages="false" static="false" />
+            <package name="org.jooq.impl.DSL" withSubpackages="false" static="true" />
+            <package name="mineplex.database.Tables" withSubpackages="false" static="true" />
+            <package name="javax.swing" withSubpackages="false" static="false" />
+          </value>
+        </option>
         <option name="IMPORT_LAYOUT_TABLE">
           <value>
             <package name="javax" withSubpackages="true" static="false" />
diff --git a/Plugins/.idea/compiler.xml b/Plugins/.idea/compiler.xml
index 56d0c48ed..30263f09d 100644
--- a/Plugins/.idea/compiler.xml
+++ b/Plugins/.idea/compiler.xml
@@ -5,9 +5,6 @@
     <excludeFromCompile>
       <directory url="file://$PROJECT_DIR$/Nautilus.Game.PvP" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/Mineplex.ServerMonitor" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/Mineplex.Game.Clans" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/Nautilus.Game.Arcade" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/Mineplex.Hub" includeSubdirectories="true" />
     </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
@@ -31,9 +28,7 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel target="1.7">
-      <module name="bungee" target="1.7" />
-    </bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.7" />
   </component>
   <component name="JavacSettings">
     <option name="GENERATE_NO_WARNINGS" value="true" />
diff --git a/Plugins/.idea/dataSources.xml b/Plugins/.idea/dataSources.xml
index 8c71c7a5f..dea8a489b 100644
--- a/Plugins/.idea/dataSources.xml
+++ b/Plugins/.idea/dataSources.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="DataSourceManagerImpl" format="xml" hash="4268976312">
+  <component name="DataSourceManagerImpl" format="xml" hash="2876127046">
     <data-source source="LOCAL" name="Mineplex" uuid="14dfc55d-5343-47c4-ab24-76a055b8059e">
       <driver-ref>mysql</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://db.mineplex.com:3306</jdbc-url>
+      <jdbc-url>jdbc:mysql://db.mineplex.com:3306/Account</jdbc-url>
       <driver-properties>
         <property name="zeroDateTimeBehavior" value="convertToNull" />
         <property name="tinyInt1isBit" value="false" />
diff --git a/Plugins/.idea/libraries/craftbukkit.xml b/Plugins/.idea/libraries/craftbukkit.xml
index d3750ebca..757400be0 100644
--- a/Plugins/.idea/libraries/craftbukkit.xml
+++ b/Plugins/.idea/libraries/craftbukkit.xml
@@ -4,7 +4,7 @@
       <root url="jar://$PROJECT_DIR$/Libraries/craftbukkit.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="http://jd.bukkit.org/dev/apidocs/" />
+      <root url="https://hub.spigotmc.org/javadocs/spigot/" />
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/Libraries/craftbukkit.jar!/" />
diff --git a/Plugins/.idea/misc.xml b/Plugins/.idea/misc.xml
index aeea575e6..4b4d0cc04 100644
--- a/Plugins/.idea/misc.xml
+++ b/Plugins/.idea/misc.xml
@@ -16,7 +16,7 @@
       </set>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Plugins/.idea/modules.xml b/Plugins/.idea/modules.xml
index f7936ba2e..a8626a3f1 100644
--- a/Plugins/.idea/modules.xml
+++ b/Plugins/.idea/modules.xml
@@ -3,21 +3,23 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Classpath.Dummy/Classpath.Dummy.iml" filepath="$PROJECT_DIR$/Classpath.Dummy/Classpath.Dummy.iml" group="Core" />
-      <module fileurl="file://$PROJECT_DIR$/JedisTest/JedisTest.iml" filepath="$PROJECT_DIR$/JedisTest/JedisTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/JedisTest/JedisTest.iml" filepath="$PROJECT_DIR$/JedisTest/JedisTest.iml" group="Legacy" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Bungee.Mineplexer/Mineplex.Bungee.Mineplexer.iml" filepath="$PROJECT_DIR$/Mineplex.Bungee.Mineplexer/Mineplex.Bungee.Mineplexer.iml" group="Bungee" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Core/Mineplex.Core.iml" filepath="$PROJECT_DIR$/Mineplex.Core/Mineplex.Core.iml" group="Core" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Core.Common/Mineplex.Core.Common.iml" filepath="$PROJECT_DIR$/Mineplex.Core.Common/Mineplex.Core.Common.iml" group="Core" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Database/Mineplex.Database.iml" filepath="$PROJECT_DIR$/Mineplex.Database/Mineplex.Database.iml" group="Core" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Game.Clans/Mineplex.Game.Clans.iml" filepath="$PROJECT_DIR$/Mineplex.Game.Clans/Mineplex.Game.Clans.iml" group="Game" />
+      <module fileurl="file://$PROJECT_DIR$/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml" filepath="$PROJECT_DIR$/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Hub/Mineplex.Hub.iml" filepath="$PROJECT_DIR$/Mineplex.Hub/Mineplex.Hub.iml" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.MapParser/Mineplex.MapParser.iml" filepath="$PROJECT_DIR$/Mineplex.MapParser/Mineplex.MapParser.iml" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml" filepath="$PROJECT_DIR$/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml" group="Game" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml" filepath="$PROJECT_DIR$/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml" group="Game" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.PlayerCache/Mineplex.PlayerCache.iml" filepath="$PROJECT_DIR$/Mineplex.PlayerCache/Mineplex.PlayerCache.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Mineplex.PlayerCache/Mineplex.PlayerCache.iml" filepath="$PROJECT_DIR$/Mineplex.PlayerCache/Mineplex.PlayerCache.iml" group="Core" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.ServerData/Mineplex.ServerData.iml" filepath="$PROJECT_DIR$/Mineplex.ServerData/Mineplex.ServerData.iml" group="Core" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml" filepath="$PROJECT_DIR$/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml" group="Core" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Votifier/Mineplex.Votifier.iml" filepath="$PROJECT_DIR$/Mineplex.Votifier/Mineplex.Votifier.iml" />
       <module fileurl="file://$PROJECT_DIR$/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml" filepath="$PROJECT_DIR$/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml" group="Game" />
+      <module fileurl="file://$PROJECT_DIR$/Nautilus.Game.PvP/Nautilus.Game.PvP.iml" filepath="$PROJECT_DIR$/Nautilus.Game.PvP/Nautilus.Game.PvP.iml" group="Legacy" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/Plugins/BuildFiles/common.xml b/Plugins/BuildFiles/common.xml
index 3359861d8..6c5db05db 100644
--- a/Plugins/BuildFiles/common.xml
+++ b/Plugins/BuildFiles/common.xml
@@ -149,6 +149,9 @@
 			<fileset dir="../Mineplex.Minecraft.Game.Core/bin">
 				<include name="**/*.class"/>
 			</fileset>
+            <fileset dir="../Mineplex.Game.Clans.Core/bin">
+				<include name="**/*.class"/>
+			</fileset>
 			<fileset dir="../Mineplex.Hub">
 				<include name="*.yml"/>
 			</fileset>
@@ -189,6 +192,9 @@
 			<fileset dir="../Mineplex.Core.Common/bin">
 				<include name="**/*.class"/>
 			</fileset>
+            <fileset dir="../Mineplex.Game.Clans.Core/bin">
+				<include name="**/*.class"/>
+			</fileset>
 			<fileset dir="../Mineplex.Minecraft.Game.ClassCombat/bin">
 				<include name="**/*.class"/>
 			</fileset>
diff --git a/Plugins/Classpath.Dummy/Classpath.Dummy.iml b/Plugins/Classpath.Dummy/Classpath.Dummy.iml
index c576490ad..62272ae21 100644
--- a/Plugins/Classpath.Dummy/Classpath.Dummy.iml
+++ b/Plugins/Classpath.Dummy/Classpath.Dummy.iml
@@ -12,5 +12,4 @@
     <orderEntry type="library" name="commons-pool2" level="project" />
     <orderEntry type="library" name="commons-logging" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/Plugins/Classpath.Dummy/src/org/bukkit/command/SimpleCommandMap.java b/Plugins/Classpath.Dummy/src/org/bukkit/command/SimpleCommandMap.java
deleted file mode 100644
index e7995c922..000000000
--- a/Plugins/Classpath.Dummy/src/org/bukkit/command/SimpleCommandMap.java
+++ /dev/null
@@ -1,328 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
-package org.bukkit.command;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.regex.Pattern;
-import org.apache.commons.lang.Validate;
-import org.bukkit.Server;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandException;
-import org.bukkit.command.CommandMap;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.FormattedCommandAlias;
-import org.bukkit.command.defaults.AchievementCommand;
-import org.bukkit.command.defaults.BanCommand;
-import org.bukkit.command.defaults.BanIpCommand;
-import org.bukkit.command.defaults.BanListCommand;
-import org.bukkit.command.defaults.ClearCommand;
-import org.bukkit.command.defaults.DefaultGameModeCommand;
-import org.bukkit.command.defaults.DeopCommand;
-import org.bukkit.command.defaults.DifficultyCommand;
-import org.bukkit.command.defaults.EffectCommand;
-import org.bukkit.command.defaults.EnchantCommand;
-import org.bukkit.command.defaults.ExpCommand;
-import org.bukkit.command.defaults.GameModeCommand;
-import org.bukkit.command.defaults.GameRuleCommand;
-import org.bukkit.command.defaults.GiveCommand;
-import org.bukkit.command.defaults.HelpCommand;
-import org.bukkit.command.defaults.KickCommand;
-import org.bukkit.command.defaults.KillCommand;
-import org.bukkit.command.defaults.ListCommand;
-import org.bukkit.command.defaults.MeCommand;
-import org.bukkit.command.defaults.OpCommand;
-import org.bukkit.command.defaults.PardonCommand;
-import org.bukkit.command.defaults.PardonIpCommand;
-import org.bukkit.command.defaults.PlaySoundCommand;
-import org.bukkit.command.defaults.PluginsCommand;
-import org.bukkit.command.defaults.ReloadCommand;
-import org.bukkit.command.defaults.SaveCommand;
-import org.bukkit.command.defaults.SaveOffCommand;
-import org.bukkit.command.defaults.SaveOnCommand;
-import org.bukkit.command.defaults.SayCommand;
-import org.bukkit.command.defaults.ScoreboardCommand;
-import org.bukkit.command.defaults.SeedCommand;
-import org.bukkit.command.defaults.SetIdleTimeoutCommand;
-import org.bukkit.command.defaults.SetWorldSpawnCommand;
-import org.bukkit.command.defaults.SpawnpointCommand;
-import org.bukkit.command.defaults.SpreadPlayersCommand;
-import org.bukkit.command.defaults.StopCommand;
-import org.bukkit.command.defaults.TeleportCommand;
-import org.bukkit.command.defaults.TellCommand;
-import org.bukkit.command.defaults.TestForCommand;
-import org.bukkit.command.defaults.TimeCommand;
-import org.bukkit.command.defaults.TimingsCommand;
-import org.bukkit.command.defaults.ToggleDownfallCommand;
-import org.bukkit.command.defaults.VanillaCommand;
-import org.bukkit.command.defaults.VersionCommand;
-import org.bukkit.command.defaults.WeatherCommand;
-import org.bukkit.command.defaults.WhitelistCommand;
-import org.bukkit.entity.Player;
-import org.bukkit.event.TabCompleteEvent;
-import org.bukkit.util.Java15Compat;
-import org.bukkit.util.StringUtil;
-
-public class SimpleCommandMap implements CommandMap {
-	private static final Pattern PATTERN_ON_SPACE = Pattern.compile(" ", 16);
-	protected final Map<String, Command> knownCommands = new HashMap<String, Command>();
-	private final Server server;
-
-	public SimpleCommandMap(Server server) {
-		this.server = server;
-		this.setDefaultCommands();
-	}
-
-	private void setDefaultCommands() {
-		this.register("bukkit", new SaveCommand());
-		this.register("bukkit", new SaveOnCommand());
-		this.register("bukkit", new SaveOffCommand());
-		this.register("bukkit", new StopCommand());
-		this.register("bukkit", new VersionCommand("version"));
-		this.register("bukkit", new ReloadCommand("reload"));
-		this.register("bukkit", new PluginsCommand("plugins"));
-		this.register("bukkit", new TimingsCommand("timings"));
-	}
-
-	public void setFallbackCommands() {
-		this.register("bukkit", new ListCommand());
-		this.register("bukkit", new OpCommand());
-		this.register("bukkit", new DeopCommand());
-		this.register("bukkit", new BanIpCommand());
-		this.register("bukkit", new PardonIpCommand());
-		this.register("bukkit", new BanCommand());
-		this.register("bukkit", new PardonCommand());
-		this.register("bukkit", new KickCommand());
-		this.register("bukkit", new TeleportCommand());
-		this.register("bukkit", new GiveCommand());
-		this.register("bukkit", new TimeCommand());
-		this.register("bukkit", new SayCommand());
-		this.register("bukkit", new WhitelistCommand());
-		this.register("bukkit", new TellCommand());
-		this.register("bukkit", new MeCommand());
-		this.register("bukkit", new KillCommand());
-		this.register("bukkit", new GameModeCommand());
-		this.register("bukkit", new HelpCommand());
-		this.register("bukkit", new ExpCommand());
-		this.register("bukkit", new ToggleDownfallCommand());
-		this.register("bukkit", new BanListCommand());
-		this.register("bukkit", new DefaultGameModeCommand());
-		this.register("bukkit", new SeedCommand());
-		this.register("bukkit", new DifficultyCommand());
-		this.register("bukkit", new WeatherCommand());
-		this.register("bukkit", new SpawnpointCommand());
-		this.register("bukkit", new ClearCommand());
-		this.register("bukkit", new GameRuleCommand());
-		this.register("bukkit", new EnchantCommand());
-		this.register("bukkit", new TestForCommand());
-		this.register("bukkit", new EffectCommand());
-		this.register("bukkit", new ScoreboardCommand());
-		this.register("bukkit", new PlaySoundCommand());
-		this.register("bukkit", new SpreadPlayersCommand());
-		this.register("bukkit", new SetWorldSpawnCommand());
-		this.register("bukkit", new SetIdleTimeoutCommand());
-		this.register("bukkit", new AchievementCommand());
-	}
-
-	public void registerAll(String fallbackPrefix, List<Command> commands) {
-		if(commands != null) {
-			Iterator var3 = commands.iterator();
-
-			while(var3.hasNext()) {
-				Command c = (Command)var3.next();
-				this.register(fallbackPrefix, c);
-			}
-		}
-
-	}
-
-	public boolean register(String fallbackPrefix, Command command) {
-		return this.register(command.getName(), fallbackPrefix, command);
-	}
-
-	public boolean register(String label, String fallbackPrefix, Command command) {
-		label = label.toLowerCase().trim();
-		fallbackPrefix = fallbackPrefix.toLowerCase().trim();
-		boolean registered = this.register(label, command, false, fallbackPrefix);
-		Iterator iterator = command.getAliases().iterator();
-
-		while(iterator.hasNext()) {
-			if(!this.register((String)iterator.next(), command, true, fallbackPrefix)) {
-				iterator.remove();
-			}
-		}
-
-		if(!registered) {
-			command.setLabel(fallbackPrefix + ":" + label);
-		}
-
-		command.register(this);
-		return registered;
-	}
-
-	private synchronized boolean register(String label, Command command, boolean isAlias, String fallbackPrefix) {
-		this.knownCommands.put(fallbackPrefix + ":" + label, command);
-		if((command instanceof VanillaCommand || isAlias) && this.knownCommands.containsKey(label)) {
-			return false;
-		} else {
-			boolean registered = true;
-			Command conflict = (Command)this.knownCommands.get(label);
-			if(conflict != null && conflict.getLabel().equals(label)) {
-				return false;
-			} else {
-				if(!isAlias) {
-					command.setLabel(label);
-				}
-
-				this.knownCommands.put(label, command);
-				return registered;
-			}
-		}
-	}
-
-	public boolean dispatch(CommandSender sender, String commandLine) throws CommandException {
-		String[] args = PATTERN_ON_SPACE.split(commandLine);
-		if(args.length == 0) {
-			return false;
-		} else {
-			String sentCommandLabel = args[0].toLowerCase();
-			Command target = this.getCommand(sentCommandLabel);
-			if(target == null) {
-				return false;
-			} else {
-				try {
-					target.timings.startTiming();
-					target.execute(sender, sentCommandLabel, (String[])Java15Compat.Arrays_copyOfRange(args, 1, args.length));
-					target.timings.stopTiming();
-					return true;
-				} catch (CommandException var7) {
-					target.timings.stopTiming();
-					throw var7;
-				} catch (Throwable var8) {
-					target.timings.stopTiming();
-					throw new CommandException("Unhandled exception executing \'" + commandLine + "\' in " + target, var8);
-				}
-			}
-		}
-	}
-
-	public synchronized void clearCommands() {
-		Iterator var1 = this.knownCommands.entrySet().iterator();
-
-		while(var1.hasNext()) {
-			Entry entry = (Entry)var1.next();
-			((Command)entry.getValue()).unregister(this);
-		}
-
-		this.knownCommands.clear();
-		this.setDefaultCommands();
-	}
-
-	public Command getCommand(String name) {
-		Command target = (Command)this.knownCommands.get(name.toLowerCase());
-		return target;
-	}
-
-	public List<String> tabComplete(CommandSender sender, String cmdLine) {
-		Validate.notNull(sender, "Sender cannot be null");
-		Validate.notNull(cmdLine, "Command line cannot null");
-		int spaceIndex = cmdLine.indexOf(32);
-		String argLine;
-		if(spaceIndex == -1) {
-			ArrayList commandName1 = new ArrayList();
-			Map target1 = this.knownCommands;
-			argLine = sender instanceof Player?"/":"";
-			Iterator args1 = target1.entrySet().iterator();
-
-			while(args1.hasNext()) {
-				Entry ex = (Entry)args1.next();
-				Command command = (Command)ex.getValue();
-				if(command.testPermissionSilent(sender)) {
-					String name = (String)ex.getKey();
-					if(StringUtil.startsWithIgnoreCase(name, cmdLine)) {
-						commandName1.add(argLine + name);
-					}
-				}
-			}
-
-			Collections.sort(commandName1, String.CASE_INSENSITIVE_ORDER);
-			return commandName1;
-		} else {
-			String commandName = cmdLine.substring(0, spaceIndex);
-			Command target = this.getCommand(commandName);
-
-			argLine = cmdLine.substring(spaceIndex + 1, cmdLine.length());
-			String[] args = PATTERN_ON_SPACE.split(argLine, -1);
-			TabCompleteEvent event = new TabCompleteEvent(sender, commandName, args);
-
-			if (target != null) {
-				try {
-					event.getSuggestions().addAll(target.tabComplete(sender, commandName, args));
-				} catch (CommandException var11) {
-					throw var11;
-				} catch (Throwable var12) {
-					throw new CommandException("Unhandled exception executing tab-completer for \'" + cmdLine + "\' in " + target, var12);
-				}
-			}
-
-			server.getPluginManager().callEvent(event);
-
-			return event.getSuggestions();
-		}
-	}
-
-	public Collection<Command> getCommands() {
-		return Collections.unmodifiableCollection(this.knownCommands.values());
-	}
-
-	public void registerServerAliases() {
-		Map values = this.server.getCommandAliases();
-		Iterator var2 = values.keySet().iterator();
-
-		while(var2.hasNext()) {
-			String alias = (String)var2.next();
-			if(!alias.contains(":") && !alias.contains(" ")) {
-				String[] commandStrings = (String[])values.get(alias);
-				ArrayList targets = new ArrayList();
-				StringBuilder bad = new StringBuilder();
-				String[] var7 = commandStrings;
-				int var8 = commandStrings.length;
-
-				for(int var9 = 0; var9 < var8; ++var9) {
-					String commandString = var7[var9];
-					String[] commandArgs = commandString.split(" ");
-					Command command = this.getCommand(commandArgs[0]);
-					if(command == null) {
-						if(bad.length() > 0) {
-							bad.append(", ");
-						}
-
-						bad.append(commandString);
-					} else {
-						targets.add(commandString);
-					}
-				}
-
-				if(bad.length() > 0) {
-					this.server.getLogger().warning("Could not register alias " + alias + " because it contains commands that do not exist: " + bad);
-				} else if(targets.size() > 0) {
-					this.knownCommands.put(alias.toLowerCase(), new FormattedCommandAlias(alias.toLowerCase(), (String[])targets.toArray(new String[targets.size()])));
-				} else {
-					this.knownCommands.remove(alias.toLowerCase());
-				}
-			} else {
-				this.server.getLogger().warning("Could not register alias " + alias + " because it contains illegal characters");
-			}
-		}
-
-	}
-}
diff --git a/Plugins/Classpath.Dummy/src/org/bukkit/event/TabCompleteEvent.java b/Plugins/Classpath.Dummy/src/org/bukkit/event/TabCompleteEvent.java
deleted file mode 100644
index bf9340257..000000000
--- a/Plugins/Classpath.Dummy/src/org/bukkit/event/TabCompleteEvent.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bukkit.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.command.CommandSender;
-
-public class TabCompleteEvent extends Event
-{
-	private static final HandlerList handlers = new HandlerList();
-
-	private CommandSender _sender;
-	private String _command;
-	private String[] _args;
-
-	private List<String> _suggestions;
-
-	public TabCompleteEvent(CommandSender sender, String command, String[] args)
-	{
-		_sender = sender;
-		_command = command;
-		_args = args;
-
-		_suggestions = new ArrayList<String>();
-	}
-
-	public CommandSender getSender()
-	{
-		return _sender;
-	}
-
-	public String getCommand()
-	{
-		return _command;
-	}
-
-	public String[] getArgs()
-	{
-		return _args;
-	}
-
-	public List<String> getSuggestions()
-	{
-		return _suggestions;
-	}
-
-	public void setSuggestions(List<String> suggestions)
-	{
-		_suggestions = suggestions;
-	}
-
-	public HandlerList getHandlers()
-	{
-		return handlers;
-	}
-
-	public static HandlerList getHandlerList()
-	{
-		return handlers;
-	}
-}
diff --git a/Plugins/Classpath.Dummy/src/org/bukkit/scoreboard/Team.java b/Plugins/Classpath.Dummy/src/org/bukkit/scoreboard/Team.java
deleted file mode 100644
index 41344a7da..000000000
--- a/Plugins/Classpath.Dummy/src/org/bukkit/scoreboard/Team.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.bukkit.scoreboard;
-
-import java.util.Set;
-
-import org.bukkit.OfflinePlayer;
-
-public abstract interface Team
-{
-	public abstract String getName()
-			throws IllegalStateException;
-
-	public abstract String getDisplayName()
-			throws IllegalStateException;
-
-	public abstract void setDisplayName(String paramString)
-			throws IllegalStateException, IllegalArgumentException;
-
-	public abstract String getPrefix()
-			throws IllegalStateException;
-
-	public abstract void setPrefix(String paramString)
-			throws IllegalStateException, IllegalArgumentException;
-
-	public abstract String getSuffix()
-			throws IllegalStateException;
-
-	public abstract void setSuffix(String paramString)
-			throws IllegalStateException, IllegalArgumentException;
-
-	public abstract boolean allowFriendlyFire()
-			throws IllegalStateException;
-
-	// Mineplex
-	public abstract void setNameTagVisibility(TeamNameTagVisibility visibility)
-			throws IllegalStateException;
-
-	public abstract void setAllowFriendlyFire(boolean paramBoolean)
-			throws IllegalStateException;
-
-	public abstract boolean canSeeFriendlyInvisibles()
-			throws IllegalStateException;
-
-	public abstract void setCanSeeFriendlyInvisibles(boolean paramBoolean)
-			throws IllegalStateException;
-
-	public abstract Set<OfflinePlayer> getPlayers()
-			throws IllegalStateException;
-
-	public abstract Set<String> getEntries()
-			throws IllegalStateException;
-
-	public abstract int getSize()
-			throws IllegalStateException;
-
-	public abstract Scoreboard getScoreboard();
-
-	public abstract void addPlayer(OfflinePlayer paramOfflinePlayer)
-			throws IllegalStateException, IllegalArgumentException;
-
-	public abstract void addEntry(String paramString)
-			throws IllegalStateException, IllegalArgumentException;
-
-	public abstract boolean removePlayer(OfflinePlayer paramOfflinePlayer)
-			throws IllegalStateException, IllegalArgumentException;
-
-	public abstract boolean removeEntry(String paramString)
-			throws IllegalStateException, IllegalArgumentException;
-
-	public abstract void unregister()
-			throws IllegalStateException;
-
-	public abstract boolean hasPlayer(OfflinePlayer paramOfflinePlayer)
-			throws IllegalArgumentException, IllegalStateException;
-
-	public abstract boolean hasEntry(String paramString)
-			throws IllegalArgumentException, IllegalStateException;
-}
diff --git a/Plugins/Classpath.Dummy/src/org/bukkit/scoreboard/TeamNameTagVisibility.java b/Plugins/Classpath.Dummy/src/org/bukkit/scoreboard/TeamNameTagVisibility.java
deleted file mode 100644
index 0d348a600..000000000
--- a/Plugins/Classpath.Dummy/src/org/bukkit/scoreboard/TeamNameTagVisibility.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bukkit.scoreboard;
-
-/**
- * Created by shaun on 14-10-05.
- */
-public enum TeamNameTagVisibility
-{
-	NEVER("never"), HIDE_FOR_OTHER_TEAMS("hideForOtherTeams"), HIDE_FOR_OWN_TEAM("hideForOwnTeam"), ALWAYS("always");
-
-	private String _keyword;
-
-	TeamNameTagVisibility(String keyword)
-	{
-		_keyword = keyword;
-	}
-
-	@Override
-	public String toString()
-	{
-		return _keyword;
-	}
-}
diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar
index 5bbef8dd0..a585cf020 100644
Binary files a/Plugins/Libraries/craftbukkit.jar and b/Plugins/Libraries/craftbukkit.jar differ
diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
index c1cba124c..ede793bef 100644
--- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
+++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
@@ -55,12 +55,12 @@ public class MotdManager implements Listener, Runnable
 			
 			//String motdLine = "§f§l◄ §c§lMaintenance§f§l ►";
 			//String motdLine = "§f§l◄ §a§lCarl the Creeper§f§l ►";
-			String motdLine = "  §2§l§n     M O N S T E R   M A Z E   B E T A     §f";
-			//String motdLine = "       §f§l◄ §a§lCarl the Creeper§f§l ▬ §c§l75% OFF SALE§f§l ►";
+//			String motdLine = "  §2§l§n     M O N S T E R   M A Z E   B E T A     §f";
+			String motdLine = "           §f§l◄ §b§lNew Game§f§l ▬ §3§lChampions CTF§f§l ►";
 			//String motdLine = "                     §d§lRank Sale §a§l40% Off");
 			//String motdLine = "                        §f§l◄§c§lMAINTENANCE§f§l►");
 			
-			updateMainMotd("              §4§l§m  §f§l§m §8§l§m[ §r §4§lMineplex§r §f§lGames§r §8§l§m ]§f§l§m §4§l§m  §r", motdLine);
+			updateMainMotd("              §f§l§m   §8§l§m[ §r §6§lMineplex§r §f§lGames§r §8§l§m ]§f§l§m   §r", motdLine);
 			System.out.println("Updated Bungee MOTD");
 		}
 	}
diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerTracker.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerTracker.java
index 707dc3eb8..8d0a2cf99 100644
--- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerTracker.java
+++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerTracker.java
@@ -38,9 +38,8 @@ public class PlayerTracker implements Listener, Runnable
 		_plugin.getProxy().getPluginManager().registerListener(_plugin, this);
 		_plugin.getProxy().getScheduler().schedule(_plugin, this, 1L, 1L, TimeUnit.MINUTES);
 		
-		Region region = !new File("eu.dat").exists() ? Region.US : Region.EU;
 		_repository = new RedisDataRepository<PlayerStatus>(ServerManager.getMasterConnection(), ServerManager.getSlaveConnection(),
-				region, PlayerStatus.class, "playerStatus");
+				Region.currentRegion(), PlayerStatus.class, "playerStatus");
 		
 		ServerCommandManager.getInstance().registerCommandType("PlayerJoinCommand", mineplex.serverdata.commands.PlayerJoinCommand.class, new PlayerJoinHandler(this));
 		
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ByteArrayTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ByteArrayTag.java
new file mode 100755
index 000000000..8a246e5a4
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ByteArrayTag.java
@@ -0,0 +1,57 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+/**
+ * The {@code TAG_Byte_Array} tag.
+ */
+public final class ByteArrayTag extends Tag {
+
+    private final byte[] value;
+
+    /**
+     * Creates the tag with an empty name.
+     *
+     * @param value the value of the tag
+     */
+    public ByteArrayTag(byte[] value) {
+        super();
+        this.value = value;
+    }
+
+    @Override
+    public byte[] getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder hex = new StringBuilder();
+        for (byte b : value) {
+            String hexDigits = Integer.toHexString(b).toUpperCase();
+            if (hexDigits.length() == 1) {
+                hex.append("0");
+            }
+            hex.append(hexDigits).append(" ");
+        }
+        return "TAG_Byte_Array(" + hex + ")";
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ByteTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ByteTag.java
new file mode 100755
index 000000000..715902be6
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ByteTag.java
@@ -0,0 +1,49 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+/**
+ * The {@code TAG_Byte} tag.
+ */
+public final class ByteTag extends Tag {
+
+    private final byte value;
+
+    /**
+     * Creates the tag with an empty name.
+     *
+     * @param value the value of the tag
+     */
+    public ByteTag(byte value) {
+        super();
+        this.value = value;
+    }
+
+    @Override
+    public Byte getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return "TAG_Byte(" + value + ")";
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/CompoundTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/CompoundTag.java
new file mode 100755
index 000000000..7a6d55d87
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/CompoundTag.java
@@ -0,0 +1,420 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The {@code TAG_Compound} tag.
+ */
+public final class CompoundTag extends Tag {
+
+    private final Map<String, Tag> value;
+
+    /**
+     * Creates the tag with an empty name.
+     *
+     * @param value the value of the tag
+     */
+    public CompoundTag(Map<String, Tag> value) {
+        super();
+        this.value = Collections.unmodifiableMap(value);
+    }
+
+    /**
+     * Returns whether this compound tag contains the given key.
+     *
+     * @param key the given key
+     * @return true if the tag contains the given key
+     */
+    public boolean containsKey(String key) {
+        return value.containsKey(key);
+    }
+
+    @Override
+    public Map<String, Tag> getValue() {
+        return value;
+    }
+
+    /**
+     * Return a new compound tag with the given values.
+     *
+     * @param value the value
+     * @return the new compound tag
+     */
+    public CompoundTag setValue(Map<String, Tag> value) {
+        return new CompoundTag(value);
+    }
+
+    /**
+     * Create a compound tag builder.
+     *
+     * @return the builder
+     */
+    public CompoundTagBuilder createBuilder() {
+        return new CompoundTagBuilder(new HashMap<String, Tag>(value));
+    }
+
+    /**
+     * Get a byte array named with the given key.
+     *
+     * <p>If the key does not exist or its value is not a byte array tag,
+     * then an empty byte array will be returned.</p>
+     *
+     * @param key the key
+     * @return a byte array
+     */
+    public byte[] getByteArray(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof ByteArrayTag) {
+            return ((ByteArrayTag) tag).getValue();
+        } else {
+            return new byte[0];
+        }
+    }
+
+    /**
+     * Get a byte named with the given key.
+     *
+     * <p>If the key does not exist or its value is not a byte tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param key the key
+     * @return a byte
+     */
+    public byte getByte(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof ByteTag) {
+            return ((ByteTag) tag).getValue();
+        } else {
+            return (byte) 0;
+        }
+    }
+
+    /**
+     * Get a double named with the given key.
+     *
+     * <p>If the key does not exist or its value is not a double tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param key the key
+     * @return a double
+     */
+    public double getDouble(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof DoubleTag) {
+            return ((DoubleTag) tag).getValue();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get a double named with the given key, even if it's another
+     * type of number.
+     *
+     * <p>If the key does not exist or its value is not a number,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param key the key
+     * @return a double
+     */
+    public double asDouble(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof ByteTag) {
+            return ((ByteTag) tag).getValue();
+
+        } else if (tag instanceof ShortTag) {
+            return ((ShortTag) tag).getValue();
+
+        } else if (tag instanceof IntTag) {
+            return ((IntTag) tag).getValue();
+
+        } else if (tag instanceof LongTag) {
+            return ((LongTag) tag).getValue();
+
+        } else if (tag instanceof FloatTag) {
+            return ((FloatTag) tag).getValue();
+
+        } else if (tag instanceof DoubleTag) {
+            return ((DoubleTag) tag).getValue();
+
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get a float named with the given key.
+     *
+     * <p>If the key does not exist or its value is not a float tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param key the key
+     * @return a float
+     */
+    public float getFloat(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof FloatTag) {
+            return ((FloatTag) tag).getValue();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get a {@code int[]} named with the given key.
+     *
+     * <p>If the key does not exist or its value is not an int array tag,
+     * then an empty array will be returned.</p>
+     *
+     * @param key the key
+     * @return an int array
+     */
+    public int[] getIntArray(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof IntArrayTag) {
+            return ((IntArrayTag) tag).getValue();
+        } else {
+            return new int[0];
+        }
+    }
+
+    /**
+     * Get an int named with the given key.
+     *
+     * <p>If the key does not exist or its value is not an int tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param key the key
+     * @return an int
+     */
+    public int getInt(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof IntTag) {
+            return ((IntTag) tag).getValue();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get an int named with the given key, even if it's another
+     * type of number.
+     *
+     * <p>If the key does not exist or its value is not a number,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param key the key
+     * @return an int
+     */
+    public int asInt(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof ByteTag) {
+            return ((ByteTag) tag).getValue();
+
+        } else if (tag instanceof ShortTag) {
+            return ((ShortTag) tag).getValue();
+
+        } else if (tag instanceof IntTag) {
+            return ((IntTag) tag).getValue();
+
+        } else if (tag instanceof LongTag) {
+            return ((LongTag) tag).getValue().intValue();
+
+        } else if (tag instanceof FloatTag) {
+            return ((FloatTag) tag).getValue().intValue();
+
+        } else if (tag instanceof DoubleTag) {
+            return ((DoubleTag) tag).getValue().intValue();
+
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get a list of tags named with the given key.
+     *
+     * <p>If the key does not exist or its value is not a list tag,
+     * then an empty list will be returned.</p>
+     *
+     * @param key the key
+     * @return a list of tags
+     */
+    public List<Tag> getList(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof ListTag) {
+            return ((ListTag) tag).getValue();
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    /**
+     * Get a {@code TagList} named with the given key.
+     *
+     * <p>If the key does not exist or its value is not a list tag,
+     * then an empty tag list will be returned.</p>
+     *
+     * @param key the key
+     * @return a tag list instance
+     */
+    public ListTag getListTag(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof ListTag) {
+            return (ListTag) tag;
+        } else {
+            return new ListTag(StringTag.class, Collections.<Tag>emptyList());
+        }
+    }
+
+    /**
+     * Get a list of tags named with the given key.
+     *
+     * <p>If the key does not exist or its value is not a list tag,
+     * then an empty list will be returned. If the given key references
+     * a list but the list of of a different type, then an empty
+     * list will also be returned.</p>
+     *
+     * @param key the key
+     * @param listType the class of the contained type
+     * @return a list of tags
+     * @param <T> the type of list
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends Tag> List<T> getList(String key, Class<T> listType) {
+        Tag tag = value.get(key);
+        if (tag instanceof ListTag) {
+            ListTag listTag = (ListTag) tag;
+            if (listTag.getType().equals(listType)) {
+                return (List<T>) listTag.getValue();
+            } else {
+                return Collections.emptyList();
+            }
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    /**
+     * Get a long named with the given key.
+     *
+     * <p>If the key does not exist or its value is not a long tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param key the key
+     * @return a long
+     */
+    public long getLong(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof LongTag) {
+            return ((LongTag) tag).getValue();
+        } else {
+            return 0L;
+        }
+    }
+
+    /**
+     * Get a long named with the given key, even if it's another
+     * type of number.
+     *
+     * <p>If the key does not exist or its value is not a number,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param key the key
+     * @return a long
+     */
+    public long asLong(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof ByteTag) {
+            return ((ByteTag) tag).getValue();
+
+        } else if (tag instanceof ShortTag) {
+            return ((ShortTag) tag).getValue();
+
+        } else if (tag instanceof IntTag) {
+            return ((IntTag) tag).getValue();
+
+        } else if (tag instanceof LongTag) {
+            return ((LongTag) tag).getValue();
+
+        } else if (tag instanceof FloatTag) {
+            return ((FloatTag) tag).getValue().longValue();
+
+        } else if (tag instanceof DoubleTag) {
+            return ((DoubleTag) tag).getValue().longValue();
+
+        } else {
+            return 0L;
+        }
+    }
+
+    /**
+     * Get a short named with the given key.
+     *
+     * <p>If the key does not exist or its value is not a short tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param key the key
+     * @return a short
+     */
+    public short getShort(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof ShortTag) {
+            return ((ShortTag) tag).getValue();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get a string named with the given key.
+     *
+     * <p>If the key does not exist or its value is not a string tag,
+     * then {@code ""} will be returned.</p>
+     *
+     * @param key the key
+     * @return a string
+     */
+    public String getString(String key) {
+        Tag tag = value.get(key);
+        if (tag instanceof StringTag) {
+            return ((StringTag) tag).getValue();
+        } else {
+            return "";
+        }
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder bldr = new StringBuilder();
+        bldr.append("TAG_Compound").append(": ").append(value.size()).append(" entries\r\n{\r\n");
+        for (Map.Entry<String, Tag> entry : value.entrySet()) {
+            bldr.append("   ").append(entry.getValue().toString().replaceAll("\r\n", "\r\n   ")).append("\r\n");
+        }
+        bldr.append("}");
+        return bldr.toString();
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/CompoundTagBuilder.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/CompoundTagBuilder.java
new file mode 100755
index 000000000..ad90a097c
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/CompoundTagBuilder.java
@@ -0,0 +1,204 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Helps create compound tags.
+ */
+public class CompoundTagBuilder {
+
+    private final Map<String, Tag> entries;
+
+    /**
+     * Create a new instance.
+     */
+    CompoundTagBuilder() {
+        this.entries = new HashMap<String, Tag>();
+    }
+
+    /**
+     * Create a new instance and use the given map (which will be modified).
+     *
+     * @param value the value
+     */
+    CompoundTagBuilder(Map<String, Tag> value) {
+        checkNotNull(value);
+        this.entries = value;
+    }
+
+    /**
+     * Put the given key and tag into the compound tag.
+     *
+     * @param key they key
+     * @param value the value
+     * @return this object
+     */
+    public CompoundTagBuilder put(String key, Tag value) {
+        checkNotNull(key);
+        checkNotNull(value);
+        entries.put(key, value);
+        return this;
+    }
+
+    /**
+     * Put the given key and value into the compound tag as a
+     * {@code ByteArrayTag}.
+     *
+     * @param key they key
+     * @param value the value
+     * @return this object
+     */
+    public CompoundTagBuilder putByteArray(String key, byte[] value) {
+        return put(key, new ByteArrayTag(value));
+    }
+
+    /**
+     * Put the given key and value into the compound tag as a
+     * {@code ByteTag}.
+     *
+     * @param key they key
+     * @param value the value
+     * @return this object
+     */
+    public CompoundTagBuilder putByte(String key, byte value) {
+        return put(key, new ByteTag(value));
+    }
+
+    /**
+     * Put the given key and value into the compound tag as a
+     * {@code DoubleTag}.
+     *
+     * @param key they key
+     * @param value the value
+     * @return this object
+     */
+    public CompoundTagBuilder putDouble(String key, double value) {
+        return put(key, new DoubleTag(value));
+    }
+
+    /**
+     * Put the given key and value into the compound tag as a
+     * {@code FloatTag}.
+     *
+     * @param key they key
+     * @param value the value
+     * @return this object
+     */
+    public CompoundTagBuilder putFloat(String key, float value) {
+        return put(key, new FloatTag(value));
+    }
+
+    /**
+     * Put the given key and value into the compound tag as a
+     * {@code IntArrayTag}.
+     *
+     * @param key they key
+     * @param value the value
+     * @return this object
+     */
+    public CompoundTagBuilder putIntArray(String key, int[] value) {
+        return put(key, new IntArrayTag(value));
+    }
+
+    /**
+     * Put the given key and value into the compound tag as an {@code IntTag}.
+     *
+     * @param key they key
+     * @param value the value
+     * @return this object
+     */
+    public CompoundTagBuilder putInt(String key, int value) {
+        return put(key, new IntTag(value));
+    }
+
+    /**
+     * Put the given key and value into the compound tag as a
+     * {@code LongTag}.
+     *
+     * @param key they key
+     * @param value the value
+     * @return this object
+     */
+    public CompoundTagBuilder putLong(String key, long value) {
+        return put(key, new LongTag(value));
+    }
+
+    /**
+     * Put the given key and value into the compound tag as a
+     * {@code ShortTag}.
+     *
+     * @param key they key
+     * @param value the value
+     * @return this object
+     */
+    public CompoundTagBuilder putShort(String key, short value) {
+        return put(key, new ShortTag(value));
+    }
+
+    /**
+     * Put the given key and value into the compound tag as a
+     * {@code StringTag}.
+     *
+     * @param key they key
+     * @param value the value
+     * @return this object
+     */
+    public CompoundTagBuilder putString(String key, String value) {
+        return put(key, new StringTag(value));
+    }
+
+    /**
+     * Put all the entries from the given map into this map.
+     *
+     * @param value the map of tags
+     * @return this object
+     */
+    public CompoundTagBuilder putAll(Map<String, ? extends Tag> value) {
+        checkNotNull(value);
+        for (Map.Entry<String, ? extends Tag> entry : value.entrySet()) {
+            put(entry.getKey(), entry.getValue());
+        }
+        return this;
+    }
+
+    /**
+     * Build an unnamed compound tag with this builder's entries.
+     *
+     * @return the new compound tag
+     */
+    public CompoundTag build() {
+        return new CompoundTag(new HashMap<String, Tag>(entries));
+    }
+
+    /**
+     * Create a new builder instance.
+     *
+     * @return a new builder
+     */
+    public static CompoundTagBuilder create() {
+        return new CompoundTagBuilder();
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/DoubleTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/DoubleTag.java
new file mode 100755
index 000000000..dd53071a6
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/DoubleTag.java
@@ -0,0 +1,50 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+/**
+ * The {@code TAG_Double} tag.
+ * 
+ */
+public final class DoubleTag extends Tag {
+
+    private final double value;
+
+    /**
+     * Creates the tag with an empty name.
+     *
+     * @param value the value of the tag
+     */
+    public DoubleTag(double value) {
+        super();
+        this.value = value;
+    }
+
+    @Override
+    public Double getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return "TAG_Double(" + value + ")";
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/EndTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/EndTag.java
new file mode 100755
index 000000000..e2d2e3118
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/EndTag.java
@@ -0,0 +1,37 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+/**
+ * The {@code TAG_End} tag.
+ */
+public final class EndTag extends Tag {
+
+    @Override
+    public Object getValue() {
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return "TAG_End";
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/FloatTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/FloatTag.java
new file mode 100755
index 000000000..4a18525ef
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/FloatTag.java
@@ -0,0 +1,49 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+/**
+ * The {@code TAG_Float} tag.
+ */
+public final class FloatTag extends Tag {
+
+    private final float value;
+
+    /**
+     * Creates the tag with an empty name.
+     *
+     * @param value the value of the tag
+     */
+    public FloatTag(float value) {
+        super();
+        this.value = value;
+    }
+
+    @Override
+    public Float getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return "TAG_Float(" + value + ")";
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/IntArrayTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/IntArrayTag.java
new file mode 100755
index 000000000..7a036013f
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/IntArrayTag.java
@@ -0,0 +1,60 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * The {@code TAG_Int_Array} tag.
+ */
+public final class IntArrayTag extends Tag {
+
+    private final int[] value;
+
+    /**
+     * Creates the tag with an empty name.
+     *
+     * @param value the value of the tag
+     */
+    public IntArrayTag(int[] value) {
+        super();
+        checkNotNull(value);
+        this.value = value;
+    }
+
+    @Override
+    public int[] getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder hex = new StringBuilder();
+        for (int b : value) {
+            String hexDigits = Integer.toHexString(b).toUpperCase();
+            if (hexDigits.length() == 1) {
+                hex.append("0");
+            }
+            hex.append(hexDigits).append(" ");
+        }
+        return "TAG_Int_Array(" + hex + ")";
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/IntTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/IntTag.java
new file mode 100755
index 000000000..2b549ebf5
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/IntTag.java
@@ -0,0 +1,49 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+/**
+ * The {@code TAG_Int} tag.
+ */
+public final class IntTag extends Tag {
+
+    private final int value;
+
+    /**
+     * Creates the tag with an empty name.
+     *
+     * @param value the value of the tag
+     */
+    public IntTag(int value) {
+        super();
+        this.value = value;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return "TAG_Int(" + value + ")";
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ListTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ListTag.java
new file mode 100755
index 000000000..c82650924
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ListTag.java
@@ -0,0 +1,431 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+import javax.annotation.Nullable;
+import java.util.Collections;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * The {@code TAG_List} tag.
+ */
+public final class ListTag extends Tag {
+
+    private final Class<? extends Tag> type;
+    private final List<Tag> value;
+
+    /**
+     * Creates the tag with an empty name.
+     *
+     * @param type the type of tag
+     * @param value the value of the tag
+     */
+    public ListTag(Class<? extends Tag> type, List<? extends Tag> value) {
+        super();
+        checkNotNull(value);
+        this.type = type;
+        this.value = Collections.unmodifiableList(value);
+    }
+
+    /**
+     * Gets the type of item in this list.
+     *
+     * @return The type of item in this list.
+     */
+    public Class<? extends Tag> getType() {
+        return type;
+    }
+
+    @Override
+    public List<Tag> getValue() {
+        return value;
+    }
+
+    /**
+     * Create a new list tag with this tag's name and type.
+     *
+     * @param list the new list
+     * @return a new list tag
+     */
+    public ListTag setValue(List<Tag> list) {
+        return new ListTag(getType(), list);
+    }
+
+    /**
+     * Get the tag if it exists at the given index.
+     * 
+     * @param index the index
+     * @return the tag or null
+     */
+    @Nullable
+    public Tag getIfExists(int index) {
+        try {
+            return value.get(index);
+        } catch (NoSuchElementException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Get a byte array named with the given index.
+     *
+     * <p>If the index does not exist or its value is not a byte array tag,
+     * then an empty byte array will be returned.</p>
+     *
+     * @param index the index
+     * @return a byte array
+     */
+    public byte[] getByteArray(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof ByteArrayTag) {
+            return ((ByteArrayTag) tag).getValue();
+        } else {
+            return new byte[0];
+        }
+    }
+
+    /**
+     * Get a byte named with the given index.
+     *
+     * <p>If the index does not exist or its value is not a byte tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param index the index
+     * @return a byte
+     */
+    public byte getByte(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof ByteTag) {
+            return ((ByteTag) tag).getValue();
+        } else {
+            return (byte) 0;
+        }
+    }
+
+    /**
+     * Get a double named with the given index.
+     *
+     * <p>If the index does not exist or its value is not a double tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param index the index
+     * @return a double
+     */
+    public double getDouble(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof DoubleTag) {
+            return ((DoubleTag) tag).getValue();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get a double named with the given index, even if it's another
+     * type of number.
+     *
+     * <p>If the index does not exist or its value is not a number,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param index the index
+     * @return a double
+     */
+    public double asDouble(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof ByteTag) {
+            return ((ByteTag) tag).getValue();
+
+        } else if (tag instanceof ShortTag) {
+            return ((ShortTag) tag).getValue();
+
+        } else if (tag instanceof IntTag) {
+            return ((IntTag) tag).getValue();
+
+        } else if (tag instanceof LongTag) {
+            return ((LongTag) tag).getValue();
+
+        } else if (tag instanceof FloatTag) {
+            return ((FloatTag) tag).getValue();
+
+        } else if (tag instanceof DoubleTag) {
+            return ((DoubleTag) tag).getValue();
+
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get a float named with the given index.
+     *
+     * <p>If the index does not exist or its value is not a float tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param index the index
+     * @return a float
+     */
+    public float getFloat(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof FloatTag) {
+            return ((FloatTag) tag).getValue();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get a {@code int[]} named with the given index.
+     *
+     * <p>If the index does not exist or its value is not an int array tag,
+     * then an empty array will be returned.</p>
+     *
+     * @param index the index
+     * @return an int array
+     */
+    public int[] getIntArray(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof IntArrayTag) {
+            return ((IntArrayTag) tag).getValue();
+        } else {
+            return new int[0];
+        }
+    }
+
+    /**
+     * Get an int named with the given index.
+     *
+     * <p>If the index does not exist or its value is not an int tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param index the index
+     * @return an int
+     */
+    public int getInt(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof IntTag) {
+            return ((IntTag) tag).getValue();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get an int named with the given index, even if it's another
+     * type of number.
+     *
+     * <p>If the index does not exist or its value is not a number,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param index the index
+     * @return an int
+     */
+    public int asInt(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof ByteTag) {
+            return ((ByteTag) tag).getValue();
+
+        } else if (tag instanceof ShortTag) {
+            return ((ShortTag) tag).getValue();
+
+        } else if (tag instanceof IntTag) {
+            return ((IntTag) tag).getValue();
+
+        } else if (tag instanceof LongTag) {
+            return ((LongTag) tag).getValue().intValue();
+
+        } else if (tag instanceof FloatTag) {
+            return ((FloatTag) tag).getValue().intValue();
+
+        } else if (tag instanceof DoubleTag) {
+            return ((DoubleTag) tag).getValue().intValue();
+
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get a list of tags named with the given index.
+     *
+     * <p>If the index does not exist or its value is not a list tag,
+     * then an empty list will be returned.</p>
+     *
+     * @param index the index
+     * @return a list of tags
+     */
+    public List<Tag> getList(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof ListTag) {
+            return ((ListTag) tag).getValue();
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    /**
+     * Get a {@code TagList} named with the given index.
+     *
+     * <p>If the index does not exist or its value is not a list tag,
+     * then an empty tag list will be returned.</p>
+     *
+     * @param index the index
+     * @return a tag list instance
+     */
+    public ListTag getListTag(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof ListTag) {
+            return (ListTag) tag;
+        } else {
+            return new ListTag(StringTag.class, Collections.<Tag>emptyList());
+        }
+    }
+
+    /**
+     * Get a list of tags named with the given index.
+     *
+     * <p>If the index does not exist or its value is not a list tag,
+     * then an empty list will be returned. If the given index references
+     * a list but the list of of a different type, then an empty
+     * list will also be returned.</p>
+     *
+     * @param index the index
+     * @param listType the class of the contained type
+     * @return a list of tags
+     * @param <T> the NBT type
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends Tag> List<T> getList(int index, Class<T> listType) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof ListTag) {
+            ListTag listTag = (ListTag) tag;
+            if (listTag.getType().equals(listType)) {
+                return (List<T>) listTag.getValue();
+            } else {
+                return Collections.emptyList();
+            }
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    /**
+     * Get a long named with the given index.
+     *
+     * <p>If the index does not exist or its value is not a long tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param index the index
+     * @return a long
+     */
+    public long getLong(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof LongTag) {
+            return ((LongTag) tag).getValue();
+        } else {
+            return 0L;
+        }
+    }
+
+    /**
+     * Get a long named with the given index, even if it's another
+     * type of number.
+     *
+     * <p>If the index does not exist or its value is not a number,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param index the index
+     * @return a long
+     */
+    public long asLong(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof ByteTag) {
+            return ((ByteTag) tag).getValue();
+
+        } else if (tag instanceof ShortTag) {
+            return ((ShortTag) tag).getValue();
+
+        } else if (tag instanceof IntTag) {
+            return ((IntTag) tag).getValue();
+
+        } else if (tag instanceof LongTag) {
+            return ((LongTag) tag).getValue();
+
+        } else if (tag instanceof FloatTag) {
+            return ((FloatTag) tag).getValue().longValue();
+
+        } else if (tag instanceof DoubleTag) {
+            return ((DoubleTag) tag).getValue().longValue();
+
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get a short named with the given index.
+     *
+     * <p>If the index does not exist or its value is not a short tag,
+     * then {@code 0} will be returned.</p>
+     *
+     * @param index the index
+     * @return a short
+     */
+    public short getShort(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof ShortTag) {
+            return ((ShortTag) tag).getValue();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get a string named with the given index.
+     *
+     * <p>If the index does not exist or its value is not a string tag,
+     * then {@code ""} will be returned.</p>
+     *
+     * @param index the index
+     * @return a string
+     */
+    public String getString(int index) {
+        Tag tag = getIfExists(index);
+        if (tag instanceof StringTag) {
+            return ((StringTag) tag).getValue();
+        } else {
+            return "";
+        }
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder bldr = new StringBuilder();
+        bldr.append("TAG_List").append(": ").append(value.size()).append(" entries of type ").append(NBTUtils.getTypeName(type)).append("\r\n{\r\n");
+        for (Tag t : value) {
+            bldr.append("   ").append(t.toString().replaceAll("\r\n", "\r\n   ")).append("\r\n");
+        }
+        bldr.append("}");
+        return bldr.toString();
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ListTagBuilder.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ListTagBuilder.java
new file mode 100755
index 000000000..31cae46c9
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ListTagBuilder.java
@@ -0,0 +1,119 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Helps create list tags.
+ */
+public class ListTagBuilder {
+
+    private final Class<? extends Tag> type;
+    private final List<Tag> entries;
+
+    /**
+     * Create a new instance.
+     *
+     * @param type of tag contained in this list
+     */
+    ListTagBuilder(Class<? extends Tag> type) {
+        checkNotNull(type);
+        this.type = type;
+        this.entries = new ArrayList<Tag>();
+    }
+
+    /**
+     * Add the given tag.
+     *
+     * @param value the tag
+     * @return this object
+     */
+    public ListTagBuilder add(Tag value) {
+        checkNotNull(value);
+        if (!type.isInstance(value)) {
+            throw new IllegalArgumentException(value.getClass().getCanonicalName() + " is not of expected type " + type.getCanonicalName());
+        }
+        entries.add(value);
+        return this;
+    }
+
+    /**
+     * Add all the tags in the given list.
+     *
+     * @param value a list of tags
+     * @return this object
+     */
+    public ListTagBuilder addAll(Collection<? extends Tag> value) {
+        checkNotNull(value);
+        for (Tag v : value) {
+            add(v);
+        }
+        return this;
+    }
+
+    /**
+     * Build an unnamed list tag with this builder's entries.
+     *
+     * @return the new list tag
+     */
+    public ListTag build() {
+        return new ListTag(type, new ArrayList<Tag>(entries));
+    }
+
+    /**
+     * Create a new builder instance.
+     *
+     * @return a new builder
+     */
+    public static ListTagBuilder create(Class<? extends Tag> type) {
+        return new ListTagBuilder(type);
+    }
+
+    /**
+     * Create a new builder instance.
+     *
+     * @return a new builder
+     */
+    public static <T extends Tag> ListTagBuilder createWith(T ... entries) {
+        checkNotNull(entries);
+
+        if (entries.length == 0) {
+            throw new IllegalArgumentException("This method needs an array of at least one entry");
+        }
+
+        Class<? extends Tag> type = entries[0].getClass();
+        for (int i = 1; i < entries.length; i++) {
+            if (!type.isInstance(entries[i])) {
+                throw new IllegalArgumentException("An array of different tag types was provided");
+            }
+        }
+
+        ListTagBuilder builder = new ListTagBuilder(type);
+        builder.addAll(Arrays.asList(entries));
+        return builder;
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/LongTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/LongTag.java
new file mode 100755
index 000000000..d5371dd79
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/LongTag.java
@@ -0,0 +1,50 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+/**
+ * The {@code TAG_Long} tag.
+ * 
+ */
+public final class LongTag extends Tag {
+
+    private final long value;
+
+    /**
+     * Creates the tag with an empty name.
+     *
+     * @param value the value of the tag
+     */
+    public LongTag(long value) {
+        super();
+        this.value = value;
+    }
+
+    @Override
+    public Long getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return "TAG_Long(" + value + ")";
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTConstants.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTConstants.java
new file mode 100755
index 000000000..21743b1ea
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTConstants.java
@@ -0,0 +1,81 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+import java.nio.charset.Charset;
+
+/**
+ * A class which holds constant values.
+ */
+public final class NBTConstants {
+
+    public static final Charset CHARSET = Charset.forName("UTF-8");
+
+    public static final int TYPE_END = 0, TYPE_BYTE = 1, TYPE_SHORT = 2,
+            TYPE_INT = 3, TYPE_LONG = 4, TYPE_FLOAT = 5, TYPE_DOUBLE = 6,
+            TYPE_BYTE_ARRAY = 7, TYPE_STRING = 8, TYPE_LIST = 9,
+            TYPE_COMPOUND = 10, TYPE_INT_ARRAY = 11;
+
+    /**
+     * Default private constructor.
+     */
+    private NBTConstants() {
+
+    }
+    
+    /**
+     * Convert a type ID to its corresponding {@link Tag} class.
+     * 
+     * @param id type ID
+     * @return tag class
+     * @throws IllegalArgumentException thrown if the tag ID is not valid
+     */
+    public static Class<? extends Tag> getClassFromType(int id) {
+        switch (id) {
+        case TYPE_END:
+            return EndTag.class;
+        case TYPE_BYTE:
+            return ByteTag.class;
+        case TYPE_SHORT:
+            return ShortTag.class;
+        case TYPE_INT:
+            return IntTag.class;
+        case TYPE_LONG:
+            return LongTag.class;
+        case TYPE_FLOAT:
+            return FloatTag.class;
+        case TYPE_DOUBLE:
+            return DoubleTag.class;
+        case TYPE_BYTE_ARRAY:
+            return ByteArrayTag.class;
+        case TYPE_STRING:
+            return StringTag.class;
+        case TYPE_LIST:
+            return ListTag.class;
+        case TYPE_COMPOUND:
+            return CompoundTag.class;
+        case TYPE_INT_ARRAY:
+            return IntArrayTag.class;
+        default:
+            throw new IllegalArgumentException("Unknown tag type ID of " + id);
+        }
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTInputStream.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTInputStream.java
new file mode 100755
index 000000000..2080cbcd3
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTInputStream.java
@@ -0,0 +1,171 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+import java.io.Closeable;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This class reads <strong>NBT</strong>, or <strong>Named Binary Tag</strong>
+ * streams, and produces an object graph of subclasses of the {@code Tag}
+ * object.
+ * 
+ * <p>The NBT format was created by Markus Persson, and the specification may be
+ * found at <a href="http://www.minecraft.net/docs/NBT.txt">
+ * http://www.minecraft.net/docs/NBT.txt</a>.</p>
+ */
+public final class NBTInputStream implements Closeable {
+
+    private final DataInputStream is;
+
+    /**
+     * Creates a new {@code NBTInputStream}, which will source its data
+     * from the specified input stream.
+     * 
+     * @param is the input stream
+     * @throws IOException if an I/O error occurs
+     */
+    public NBTInputStream(InputStream is) throws IOException {
+        this.is = new DataInputStream(is);
+    }
+
+    /**
+     * Reads an NBT tag from the stream.
+     * 
+     * @return The tag that was read.
+     * @throws IOException if an I/O error occurs.
+     */
+    public NamedTag readNamedTag() throws IOException {
+        return readNamedTag(0);
+    }
+
+    /**
+     * Reads an NBT from the stream.
+     * 
+     * @param depth the depth of this tag
+     * @return The tag that was read.
+     * @throws IOException if an I/O error occurs.
+     */
+    private NamedTag readNamedTag(int depth) throws IOException {
+        int type = is.readByte() & 0xFF;
+
+        String name;
+        if (type != NBTConstants.TYPE_END) {
+            int nameLength = is.readShort() & 0xFFFF;
+            byte[] nameBytes = new byte[nameLength];
+            is.readFully(nameBytes);
+            name = new String(nameBytes, NBTConstants.CHARSET);
+        } else {
+            name = "";
+        }
+
+        return new NamedTag(name, readTagPayload(type, depth));
+    }
+
+    /**
+     * Reads the payload of a tag given the type.
+     * 
+     * @param type the type
+     * @param depth the depth
+     * @return the tag
+     * @throws IOException if an I/O error occurs.
+     */
+    private Tag readTagPayload(int type, int depth) throws IOException {
+        switch (type) {
+        case NBTConstants.TYPE_END:
+            if (depth == 0) {
+                throw new IOException(
+                        "TAG_End found without a TAG_Compound/TAG_List tag preceding it.");
+            } else {
+                return new EndTag();
+            }
+        case NBTConstants.TYPE_BYTE:
+            return new ByteTag(is.readByte());
+        case NBTConstants.TYPE_SHORT:
+            return new ShortTag(is.readShort());
+        case NBTConstants.TYPE_INT:
+            return new IntTag(is.readInt());
+        case NBTConstants.TYPE_LONG:
+            return new LongTag(is.readLong());
+        case NBTConstants.TYPE_FLOAT:
+            return new FloatTag(is.readFloat());
+        case NBTConstants.TYPE_DOUBLE:
+            return new DoubleTag(is.readDouble());
+        case NBTConstants.TYPE_BYTE_ARRAY:
+            int length = is.readInt();
+            byte[] bytes = new byte[length];
+            is.readFully(bytes);
+            return new ByteArrayTag(bytes);
+        case NBTConstants.TYPE_STRING:
+            length = is.readShort();
+            bytes = new byte[length];
+            is.readFully(bytes);
+            return new StringTag(new String(bytes, NBTConstants.CHARSET));
+        case NBTConstants.TYPE_LIST:
+            int childType = is.readByte();
+            length = is.readInt();
+
+            List<Tag> tagList = new ArrayList<Tag>();
+            for (int i = 0; i < length; ++i) {
+                Tag tag = readTagPayload(childType, depth + 1);
+                if (tag instanceof EndTag) {
+                    throw new IOException("TAG_End not permitted in a list.");
+                }
+                tagList.add(tag);
+            }
+
+            return new ListTag(NBTUtils.getTypeClass(childType), tagList);
+        case NBTConstants.TYPE_COMPOUND:
+            Map<String, Tag> tagMap = new HashMap<String, Tag>();
+            while (true) {
+                NamedTag namedTag = readNamedTag(depth + 1);
+                Tag tag = namedTag.getTag();
+                if (tag instanceof EndTag) {
+                    break;
+                } else {
+                    tagMap.put(namedTag.getName(), tag);
+                }
+            }
+
+            return new CompoundTag(tagMap);
+        case NBTConstants.TYPE_INT_ARRAY:
+            length = is.readInt();
+            int[] data = new int[length];
+            for (int i = 0; i < length; i++) {
+                data[i] = is.readInt();
+            }
+            return new IntArrayTag(data);
+        default:
+            throw new IOException("Invalid tag type: " + type + ".");
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        is.close();
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTOutputStream.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTOutputStream.java
new file mode 100755
index 000000000..bb10e135a
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTOutputStream.java
@@ -0,0 +1,294 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+import java.io.Closeable;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * This class writes <strong>NBT</strong>, or <strong>Named Binary Tag</strong>
+ * {@code Tag} objects to an underlying {@code OutputStream}.
+ * 
+ * <p>The NBT format was created by Markus Persson, and the specification may be
+ * found at <a href="http://www.minecraft.net/docs/NBT.txt">
+ * http://www.minecraft.net/docs/NBT.txt</a>.</p>
+ */
+public final class NBTOutputStream implements Closeable {
+
+    /**
+     * The output stream.
+     */
+    private final DataOutputStream os;
+
+    /**
+     * Creates a new {@code NBTOutputStream}, which will write data to the
+     * specified underlying output stream.
+     * 
+     * @param os
+     *            The output stream.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    public NBTOutputStream(OutputStream os) throws IOException {
+        this.os = new DataOutputStream(os);
+    }
+
+    /**
+     * Writes a tag.
+     * 
+     * @param tag
+     *            The tag to write.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    public void writeNamedTag(String name, Tag tag) throws IOException {
+        checkNotNull(name);
+        checkNotNull(tag);
+
+        int type = NBTUtils.getTypeCode(tag.getClass());
+        byte[] nameBytes = name.getBytes(NBTConstants.CHARSET);
+
+        os.writeByte(type);
+        os.writeShort(nameBytes.length);
+        os.write(nameBytes);
+
+        if (type == NBTConstants.TYPE_END) {
+            throw new IOException("Named TAG_End not permitted.");
+        }
+
+        writeTagPayload(tag);
+    }
+
+    /**
+     * Writes tag payload.
+     * 
+     * @param tag
+     *            The tag.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    private void writeTagPayload(Tag tag) throws IOException {
+        int type = NBTUtils.getTypeCode(tag.getClass());
+        switch (type) {
+        case NBTConstants.TYPE_END:
+            writeEndTagPayload((EndTag) tag);
+            break;
+        case NBTConstants.TYPE_BYTE:
+            writeByteTagPayload((ByteTag) tag);
+            break;
+        case NBTConstants.TYPE_SHORT:
+            writeShortTagPayload((ShortTag) tag);
+            break;
+        case NBTConstants.TYPE_INT:
+            writeIntTagPayload((IntTag) tag);
+            break;
+        case NBTConstants.TYPE_LONG:
+            writeLongTagPayload((LongTag) tag);
+            break;
+        case NBTConstants.TYPE_FLOAT:
+            writeFloatTagPayload((FloatTag) tag);
+            break;
+        case NBTConstants.TYPE_DOUBLE:
+            writeDoubleTagPayload((DoubleTag) tag);
+            break;
+        case NBTConstants.TYPE_BYTE_ARRAY:
+            writeByteArrayTagPayload((ByteArrayTag) tag);
+            break;
+        case NBTConstants.TYPE_STRING:
+            writeStringTagPayload((StringTag) tag);
+            break;
+        case NBTConstants.TYPE_LIST:
+            writeListTagPayload((ListTag) tag);
+            break;
+        case NBTConstants.TYPE_COMPOUND:
+            writeCompoundTagPayload((CompoundTag) tag);
+            break;
+        case NBTConstants.TYPE_INT_ARRAY:
+            writeIntArrayTagPayload((IntArrayTag) tag);
+            break;
+        default:
+            throw new IOException("Invalid tag type: " + type + ".");
+        }
+    }
+
+    /**
+     * Writes a {@code TAG_Byte} tag.
+     * 
+     * @param tag
+     *            The tag.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    private void writeByteTagPayload(ByteTag tag) throws IOException {
+        os.writeByte(tag.getValue());
+    }
+
+    /**
+     * Writes a {@code TAG_Byte_Array} tag.
+     * 
+     * @param tag
+     *            The tag.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    private void writeByteArrayTagPayload(ByteArrayTag tag) throws IOException {
+        byte[] bytes = tag.getValue();
+        os.writeInt(bytes.length);
+        os.write(bytes);
+    }
+
+    /**
+     * Writes a {@code TAG_Compound} tag.
+     * 
+     * @param tag
+     *            The tag.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    private void writeCompoundTagPayload(CompoundTag tag) throws IOException {
+        for (Map.Entry<String, Tag> entry : tag.getValue().entrySet()) {
+            writeNamedTag(entry.getKey(), entry.getValue());
+        }
+        os.writeByte((byte) 0); // end tag - better way?
+    }
+
+    /**
+     * Writes a {@code TAG_List} tag.
+     * 
+     * @param tag
+     *            The tag.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    private void writeListTagPayload(ListTag tag) throws IOException {
+        Class<? extends Tag> clazz = tag.getType();
+        List<Tag> tags = tag.getValue();
+        int size = tags.size();
+
+        os.writeByte(NBTUtils.getTypeCode(clazz));
+        os.writeInt(size);
+        for (Tag tag1 : tags) {
+            writeTagPayload(tag1);
+        }
+    }
+
+    /**
+     * Writes a {@code TAG_String} tag.
+     * 
+     * @param tag
+     *            The tag.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    private void writeStringTagPayload(StringTag tag) throws IOException {
+        byte[] bytes = tag.getValue().getBytes(NBTConstants.CHARSET);
+        os.writeShort(bytes.length);
+        os.write(bytes);
+    }
+
+    /**
+     * Writes a {@code TAG_Double} tag.
+     * 
+     * @param tag
+     *            The tag.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    private void writeDoubleTagPayload(DoubleTag tag) throws IOException {
+        os.writeDouble(tag.getValue());
+    }
+
+    /**
+     * Writes a {@code TAG_Float} tag.
+     * 
+     * @param tag
+     *            The tag.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    private void writeFloatTagPayload(FloatTag tag) throws IOException {
+        os.writeFloat(tag.getValue());
+    }
+
+    /**
+     * Writes a {@code TAG_Long} tag.
+     * 
+     * @param tag
+     *            The tag.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    private void writeLongTagPayload(LongTag tag) throws IOException {
+        os.writeLong(tag.getValue());
+    }
+
+    /**
+     * Writes a {@code TAG_Int} tag.
+     * 
+     * @param tag
+     *            The tag.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    private void writeIntTagPayload(IntTag tag) throws IOException {
+        os.writeInt(tag.getValue());
+    }
+
+    /**
+     * Writes a {@code TAG_Short} tag.
+     * 
+     * @param tag
+     *            The tag.
+     * @throws IOException
+     *             if an I/O error occurs.
+     */
+    private void writeShortTagPayload(ShortTag tag) throws IOException {
+        os.writeShort(tag.getValue());
+    }
+
+    /**
+     * Writes a {@code TAG_Empty} tag.
+     * 
+     * @param tag the tag
+     */
+    private void writeEndTagPayload(EndTag tag) {
+        /* empty */
+    }
+    
+    private void writeIntArrayTagPayload(IntArrayTag tag) throws IOException {
+        int[] data = tag.getValue();
+        os.writeInt(data.length);
+        for (int aData : data) {
+            os.writeInt(aData);
+        } 
+    }
+
+    @Override
+    public void close() throws IOException {
+        os.close();
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTUtils.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTUtils.java
new file mode 100755
index 000000000..bafd00135
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NBTUtils.java
@@ -0,0 +1,170 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+import java.util.Map;
+
+/**
+ * A class which contains NBT-related utility methods.
+ *
+ */
+public final class NBTUtils {
+
+    /**
+     * Default private constructor.
+     */
+    private NBTUtils() {
+    }
+
+    /**
+     * Gets the type name of a tag.
+     *
+     * @param clazz the tag class
+     * @return The type name.
+     */
+    public static String getTypeName(Class<? extends Tag> clazz) {
+        if (clazz.equals(ByteArrayTag.class)) {
+            return "TAG_Byte_Array";
+        } else if (clazz.equals(ByteTag.class)) {
+            return "TAG_Byte";
+        } else if (clazz.equals(CompoundTag.class)) {
+            return "TAG_Compound";
+        } else if (clazz.equals(DoubleTag.class)) {
+            return "TAG_Double";
+        } else if (clazz.equals(EndTag.class)) {
+            return "TAG_End";
+        } else if (clazz.equals(FloatTag.class)) {
+            return "TAG_Float";
+        } else if (clazz.equals(IntTag.class)) {
+            return "TAG_Int";
+        } else if (clazz.equals(ListTag.class)) {
+            return "TAG_List";
+        } else if (clazz.equals(LongTag.class)) {
+            return "TAG_Long";
+        } else if (clazz.equals(ShortTag.class)) {
+            return "TAG_Short";
+        } else if (clazz.equals(StringTag.class)) {
+            return "TAG_String";
+        } else if (clazz.equals(IntArrayTag.class)) {
+            return "TAG_Int_Array";
+        } else {
+            throw new IllegalArgumentException("Invalid tag classs ("
+                    + clazz.getName() + ").");
+        }
+    }
+
+    /**
+     * Gets the type code of a tag class.
+     *
+     * @param clazz the tag class
+     * @return The type code.
+     * @throws IllegalArgumentException if the tag class is invalid.
+     */
+    public static int getTypeCode(Class<? extends Tag> clazz) {
+        if (clazz.equals(ByteArrayTag.class)) {
+            return NBTConstants.TYPE_BYTE_ARRAY;
+        } else if (clazz.equals(ByteTag.class)) {
+            return NBTConstants.TYPE_BYTE;
+        } else if (clazz.equals(CompoundTag.class)) {
+            return NBTConstants.TYPE_COMPOUND;
+        } else if (clazz.equals(DoubleTag.class)) {
+            return NBTConstants.TYPE_DOUBLE;
+        } else if (clazz.equals(EndTag.class)) {
+            return NBTConstants.TYPE_END;
+        } else if (clazz.equals(FloatTag.class)) {
+            return NBTConstants.TYPE_FLOAT;
+        } else if (clazz.equals(IntTag.class)) {
+            return NBTConstants.TYPE_INT;
+        } else if (clazz.equals(ListTag.class)) {
+            return NBTConstants.TYPE_LIST;
+        } else if (clazz.equals(LongTag.class)) {
+            return NBTConstants.TYPE_LONG;
+        } else if (clazz.equals(ShortTag.class)) {
+            return NBTConstants.TYPE_SHORT;
+        } else if (clazz.equals(StringTag.class)) {
+            return NBTConstants.TYPE_STRING;
+        } else if (clazz.equals(IntArrayTag.class)) {
+            return NBTConstants.TYPE_INT_ARRAY;
+        } else {
+            throw new IllegalArgumentException("Invalid tag classs ("
+                    + clazz.getName() + ").");
+        }
+    }
+
+    /**
+     * Gets the class of a type of tag.
+     *
+     * @param type the type
+     * @return The class.
+     * @throws IllegalArgumentException if the tag type is invalid.
+     */
+    public static Class<? extends Tag> getTypeClass(int type) {
+        switch (type) {
+        case NBTConstants.TYPE_END:
+            return EndTag.class;
+        case NBTConstants.TYPE_BYTE:
+            return ByteTag.class;
+        case NBTConstants.TYPE_SHORT:
+            return ShortTag.class;
+        case NBTConstants.TYPE_INT:
+            return IntTag.class;
+        case NBTConstants.TYPE_LONG:
+            return LongTag.class;
+        case NBTConstants.TYPE_FLOAT:
+            return FloatTag.class;
+        case NBTConstants.TYPE_DOUBLE:
+            return DoubleTag.class;
+        case NBTConstants.TYPE_BYTE_ARRAY:
+            return ByteArrayTag.class;
+        case NBTConstants.TYPE_STRING:
+            return StringTag.class;
+        case NBTConstants.TYPE_LIST:
+            return ListTag.class;
+        case NBTConstants.TYPE_COMPOUND:
+            return CompoundTag.class;
+        case NBTConstants.TYPE_INT_ARRAY:
+            return IntArrayTag.class;
+        default:
+            throw new IllegalArgumentException("Invalid tag type : " + type
+                    + ".");
+        }
+    }
+
+    /**
+     * Get child tag of a NBT structure.
+     *
+     * @param items the map to read from
+     * @param key the key to look for
+     * @param expected the expected NBT class type
+     * @return child tag
+     * @throws IllegalArgumentException
+     */
+    public static <T extends Tag> T getChildTag(Map<String, Tag> items, String key, Class<T> expected) throws IllegalArgumentException {
+        if (!items.containsKey(key)) {
+            throw new IllegalArgumentException("Missing a \"" + key + "\" tag");
+        }
+        Tag tag = items.get(key);
+        if (!expected.isInstance(tag)) {
+            throw new IllegalArgumentException(key + " tag is not of tag type " + expected.getName());
+        }
+        return expected.cast(tag);
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NamedTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NamedTag.java
new file mode 100755
index 000000000..30dc789a1
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/NamedTag.java
@@ -0,0 +1,63 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * A tag that has a name.
+ */
+public class NamedTag {
+
+    private final String name;
+    private final Tag tag;
+
+    /**
+     * Create a new named tag.
+     *
+     * @param name the name
+     * @param tag the tag
+     */
+    public NamedTag(String name, Tag tag) {
+        checkNotNull(name);
+        checkNotNull(tag);
+        this.name = name;
+        this.tag = tag;
+    }
+
+    /**
+     * Get the name of the tag.
+     *
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Get the tag.
+     *
+     * @return the tag
+     */
+    public Tag getTag() {
+        return tag;
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ShortTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ShortTag.java
new file mode 100755
index 000000000..9fc3a74be
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/ShortTag.java
@@ -0,0 +1,49 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+/**
+ * The {@code TAG_Short} tag.
+ */
+public final class ShortTag extends Tag {
+
+    private final short value;
+
+    /**
+     * Creates the tag with an empty name.
+     *
+     * @param value the value of the tag
+     */
+    public ShortTag(short value) {
+        super();
+        this.value = value;
+    }
+
+    @Override
+    public Short getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return "TAG_Short(" + value + ")";
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/StringTag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/StringTag.java
new file mode 100755
index 000000000..0086c2e32
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/StringTag.java
@@ -0,0 +1,52 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * The {@code TAG_String} tag.
+ */
+public final class StringTag extends Tag {
+
+    private final String value;
+
+    /**
+     * Creates the tag with an empty name.
+     *
+     * @param value the value of the tag
+     */
+    public StringTag(String value) {
+        super();
+        checkNotNull(value);
+        this.value = value;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return "TAG_String(" + value + ")";
+    }
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/Tag.java b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/Tag.java
new file mode 100755
index 000000000..4ccda5357
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/com/java/sk89q/jnbt/Tag.java
@@ -0,0 +1,34 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.java.sk89q.jnbt;
+
+/**
+ * Represents a NBT tag.
+ */
+public abstract class Tag {
+
+    /**
+     * Gets the value of this tag.
+     * 
+     * @return the value
+     */
+    public abstract Object getValue();
+
+}
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/CurrencyType.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/CurrencyType.java
index f32ced62d..6a007fefa 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/CurrencyType.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/CurrencyType.java
@@ -6,8 +6,9 @@ public enum CurrencyType
 {
 	Tokens(" Tokens", Material.EMERALD),
 	Coins(" Coins", Material.DOUBLE_PLANT),
-	Gems(" Gems", Material.EMERALD);
-	
+	Gems(" Gems", Material.EMERALD),
+	Gold(" Gold", Material.GOLD_NUGGET);
+	    
 	private String _prefix;
 	private Material _displayMaterial;
 	
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
index 45fd28921..d76d2428e 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
@@ -26,7 +26,7 @@ public enum Rank
 
 	//Media
 	YOUTUBE("YouTube", ChatColor.RED),
-	YOUTUBE_SMALL("MooTube", ChatColor.DARK_PURPLE),
+	YOUTUBE_SMALL("YT", ChatColor.DARK_PURPLE),
 	TWITCH("Twitch", ChatColor.DARK_PURPLE),
 	
 	//Player
@@ -116,4 +116,12 @@ public enum Rank
 	{
 		return _donor;
 	}
+
+	public String getRawTag()
+	{
+		if (Name.equalsIgnoreCase("ALL"))
+			return "";
+		
+		return Name;
+	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/data/BlockData.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/BlockData.java
similarity index 93%
rename from Plugins/Mineplex.Core/src/mineplex/core/data/BlockData.java
rename to Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/BlockData.java
index bc6f7246a..89a1d27d2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/data/BlockData.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/BlockData.java
@@ -1,4 +1,4 @@
-package mineplex.core.data;
+package mineplex.core.common.block;
 
 import org.bukkit.block.Block;
 import org.bukkit.Material;
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
new file mode 100644
index 000000000..b64056a47
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
@@ -0,0 +1,104 @@
+package mineplex.core.common.block.schematic;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+
+public class Schematic
+{
+	private final short _width;
+	private final short _height;
+	private final short _length;
+	private final short[] _blocks;
+	private final byte[] _blockData;
+
+	public Schematic(short width, short height, short length, short[] blocks, byte[] blockData)
+	{
+		_width = width;
+		_height = height;
+		_length = length;
+		_blocks = blocks;
+		_blockData = blockData;
+	}
+
+	public void paste(Location originLocation)
+	{
+		int startX = originLocation.getBlockX();
+		int startY = originLocation.getBlockY();
+		int startZ = originLocation.getBlockZ();
+
+		for (int x = 0; x < _width; x++)
+		{
+			for (int y = 0; y < _height; y++)
+			{
+				for (int z = 0; z < _length; z++)
+				{
+					int index = getIndex(x, y, z);
+					Block block = originLocation.getWorld().getBlockAt(startX + x, startY + y, startZ + z);
+					// some blocks were giving me negative id's in the schematic (like stairs)
+					// not sure why but the math.abs is my simple fix
+					int materialId = Math.abs(_blocks[index]);
+
+					Material material = Material.getMaterial(materialId);
+					if (material == null)
+					{
+						System.out.println(materialId + " data: " + _blockData[index]);
+						continue;
+					}
+					block.setTypeIdAndData(materialId, _blockData[index], false);
+				}
+			}
+		}
+	}
+
+	public int getSize()
+	{
+		return _blocks.length;
+	}
+
+	public int getIndex(int x, int y, int z)
+	{
+		return y * _width * _length + z * _width + x;
+	}
+
+	public short getBlock(int x, int y, int z)
+	{
+		return _blocks[getIndex(x, y, z)];
+	}
+
+	public byte getData(int x, int y, int z)
+	{
+		return _blockData[getIndex(x, y, z)];
+	}
+
+	public short getWidth()
+	{
+		return _width;
+	}
+
+	public short getHeight()
+	{
+		return _height;
+	}
+
+	public short getLength()
+	{
+		return _length;
+	}
+
+	public short[] getBlocks()
+	{
+		return _blocks;
+	}
+
+	public byte[] getBlockData()
+	{
+		return _blockData;
+	}
+
+	@Override
+	public String toString()
+	{
+		return String.format("width: %d, length: %d, height: %d, blockLength: %d, blockDataLength: %d", _width, _length, _height, _blocks.length, _blockData.length);
+	}
+}
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/SchematicRunnable.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/SchematicRunnable.java
new file mode 100644
index 000000000..e3b8c1d0a
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/SchematicRunnable.java
@@ -0,0 +1,120 @@
+package mineplex.core.common.block.schematic;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitTask;
+
+import mineplex.core.common.block.BlockData;
+import mineplex.core.common.util.Callback;
+
+public class SchematicRunnable implements Runnable
+{
+	private JavaPlugin _plugin;
+	private boolean _started;
+	private BukkitTask _task;
+	private List<BlockData> _changedBlocks;
+	private Callback<List<BlockData>> _callback;
+
+	private Schematic _schematic;
+	private Block _startBlock;
+	private int _currentX = 0;
+	private int _currentY = 0;
+	private int _currentZ = 0;
+	private int _blocksPerTick = 1000;
+
+	public SchematicRunnable(JavaPlugin plugin, Schematic schematic, Block startBlock, Callback<List<BlockData>> callback)
+	{
+		_plugin = plugin;
+		_changedBlocks = new ArrayList<BlockData>(schematic.getSize());
+		_started = false;
+		_callback = callback;
+
+		_schematic = schematic;
+		_startBlock = startBlock;
+	}
+
+	public void start()
+	{
+		if (!_started)
+		{
+			_task = Bukkit.getScheduler().runTaskTimer(_plugin, this, 1, 1);
+			_started = true;
+		}
+	}
+
+	public void pause()
+	{
+		if (_started)
+		{
+			_task.cancel();
+			_started = false;
+		}
+	}
+
+	public void setBlocksPerTick(int blocksPerTick)
+	{
+		_blocksPerTick = blocksPerTick;
+	}
+
+	@Override
+	public void run()
+	{
+		for (int i = 0; i < _blocksPerTick; i++)
+		{
+			setBlock(_startBlock.getRelative(_currentX, _currentY, _currentZ), _currentX, _currentY, _currentZ);
+
+			_currentX++;
+
+			if (_currentX >= _schematic.getWidth())
+			{
+				_currentX = 0;
+				_currentZ++;
+
+				if (_currentZ >= _schematic.getLength())
+				{
+					_currentZ = 0;
+					_currentY++;
+
+					if (_currentY >= _schematic.getHeight())
+					{
+						// We are done
+						System.out.println("Finished importing schematic with setblockrunnable!");
+
+						if (_callback != null)
+							_callback.run(_changedBlocks);
+
+						_task.cancel();
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	private void setBlock(Block block, int x, int y, int z)
+	{
+
+		int materialId = _schematic.getBlock(x, y, z);
+		byte data = _schematic.getData(x, y, z);
+
+		Material material = Material.getMaterial(materialId);
+		if (material == null)
+		{
+			System.out.println("Failed to find material with id: " + materialId);
+			return;
+		}
+
+		if (block.getTypeId() == materialId && block.getData() == data)
+			return;
+
+		BlockData blockData = new BlockData(block);
+		_changedBlocks.add(blockData);
+		block.setTypeIdAndData(materialId, data, false);
+	}
+}
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/UtilSchematic.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/UtilSchematic.java
new file mode 100644
index 000000000..96f8cbc8b
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/UtilSchematic.java
@@ -0,0 +1,76 @@
+package mineplex.core.common.block.schematic;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Map;
+import java.util.zip.GZIPInputStream;
+
+import com.java.sk89q.jnbt.ByteArrayTag;
+import com.java.sk89q.jnbt.CompoundTag;
+import com.java.sk89q.jnbt.NBTInputStream;
+import com.java.sk89q.jnbt.NamedTag;
+import com.java.sk89q.jnbt.ShortTag;
+import com.java.sk89q.jnbt.Tag;
+
+public class UtilSchematic
+{
+	public static Schematic loadSchematic(File file) throws IOException
+	{
+		FileInputStream fis = new FileInputStream(file);
+		NBTInputStream nbtStream = new NBTInputStream(new GZIPInputStream(fis));
+
+		NamedTag rootTag = nbtStream.readNamedTag();
+		nbtStream.close();
+
+		if (!rootTag.getName().equals("Schematic"))
+			return null;
+
+		CompoundTag schematicTag = (CompoundTag) rootTag.getTag();
+		Map<String, Tag> schematic = schematicTag.getValue();
+
+		short width = getChildTag(schematic, "Width", ShortTag.class).getValue();
+		short height = getChildTag(schematic, "Height", ShortTag.class).getValue();
+		short length = getChildTag(schematic, "Length", ShortTag.class).getValue();
+		byte[] blockId = getChildTag(schematic, "Blocks", ByteArrayTag.class).getValue();
+		byte[] addId = new byte[0];
+		short[] blocks = new short[blockId.length];
+		byte[] blockData = getChildTag(schematic, "Data", ByteArrayTag.class).getValue();
+
+		if (schematic.containsKey("AddBlocks"))
+		{
+			addId = getChildTag(schematic, "AddBlocks", ByteArrayTag.class).getValue();
+		}
+
+		for (int index = 0; index < blockId.length; index++)
+		{
+			if ((index >> 1) >= addId.length)
+				blocks[index] = (short) (blockId[index] & 0xFF);
+			else
+			{
+				if ((index & 1) == 0)
+					blocks[index] = (short) (((addId[index >> 1] & 0x0F) << 8) + (blockId[index] & 0xFF));
+				else
+					blocks[index] = (short) (((addId[index >> 1] & 0xF0) << 4) + (blockId[index] & 0xFF));
+			}
+		}
+
+
+		return new Schematic(width, height, length, blocks, blockData);
+	}
+
+
+	private static <T extends Tag> T getChildTag(Map<String, Tag> items, String key, Class<T> expected)
+	{
+		Tag tag = items.get(key);
+		return expected.cast(tag);
+	}
+
+	public static void main(String[] args) throws IOException
+	{
+		File file = new File("test.schematic");
+		System.out.println(file.getAbsoluteFile());
+		Schematic m = UtilSchematic.loadSchematic(file);
+		System.out.println(m);
+	}
+}
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/player/PlayerSnapshot.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/player/PlayerSnapshot.java
new file mode 100644
index 000000000..fa4b6c53c
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/player/PlayerSnapshot.java
@@ -0,0 +1,78 @@
+package mineplex.core.common.player;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.Vector;
+
+public class PlayerSnapshot
+{
+	private Location _location;
+	private ItemStack[] _armor;
+	private ItemStack[] _items;
+	private double _health;
+	private int _hunger;
+	private float _saturation;
+	private float _exhaustion;
+	private int _experience;
+	private Vector _velocity;
+
+	private PlayerSnapshot(Location location, ItemStack[] armor, ItemStack[] items, double health, int hunger, float saturation, float exhaustion, int experience, Vector velocity)
+	{
+		_location = location;
+		_armor = armor;
+		_items = items;
+		_health = health;
+		_hunger = hunger;
+		_saturation = saturation;
+		_exhaustion = exhaustion;
+		_experience = experience;
+		_velocity = velocity;
+	}
+
+	public void applySnapshot(Player player)
+	{
+		player.teleport(_location);
+		player.getInventory().setArmorContents(_armor);
+		player.getInventory().setContents(_items);
+		player.setHealth(_health);
+		player.setFoodLevel(_hunger);
+		player.setSaturation(_saturation);
+		player.setExhaustion(_exhaustion);
+		player.setVelocity(_velocity);
+		player.setTotalExperience(_experience);
+	}
+
+	public static PlayerSnapshot getSnapshot(Player player)
+	{
+		Location location = player.getLocation();
+
+		// Inventory
+		ItemStack[] bArmor = player.getInventory().getArmorContents();
+		ItemStack[] armor = new ItemStack[bArmor.length];
+
+		for (int i = 0; i < bArmor.length; i++)
+		{
+			armor[i] = bArmor[i];
+		}
+
+		ItemStack[] bItems = player.getInventory().getContents();
+		ItemStack[] items = new ItemStack[bItems.length];
+
+		for (int i = 0; i < bItems.length; i++)
+		{
+			items[i] = bItems[i];
+		}
+
+		// Health
+		double health = player.getHealth();
+		int hunger = player.getFoodLevel();
+		float saturation = player.getSaturation();
+		float exhaustion = player.getExhaustion();
+		int experience = player.getTotalExperience();
+
+		Vector velocity = player.getVelocity();
+
+		return new PlayerSnapshot(location, armor, items, health, hunger, saturation, exhaustion, experience, velocity);
+	}
+}
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/C.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/C.java
index 136e6b73b..7d5f00c91 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/C.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/C.java
@@ -10,6 +10,7 @@ public class C
 	public static String BoldStrike = "§l§m";
 	public static String Line = "§n";
 	public static String Italics = "§o";
+	public static String Reset = "§r";
 	
 	public static String cAqua = "" + ChatColor.AQUA;
 	public static String cBlack = "" + ChatColor.BLACK;
@@ -87,22 +88,26 @@ public class C
 	public static String chat = "" + ChatColor.WHITE;
 
 	public static String xBorderlands = "" + ChatColor.GOLD;
-	public static String xWilderness = "" + ChatColor.YELLOW;
+	public static String xWilderness = "" + ChatColor.GRAY;
 	public static String xMid = "" + ChatColor.WHITE;
-	public static String xNone = "" + ChatColor.GRAY;
+	public static ChatColor xNone = ChatColor.YELLOW;
 
 	public static ChatColor xAdmin = ChatColor.WHITE;
 	public static ChatColor xSafe = ChatColor.AQUA;
 
+	public static ChatColor xNeutral = ChatColor.YELLOW;
 	public static ChatColor xSelf = ChatColor.AQUA;
 	public static ChatColor xAlly = ChatColor.GREEN;
-	public static ChatColor xEnemy = ChatColor.YELLOW;
-	public static ChatColor xWar = ChatColor.RED;
+	public static ChatColor xEnemy = ChatColor.RED;
+	public static ChatColor xWarWinning = ChatColor.LIGHT_PURPLE;
+	public static ChatColor xWarLosing = ChatColor.RED;
 	public static ChatColor xPillage = ChatColor.LIGHT_PURPLE;
-	
+
+	public static ChatColor xdNeutral = ChatColor.GOLD;
 	public static ChatColor xdSelf = ChatColor.DARK_AQUA;
 	public static ChatColor xdAlly = ChatColor.DARK_GREEN;
-	public static ChatColor xdEnemy = ChatColor.GOLD;
-	public static ChatColor xdWar = ChatColor.DARK_RED;
+	public static ChatColor xdEnemy = ChatColor.DARK_RED;
+	public static ChatColor xdWarWinning = ChatColor.DARK_PURPLE;
+	public static ChatColor xdWarLosing = ChatColor.DARK_RED;
 	public static ChatColor xdPillage = ChatColor.DARK_PURPLE;
 }
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/NautArrayList.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/NautArrayList.java
new file mode 100644
index 000000000..29235ec86
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/NautArrayList.java
@@ -0,0 +1,132 @@
+package mineplex.core.common.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+public class NautArrayList<Elem>
+{
+	private ArrayList<Elem> _wrappedArrayList = new ArrayList<Elem>();
+
+	public boolean add(Elem elem)
+	{
+		return _wrappedArrayList.add(elem);
+	}
+	
+	public void add(int index, Elem elem)
+	{
+		_wrappedArrayList.add(index, elem);
+	}
+	
+	public boolean addAll(Collection<? extends Elem> elements)
+	{
+		return _wrappedArrayList.addAll(elements);
+	}
+	
+	public boolean addAll(int index, Collection<? extends Elem> elements)
+	{
+		return _wrappedArrayList.addAll(index, elements);
+	}
+	
+	public void clear()
+	{
+		_wrappedArrayList.clear();
+	}
+	
+	public boolean contains(Elem elem)
+	{
+		return _wrappedArrayList.contains(elem);
+	}
+	
+	public boolean containsAll(Collection<? extends Elem> elements)
+	{
+		return _wrappedArrayList.containsAll(elements);
+	}
+	
+	public Elem get(int index)
+	{
+		return _wrappedArrayList.get(index);
+	}
+	
+	public boolean equals(Object o)
+	{
+		return _wrappedArrayList.equals(o);
+	}
+	
+	public int hashCode()
+	{
+		return _wrappedArrayList.hashCode();
+	}
+	
+	public int indexOf(Elem elem)
+	{
+		return _wrappedArrayList.indexOf(elem);
+	}
+	
+	public boolean isEmpty()
+	{
+		return _wrappedArrayList.isEmpty();
+	}
+	
+	public Iterator<Elem> iterator()
+	{
+		return _wrappedArrayList.iterator();
+	}
+	
+	public int lastIndexOf(Elem elem)
+	{
+		return _wrappedArrayList.lastIndexOf(elem);
+	}
+	
+	public ListIterator<Elem> listIterator()
+	{
+		return _wrappedArrayList.listIterator();
+	}
+	
+	public ListIterator<Elem> listIterator(int index)
+	{
+		return _wrappedArrayList.listIterator(index);
+	}
+	
+	public Elem remove(int index)
+	{
+		return _wrappedArrayList.remove(index);
+	}
+	
+	public boolean remove(Elem element)
+	{
+		return _wrappedArrayList.remove(element);
+	}
+	
+	public boolean removeAll(Collection<? extends Elem> elements)
+	{
+		return _wrappedArrayList.removeAll(elements);
+	}
+	
+	public boolean retainAll(Collection<? extends Elem> elements)
+	{
+		return _wrappedArrayList.retainAll(elements);
+	}
+	
+	public Elem set(int index, Elem element)
+	{
+		return _wrappedArrayList.set(index, element);
+	}
+	
+	public int size()
+	{
+		return _wrappedArrayList.size();
+	}
+	
+	public List<Elem> subList(int begin, int end)
+	{
+		return _wrappedArrayList.subList(begin, end);
+	}
+	
+	public Object[] toArray()
+	{
+		return _wrappedArrayList.toArray();
+	}
+}
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
index c3d16a857..6045f4d9e 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
@@ -1,6 +1,8 @@
 package mineplex.core.common.util;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -8,17 +10,26 @@ import java.util.TreeSet;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.util.EulerAngle;
 import org.bukkit.util.Vector;
 
+import net.minecraft.server.v1_8_R3.EnumDirection;
+
 public class UtilAlg
-{	
+{
 	public static TreeSet<String> sortKey(Set<String> toSort)
 	{
-		TreeSet<String> sortedSet = new TreeSet<String>();
-		for (String cur : toSort)
+		return sortSet(toSort, null);
+	}
+
+	public static <T> TreeSet<T> sortSet(Collection<T> toSort, Comparator<T> comparator)
+	{
+		TreeSet<T> sortedSet = new TreeSet<T>(comparator);
+		for (T cur : toSort)
 			sortedSet.add(cur);
-		
+
 		return sortedSet;
 	}
 	
@@ -39,7 +50,7 @@ public class UtilAlg
 	
 	public static Vector getTrajectory(Vector from, Vector to)
 	{
-		return to.subtract(from).normalize();
+		return to.clone().subtract(from).normalize();
 	}
 	
 	public static Vector getTrajectory2d(Entity from, Entity to)
@@ -54,7 +65,7 @@ public class UtilAlg
 	
 	public static Vector getTrajectory2d(Vector from, Vector to)
 	{
-		return to.subtract(from).setY(0).normalize();
+		return to.clone().subtract(from).setY(0).normalize();
 	}
 
 	public static boolean HasSight(Location from, Player to) 
@@ -407,6 +418,55 @@ public class UtilAlg
 		return bestLoc;
 	}
 	
+	public static Vector calculateVelocity(Vector from, Vector to, double heightGain, Entity entity)
+	{
+		if (entity instanceof LivingEntity)
+		{
+			return calculateVelocity(from, to, heightGain, 1.15);
+		}
+		else
+		{
+			return calculateVelocity(from, to, heightGain, 0.115);
+		}
+	}
+
+	public static Vector calculateVelocity(Vector from, Vector to, double heightGain)
+	{
+		return calculateVelocity(from, to, heightGain, 0.115);
+	}
+
+	public static Vector calculateVelocity(Vector from, Vector to, double heightGain, double gravity)
+	{
+		// Block locations
+		int endGain = to.getBlockY() - from.getBlockY();
+
+		double dx1 = to.getBlockX() - from.getBlockX();
+		double dz1 = to.getBlockZ() - from.getBlockZ();
+
+		double horizDist = Math.sqrt(dx1 * dx1 + dz1 * dz1);
+		// Height gain
+		double maxGain = heightGain > (endGain + heightGain) ? heightGain : (endGain + heightGain);
+		// Solve quadratic equation for velocity
+		double a = -horizDist * horizDist / (4 * maxGain);
+		double b = horizDist;
+		double c = -endGain;
+		double slope = -b / (2 * a) - Math.sqrt(b * b - 4 * a * c) / (2 * a);
+		// Vertical velocity
+		double vy = Math.sqrt(maxGain * gravity);
+		// Horizontal velocity
+		double vh = vy / slope;
+		// Calculate horizontal direction
+		int dx = to.getBlockX() - from.getBlockX();
+		int dz = to.getBlockZ() - from.getBlockZ();
+		double mag = Math.sqrt(dx * dx + dz * dz);
+		double dirx = dx / mag;
+		double dirz = dz / mag;
+		// Horizontal velocity components
+		double vx = vh * dirx;
+		double vz = vh * dirz;
+		return new Vector(vx, vy, vz);
+	}
+	
 	public static Location getNearestCornerLocation(Location near, Block block)
 	{
 		ArrayList<Location> corners = new ArrayList<Location>();
@@ -439,4 +499,15 @@ public class UtilAlg
 		
 		return value;
 	}
+
+	
+	public static EulerAngle vectorToEuler(Vector vector)
+	{
+		//JUST MAKE SURE THE ARMOR STAND ISNT ROTATED.
+		
+		return new EulerAngle(
+				Math.toRadians(UtilAlg.GetPitch(vector)), 
+				Math.toRadians(UtilAlg.GetYaw(vector)),
+				0);
+	}
 }
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
index c4152acb0..da7bc464c 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
@@ -4,65 +4,95 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import net.minecraft.server.v1_8_R3.BlockPosition;
-import net.minecraft.server.v1_8_R3.Blocks;
-import net.minecraft.server.v1_8_R3.MathHelper;
-import net.minecraft.server.v1_8_R3.WorldServer;
-
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.SkullType;
 import org.bukkit.World;
+import org.bukkit.block.Banner;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.BrewingStand;
+import org.bukkit.block.Chest;
+import org.bukkit.block.Dispenser;
+import org.bukkit.block.Dropper;
+import org.bukkit.block.Furnace;
+import org.bukkit.block.Hopper;
+import org.bukkit.block.Jukebox;
+import org.bukkit.block.Skull;
 import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BannerMeta;
+import org.bukkit.inventory.meta.SkullMeta;
+import org.bukkit.material.Bed;
+
+import net.minecraft.server.v1_8_R3.BlockPosition;
+import net.minecraft.server.v1_8_R3.Blocks;
+import net.minecraft.server.v1_8_R3.EnumDirection;
+import net.minecraft.server.v1_8_R3.Item;
+import net.minecraft.server.v1_8_R3.MathHelper;
+import net.minecraft.server.v1_8_R3.MinecraftKey;
+import net.minecraft.server.v1_8_R3.NBTTagCompound;
+import net.minecraft.server.v1_8_R3.TileEntityFlowerPot;
+import net.minecraft.server.v1_8_R3.WorldServer;
 
 public class UtilBlock
 {
 	
-	public static void main(String[] args) {
-		
-		for (Material m : Material.values()) {
+	public static void main(String[] args)
+	{
 		
+		for (Material m : Material.values())
+		{
+			
 			boolean thisSolid = fullSolid(m.getId());
 			boolean solid = m.isSolid();
-			if (thisSolid != solid) {
+			if (thisSolid != solid)
+			{
 				StringBuilder sb = new StringBuilder();
 				sb.append("Failed: ");
 				sb.append(m.name());
 				int amount = 40 - sb.length();
-				for (int i = 0; i < amount; i++) {
+				for (int i = 0; i < amount; i++)
+				{
 					sb.append(" ");
 				}
 				sb.append(thisSolid);
 				System.out.println(sb);
 			}
-				
+			
 		}
 		System.out.println("done!");
 		
 	}
 	
+	/**
+	 * A list of blocks that are usable
+	 */
+	public static HashSet<Byte> blockUseSet = new HashSet<Byte>();
+	/**
+	 * A list of blocks that are always solid and can be stood on
+	 */
+	public static HashSet<Byte> fullSolid = new HashSet<Byte>();
+	/**
+	 * A list of blocks that are non-solid, but can't be moved through. Eg lily,
+	 * fence gate, portal
+	 */
+	public static HashSet<Byte> blockPassSet = new HashSet<Byte>();
+	/**
+	 * A list of blocks that offer zero resistance (long grass, torch, flower)
+	 */
+	public static HashSet<Byte> blockAirFoliageSet = new HashSet<Byte>();
 	
-    /**
-     * A list of blocks that are usable
-     */
-    public static HashSet<Byte> blockUseSet = new HashSet<Byte>();
-    /**
-     * A list of blocks that are always solid and can be stood on
-     */
-    public static HashSet<Byte> fullSolid = new HashSet<Byte>();
-    /**
-     * A list of blocks that are non-solid, but can't be moved through. Eg lily, fence gate, portal
-     */
-    public static HashSet<Byte> blockPassSet = new HashSet<Byte>();
-    /**
-     * A list of blocks that offer zero resistance (long grass, torch, flower)
-     */
-    public static HashSet<Byte> blockAirFoliageSet = new HashSet<Byte>();
-    
-    static {
-
+	/**
+	 * All horizontal diections [north, east, south, west]
+	 */
+	public static HashSet<BlockFace> horizontals = new HashSet<>();
+	
+	static
+	{
+		
 		blockAirFoliageSet.add((byte) Material.AIR.getId());
 		blockAirFoliageSet.add((byte) Material.SAPLING.getId());
 		blockAirFoliageSet.add((byte) Material.LONG_GRASS.getId());
@@ -83,7 +113,7 @@ public class UtilBlock
 		blockAirFoliageSet.add((byte) Material.DOUBLE_PLANT.getId());
 		blockAirFoliageSet.add((byte) Material.STANDING_BANNER.getId());
 		blockAirFoliageSet.add((byte) Material.WALL_BANNER.getId());
-
+		
 		blockPassSet.add((byte) Material.AIR.getId());
 		blockPassSet.add((byte) Material.SAPLING.getId());
 		blockPassSet.add((byte) Material.WATER.getId());
@@ -141,7 +171,7 @@ public class UtilBlock
 		blockPassSet.add((byte) Material.STAINED_GLASS_PANE.getId());
 		blockPassSet.add((byte) Material.IRON_TRAPDOOR.getId());
 		blockPassSet.add((byte) Material.DAYLIGHT_DETECTOR_INVERTED.getId());
-
+		
 		blockPassSet.add((byte) Material.BIRCH_FENCE_GATE.getId());
 		blockPassSet.add((byte) Material.JUNGLE_FENCE_GATE.getId());
 		blockPassSet.add((byte) Material.DARK_OAK_FENCE_GATE.getId());
@@ -151,13 +181,13 @@ public class UtilBlock
 		blockPassSet.add((byte) Material.JUNGLE_FENCE.getId());
 		blockPassSet.add((byte) Material.DARK_OAK_FENCE.getId());
 		blockPassSet.add((byte) Material.ACACIA_FENCE.getId());
-
+		
 		blockPassSet.add((byte) Material.SPRUCE_DOOR.getId());
 		blockPassSet.add((byte) Material.BIRCH_DOOR.getId());
 		blockPassSet.add((byte) Material.JUNGLE_DOOR.getId());
 		blockPassSet.add((byte) Material.ACACIA_DOOR.getId());
 		blockPassSet.add((byte) Material.DARK_OAK_DOOR.getId());
-
+		
 		fullSolid.add((byte) Material.STONE.getId());
 		fullSolid.add((byte) Material.GRASS.getId());
 		fullSolid.add((byte) Material.DIRT.getId());
@@ -239,7 +269,7 @@ public class UtilBlock
 		fullSolid.add((byte) Material.PACKED_ICE.getId());
 		fullSolid.add((byte) Material.RED_SANDSTONE.getId());
 		fullSolid.add((byte) Material.DOUBLE_STONE_SLAB2.getId());
-
+		
 		blockUseSet.add((byte) Material.DISPENSER.getId());
 		blockUseSet.add((byte) Material.BED_BLOCK.getId());
 		blockUseSet.add((byte) Material.PISTON_BASE.getId());
@@ -265,7 +295,7 @@ public class UtilBlock
 		blockUseSet.add((byte) Material.TRAPPED_CHEST.getId());
 		blockUseSet.add((byte) Material.HOPPER.getId());
 		blockUseSet.add((byte) Material.DROPPER.getId());
-
+		
 		blockUseSet.add((byte) Material.BIRCH_FENCE_GATE.getId());
 		blockUseSet.add((byte) Material.JUNGLE_FENCE_GATE.getId());
 		blockUseSet.add((byte) Material.DARK_OAK_FENCE_GATE.getId());
@@ -275,189 +305,192 @@ public class UtilBlock
 		blockUseSet.add((byte) Material.JUNGLE_FENCE.getId());
 		blockUseSet.add((byte) Material.DARK_OAK_FENCE.getId());
 		blockUseSet.add((byte) Material.ACACIA_FENCE.getId());
-
+		
 		blockUseSet.add((byte) Material.SPRUCE_DOOR.getId());
 		blockUseSet.add((byte) Material.BIRCH_DOOR.getId());
 		blockUseSet.add((byte) Material.JUNGLE_DOOR.getId());
 		blockUseSet.add((byte) Material.ACACIA_DOOR.getId());
 		blockUseSet.add((byte) Material.DARK_OAK_DOOR.getId());
-    }
+		
+		horizontals.add(BlockFace.NORTH);
+		horizontals.add(BlockFace.EAST);
+		horizontals.add(BlockFace.SOUTH);
+		horizontals.add(BlockFace.WEST);
+	}
 	
 	public static boolean solid(Block block)
 	{
-		if (block == null)			return false;
+		if (block == null) return false;
 		return solid(block.getTypeId());
 	}
+	
 	public static boolean solid(int block)
 	{
-		return solid((byte)block);
+		return solid((byte) block);
 	}
+	
 	public static boolean solid(byte block)
 	{
 		return !blockPassSet.contains(block);
 	}
-
+	
 	public static boolean airFoliage(Block block)
 	{
-		if (block == null)			return false;
+		if (block == null) return false;
 		return airFoliage(block.getTypeId());
 	}
+	
 	public static boolean airFoliage(int block)
 	{
-		return airFoliage((byte)block);
+		return airFoliage((byte) block);
 	}
+	
 	public static boolean airFoliage(byte block)
 	{
 		return blockAirFoliageSet.contains(block);
 	}
-
+	
 	public static boolean fullSolid(Block block)
 	{
-		if (block == null)
-			return false;
-
+		if (block == null) return false;
+		
 		return fullSolid(block.getTypeId());
 	}
+	
 	public static boolean fullSolid(int block)
 	{
-		return fullSolid((byte)block);
+		return fullSolid((byte) block);
 	}
+	
 	public static boolean fullSolid(byte block)
 	{
 		return fullSolid.contains(block);
 	}
-
+	
 	public static boolean usable(Block block)
 	{
-		if (block == null)
-			return false;
-
+		if (block == null) return false;
+		
 		return usable(block.getTypeId());
 	}
+	
 	public static boolean usable(int block)
 	{
-		return usable((byte)block);
+		return usable((byte) block);
 	}
+	
 	public static boolean usable(byte block)
 	{
 		return blockUseSet.contains(block);
 	}
-
+	
 	public static HashMap<Block, Double> getInRadius(Location loc, double dR)
 	{
 		return getInRadius(loc, dR, 9999);
 	}
-
+	
 	public static HashMap<Block, Double> getInRadius(Location loc, double dR, double maxHeight)
 	{
 		HashMap<Block, Double> blockList = new HashMap<Block, Double>();
-		int iR = (int)dR + 1;
-
-		for (int x=-iR ; x <= iR ; x++)
-			for (int z=-iR ; z <= iR ; z++)
-				for (int y=-iR ; y <= iR ; y++)
+		int iR = (int) dR + 1;
+		
+		for (int x = -iR; x <= iR; x++)
+			for (int z = -iR; z <= iR; z++)
+				for (int y = -iR; y <= iR; y++)
 				{
-					if (Math.abs(y) > maxHeight)
-						continue;
-
-					Block curBlock = loc.getWorld().getBlockAt((int)(loc.getX()+x), (int)(loc.getY()+y), (int)(loc.getZ()+z));
-
+					if (Math.abs(y) > maxHeight) continue;
+					
+					Block curBlock = loc.getWorld().getBlockAt((int) (loc.getX() + x), (int) (loc.getY() + y), (int) (loc.getZ() + z));
+					
 					double offset = UtilMath.offset(loc, curBlock.getLocation().add(0.5, 0.5, 0.5));;
-
-					if (offset <= dR)
-						blockList.put(curBlock, 1 - (offset/dR));
+					
+					if (offset <= dR) blockList.put(curBlock, 1 - (offset / dR));
 				}
-
+				
 		return blockList;
 	}
-
-
+	
 	public static HashMap<Block, Double> getInRadius(Block block, double dR)
 	{
 		return getInRadius(block, dR, false);
 	}
-
+	
 	public static HashMap<Block, Double> getInRadius(Block block, double dR, boolean hollow)
 	{
 		HashMap<Block, Double> blockList = new HashMap<Block, Double>();
-		int iR = (int)dR + 1;
-
-		for (int x=-iR ; x <= iR ; x++)
-			for (int z=-iR ; z <= iR ; z++)
-				for (int y=-iR ; y <= iR ; y++)
+		int iR = (int) dR + 1;
+		
+		for (int x = -iR; x <= iR; x++)
+			for (int z = -iR; z <= iR; z++)
+				for (int y = -iR; y <= iR; y++)
 				{
 					Block curBlock = block.getRelative(x, y, z);
-
+					
 					double offset = UtilMath.offset(block.getLocation(), curBlock.getLocation());
-
+					
 					if (offset <= dR && !(hollow && offset < dR - 1))
 					{
 						blockList.put(curBlock, 1 - (offset / dR));
 					}
 				}
-
+				
 		return blockList;
 	}
-
+	
 	public static ArrayList<Block> getInSquare(Block block, double dR)
 	{
 		ArrayList<Block> blockList = new ArrayList<Block>();
-		int iR = (int)dR + 1;
-
-		for (int x=-iR ; x <= iR ; x++)
-			for (int z=-iR ; z <= iR ; z++)
-				for (int y=-iR ; y <= iR ; y++)
+		int iR = (int) dR + 1;
+		
+		for (int x = -iR; x <= iR; x++)
+			for (int z = -iR; z <= iR; z++)
+				for (int y = -iR; y <= iR; y++)
 				{
 					blockList.add(block.getRelative(x, y, z));
 				}
-
+				
 		return blockList;
 	}
-
-	public static boolean isBlock(ItemStack item) 
+	
+	public static boolean isBlock(ItemStack item)
 	{
-		if (item == null)
-			return false;
-
+		if (item == null) return false;
+		
 		return item.getTypeId() > 0 && item.getTypeId() < 256;
 	}
-
+	
 	public static Block getHighest(World world, int x, int z)
 	{
 		return getHighest(world, x, z, null);
 	}
-
+	
 	public static Block getHighest(World world, int x, int z, HashSet<Material> ignore)
 	{
 		Block block = world.getHighestBlockAt(x, z);
-
-		//Shuffle Down
-		while (block.getY() > 0 && 
-				(
-						airFoliage(block) || 
-						block.getType() == Material.LEAVES || 
-						(ignore != null && ignore.contains(block.getType()))
-				))
+		
+		// Shuffle Down
+		while (block.getY() > 0 && (airFoliage(block) || block.getType() == Material.LEAVES || block.getType() == Material.LEAVES_2 || (ignore != null && ignore.contains(block.getType()))))
 		{
 			block = block.getRelative(BlockFace.DOWN);
 		}
-
-		return block.getRelative(BlockFace.UP); 
+		
+		return block.getRelative(BlockFace.UP);
 	}
-
+	
 	/**
 	 * 
 	 * @param location of explosion
 	 * @param strength of explosion
 	 * @param damageBlocksEqually - Treat all blocks as durability of dirt
-	 * @param ensureDestruction - Ensure that the closest blocks are destroyed at least
+	 * @param ensureDestruction - Ensure that the closest blocks are destroyed
+	 *        at least
 	 * @return
 	 */
 	public static ArrayList<Block> getExplosionBlocks(Location location, float strength, boolean damageBlocksEqually)
 	{
 		ArrayList<Block> toExplode = new ArrayList<Block>();
 		WorldServer world = ((CraftWorld) location.getWorld()).getHandle();
-
+		
 		for (int i = 0; i < 16; i++)
 		{
 			for (int j = 0; j < 16; j++)
@@ -470,37 +503,36 @@ public class UtilBlock
 						double d4 = j / (16 - 1.0F) * 2.0F - 1.0F;
 						double d5 = k / (16 - 1.0F) * 2.0F - 1.0F;
 						double d6 = Math.sqrt(d3 * d3 + d4 * d4 + d5 * d5);
-
+						
 						d3 /= d6;
 						d4 /= d6;
 						d5 /= d6;
 						float f1 = strength * (0.7F + UtilMath.random.nextFloat() * 0.6F);
-
+						
 						double d0 = location.getX();
 						double d1 = location.getY();
 						double d2 = location.getZ();
-
+						
 						for (float f2 = 0.3F; f1 > 0.0F; f1 -= f2 * 0.75F)
 						{
 							int l = MathHelper.floor(d0);
 							int i1 = MathHelper.floor(d1);
 							int j1 = MathHelper.floor(d2);
 							Block block = location.getWorld().getBlockAt(l, i1, j1);
-
+							
 							if (block.getType() != Material.AIR)
 							{
 								Blocks.DIRT.a((net.minecraft.server.v1_8_R3.Entity) null);
-								float f3 = (damageBlocksEqually ? Blocks.DIRT : world.getType(new BlockPosition(block.getX(), block.getY(),
-										block.getZ())).getBlock()).a((net.minecraft.server.v1_8_R3.Entity) null);
-
+								float f3 = (damageBlocksEqually ? Blocks.DIRT : world.getType(new BlockPosition(block.getX(), block.getY(), block.getZ())).getBlock()).a((net.minecraft.server.v1_8_R3.Entity) null);
+								
 								f1 -= (f3 + 0.3F) * f2;
 							}
-
+							
 							if ((f1 > 0.0F) && (i1 < 256) && (i1 >= 0))
 							{
 								toExplode.add(block);
 							}
-
+							
 							d0 += d3 * f2;
 							d1 += d4 * f2;
 							d2 += d5 * f2;
@@ -512,20 +544,19 @@ public class UtilBlock
 		
 		return toExplode;
 	}
-
-	public static ArrayList<Block> getSurrounding(Block block, boolean diagonals) 
+	
+	public static ArrayList<Block> getSurrounding(Block block, boolean diagonals)
 	{
 		ArrayList<Block> blocks = new ArrayList<Block>();
-
+		
 		if (diagonals)
 		{
-			for (int x=-1 ; x<= 1 ; x++)
-				for (int y=-1 ; y<= 1 ; y++)
-					for (int z=-1 ; z<= 1 ; z++)
+			for (int x = -1; x <= 1; x++)
+				for (int y = -1; y <= 1; y++)
+					for (int z = -1; z <= 1; z++)
 					{
-						if (x == 0 && y == 0 && z == 0)
-							continue;
-
+						if (x == 0 && y == 0 && z == 0) continue;
+						
 						blocks.add(block.getRelative(x, y, z));
 					}
 		}
@@ -538,23 +569,24 @@ public class UtilBlock
 			blocks.add(block.getRelative(BlockFace.EAST));
 			blocks.add(block.getRelative(BlockFace.WEST));
 		}
-
+		
 		return blocks;
 	}
-
+	
 	public static boolean isVisible(Block block)
 	{
 		for (Block other : UtilBlock.getSurrounding(block, false))
 		{
-			if (!other.getType().isOccluding()) 
+			if (!other.getType().isOccluding())
 			{
 				return true;
 			}
 		}
-
+		
 		return false;
 	}
-	public static ArrayList<Block> getInBoundingBox(Location a,	Location b)
+	
+	public static ArrayList<Block> getInBoundingBox(Location a, Location b)
 	{
 		return getInBoundingBox(a, b, true);
 	}
@@ -563,65 +595,815 @@ public class UtilBlock
 	{
 		ArrayList<Block> blocks = new ArrayList<Block>();
 		
-		for (int x=Math.min(a.getBlockX(), b.getBlockX()) ; x<=Math.max(a.getBlockX(), b.getBlockX()) ; x++)
-			for (int y=Math.min(a.getBlockY(), b.getBlockY()) ; y<=Math.max(a.getBlockY(), b.getBlockY()) ; y++)
-				for (int z=Math.min(a.getBlockZ(), b.getBlockZ()) ; z<=Math.max(a.getBlockZ(), b.getBlockZ()) ; z++)
+		for (int x = Math.min(a.getBlockX(), b.getBlockX()); x <= Math.max(a.getBlockX(), b.getBlockX()); x++)
+			for (int y = Math.min(a.getBlockY(), b.getBlockY()); y <= Math.max(a.getBlockY(), b.getBlockY()); y++)
+				for (int z = Math.min(a.getBlockZ(), b.getBlockZ()); z <= Math.max(a.getBlockZ(), b.getBlockZ()); z++)
 				{
-					Block block = a.getWorld().getBlockAt(x,y,z);
+					Block block = a.getWorld().getBlockAt(x, y, z);
 					
-					if(ignoreAir)
+					if (ignoreAir)
 					{
-						if (block.getType() != Material.AIR)
-							blocks.add(block);
+						if (block.getType() != Material.AIR) blocks.add(block);
 					}
-					else blocks.add(block);
+					else
+						blocks.add(block);
 				}
-		
+				
 		return blocks;
 	}
 	
 	public static int getStepSoundId(Block block)
 	{
-		if (block.getTypeId() != 35 && block.getTypeId() != 159 && block.getTypeId() != 160)
-			return block.getTypeId();
+		if (block.getTypeId() != 35 && block.getTypeId() != 159 && block.getTypeId() != 160) return block.getTypeId();
 		
 		switch (block.getData())
 		{
-		case 0:
-			return block.getTypeId();
-		case 1: 
-			return 172;
-		case 2:
-			return 87;
-		case 3:
-			return 79;
-		case 4:
-			return 41;
-		case 5:
-			return 133;
-		case 6:
-			return 45;
-		case 7:
-			return 16;
-		case 8: 
-			return 13;
-		case 9:
-			return 56;
-		case 10:
-			return 110;
-		case 11:
-			return 22;
-		case 12: 
-			return 3;
-		case 13: 
-			return 31;
-		case 14:
-			return 152;
-		case 15:
-			return 173;
-		
-		default: 
-			return block.getTypeId();
+			case 0:
+				return block.getTypeId();
+			case 1:
+				return 172;
+			case 2:
+				return 87;
+			case 3:
+				return 79;
+			case 4:
+				return 41;
+			case 5:
+				return 133;
+			case 6:
+				return 45;
+			case 7:
+				return 16;
+			case 8:
+				return 13;
+			case 9:
+				return 56;
+			case 10:
+				return 110;
+			case 11:
+				return 22;
+			case 12:
+				return 3;
+			case 13:
+				return 31;
+			case 14:
+				return 152;
+			case 15:
+				return 173;
+				
+			default:
+				return block.getTypeId();
 		}
 	}
+	
+	/**
+	 * The location specified is the location of the foot block of the bed.
+	 * <p>
+	 * ex:
+	 * <p>
+	 * placeBed(location[0,0,0], NORTH);
+	 * <p>
+	 * will result in two blocks appearing, at location[0,0,0](foot block) and
+	 * location[0,0,-1](head block (pillow))
+	 * <p>
+	 * allowFloating defines whether or not the bed is allowed to float (over
+	 * water, lava, air, and anything other blocks that do not have bounds)
+	 * <p>
+	 * if force is set to true, then the bed will be placed even if there are
+	 * blocks obstructing it, on the other hand, if force is false, then the bed
+	 * will only be placed if there is air in the location specified.
+	 */
+	public static boolean placeBed(Location location, BlockFace direction, boolean allowFloating, boolean force)
+	{
+		if (!horizontals.contains(direction))
+		{
+			return false;
+		}
+		
+		if (location == null)
+		{
+			return false;
+		}
+		
+		if (location.getY() <= 0)
+		{
+			return false;
+		}
+		
+		if (!allowFloating && UtilItem.isBoundless(location.getBlock().getRelative(BlockFace.DOWN).getType()))
+		{
+			return false;
+		}
+		
+		BlockState head = location.getBlock().getRelative(direction).getState();
+		BlockState foot = location.getBlock().getState();
+		
+		if (!force && (!UtilItem.isBoundless(head.getType()) || !UtilItem.isBoundless(foot.getType())))
+		{
+			return false;
+		}
+		
+		System.out.println("<-bed-> head & foot are air");
+		
+		head.setType(Material.BED_BLOCK);
+		foot.setType(Material.BED_BLOCK);
+		
+		Bed bedHead = (Bed) head.getData();
+		Bed bedFoot = (Bed) foot.getData();
+		
+		bedHead.setHeadOfBed(true);
+		bedFoot.setHeadOfBed(false);
+		
+		bedHead.setFacingDirection(direction);
+		bedFoot.setFacingDirection(direction);
+		
+		head.setData(bedHead);
+		foot.setData(bedFoot);
+		head.update(true, false);
+		foot.update(true, false);
+		
+		System.out.println("<-bed-> alls guude");
+		
+		return head.getBlock().getType().equals(Material.BED_BLOCK) && foot.getBlock().getType().equals(Material.BED_BLOCK);
+	}
+	
+	public static boolean deleteBed(Location loc)
+	{
+		if (loc == null)
+		{
+			return false;
+		}
+		
+		if (loc.getY() <= 0)
+		{
+			return false;
+		}
+		
+		if (!loc.getBlock().getType().equals(Material.BED_BLOCK))
+		{
+			return false;
+		}
+		
+		BlockState head = getBedHead(loc.getBlock()).getState();
+		BlockState foot = getBedFoot(loc.getBlock()).getState();
+		
+		head.setType(Material.AIR);
+		head.setRawData((byte) 0);
+		
+		foot.setType(Material.AIR);
+		foot.setRawData((byte) 0);
+		
+		return head.update(true, false) && foot.update(true, false);
+	}
+	
+	private static Block getBedHead(Block bed)
+	{
+		if (bed == null)
+		{
+			return null;
+		}
+		
+		if (!bed.getType().equals(Material.BED_BLOCK))
+		{
+			return null;
+		}
+		
+		if (getBed(bed).isHeadOfBed())
+		{
+			return bed;
+		}
+		else
+		{
+			return bed.getRelative(getBed(bed).getFacing()).getType().equals(Material.BED_BLOCK) ? bed.getRelative(getBed(bed).getFacing()) : null;
+		}
+	}
+	
+	private static Block getBedFoot(Block bed)
+	{
+		if (bed == null)
+		{
+			return null;
+		}
+		
+		if (!bed.getType().equals(Material.BED_BLOCK))
+		{
+			return null;
+		}
+		
+		if (!getBed(bed).isHeadOfBed())
+		{
+			return bed;
+		}
+		else
+		{
+			return bed.getRelative(getBed(bed).getFacing().getOppositeFace()).getType().equals(Material.BED_BLOCK) ? bed.getRelative(getBed(bed).getFacing().getOppositeFace()) : null;
+		}
+	}
+	
+	private static Bed getBed(Block bed)
+	{
+		if (bed == null)
+		{
+			return null;
+		}
+		
+		if (!bed.getType().equals(Material.BED_BLOCK))
+		{
+			return null;
+		}
+		
+		return (Bed) bed.getState().getData();
+	}
+	
+	public static boolean isValidBed(Location bed)
+	{
+		if (bed == null)
+		{
+			return false;
+		}
+		
+		if (bed.getY() <= 0)
+		{
+			return false;
+		}
+		
+		if (!bed.getBlock().getType().equals(Material.BED_BLOCK))
+		{
+			return false;
+		}
+		
+		return getBedHead(bed.getBlock()) != null && getBedFoot(bed.getBlock()) != null;
+	}
+	
+	public static HashSet<Block> findConnectedBlocks(Block block, HashSet<Block> blocks, int limit)
+	{
+		if (blocks == null)
+			blocks = new HashSet<Block>();
+		
+		//This is incase you recursively check an entire MC world
+		if (blocks.size() >= limit)
+			return blocks;
+
+		//Mark current node as searched
+		blocks.add(block);
+
+		//Search the node
+		for (Block neighbour : UtilBlock.getSurrounding(block, false))
+		{
+			if (neighbour.getType() == Material.AIR)
+				continue;
+				
+			//If neighbour hasn't been searched, recursively search it!
+			if (!blocks.contains(neighbour))
+				findConnectedBlocks(neighbour, blocks, limit);
+		}
+		
+		return blocks;
+	}
+	
+	public static ArrayList<ItemStack> blockToInventoryItemStacks(Block block)
+	{
+		ItemStack itemStack = new ItemStack(block.getType(), 1, block.getData());
+		ArrayList<ItemStack> itemStacks = new ArrayList<ItemStack>();
+		itemStacks.add(itemStack);
+		
+		switch (block.getType())
+		{
+			case SAPLING:
+				itemStack.setDurability((short) 0);
+				break;
+			case WATER:
+				itemStack.setType(Material.WATER_BUCKET);
+				itemStack.setDurability((short) 0);
+				break;
+			case STATIONARY_WATER:
+				itemStack.setType(Material.WATER_BUCKET);
+				itemStack.setDurability((short) 0);
+				break;
+			case LAVA:
+				itemStack.setType(Material.LAVA_BUCKET);
+				itemStack.setDurability((short) 0);
+				break;
+			case STATIONARY_LAVA:
+				itemStack.setType(Material.LAVA_BUCKET);
+				itemStack.setDurability((short) 0);
+				break;
+			case LOG:
+				itemStack.setDurability((short) (itemStack.getDurability() % 4));
+				break;
+			case LEAVES:
+				itemStack.setDurability((short) (itemStack.getDurability() % 4));
+				break;
+			case DISPENSER:
+				itemStack.setDurability((short) 0);
+				
+				Dispenser dispenser = (Dispenser) block.getState();
+				
+				for (ItemStack is : dispenser.getInventory().getContents())
+				{
+					if (is == null)
+						continue;
+					
+					itemStacks.add(is);
+				}
+				
+				break;
+			case BED_BLOCK:
+				itemStack.setType(Material.BED);
+				itemStack.setDurability((short) 0);
+				break;
+			case POWERED_RAIL:
+				itemStack.setDurability((short) 0);
+				break;
+			case DETECTOR_RAIL:
+				itemStack.setDurability((short) 0);
+				break;
+			case PISTON_STICKY_BASE:
+				itemStack.setDurability((short) 0);
+				break;
+			case PISTON_BASE:
+				itemStack.setDurability((short) 0);
+				break;
+			case PISTON_EXTENSION:
+				itemStack.setType(Material.AIR);
+				itemStack.setDurability((short) 0);
+				break;
+			case PISTON_MOVING_PIECE:
+				itemStack.setType(Material.AIR);
+				itemStack.setDurability((short) 0);
+				break;
+			case DOUBLE_STEP:
+				itemStack.setType(Material.STEP);
+				itemStack.setAmount(2);
+				break;
+			case STEP:
+				itemStack.setDurability((short) (itemStack.getDurability() % 8));
+				break;
+			case TORCH:
+				itemStack.setDurability((short) 0);
+				break;
+			case FIRE:
+				itemStack.setType(Material.FIREBALL);
+				itemStack.setDurability((short) 0);
+				break;
+			case WOOD_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case CHEST:
+				itemStack.setDurability((short) 0);
+				
+				Chest chest = (Chest) block.getState();
+				
+				for (ItemStack is : chest.getBlockInventory().getContents())
+				{
+					if (is == null)
+						continue;
+					
+					itemStacks.add(is);
+				}
+				
+				break;
+			case REDSTONE_WIRE:
+				itemStack.setType(Material.REDSTONE);
+				itemStack.setDurability((short) 0);
+				break;
+			case CROPS:
+				itemStack.setType(Material.SEEDS);
+				itemStack.setDurability((short) 0);
+				break;
+			case SOIL:
+				itemStack.setType(Material.DIRT);
+				itemStack.setDurability((short) 0);
+				break;
+			case FURNACE:
+				itemStack.setDurability((short) 0);
+				
+				Furnace furnace = (Furnace) block.getState();
+				
+				for (ItemStack is : furnace.getInventory().getContents())
+				{
+					if (is == null)
+						continue;
+					
+					itemStacks.add(is);
+				}
+				
+				break;
+			case BURNING_FURNACE:
+				itemStack.setType(Material.FURNACE);
+				itemStack.setDurability((short) 0);
+				
+				Furnace burningFurnace = (Furnace) block.getState();
+				
+				for (ItemStack is : burningFurnace.getInventory().getContents())
+				{
+					if (is == null)
+						continue;
+					
+					itemStacks.add(is);
+				}
+				
+				break;
+			case SIGN_POST:
+				itemStack.setType(Material.SIGN);
+				itemStack.setDurability((short) 0);
+				break;
+			case WOODEN_DOOR:
+				itemStack.setType(Material.WOOD_DOOR);
+				itemStack.setDurability((short) 0);
+				break;
+			case LADDER:
+				itemStack.setDurability((short) 0);
+				break;
+			case RAILS:
+				itemStack.setDurability((short) 0);
+				break;
+			case COBBLESTONE_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case WALL_SIGN:
+				itemStack.setType(Material.SIGN);
+				itemStack.setDurability((short) 0);
+				break;
+			case LEVER:
+				itemStack.setDurability((short) 0);
+				break;
+			case STONE_PLATE:
+				itemStack.setDurability((short) 0);
+				break;
+			case IRON_DOOR_BLOCK:
+				itemStack.setType(Material.IRON_DOOR);
+				itemStack.setDurability((short) 0);
+				break;
+			case WOOD_PLATE:
+				itemStack.setDurability((short) 0);
+				break;
+			case GLOWING_REDSTONE_ORE:
+				itemStack.setType(Material.REDSTONE_ORE);
+				break;
+			case REDSTONE_TORCH_OFF:
+				itemStack.setType(Material.REDSTONE_TORCH_ON);
+				itemStack.setDurability((short) 0);
+				break;
+			case REDSTONE_TORCH_ON:
+				itemStack.setDurability((short) 0);
+				break;
+			case STONE_BUTTON:
+				itemStack.setDurability((short) 0);
+				break;
+			case SNOW:
+				itemStack.setAmount(1 + itemStack.getDurability());
+				itemStack.setDurability((short) 0);
+				break;
+			case CACTUS:
+				itemStack.setDurability((short) 0);
+				break;
+			case SUGAR_CANE_BLOCK:
+				itemStack.setType(Material.SUGAR_CANE);
+				itemStack.setDurability((short) 0);
+				break;
+			case JUKEBOX:
+				itemStack.setDurability((short) 0);
+				
+				Jukebox jukebox = (Jukebox) block.getState();
+				
+				if (jukebox.getPlaying() != Material.AIR)
+					itemStacks.add(new ItemStack(jukebox.getPlaying()));
+					
+				break;
+			case PORTAL:
+				itemStack.setType(Material.AIR);
+				itemStack.setDurability((short) 0);
+				break;
+			case CAKE_BLOCK:
+				itemStack.setType(Material.CAKE);
+				itemStack.setDurability((short) 0);
+				break;
+			case DIODE_BLOCK_OFF:
+				itemStack.setType(Material.DIODE);
+				itemStack.setDurability((short) 0);
+				break;
+			case DIODE_BLOCK_ON:
+				itemStack.setType(Material.DIODE);
+				itemStack.setDurability((short) 0);
+				break;
+			case TRAP_DOOR:
+				itemStack.setDurability((short) 0);
+				break;
+			case HUGE_MUSHROOM_1:
+				itemStack.setDurability((short) 0);
+				break;
+			case HUGE_MUSHROOM_2:
+				itemStack.setDurability((short) 0);
+				break;
+			case PUMPKIN_STEM:
+				itemStack.setType(Material.PUMPKIN_SEEDS);
+				itemStack.setDurability((short) 0);
+				break;
+			case MELON_STEM:
+				itemStack.setType(Material.MELON_SEEDS);
+				itemStack.setDurability((short) 0);
+				break;
+			case VINE:
+				itemStack.setDurability((short) 0);
+				break;
+			case FENCE_GATE:
+				itemStack.setDurability((short) 0);
+				break;
+			case BRICK_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case SMOOTH_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case NETHER_BRICK_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case NETHER_WARTS:
+				itemStack.setType(Material.NETHER_STALK);
+				itemStack.setDurability((short) 0);
+				break;
+			case BREWING_STAND:
+				itemStack.setType(Material.BREWING_STAND_ITEM);
+				itemStack.setDurability((short) 0);
+				
+				BrewingStand brewingStand = (BrewingStand) block.getState();
+				
+				for (ItemStack is : brewingStand.getInventory().getContents())
+				{
+					if (is == null)
+						continue;
+					
+					itemStacks.add(is);
+				}
+				
+				break;
+			case CAULDRON:
+				itemStack.setType(Material.CAULDRON_ITEM);
+				itemStack.setDurability((short) 0);
+				
+				if (block.getData() != 0)
+					itemStacks.add(new ItemStack(Material.WATER_BUCKET));
+					
+				break;
+			case ENDER_PORTAL:
+				itemStack.setType(Material.AIR);
+				itemStack.setDurability((short) 0);
+				break;
+			case ENDER_PORTAL_FRAME:
+				itemStack.setDurability((short) 0);
+				
+				if ((block.getData() & 0x4) != 0)
+					itemStacks.add(new ItemStack(Material.EYE_OF_ENDER));
+					
+				break;
+			case REDSTONE_LAMP_ON:
+				itemStack.setType(Material.REDSTONE_LAMP_OFF);
+				break;
+			case WOOD_DOUBLE_STEP:
+				itemStack.setType(Material.WOOD_STEP);
+				itemStack.setAmount(2);
+				break;
+			case WOOD_STEP:
+				itemStack.setDurability((short) (itemStack.getDurability() % 8));
+				break;
+			case COCOA:
+				itemStack.setType(Material.INK_SACK);
+				itemStack.setDurability((short) 3);
+				break;
+			case SANDSTONE_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case ENDER_CHEST:
+				itemStack.setDurability((short) 0);
+				break;
+			case TRIPWIRE_HOOK:
+				itemStack.setDurability((short) 0);
+				break;
+			case TRIPWIRE:
+				itemStack.setType(Material.STRING);
+				itemStack.setDurability((short) 0);
+				break;
+			case SPRUCE_WOOD_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case BIRCH_WOOD_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case JUNGLE_WOOD_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case COMMAND:
+				itemStack.setDurability((short) 0);
+				break;
+			case FLOWER_POT:
+				itemStack.setType(Material.FLOWER_POT_ITEM);
+				itemStack.setDurability((short) 0);
+				
+				//The FlowerPot class is outdated and doesn't work so we do some NBT checking
+				TileEntityFlowerPot tefp = (TileEntityFlowerPot) ((CraftWorld) block.getWorld()).getHandle().getTileEntity(new BlockPosition(block.getX(), block.getY(), block.getZ()));
+				
+				NBTTagCompound c = new NBTTagCompound();
+				tefp.b(c);
+				
+				ItemStack blockInPot = new ItemStack(Material.AIR);
+				
+				if (c.hasKey("Item"))
+				{
+					MinecraftKey mk = new MinecraftKey(c.getString("Item"));
+					blockInPot = CraftItemStack.asNewCraftStack(Item.REGISTRY.get(mk));
+				}
+				
+				if (c.hasKey("Data"))
+					blockInPot.setDurability(c.getShort("Data"));
+				
+				if (blockInPot.getType() != Material.AIR)
+					itemStacks.add(blockInPot);
+				
+				break;
+			case CARROT:
+				itemStack.setType(Material.CARROT_ITEM);
+				itemStack.setDurability((short) 0);
+				break;
+			case POTATO:
+				itemStack.setType(Material.POTATO_ITEM);
+				itemStack.setDurability((short) 0);
+				break;
+			case WOOD_BUTTON:
+				itemStack.setDurability((short) 0);
+				break;
+			case SKULL:
+				itemStack.setType(Material.SKULL_ITEM);
+				
+				Skull skull = (Skull) block.getState();
+				itemStack.setDurability((short) skull.getSkullType().ordinal());
+				
+				if (skull.getSkullType() == SkullType.PLAYER && skull.hasOwner())
+				{
+					SkullMeta skullMeta = (SkullMeta) itemStack.getItemMeta();
+					skullMeta.setOwner(skull.getOwner());
+					itemStack.setItemMeta(skullMeta);
+				}
+					
+				break;
+			case TRAPPED_CHEST:
+				itemStack.setDurability((short) 0);
+				
+				Chest trappedChest = (Chest) block.getState();
+				
+				for (ItemStack is : trappedChest.getBlockInventory().getContents())
+				{
+					if (is == null)
+						continue;
+					
+					itemStacks.add(is);
+				}
+				
+				break;
+			case GOLD_PLATE:
+				itemStack.setDurability((short) 0);
+				break;
+			case IRON_PLATE:
+				itemStack.setDurability((short) 0);
+				break;
+			case REDSTONE_COMPARATOR_OFF:
+				itemStack.setType(Material.REDSTONE_COMPARATOR);
+				itemStack.setDurability((short) 0);
+				break;
+			case REDSTONE_COMPARATOR_ON:
+				itemStack.setType(Material.REDSTONE_COMPARATOR);
+				itemStack.setDurability((short) 0);
+				break;
+			case DAYLIGHT_DETECTOR:
+				itemStack.setDurability((short) 0);
+				break;
+			case HOPPER:
+				itemStack.setDurability((short) 0);
+				
+				Hopper hopper = (Hopper) block.getState();
+				
+				for (ItemStack is : hopper.getInventory().getContents())
+				{
+					if (is == null)
+						continue;
+					
+					itemStacks.add(is);
+				}
+				
+				break;
+			case QUARTZ_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case ACTIVATOR_RAIL:
+				itemStack.setDurability((short) 0);
+				break;
+			case DROPPER:
+				itemStack.setDurability((short) 0);
+				
+				Dropper dropper = (Dropper) block.getState();
+				
+				for (ItemStack is : dropper.getInventory().getContents())
+				{
+					if (is == null)
+						continue;
+					
+					itemStacks.add(is);
+				}
+				
+				break;
+			case LEAVES_2:
+				itemStack.setDurability((short) (itemStack.getDurability() % 4));
+				break;
+			case LOG_2:
+				itemStack.setDurability((short) (itemStack.getDurability() % 4));
+				break;
+			case ACACIA_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case DARK_OAK_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case IRON_TRAPDOOR:
+				itemStack.setDurability((short) 0);
+				break;
+			case HAY_BLOCK:
+				itemStack.setDurability((short) 0);
+				break;
+			case STANDING_BANNER:
+				itemStack.setType(Material.BANNER);
+				
+				Banner banner = (Banner) block.getState();
+				itemStack.setDurability(banner.getBaseColor().getDyeData());
+				
+				BannerMeta bannerMeta = (BannerMeta) itemStack.getItemMeta();
+				bannerMeta.setBaseColor(bannerMeta.getBaseColor());
+				bannerMeta.setPatterns(banner.getPatterns());
+				itemStack.setItemMeta(bannerMeta);
+				
+				break;
+			case WALL_BANNER:
+				itemStack.setType(Material.BANNER);
+				
+				Banner wallBanner = (Banner) block.getState();
+				itemStack.setDurability(wallBanner.getBaseColor().getDyeData());
+				
+				BannerMeta wallBannerMeta = (BannerMeta) itemStack.getItemMeta();
+				wallBannerMeta.setBaseColor(wallBannerMeta.getBaseColor());
+				wallBannerMeta.setPatterns(wallBanner.getPatterns());
+				itemStack.setItemMeta(wallBannerMeta);
+				
+				break;
+			case DAYLIGHT_DETECTOR_INVERTED:
+				itemStack.setType(Material.DAYLIGHT_DETECTOR);
+				itemStack.setDurability((short) 0);
+				break;
+			case RED_SANDSTONE_STAIRS:
+				itemStack.setDurability((short) 0);
+				break;
+			case DOUBLE_STONE_SLAB2:
+				itemStack.setType(Material.STONE_SLAB2);
+				itemStack.setAmount(2);
+				break;
+			case STONE_SLAB2:
+				itemStack.setDurability((short) (itemStack.getDurability() % 8));
+				break;
+			case SPRUCE_FENCE_GATE:
+				itemStack.setDurability((short) 0);
+				break;
+			case BIRCH_FENCE_GATE:
+				itemStack.setDurability((short) 0);
+				break;
+			case JUNGLE_FENCE_GATE:
+				itemStack.setDurability((short) 0);
+				break;
+			case DARK_OAK_FENCE_GATE:
+				itemStack.setDurability((short) 0);
+				break;
+			case ACACIA_FENCE_GATE:
+				itemStack.setDurability((short) 0);
+				break;
+			case SPRUCE_DOOR:
+				itemStack.setType(Material.SPRUCE_DOOR_ITEM);
+				itemStack.setDurability((short) 0);
+				break;
+			case BIRCH_DOOR:
+				itemStack.setType(Material.BIRCH_DOOR_ITEM);
+				itemStack.setDurability((short) 0);
+				break;
+			case JUNGLE_DOOR:
+				itemStack.setType(Material.JUNGLE_DOOR_ITEM);
+				itemStack.setDurability((short) 0);
+				break;
+			case ACACIA_DOOR:
+				itemStack.setType(Material.ACACIA_DOOR_ITEM);
+				itemStack.setDurability((short) 0);
+				break;
+			case DARK_OAK_DOOR:	
+				itemStack.setType(Material.DARK_OAK_DOOR_ITEM);
+				itemStack.setDurability((short) 0);
+				break;
+		}
+		
+		return itemStacks;
+	}
 }
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
index 8587871ee..566be1092 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
@@ -29,11 +29,11 @@ import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
 import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
 import org.bukkit.craftbukkit.v1_8_R3.entity.CraftCreature;
 import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity;
+import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -291,6 +291,8 @@ public class UtilEnt
 			creatureMap.put("WitherSkull", EntityType.WITHER_SKULL);
 			creatureMap.put("Wolf", EntityType.WOLF);
 			creatureMap.put("Zombie", EntityType.ZOMBIE);
+			creatureMap.put("Guardian", EntityType.GUARDIAN);
+			creatureMap.put("Rabbit", EntityType.RABBIT);
 			
 			creatureMap.put("Item", EntityType.DROPPED_ITEM);
 		}
@@ -457,6 +459,28 @@ public class UtilEnt
 		return ents;
 	}
 	
+	public static HashMap<Entity, Double> getAllInRadius(Location loc,	double dR) 
+	{
+		HashMap<Entity, Double> ents = new HashMap<Entity, Double>();
+
+		for (Entity cur : loc.getWorld().getEntities())
+		{
+			if (UtilPlayer.isSpectator(cur))
+				continue;
+			
+			//Loc
+			double offset = UtilMath.offset(loc, cur.getLocation());
+			
+			if (offset < dR)
+			{
+				ents.put(cur, 1 - (offset/dR));
+				continue;
+			}
+		}
+
+		return ents;
+	}
+	
 	public static boolean hitBox(Location loc, LivingEntity ent, double mult, EntityType disguise)
 	{
 		if (disguise != null)
@@ -480,7 +504,7 @@ public class UtilEnt
 			}
 			else if (UtilMath.offset2d(loc, player.getLocation()) < 0.6 * mult)
 			{
-				if (loc.getY() > player.getLocation().getY() && loc.getY() < player.getEyeLocation().getY())
+				if (loc.getY() >= player.getLocation().getY() - 0.2*mult && loc.getY() <= player.getEyeLocation().getY() + 0.2*mult)
 				{
 					return true;
 				}		
@@ -508,10 +532,27 @@ public class UtilEnt
 	}
 	
 	public static boolean isGrounded(Entity ent) 
+	{ 
+		
+		if(!(ent instanceof Player)) {
+			return ent.isOnGround();
+		}
+		
+		AxisAlignedBB box = ((CraftEntity)ent).getHandle().getBoundingBox().shrink(0.05, 0, 0.05);
+		Location bottom_corner_1 = new Location(ent.getWorld(), box.a, ent.getLocation().getY()-0.05, box.c);
+		Location bottom_corner_2 = new Location(ent.getWorld(), box.d, ent.getLocation().getY()-0.05, box.f);
+		
+		for(Block b : UtilBlock.getInBoundingBox(bottom_corner_1, bottom_corner_2)){
+			if(UtilBlock.solid(b)) return true;
+		}
+		return false;
+	}
+	
+	public static boolean isGrounded(Entity ent, Location loc) 
 	{ 
 		AxisAlignedBB box = ((CraftEntity)ent).getHandle().getBoundingBox();
-		Location bottom_corner_1 = new Location(ent.getWorld(), box.a, ent.getLocation().getY()-0.1, box.c);
-		Location bottom_corner_2 = new Location(ent.getWorld(), box.d, ent.getLocation().getY()-0.1, box.f);
+		Location bottom_corner_1 = new Location(ent.getWorld(), box.a, loc.getY()-0.1, box.c);
+		Location bottom_corner_2 = new Location(ent.getWorld(), box.d, loc.getY()-0.1, box.f);
 		
 		for(Block b : UtilBlock.getInBoundingBox(bottom_corner_1, bottom_corner_2)){
 			if(UtilBlock.solid(b)) return true;
@@ -616,6 +657,11 @@ public class UtilEnt
 		return CreatureLook(ent, UtilAlg.GetPitch(vec), UtilAlg.GetYaw(vec));
 	}
 
+	public static boolean CreatureLook(Entity ent, Vector target)
+	{
+		return CreatureLook(ent, UtilAlg.GetPitch(target), UtilAlg.GetYaw(target));
+	}
+
 	public static void setFakeHead(Entity ent, boolean fakeHead)
 	{
 		net.minecraft.server.v1_8_R3.Entity ec = ((CraftEntity) ent).getHandle();
@@ -758,6 +804,20 @@ public class UtilEnt
 		
 		return null;
 	}
+	
+	public static void setAI(LivingEntity entity, boolean ai)
+	{
+		if(entity instanceof ArmorStand)
+		{
+			((ArmorStand)entity).setGravity(ai);
+			return;
+		}
+		CraftEntity e = (CraftEntity)entity;
+		if(e.getHandle() instanceof EntityInsentient)
+		{
+			((EntityInsentient)e.getHandle()).k(!ai);
+		}
+	}
 
 	public static boolean inWater(LivingEntity ent) 
 	{
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEvent.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEvent.java
index 79059c454..bd5346696 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEvent.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEvent.java
@@ -16,7 +16,8 @@ public class UtilEvent
 		L_BLOCK,
 		R,
 		R_AIR,
-		R_BLOCK
+		R_BLOCK,
+		ANY
 	}
 	
 	public static boolean isAction(PlayerInteractEvent event, ActionType action)
@@ -39,6 +40,9 @@ public class UtilEvent
 		if (action == ActionType.R_BLOCK)
 			return (event.getAction() == Action.RIGHT_CLICK_BLOCK);
 		
+		if (action == ActionType.ANY)
+			return event.getAction() != Action.PHYSICAL; 
+		
 		return false;
 	}
 	
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilFile.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilFile.java
new file mode 100644
index 000000000..5429f0107
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilFile.java
@@ -0,0 +1,310 @@
+package mineplex.core.common.util;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+public class UtilFile
+{
+	public static void writePlainFile(File file, String text) throws FileNotFoundException
+	{
+		PrintWriter writer = new PrintWriter(file);
+		writer.print(text);
+		writer.close();
+	}
+	
+	/**
+	 * Will read the specified file, and return the contents, or a null value,
+	 * if an exception is thrown. Will handle all exceptions, and simply ignore
+	 * them and return null. No stack trace printed or anything.
+	 */
+	public static String readIgnoreErrors(File file)
+	{
+		try
+		{
+			return readToStr(file);
+		}
+		catch (IOException exception)
+		{
+			return null;
+		}
+	}
+	
+	public static String readToStr(File file) throws IOException
+	{
+		return new String(readAllBytes(file));
+	}
+	
+	public static byte[] readAllBytes(File file) throws IOException
+	{
+		return Files.readAllBytes(Paths.get(file.toURI()));
+	}
+	
+	public static void writePlainFile(String file, String text) throws FileNotFoundException
+	{
+		writePlainFile(new File(file), text);
+	}
+	
+	/**
+	 * Will read the specified file, and return the contents, or a null value,
+	 * if an exception is thrown. Will handle all exceptions, and simply ignore
+	 * them and return null. No stack trace printed or anything.
+	 */
+	public static String readIgnoreErrors(String file)
+	{
+		return readIgnoreErrors(new File(file));
+	}
+	
+	public static String readToStr(String file) throws IOException
+	{
+		return readToStr(new File(file));
+	}
+	
+	public static byte[] readAllBytes(String file) throws IOException
+	{
+		return readAllBytes(new File(file));
+	}
+	
+	public static void writeDataFile(File file, DataFileChunk... chunks) throws IOException
+	{
+		DataOutputStream stream = new DataOutputStream(new FileOutputStream(file));
+		for (DataFileChunk chunk : chunks)
+		{
+			chunk.writeTo(stream);
+		}
+		stream.close();
+	}
+	
+	public static DataFileReader beginReading(String file) throws FileNotFoundException
+	{
+		return beginReading(new File(file));
+	}
+	
+	public static DataFileReader beginReading(File file) throws FileNotFoundException
+	{
+		return new DataFileReader(file);
+	}
+	
+	public static void writeDataFile(String file, DataFileChunk... chunks) throws IOException
+	{
+		writeDataFile(new File(file), chunks);
+	}
+	
+	public static class DataFileChunk
+	{
+		private ChunkType _type;
+		private Object _value;
+		
+		public DataFileChunk(ChunkType type, Object value)
+		{
+			if (type == null)
+			{
+				throw new RuntimeException("ChunkType can NOT be null.");
+			}
+			
+			_type = type;
+			
+			if (!_type.isValid(value))
+			{
+				throw new RuntimeException("Invalid value provided for the specified ChunkType.");
+			}
+			
+			_value = value;
+		}
+		
+		public void writeTo(DataOutputStream stream) throws IOException
+		{
+			_type.writeTo(stream, _value);
+		}
+	}
+	
+	public static enum ChunkType
+	{
+		STRING(new ChunkImpl()
+		{
+			public void writeTo(DataOutputStream stream, Object value) throws IOException
+			{
+				String str = (String) value;
+				
+				INTEGER.writeTo(stream, str.length());
+				for (char b : str.toCharArray())
+				{
+					CHAR.writeTo(stream, b);
+				}
+			}
+			
+			public boolean isValid(Object value)
+			{
+				return value.getClass().equals(String.class);
+			}
+			
+			public Object readFrom(DataInputStream stream) throws IOException
+			{
+				int length = (int) INTEGER.readFrom(stream);
+				
+				StringBuilder string = new StringBuilder();
+				
+				for (int i = 0; i < length; i++)
+				{
+					string.append(CHAR.readFrom(stream));
+				}
+				
+				return string.toString();
+			}
+		}),
+		DOUBLE(new ChunkImpl()
+		{
+			public void writeTo(DataOutputStream stream, Object value) throws IOException
+			{
+				double number = (double) value;
+				
+				stream.writeDouble(number);
+			}
+			
+			public boolean isValid(Object value)
+			{
+				return value.getClass().equals(Double.class);
+			}
+			
+			public Object readFrom(DataInputStream stream) throws IOException
+			{
+				return stream.readDouble();
+			}
+		}),
+		INTEGER(new ChunkImpl()
+		{
+			public void writeTo(DataOutputStream stream, Object value) throws IOException
+			{
+				int number = (int) value;
+				
+				stream.writeInt(number);
+			}
+			
+			public boolean isValid(Object value)
+			{
+				return value.getClass().equals(Integer.class);
+			}
+			
+			public Object readFrom(DataInputStream stream) throws IOException
+			{
+				return stream.readInt();
+			}
+		}),
+		BYTE(new ChunkImpl()
+		{
+			public void writeTo(DataOutputStream stream, Object value) throws IOException
+			{
+				byte number = (byte) value;
+				
+				stream.writeByte(number);
+			}
+			
+			public boolean isValid(Object value)
+			{
+				return value.getClass().equals(Byte.class);
+			}
+			
+			public Object readFrom(DataInputStream stream) throws IOException
+			{
+				return stream.readByte();
+			}
+		}),
+		CHAR(new ChunkImpl()
+		{
+			public void writeTo(DataOutputStream stream, Object value) throws IOException
+			{
+				char number = (char) value;
+				
+				stream.writeChar(number);
+			}
+			
+			public boolean isValid(Object value)
+			{
+				return value.getClass().equals(Character.class);
+			}
+			
+			public Object readFrom(DataInputStream stream) throws IOException
+			{
+				return stream.readChar();
+			}
+		}),
+		LONG(new ChunkImpl()
+		{
+			public void writeTo(DataOutputStream stream, Object value) throws IOException
+			{
+				long number = (long) value;
+				
+				stream.writeLong(number);
+			}
+			
+			public boolean isValid(Object value)
+			{
+				return value.getClass().equals(Long.class);
+			}
+			
+			public Object readFrom(DataInputStream stream) throws IOException
+			{
+				return stream.readLong();
+			}
+		});
+		
+		private ChunkImpl _impl;
+		
+		ChunkType(ChunkImpl impl)
+		{
+			_impl = impl;
+		}
+		
+		protected void writeTo(DataOutputStream stream, Object value) throws IOException
+		{
+			_impl.writeTo(stream, value);
+		}
+		
+		protected boolean isValid(Object value)
+		{
+			return value != null && _impl.isValid(value);
+		}
+		
+		public Object readFrom(DataInputStream stream) throws IOException
+		{
+			return _impl.readFrom(stream);
+		}
+	}
+	
+	public static class DataFileReader
+	{
+		private DataInputStream _stream;
+		
+		public DataFileReader(File file) throws FileNotFoundException
+		{
+			_stream = new DataInputStream(new FileInputStream(file));
+		}
+		
+		public Object readChunk(ChunkType type) throws IOException
+		{
+			return type.readFrom(_stream);
+		}
+		
+		public void close() throws IOException
+		{
+			_stream.close();
+		}
+	}
+	
+	protected interface ChunkImpl
+	{
+		void writeTo(DataOutputStream stream, Object value) throws IOException;
+		
+		Object readFrom(DataInputStream stream) throws IOException;
+		
+		boolean isValid(Object value);
+	}
+	
+}
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilGear.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilGear.java
index a1028c25f..88139390a 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilGear.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilGear.java
@@ -13,7 +13,44 @@ public class UtilGear
 	private static HashSet<Material> pickSet = new HashSet<Material>();
 	private static HashSet<Material> diamondSet = new HashSet<Material>();
 	private static HashSet<Material> goldSet = new HashSet<Material>();
-	
+	private static HashSet<Material> _armorSet = new HashSet<Material>();
+
+	public static boolean isArmor(ItemStack item)
+	{
+		if (item == null)
+			return false;
+
+		if (_armorSet.isEmpty())
+		{
+			_armorSet.add(Material.LEATHER_HELMET);
+			_armorSet.add(Material.LEATHER_CHESTPLATE);
+			_armorSet.add(Material.LEATHER_LEGGINGS);
+			_armorSet.add(Material.LEATHER_BOOTS);
+
+			_armorSet.add(Material.GOLD_HELMET);
+			_armorSet.add(Material.GOLD_CHESTPLATE);
+			_armorSet.add(Material.GOLD_LEGGINGS);
+			_armorSet.add(Material.GOLD_BOOTS);
+
+			_armorSet.add(Material.CHAINMAIL_HELMET);
+			_armorSet.add(Material.CHAINMAIL_CHESTPLATE);
+			_armorSet.add(Material.CHAINMAIL_LEGGINGS);
+			_armorSet.add(Material.CHAINMAIL_BOOTS);
+
+			_armorSet.add(Material.IRON_HELMET);
+			_armorSet.add(Material.IRON_CHESTPLATE);
+			_armorSet.add(Material.IRON_LEGGINGS);
+			_armorSet.add(Material.IRON_BOOTS);
+
+			_armorSet.add(Material.DIAMOND_HELMET);
+			_armorSet.add(Material.DIAMOND_CHESTPLATE);
+			_armorSet.add(Material.DIAMOND_LEGGINGS);
+			_armorSet.add(Material.DIAMOND_BOOTS);
+		}
+
+		return _armorSet.contains(item.getType());
+	}
+
 	public static boolean isAxe(ItemStack item)
 	{
 		if (item == null)
@@ -126,6 +163,10 @@ public class UtilGear
 		{
 			goldSet.add(Material.GOLD_SWORD);
 			goldSet.add(Material.GOLD_AXE);
+			goldSet.add(Material.GOLD_HELMET);
+			goldSet.add(Material.GOLD_CHESTPLATE);
+			goldSet.add(Material.GOLD_LEGGINGS);
+			goldSet.add(Material.GOLD_BOOTS);
 		}
 		
 		return goldSet.contains(item.getType());
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
index 625edf4d1..c82d37f9f 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
@@ -1,48 +1,448 @@
 package mineplex.core.common.util;
 
-import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
-import mineplex.core.common.structs.ItemContainer;
-
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-public class UtilItem 
-{
-	private static final Material[] FOOD_LIST = { Material.APPLE, Material.BAKED_POTATO, Material.BREAD, Material.CARROT, Material.CARROT_ITEM, Material.COOKED_CHICKEN,
-	Material.COOKED_FISH, Material.GRILLED_PORK, Material.COOKIE, Material.GOLDEN_APPLE, Material.GOLDEN_CARROT, Material.MELON, Material.MUSHROOM_SOUP, Material.POISONOUS_POTATO,
-	Material.PUMPKIN_PIE, Material.RAW_BEEF, Material.RAW_CHICKEN, Material.RAW_FISH, Material.PORK, Material.ROTTEN_FLESH, Material.SPIDER_EYE, Material.COOKED_BEEF};
+import mineplex.core.common.structs.ItemContainer;
 
+public class UtilItem
+{
+	public static Map<Material, EnumSet<ItemCategory>> _materials = new HashMap<>();
+	
+	static
+	{
+		// Blocks
+		
+		_materials.put(Material.AIR, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.STONE, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.GRASS, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.DIRT, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.COBBLESTONE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.STONE));
+		_materials.put(Material.WOOD, EnumSet.of(ItemCategory.BLOCK, ItemCategory.WOOD));
+		_materials.put(Material.SAPLING, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.BEDROCK, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.WATER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.LIQUID, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.STATIONARY_WATER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.LIQUID, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.LAVA, EnumSet.of(ItemCategory.LIQUID, ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.LIGHT_EMITTING));
+		_materials.put(Material.STATIONARY_LAVA, EnumSet.of(ItemCategory.BLOCK, ItemCategory.LIQUID, ItemCategory.TRANSLUCENT, ItemCategory.LIGHT_EMITTING));
+		_materials.put(Material.SAND, EnumSet.of(ItemCategory.BLOCK, ItemCategory.PHYSICS));
+		_materials.put(Material.GRAVEL, EnumSet.of(ItemCategory.BLOCK, ItemCategory.PHYSICS));
+		_materials.put(Material.GOLD_ORE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.ORE, ItemCategory.GOLD));
+		_materials.put(Material.IRON_ORE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.ORE, ItemCategory.IRON));
+		_materials.put(Material.IRON_ORE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.ORE, ItemCategory.IRON));
+		_materials.put(Material.COAL_ORE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.ORE, ItemCategory.IRON));
+		_materials.put(Material.LOG, EnumSet.of(ItemCategory.BLOCK, ItemCategory.WOOD, ItemCategory.LOG));
+		_materials.put(Material.LEAVES, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.LEAVES));
+		_materials.put(Material.SPONGE, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.GLASS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.GLASS));
+		_materials.put(Material.LAPIS_ORE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.ORE));
+		_materials.put(Material.LAPIS_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.COMPACT_BLOCK));
+		_materials.put(Material.DISPENSER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.GUI));
+		_materials.put(Material.SANDSTONE, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.NOTE_BLOCK, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.BED_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.POWERED_RAIL, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.DETECTOR_RAIL, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.PISTON_STICKY_BASE, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.WEB, EnumSet.of(ItemCategory.BLOCK, ItemCategory.MOVEMENT_MODIFYING, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.LONG_GRASS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.BOUNDLESS, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.DEAD_BUSH, EnumSet.of(ItemCategory.BLOCK, ItemCategory.BOUNDLESS, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.PISTON_BASE, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.PISTON_EXTENSION, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.WOOL, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.PISTON_MOVING_PIECE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.BOUNDLESS, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.YELLOW_FLOWER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.BOUNDLESS, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.RED_ROSE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.BOUNDLESS, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.BROWN_MUSHROOM, EnumSet.of(ItemCategory.BLOCK, ItemCategory.BOUNDLESS, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.RED_MUSHROOM, EnumSet.of(ItemCategory.BLOCK, ItemCategory.BOUNDLESS, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.GOLD_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.COMPACT_BLOCK));
+		_materials.put(Material.IRON_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.COMPACT_BLOCK));
+		_materials.put(Material.DOUBLE_STEP, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.STEP, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.BRICK, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.TNT, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.BOOKSHELF, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.MOSSY_COBBLESTONE, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.OBSIDIAN, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.TORCH, EnumSet.of(ItemCategory.BLOCK, ItemCategory.LIGHT_EMITTING, ItemCategory.BOUNDLESS));
+		_materials.put(Material.FIRE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.LIGHT_EMITTING, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.MOB_SPAWNER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.LIGHT_EMITTING, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.WOOD_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.CHEST, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.GUI));
+		_materials.put(Material.REDSTONE_WIRE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS, ItemCategory.REDSTONE));
+		_materials.put(Material.DIAMOND_ORE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.ORE, ItemCategory.DIAMOND));
+		_materials.put(Material.DIAMOND_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.COMPACT_BLOCK, ItemCategory.DIAMOND));
+		_materials.put(Material.WORKBENCH, EnumSet.of(ItemCategory.BLOCK, ItemCategory.GUI));
+		_materials.put(Material.CROPS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.SOIL, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.FURNACE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.GUI));
+		_materials.put(Material.BURNING_FURNACE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.LIGHT_EMITTING, ItemCategory.GUI));
+		_materials.put(Material.SIGN_POST, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.WOODEN_DOOR, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.LADDER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.CLIMBABLE));
+		_materials.put(Material.RAILS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.COBBLESTONE_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.WALL_SIGN, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.LEVER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.STONE_PLATE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.IRON_DOOR_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.WOOD_PLATE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.REDSTONE_ORE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.ORE, ItemCategory.REDSTONE));
+		_materials.put(Material.GLOWING_REDSTONE_ORE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.ORE, ItemCategory.REDSTONE));
+		_materials.put(Material.REDSTONE_TORCH_OFF, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.REDSTONE, ItemCategory.BOUNDLESS));
+		_materials.put(Material.REDSTONE_TORCH_ON, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.REDSTONE, ItemCategory.BOUNDLESS, ItemCategory.LIGHT_EMITTING));
+		_materials.put(Material.STONE_BUTTON, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.SNOW, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.ICE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.MOVEMENT_MODIFYING));
+		_materials.put(Material.SNOW_BLOCK, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.CACTUS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.CLAY, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.SUGAR_CANE_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.BOUNDLESS, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.JUKEBOX, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.FENCE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.PUMPKIN, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.NETHERRACK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.NETHER));
+		_materials.put(Material.SOUL_SAND, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.NETHER));
+		_materials.put(Material.GLOWSTONE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.LIGHT_EMITTING, ItemCategory.NETHER));
+		_materials.put(Material.PORTAL, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.LIGHT_EMITTING, ItemCategory.BOUNDLESS));
+		_materials.put(Material.JACK_O_LANTERN, EnumSet.of(ItemCategory.BLOCK, ItemCategory.LIGHT_EMITTING));
+		_materials.put(Material.CAKE_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.DIODE_BLOCK_OFF, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.REDSTONE));
+		_materials.put(Material.DIODE_BLOCK_ON, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.REDSTONE));
+		_materials.put(Material.STAINED_GLASS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.GLASS));
+		_materials.put(Material.TRAP_DOOR, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.MONSTER_EGGS, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.SMOOTH_BRICK, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.HUGE_MUSHROOM_1, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.HUGE_MUSHROOM_2, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.IRON_FENCE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.THIN_GLASS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.GLASS));
+		_materials.put(Material.MELON_BLOCK, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.PUMPKIN_STEM, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.MELON_STEM, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.VINE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS, ItemCategory.CLIMBABLE));
+		_materials.put(Material.FENCE_GATE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.BRICK_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.SMOOTH_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.MYCEL, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.WATER_LILY, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.NETHER_BRICK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.NETHER));
+		_materials.put(Material.NETHER_FENCE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.NETHER));
+		_materials.put(Material.NETHER_BRICK_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.NETHER));
+		_materials.put(Material.NETHER_WARTS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS, ItemCategory.NETHER));
+		_materials.put(Material.ENCHANTMENT_TABLE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.BREWING_STAND, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.CAULDRON, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.ENDER_PORTAL, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS, ItemCategory.LIGHT_EMITTING));
+		_materials.put(Material.ENDER_PORTAL_FRAME, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.ENDER_STONE, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.DRAGON_EGG, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.REDSTONE_LAMP_OFF, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.REDSTONE));
+		_materials.put(Material.REDSTONE_LAMP_ON, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.REDSTONE, ItemCategory.LIGHT_EMITTING));
+		_materials.put(Material.WOOD_DOUBLE_STEP, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.WOOD_STEP, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.COCOA, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.SANDSTONE_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.EMERALD_ORE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.ORE));
+		_materials.put(Material.ENDER_CHEST, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.TRIPWIRE_HOOK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS, ItemCategory.REDSTONE));
+		_materials.put(Material.TRIPWIRE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.EMERALD_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.COMPACT_BLOCK));
+		_materials.put(Material.SPRUCE_WOOD_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.BIRCH_WOOD_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.JUNGLE_WOOD_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.COMMAND, EnumSet.of(ItemCategory.BLOCK, ItemCategory.GUI));
+		_materials.put(Material.BEACON, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.LIGHT_EMITTING));
+		_materials.put(Material.COBBLE_WALL, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.FLOWER_POT, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.CARROT, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.POTATO, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.WOOD_BUTTON, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.SKULL, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.ANVIL, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.GUI));
+		_materials.put(Material.TRAPPED_CHEST, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.GUI));
+		_materials.put(Material.GOLD_PLATE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.IRON_PLATE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.REDSTONE_COMPARATOR_OFF, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.REDSTONE));
+		_materials.put(Material.REDSTONE_COMPARATOR_ON, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.REDSTONE));
+		_materials.put(Material.DAYLIGHT_DETECTOR, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.REDSTONE_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.REDSTONE));
+		_materials.put(Material.QUARTZ_ORE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.ORE, ItemCategory.NETHER));
+		_materials.put(Material.HOPPER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.GUI));
+		_materials.put(Material.QUARTZ_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.COMPACT_BLOCK, ItemCategory.NETHER));
+		_materials.put(Material.QUARTZ_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.NETHER));
+		_materials.put(Material.ACTIVATOR_RAIL, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		_materials.put(Material.DROPPER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.GUI));
+		_materials.put(Material.STAINED_CLAY, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.STAINED_GLASS_PANE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.GLASS));
+		_materials.put(Material.LEAVES_2, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.LEAVES));
+		_materials.put(Material.LOG_2, EnumSet.of(ItemCategory.BLOCK, ItemCategory.WOOD, ItemCategory.LOG));
+		_materials.put(Material.ACACIA_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.DARK_OAK_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.HAY_BLOCK, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.CARPET, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.HARD_CLAY, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.COAL_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.COMPACT_BLOCK));
+		_materials.put(Material.PACKED_ICE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.MOVEMENT_MODIFYING));
+		_materials.put(Material.DOUBLE_PLANT, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.BOUNDLESS));
+		
+		_materials.put(Material.SLIME_BLOCK, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.BARRIER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.IRON_TRAPDOOR, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.PRISMARINE, EnumSet.of(ItemCategory.BLOCK));
+		_materials.put(Material.SEA_LANTERN, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.LIGHT_EMITTING));
+		_materials.put(Material.STANDING_BANNER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.WALL_BANNER, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.DAYLIGHT_DETECTOR_INVERTED, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.RED_SANDSTONE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.STONE));
+		_materials.put(Material.RED_SANDSTONE_STAIRS, EnumSet.of(ItemCategory.BLOCK, ItemCategory.STONE, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.DOUBLE_STONE_SLAB2, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.STONE));
+		_materials.put(Material.STONE_SLAB2, EnumSet.of(ItemCategory.BLOCK, ItemCategory.STONE, ItemCategory.TRANSLUCENT));
+		_materials.put(Material.SPRUCE_FENCE_GATE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.BIRCH_FENCE_GATE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.JUNGLE_FENCE_GATE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.DARK_OAK_FENCE_GATE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.ACACIA_FENCE_GATE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.SPRUCE_FENCE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.BIRCH_FENCE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.JUNGLE_FENCE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.SPRUCE_DOOR, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.BIRCH_DOOR, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.JUNGLE_DOOR, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.ACACIA_DOOR, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.DARK_OAK_DOOR, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		
+		
+		_materials.put(Material.DARK_OAK_FENCE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.ACACIA_FENCE, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		_materials.put(Material.DARK_OAK_DOOR_ITEM, EnumSet.of(ItemCategory.BLOCK, ItemCategory.TRANSLUCENT, ItemCategory.WOOD));
+		
+		// Items
+		
+		_materials.put(Material.PRISMARINE_SHARD, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.PRISMARINE_CRYSTALS, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.RABBIT, EnumSet.of(ItemCategory.ITEM, ItemCategory.RAW_FOOD, ItemCategory.EDIBLE));
+		_materials.put(Material.COOKED_RABBIT, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.RABBIT_STEW, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.RABBIT_FOOT, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.RABBIT_HIDE, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.ARMOR_STAND, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.MUTTON, EnumSet.of(ItemCategory.ITEM, ItemCategory.RAW_FOOD, ItemCategory.EDIBLE));
+		_materials.put(Material.COOKED_MUTTON, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.BANNER, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.SPRUCE_DOOR_ITEM, EnumSet.of(ItemCategory.ITEM, ItemCategory.WOOD));
+		_materials.put(Material.BIRCH_DOOR_ITEM, EnumSet.of(ItemCategory.ITEM, ItemCategory.WOOD));
+		_materials.put(Material.JUNGLE_DOOR_ITEM, EnumSet.of(ItemCategory.ITEM, ItemCategory.WOOD));
+		_materials.put(Material.ACACIA_DOOR_ITEM, EnumSet.of(ItemCategory.ITEM, ItemCategory.WOOD));
+		
+		
+		_materials.put(Material.IRON_SPADE, EnumSet.of(ItemCategory.ITEM, ItemCategory.IRON, ItemCategory.TOOL, ItemCategory.SHOVEL));
+		_materials.put(Material.IRON_PICKAXE, EnumSet.of(ItemCategory.ITEM, ItemCategory.IRON, ItemCategory.TOOL, ItemCategory.PICKAXE));
+		_materials.put(Material.IRON_AXE, EnumSet.of(ItemCategory.AXE, ItemCategory.ITEM, ItemCategory.IRON, ItemCategory.WEAPON, ItemCategory.TOOL));
+		_materials.put(Material.FLINT_AND_STEEL, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.APPLE, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.BOW, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.ARROW, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.COAL, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.DIAMOND, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND));
+		_materials.put(Material.IRON_INGOT, EnumSet.of(ItemCategory.ITEM, ItemCategory.IRON));
+		_materials.put(Material.GOLD_INGOT, EnumSet.of(ItemCategory.ITEM, ItemCategory.GOLD));
+		_materials.put(Material.IRON_SWORD, EnumSet.of(ItemCategory.SWORD, ItemCategory.ITEM, ItemCategory.IRON, ItemCategory.WEAPON, ItemCategory.TOOL));
+		_materials.put(Material.WOOD_SWORD, EnumSet.of(ItemCategory.SWORD, ItemCategory.ITEM, ItemCategory.WOOD, ItemCategory.WEAPON, ItemCategory.TOOL));
+		_materials.put(Material.WOOD_SPADE, EnumSet.of(ItemCategory.ITEM, ItemCategory.WOOD, ItemCategory.TOOL, ItemCategory.SHOVEL));
+		_materials.put(Material.WOOD_PICKAXE, EnumSet.of(ItemCategory.ITEM, ItemCategory.WOOD, ItemCategory.TOOL, ItemCategory.PICKAXE));
+		_materials.put(Material.WOOD_AXE, EnumSet.of(ItemCategory.AXE, ItemCategory.ITEM, ItemCategory.WOOD, ItemCategory.WEAPON, ItemCategory.TOOL));
+		_materials.put(Material.STONE_SWORD, EnumSet.of(ItemCategory.SWORD, ItemCategory.ITEM, ItemCategory.STONE, ItemCategory.WEAPON, ItemCategory.TOOL));
+		_materials.put(Material.STONE_SPADE, EnumSet.of(ItemCategory.ITEM, ItemCategory.STONE, ItemCategory.TOOL, ItemCategory.SHOVEL));
+		_materials.put(Material.STONE_PICKAXE, EnumSet.of(ItemCategory.ITEM, ItemCategory.STONE, ItemCategory.TOOL, ItemCategory.PICKAXE));
+		_materials.put(Material.STONE_AXE, EnumSet.of(ItemCategory.AXE, ItemCategory.ITEM, ItemCategory.STONE, ItemCategory.WEAPON, ItemCategory.TOOL));
+		_materials.put(Material.DIAMOND_SWORD, EnumSet.of(ItemCategory.SWORD, ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.WEAPON, ItemCategory.TOOL));
+		_materials.put(Material.DIAMOND_SPADE, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.TOOL, ItemCategory.SHOVEL));
+		_materials.put(Material.DIAMOND_PICKAXE, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.TOOL, ItemCategory.PICKAXE));
+		_materials.put(Material.DIAMOND_AXE, EnumSet.of(ItemCategory.AXE, ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.TOOL, ItemCategory.WEAPON));
+		_materials.put(Material.STICK, EnumSet.of(ItemCategory.ITEM, ItemCategory.WOOD));
+		_materials.put(Material.BOWL, EnumSet.of(ItemCategory.ITEM, ItemCategory.WOOD));
+		_materials.put(Material.MUSHROOM_SOUP, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.GOLD_SWORD, EnumSet.of(ItemCategory.SWORD, ItemCategory.ITEM, ItemCategory.GOLD, ItemCategory.WEAPON, ItemCategory.TOOL));
+		_materials.put(Material.GOLD_SPADE, EnumSet.of(ItemCategory.ITEM, ItemCategory.GOLD, ItemCategory.TOOL, ItemCategory.SHOVEL));
+		_materials.put(Material.GOLD_PICKAXE, EnumSet.of(ItemCategory.ITEM, ItemCategory.GOLD, ItemCategory.TOOL, ItemCategory.PICKAXE));
+		_materials.put(Material.GOLD_AXE, EnumSet.of(ItemCategory.AXE, ItemCategory.ITEM, ItemCategory.GOLD, ItemCategory.WEAPON, ItemCategory.TOOL));
+		_materials.put(Material.STRING, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.FEATHER, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.SULPHUR, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.WOOD_HOE, EnumSet.of(ItemCategory.ITEM, ItemCategory.TOOL, ItemCategory.WOOD, ItemCategory.HOE));
+		_materials.put(Material.STONE_HOE, EnumSet.of(ItemCategory.ITEM, ItemCategory.TOOL, ItemCategory.STONE, ItemCategory.HOE));
+		_materials.put(Material.IRON_HOE, EnumSet.of(ItemCategory.ITEM, ItemCategory.TOOL, ItemCategory.IRON, ItemCategory.HOE));
+		_materials.put(Material.DIAMOND_HOE, EnumSet.of(ItemCategory.ITEM, ItemCategory.TOOL, ItemCategory.DIAMOND, ItemCategory.HOE));
+		_materials.put(Material.GOLD_HOE, EnumSet.of(ItemCategory.ITEM, ItemCategory.TOOL, ItemCategory.GOLD, ItemCategory.HOE));
+		_materials.put(Material.SEEDS, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.WHEAT, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.BREAD, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.LEATHER_HELMET, EnumSet.of(ItemCategory.ITEM, ItemCategory.LEATHER, ItemCategory.ARMOR_HELMET, ItemCategory.ARMOR));
+		_materials.put(Material.LEATHER_CHESTPLATE, EnumSet.of(ItemCategory.ITEM, ItemCategory.LEATHER, ItemCategory.ARMOR_CHESTPLATE, ItemCategory.ARMOR));
+		_materials.put(Material.LEATHER_LEGGINGS, EnumSet.of(ItemCategory.ITEM, ItemCategory.LEATHER, ItemCategory.ARMOR_LEGGINGS, ItemCategory.ARMOR));
+		_materials.put(Material.LEATHER_BOOTS, EnumSet.of(ItemCategory.ITEM, ItemCategory.LEATHER, ItemCategory.ARMOR_BOOTS, ItemCategory.ARMOR));
+		_materials.put(Material.CHAINMAIL_HELMET, EnumSet.of(ItemCategory.ITEM, ItemCategory.CHAINMAIL, ItemCategory.ARMOR_HELMET, ItemCategory.ARMOR));
+		_materials.put(Material.CHAINMAIL_CHESTPLATE, EnumSet.of(ItemCategory.ITEM, ItemCategory.CHAINMAIL, ItemCategory.ARMOR_CHESTPLATE, ItemCategory.ARMOR));
+		_materials.put(Material.CHAINMAIL_LEGGINGS, EnumSet.of(ItemCategory.ITEM, ItemCategory.CHAINMAIL, ItemCategory.ARMOR_LEGGINGS, ItemCategory.ARMOR));
+		_materials.put(Material.CHAINMAIL_BOOTS, EnumSet.of(ItemCategory.ITEM, ItemCategory.CHAINMAIL, ItemCategory.ARMOR_BOOTS, ItemCategory.ARMOR));
+		_materials.put(Material.IRON_HELMET, EnumSet.of(ItemCategory.ITEM, ItemCategory.IRON, ItemCategory.ARMOR_HELMET, ItemCategory.ARMOR));
+		_materials.put(Material.IRON_CHESTPLATE, EnumSet.of(ItemCategory.ITEM, ItemCategory.IRON, ItemCategory.ARMOR_CHESTPLATE, ItemCategory.ARMOR));
+		_materials.put(Material.IRON_LEGGINGS, EnumSet.of(ItemCategory.ITEM, ItemCategory.IRON, ItemCategory.ARMOR_LEGGINGS, ItemCategory.ARMOR));
+		_materials.put(Material.IRON_BOOTS, EnumSet.of(ItemCategory.ITEM, ItemCategory.IRON, ItemCategory.ARMOR_BOOTS, ItemCategory.ARMOR));
+		_materials.put(Material.DIAMOND_HELMET, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.ARMOR_HELMET, ItemCategory.ARMOR));
+		_materials.put(Material.DIAMOND_CHESTPLATE, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.ARMOR_CHESTPLATE, ItemCategory.ARMOR));
+		_materials.put(Material.DIAMOND_LEGGINGS, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.ARMOR_LEGGINGS, ItemCategory.ARMOR));
+		_materials.put(Material.DIAMOND_BOOTS, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.ARMOR_BOOTS, ItemCategory.ARMOR));
+		_materials.put(Material.GOLD_HELMET, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.ARMOR_HELMET, ItemCategory.ARMOR));
+		_materials.put(Material.GOLD_CHESTPLATE, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.ARMOR_CHESTPLATE, ItemCategory.ARMOR));
+		_materials.put(Material.GOLD_LEGGINGS, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.ARMOR_LEGGINGS, ItemCategory.ARMOR));
+		_materials.put(Material.GOLD_BOOTS, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND, ItemCategory.ARMOR_BOOTS, ItemCategory.ARMOR));
+		_materials.put(Material.FLINT, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.PORK, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE, ItemCategory.RAW_FOOD));
+		_materials.put(Material.GRILLED_PORK, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.PAINTING, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.GOLDEN_APPLE, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.SIGN, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.WOOD_DOOR, EnumSet.of(ItemCategory.ITEM, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.BUCKET, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.WATER_BUCKET, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.LAVA_BUCKET, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.MINECART, EnumSet.of(ItemCategory.ITEM, ItemCategory.VEHICLE));
+		_materials.put(Material.SADDLE, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.IRON_DOOR, EnumSet.of(ItemCategory.ITEM, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.REDSTONE, EnumSet.of(ItemCategory.ITEM, ItemCategory.REDSTONE));
+		_materials.put(Material.SNOW_BALL, EnumSet.of(ItemCategory.ITEM, ItemCategory.THROWABLE));
+		_materials.put(Material.BOAT, EnumSet.of(ItemCategory.ITEM, ItemCategory.VEHICLE));
+		_materials.put(Material.LEATHER, EnumSet.of(ItemCategory.ITEM, ItemCategory.LEATHER));
+		_materials.put(Material.MILK_BUCKET, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.CLAY_BRICK, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.CLAY_BALL, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.SUGAR_CANE, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.PAPER, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.BOOK, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.SLIME_BALL, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.STORAGE_MINECART, EnumSet.of(ItemCategory.ITEM, ItemCategory.VEHICLE));
+		_materials.put(Material.POWERED_MINECART, EnumSet.of(ItemCategory.ITEM, ItemCategory.VEHICLE));
+		_materials.put(Material.EGG, EnumSet.of(ItemCategory.ITEM, ItemCategory.THROWABLE));
+		_materials.put(Material.COMPASS, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.FISHING_ROD, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.WATCH, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.GLOWSTONE_DUST, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.RAW_FISH, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE, ItemCategory.RAW_FOOD));
+		_materials.put(Material.COOKED_FISH, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.INK_SACK, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.BONE, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.SUGAR, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.CAKE, EnumSet.of(ItemCategory.ITEM, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.BED, EnumSet.of(ItemCategory.ITEM, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.DIODE, EnumSet.of(ItemCategory.ITEM, ItemCategory.REDSTONE, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.COOKIE, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.MAP, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.SHEARS, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.MELON, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.PUMPKIN_SEEDS, EnumSet.of(ItemCategory.ITEM, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.MELON_SEEDS, EnumSet.of(ItemCategory.ITEM, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.RAW_BEEF, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE, ItemCategory.RAW_FOOD));
+		_materials.put(Material.COOKED_BEEF, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.RAW_CHICKEN, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE, ItemCategory.RAW_FOOD));
+		_materials.put(Material.COOKED_CHICKEN, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.ROTTEN_FLESH, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.ENDER_PEARL, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.BLAZE_ROD, EnumSet.of(ItemCategory.ITEM, ItemCategory.NETHER));
+		_materials.put(Material.GHAST_TEAR, EnumSet.of(ItemCategory.ITEM, ItemCategory.NETHER));
+		_materials.put(Material.GOLD_NUGGET, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.NETHER_STALK, EnumSet.of(ItemCategory.ITEM, ItemCategory.NETHER));
+		_materials.put(Material.POTION, EnumSet.of(ItemCategory.ITEM, ItemCategory.POTABLE));
+		_materials.put(Material.GLASS_BOTTLE, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.SPIDER_EYE, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.FERMENTED_SPIDER_EYE, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.BLAZE_POWDER, EnumSet.of(ItemCategory.ITEM, ItemCategory.NETHER));
+		_materials.put(Material.MAGMA_CREAM, EnumSet.of(ItemCategory.ITEM, ItemCategory.NETHER));
+		_materials.put(Material.BREWING_STAND_ITEM, EnumSet.of(ItemCategory.ITEM, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.CAULDRON_ITEM, EnumSet.of(ItemCategory.ITEM, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.EYE_OF_ENDER, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.SPECKLED_MELON, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.MONSTER_EGG, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.EXP_BOTTLE, EnumSet.of(ItemCategory.ITEM, ItemCategory.THROWABLE));
+		_materials.put(Material.FIREBALL, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.BOOK_AND_QUILL, EnumSet.of(ItemCategory.ITEM, ItemCategory.GUI));
+		_materials.put(Material.WRITTEN_BOOK, EnumSet.of(ItemCategory.ITEM, ItemCategory.GUI));
+		_materials.put(Material.EMERALD, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.ITEM_FRAME, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.FLOWER_POT_ITEM, EnumSet.of(ItemCategory.ITEM, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.CARROT_ITEM, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.POTATO_ITEM, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE, ItemCategory.RAW_FOOD));
+		_materials.put(Material.BAKED_POTATO, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.POISONOUS_POTATO, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.EMPTY_MAP, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.GOLDEN_CARROT, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.SKULL_ITEM, EnumSet.of(ItemCategory.ITEM, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.CARROT_STICK, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.NETHER_STAR, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.PUMPKIN_PIE, EnumSet.of(ItemCategory.ITEM, ItemCategory.EDIBLE));
+		_materials.put(Material.FIREWORK, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.FIREWORK_CHARGE, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.ENCHANTED_BOOK, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.REDSTONE_COMPARATOR, EnumSet.of(ItemCategory.ITEM, ItemCategory.REDSTONE, ItemCategory.ITEM_BLOCK));
+		_materials.put(Material.NETHER_BRICK_ITEM, EnumSet.of(ItemCategory.ITEM, ItemCategory.NETHER));
+		_materials.put(Material.QUARTZ, EnumSet.of(ItemCategory.ITEM, ItemCategory.NETHER));
+		_materials.put(Material.EXPLOSIVE_MINECART, EnumSet.of(ItemCategory.ITEM, ItemCategory.VEHICLE));
+		_materials.put(Material.HOPPER_MINECART, EnumSet.of(ItemCategory.ITEM, ItemCategory.VEHICLE));
+		_materials.put(Material.IRON_BARDING, EnumSet.of(ItemCategory.ITEM, ItemCategory.IRON));
+		_materials.put(Material.GOLD_BARDING, EnumSet.of(ItemCategory.ITEM, ItemCategory.GOLD));
+		_materials.put(Material.DIAMOND_BARDING, EnumSet.of(ItemCategory.ITEM, ItemCategory.DIAMOND));
+		_materials.put(Material.LEASH, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.NAME_TAG, EnumSet.of(ItemCategory.ITEM));
+		_materials.put(Material.COMMAND_MINECART, EnumSet.of(ItemCategory.ITEM, ItemCategory.VEHICLE));
+		_materials.put(Material.GOLD_RECORD, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+		_materials.put(Material.GREEN_RECORD, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+		_materials.put(Material.RECORD_3, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+		_materials.put(Material.RECORD_4, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+		_materials.put(Material.RECORD_5, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+		_materials.put(Material.RECORD_6, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+		_materials.put(Material.RECORD_7, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+		_materials.put(Material.RECORD_8, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+		_materials.put(Material.RECORD_9, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+		_materials.put(Material.RECORD_10, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+		_materials.put(Material.RECORD_11, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+		_materials.put(Material.RECORD_12, EnumSet.of(ItemCategory.ITEM, ItemCategory.MUSIC_DISC));
+	}
+	
 	public static LinkedList<ItemContainer> matchItem(Player caller, String items, boolean inform)
 	{
 		LinkedList<ItemContainer> matchList = new LinkedList<ItemContainer>();
-
+		
 		String failList = "";
-
-		//Mass Search
+		
+		// Mass Search
 		for (String cur : items.split(","))
 		{
 			ItemContainer match = searchItem(caller, cur, inform);
-
+			
 			if (match != null)
 				matchList.add(match);
-
+				
 			else
-				failList += cur + " " ;
+				failList += cur + " ";
 		}
-
+		
 		if (inform && failList.length() > 0)
 		{
 			failList = failList.substring(0, failList.length() - 1);
-			UtilPlayer.message(caller, F.main("Item(s) Search", "" +
-					C.mBody + " Invalid [" +
-					C.mElem + failList +
-					C.mBody + "]."));
+			UtilPlayer.message(caller, F.main("Item(s) Search", "" + C.mBody + " Invalid [" + C.mElem + failList + C.mBody + "]."));
 		}
-
+		
 		return matchList;
 	}
 	
@@ -54,76 +454,61 @@ public class UtilItem
 		{
 			String[] arg = args.split(":");
 			
-			//Get Selected Name
+			// Get Selected Name
 			String name = null;
-			if (arg.length > 2)	
-				name = arg[2].replaceAll("_", " ");
-					
-			//By Name
-			if (cur.toString().equalsIgnoreCase(args))
-				return new ItemContainer(cur, (byte)0, name);
-
-			if (cur.toString().toLowerCase().contains(args.toLowerCase()))
-				matchList.add(new ItemContainer(cur, (byte)0, name));
+			if (arg.length > 2) name = arg[2].replaceAll("_", " ");
 			
-			//By ID:Data:Name
+			// By Name
+			if (cur.toString().equalsIgnoreCase(args)) return new ItemContainer(cur, (byte) 0, name);
 			
-			//ID
+			if (cur.toString().toLowerCase().contains(args.toLowerCase())) matchList.add(new ItemContainer(cur, (byte) 0, name));
+			
+			// By ID:Data:Name
+			
+			// ID
 			int id = 0;
 			try
 			{
-				if (arg.length > 0)	
-					id = Integer.parseInt(arg[0]);
+				if (arg.length > 0) id = Integer.parseInt(arg[0]);
 			}
-			catch (Exception e)	
+			catch (Exception e)
 			{
 				continue;
 			}
 			
-			if (id != cur.getId())
-				continue;
+			if (id != cur.getId()) continue;
 			
-			//Data
+			// Data
 			byte data = 0;
 			try
 			{
-				if (arg.length > 1)	
-					data = Byte.parseByte(arg[1]);
+				if (arg.length > 1) data = Byte.parseByte(arg[1]);
 			}
-			catch (Exception e)	
+			catch (Exception e)
 			{
 				continue;
 			}
-						
+			
 			return new ItemContainer(cur, data, name);
 		}
-
-		//No / Non-Unique
+		
+		// No / Non-Unique
 		if (matchList.size() != 1)
 		{
-			if (!inform)
-				return null;
+			if (!inform) return null;
+			
+			// Inform
+			UtilPlayer.message(caller, F.main("Item Search", "" + C.mCount + matchList.size() + C.mBody + " matches for [" + C.mElem + args + C.mBody + "]."));
 			
-			//Inform
-			UtilPlayer.message(caller, F.main("Item Search", "" +
-					C.mCount + matchList.size() +
-					C.mBody + " matches for [" +
-					C.mElem + args +
-					C.mBody + "]."));
-
 			if (matchList.size() > 0)
 			{
 				String matchString = "";
 				for (ItemContainer cur : matchList)
 					matchString += F.elem(cur.Type.toString()) + ", ";
+					
+				if (matchString.length() > 1) matchString = matchString.substring(0, matchString.length() - 2);
 				
-				if (matchString.length() > 1)
-					matchString = matchString.substring(0 , matchString.length() - 2);
-
-				UtilPlayer.message(caller, F.main("Item Search", "" +
-						C.mBody + "Matches [" +
-						C.mElem + matchString +
-						C.mBody + "]."));
+				UtilPlayer.message(caller, F.main("Item Search", "" + C.mBody + "Matches [" + C.mElem + matchString + C.mBody + "]."));
 			}
 			
 			return null;
@@ -135,25 +520,600 @@ public class UtilItem
 	public static String itemToStr(ItemStack item)
 	{
 		String data = "0";
-		if (item.getData() != null)
-			data = item.getData().getData() + "";
+		if (item.getData() != null) data = item.getData().getData() + "";
 		
 		return item.getType() + ":" + item.getAmount() + ":" + item.getDurability() + ":" + data;
 	}
-
+	
+	/**
+	 * @param item - the item to be checked for material type
+	 * @param material - the material to check if it matches
+	 * @return true, if {@code item} is non-null and its material type matches
+	 *         {@code material}.
+	 */
+	public static boolean matchesMaterial(ItemStack item, Material material)
+	{
+		return item != null && item.getType() == material;
+	}
+	
 	public static boolean isFood(ItemStack item)
 	{
-		return item == null ? false : isFood(item.getType());
+		return isEdible(item);
 	}
-
+	
 	public static boolean isFood(Material material)
 	{
-		for (Material food : FOOD_LIST)
-		{
-			if (food.equals(material))
-				return true;
-		}
+		return isEdible(material);
+	}
+	
+	public static boolean isSword(ItemStack stack)
+	{
+		return isEdible(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isSword(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.SWORD));
+	}
+	
+	public static boolean isEdible(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.EDIBLE));
+	}
+	
+	public static boolean isEdible(ItemStack stack)
+	{
+		return isEdible(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isPotable(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.POTABLE));
+	}
+	
+	public static boolean isPotable(ItemStack stack)
+	{
+		return isPotable(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isAxe(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.AXE));
+	}
+	
+	public static boolean isAxe(ItemStack stack)
+	{
+		return isAxe(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isWeapon(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.WEAPON));
+	}
+	
+	public static boolean isWeapon(ItemStack stack)
+	{
+		return isWeapon(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isHelmet(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.ARMOR_HELMET));
+	}
+	
+	public static boolean isHelmet(ItemStack stack)
+	{
+		return isHelmet(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isChestplate(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.ARMOR_CHESTPLATE));
+	}
+	
+	public static boolean isChestplate(ItemStack stack)
+	{
+		return isChestplate(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isLeggings(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.ARMOR_LEGGINGS));
+	}
+	
+	public static boolean isLeggings(ItemStack stack)
+	{
+		return isLeggings(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isBoots(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.ARMOR_BOOTS));
+	}
+	
+	public static boolean isBoots(ItemStack stack)
+	{
+		return isBoots(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isBlock(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.BLOCK));
+	}
+	
+	public static boolean isBlock(ItemStack stack)
+	{
+		return isBlock(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isLiquid(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.LIQUID));
+	}
+	
+	public static boolean isLiquid(ItemStack stack)
+	{
+		return isLiquid(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isBoundless(Material material)
+	{
+		return (_materials.get(material).contains(ItemCategory.BOUNDLESS));
+	}
+	
+	public static boolean isBoundless(ItemStack stack)
+	{
+		return isBoundless(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isTranslucent(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.TRANSLUCENT));
+	}
+	
+	public static boolean isTranslucent(ItemStack stack)
+	{
+		return isTranslucent(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isOre(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.ORE));
+	}
+	
+	public static boolean isOre(ItemStack stack)
+	{
+		return isOre(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isCompactBlock(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.COMPACT_BLOCK));
+	}
+	
+	public static boolean isCompactBlock(ItemStack stack)
+	{
+		return isCompactBlock(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isGlassProduct(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.GLASS));
+	}
+	
+	public static boolean isGlassProduct(ItemStack stack)
+	{
+		return isGlassProduct(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean doesModifyMovement(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.MOVEMENT_MODIFYING));
+	}
+	
+	public static boolean doesModifyMovement(ItemStack stack)
+	{
+		return doesModifyMovement(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean doesEmitLight(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.LIGHT_EMITTING));
+	}
+	
+	public static boolean doesEmitLight(ItemStack stack)
+	{
+		return doesEmitLight(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isRedstoneComponent(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.REDSTONE));
+	}
+	
+	public static boolean isRedstoneComponent(ItemStack stack)
+	{
+		return isRedstoneComponent(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean doesHaveGUI(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.GUI));
+	}
+	
+	public static boolean doesHaveGUI(ItemStack stack)
+	{
+		return doesHaveGUI(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isClimbable(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.CLIMBABLE));
+	}
+	
+	public static boolean isClimbable(ItemStack stack)
+	{
+		return isClimbable(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isLeatherProduct(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.LEATHER));
+	}
+	
+	public static boolean isLeatherProduct(ItemStack stack)
+	{
+		return isLeatherProduct(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isGoldProduct(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.GOLD));
+	}
+	
+	public static boolean isGoldProduct(ItemStack stack)
+	{
+		return isGoldProduct(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isIronProduct(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.IRON));
+	}
+	
+	public static boolean isIronProduct(ItemStack stack)
+	{
+		return isIronProduct(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isDiamondProduct(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.DIAMOND));
+	}
+	
+	public static boolean isDiamondProduct(ItemStack stack)
+	{
+		return isDiamondProduct(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isStoneProduct(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.STONE));
+	}
+	
+	public static boolean isStoneProduct(ItemStack stack)
+	{
+		return isStoneProduct(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isWoodProduct(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.WOOD));
+	}
+	
+	public static boolean isWoodProduct(ItemStack stack)
+	{
+		return isWoodProduct(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isChainmailProduct(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.CHAINMAIL));
+	}
+	
+	public static boolean isChainmailProduct(ItemStack stack)
+	{
+		return isChainmailProduct(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isThrowable(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.THROWABLE));
+	}
+	
+	public static boolean isThrowable(ItemStack stack)
+	{
+		return isThrowable(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isVehicle(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.VEHICLE));
+	}
+	
+	public static boolean isVehicle(ItemStack stack)
+	{
+		return isVehicle(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isItem(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.ITEM));
+	}
+	
+	public static boolean isItem(ItemStack stack)
+	{
+		return isItem(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isLog(Material material)
+	{
+		return material == null ? false : (_materials.get(material).contains(ItemCategory.LOG));
+	}
+	
+	public static boolean isLog(ItemStack stack)
+	{
+		return isLog(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isLeaf(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.LEAVES));
+	}
+	
+	public static boolean isLeaf(ItemStack stack)
+	{
+		return isLeaf(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isTool(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.TOOL));
+	}
+	
+	public static boolean isTool(ItemStack stack)
+	{
+		return isTool(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isAffectedByPhysics(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.PHYSICS));
+	}
+	
+	public static boolean isAffectedByPhysics(ItemStack stack)
+	{
+		return isAffectedByPhysics(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isFromNether(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.NETHER));
+	}
+	
+	public static boolean isFromNether(ItemStack stack)
+	{
+		return isFromNether(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isFoodRaw(Material material)
+	{
+		return material == null ? false : (_materials.get(material).contains(ItemCategory.RAW_FOOD));
+	}
+	
+	public static boolean isFoodRaw(ItemStack stack)
+	{
+		return isFoodRaw(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isMusicDisc(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.MUSIC_DISC));
+	}
+	
+	public static boolean isMusicDisc(ItemStack stack)
+	{
+		return isMusicDisc(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isSpade(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.SHOVEL));
+	}
+	
+	public static boolean isSpade(ItemStack stack)
+	{
+		return isSpade(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isPickaxe(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.PICKAXE));
+	}
+	
+	public static boolean isPickaxe(ItemStack stack)
+	{
+		return isPickaxe(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isHoe(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.HOE));
+	}
+	
+	public static boolean isHoe(ItemStack stack)
+	{
+		return isHoe(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isItemBlock(Material material)
+	{
+		return material == null ? false : (_materials.get(material).contains(ItemCategory.ITEM_BLOCK));
+	}
+	
+	public static boolean isItemBlock(ItemStack stack)
+	{
+		return isItemBlock(stack == null ? null : stack.getType());
+	}
+	
+	public static boolean isArmor(Material material)
+	{
+		return material == null ? false : (contains(material, ItemCategory.ARMOR));
+	}
+	
+	public static boolean isArmor(ItemStack stack)
+	{
+		return isArmor(stack == null ? null : stack.getType());
+	}
 
-		return false;
+	private static boolean contains(Material material, ItemCategory category)
+	{
+		EnumSet<ItemCategory> set = _materials.get(material);
+		return set == null ? false : set.contains(category);
+	}
+	
+	public static List<Material> listIn(ItemCategory... attr)
+	{
+		List<ItemCategory> attributes = new ArrayList<>(attr.length);
+		Collections.addAll(attributes, attr);
+		
+		List<Material> list = new ArrayList<>();
+		for (Entry<Material, EnumSet<ItemCategory>> mat : _materials.entrySet())
+		{
+			if (mat.getValue().containsAll(attributes))
+			{
+				list.add(mat.getKey());
+			}
+		}
+		
+		attributes.clear();
+		attributes = null;
+		
+		return list;
+	}
+	
+	public enum ItemCategory
+	{
+		EDIBLE,
+		POTABLE,
+		ORE,
+		GLASS,
+		COMPACT_BLOCK,
+		GUI,
+		LIGHT_EMITTING,
+		REDSTONE,
+		TRANSLUCENT,
+		BOUNDLESS,
+		LIQUID,
+		MOVEMENT_MODIFYING,
+		CLIMBABLE,
+		THROWABLE,
+		PHYSICS,
+		NETHER,
+		RAW_FOOD,
+		MUSIC_DISC,
+		VEHICLE,
+		TOOL,
+		GOLD,
+		IRON,
+		DIAMOND,
+		STONE,
+		WOOD,
+		LEATHER,
+		CHAINMAIL,
+		ARMOR,
+		ARMOR_HELMET,
+		ARMOR_CHESTPLATE,
+		ARMOR_LEGGINGS,
+		ARMOR_BOOTS,
+		WEAPON,
+		SWORD,
+		AXE,
+		SHOVEL,
+		PICKAXE,
+		HOE,
+		ITEM,
+		BLOCK,
+		ITEM_BLOCK,
+		LOG,
+		LEAVES;
+	}
+	
+	public enum ArmorMaterial
+	{
+		DIAMOND,
+		IRON,
+		GOLD,
+		LEATHER,
+		CHAINMAIL;
+		
+		public static ArmorMaterial of(Material armor)
+		{
+			if (!isArmor(armor))
+			{
+				return null;
+			}
+			
+			if (isDiamondProduct(armor))
+			{
+				return DIAMOND;
+			}
+			
+			if (isIronProduct(armor))
+			{
+				return IRON;
+			}
+			
+			if (isGoldProduct(armor))
+			{
+				return GOLD;
+			}
+			
+			if (isLeatherProduct(armor))
+			{
+				return LEATHER;
+			}
+			
+			if (isChainmailProduct(armor))
+			{
+				return CHAINMAIL;
+			}
+			
+			return null;
+		}
+		
+		public ItemCategory asCategory()
+		{
+			switch (this)
+			{
+				case DIAMOND:
+					return ItemCategory.DIAMOND;
+				case IRON:
+					return ItemCategory.IRON;
+				case GOLD:
+					return ItemCategory.GOLD;
+				case LEATHER:
+					return ItemCategory.LEATHER;
+				case CHAINMAIL:
+					return ItemCategory.CHAINMAIL;
+				default:
+					return null;
+			}
+		}
+	}
+
+	public static boolean isIndexed(Material material)
+	{
+		return _materials.containsKey(material);
 	}
 }
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
index 72ce23304..3d48c098f 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
@@ -2,7 +2,7 @@ package mineplex.core.common.util;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
-import java.text.NumberFormat;
+import java.util.List;
 import java.util.Locale;
 import java.util.Random;
 
@@ -12,31 +12,36 @@ import org.bukkit.util.Vector;
 
 public class UtilMath
 {
-	public static double trim(int degree, double d) 
+	public static double trim(int degree, double d)
 	{
 		String format = "#.#";
 		
-		for (int i=1 ; i<degree ; i++)
+		for (int i = 1; i < degree; i++)
 			format += "#";
-
+			
 		DecimalFormatSymbols symb = new DecimalFormatSymbols(Locale.US);
 		DecimalFormat twoDForm = new DecimalFormat(format, symb);
 		return Double.valueOf(twoDForm.format(d));
 	}
-
 	
 	public static Random random = new Random();
-	public static int r(int i) 
+	
+	public static int r(int i)
 	{
 		return random.nextInt(i);
 	}
 	
-	public static double offset2d(Entity a, Entity b) 
+	public static int rRange(int min, int max)
+	{
+		return min + r(1 + max - min);
+	}
+	
+	public static double offset2d(Entity a, Entity b)
 	{
 		return offset2d(a.getLocation().toVector(), b.getLocation().toVector());
 	}
 	
-	public static double offset2d(Location a, Location b) 
+	public static double offset2d(Location a, Location b)
 	{
 		return offset2d(a.toVector(), b.toVector());
 	}
@@ -48,48 +53,67 @@ public class UtilMath
 		return a.subtract(b).length();
 	}
 	
-	public static double offset(Entity a, Entity b) 
+	public static double offset(Entity a, Entity b)
 	{
 		return offset(a.getLocation().toVector(), b.getLocation().toVector());
 	}
 	
-	public static double offset(Location a, Location b) 
+	public static double offset(Location a, Location b)
 	{
 		return offset(a.toVector(), b.toVector());
 	}
 	
 	public static double offset(Vector a, Vector b)
 	{
-		return a.subtract(b).length();
+		return a.clone().subtract(b).length();
 	}
-
+	
 	public static double offsetSquared(Entity a, Entity b)
 	{
 		return offsetSquared(a.getLocation(), b.getLocation());
 	}
-
+	
 	public static double offsetSquared(Location a, Location b)
 	{
 		return offsetSquared(a.toVector(), b.toVector());
 	}
-
+	
 	public static double offsetSquared(Vector a, Vector b)
 	{
 		return a.distanceSquared(b);
 	}
-
+	
 	public static double rr(double d, boolean bidirectional)
 	{
-		if (bidirectional)
-			return Math.random() * (2 * d) - d;
+		if (bidirectional) return Math.random() * (2 * d) - d;
 		
 		return Math.random() * d;
 	}
 	
-	public static <T> T randomElement(T[] array) {
-		if (array.length == 0)
-			return null;
+	public static <T> T randomElement(T[] array)
+	{
+		if (array.length == 0) return null;
 		return array[random.nextInt(array.length)];
 	}
+	
+	public static <T> T randomElement(List<T> list)
+	{
+		if (list.isEmpty()) return null;
+		return list.get(random.nextInt(list.size()));
+	}
+	
+	public static double clamp(double num, double min, double max)
+	{
+		return num < min ? min : (num > max ? max : num);
+	}
+	
+	public static long clamp(long num, long min, long max)
+	{
+		return num < min ? min : (num > max ? max : num);
+	}
+	
+	public static int clamp(int num, int min, int max)
+	{
+		return num < min ? min : (num > max ? max : num);
+	}
 }
-
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
index ec6587bcf..d7896c943 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
@@ -1,14 +1,12 @@
 package mineplex.core.common.util;
 
-import java.lang.reflect.Field;
-
-import mineplex.core.common.util.UtilParticle.ViewDist;
-import net.minecraft.server.v1_8_R3.EnumParticle;
-import net.minecraft.server.v1_8_R3.PacketPlayOutWorldParticles;
-
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
+import net.minecraft.server.v1_8_R3.EnumParticle;
+import net.minecraft.server.v1_8_R3.PacketPlayOutWorldParticles;
 
 public class UtilParticle
 {
@@ -95,7 +93,7 @@ public class UtilParticle
 		LARGE_EXPLODE(EnumParticle.EXPLOSION_LARGE, "largeexplode", "Explosion", Material.FIREBALL, (byte) 0),
 
 		LARGE_SMOKE(EnumParticle.SMOKE_LARGE, "largesmoke", "Black Smoke", Material.INK_SACK, (byte) 0),
-
+		
 		SMOKE(EnumParticle.SMOKE_NORMAL, "smoke", "Smoke", Material.INK_SACK, (byte) 0),
 
 		LAVA(EnumParticle.LAVA, "lava", "Lava Debris", Material.LAVA, (byte) 0),
@@ -242,7 +240,29 @@ public class UtilParticle
 
 		return packet;
 	}
+	
+	public static void PlayParticle(ParticleType type,Location location, float offsetX, float offsetY, 
+									float offsetZ, float speed, int count, ViewDist dist)
+	{
+		PlayParticle(type, location, offsetX, offsetY, offsetZ, speed, count, dist, UtilServer.getPlayers());
+	}
 
+	public static void PlayParticleToAll(ParticleType type, Location location, Vector offset, float speed, int count, ViewDist dist)
+	{
+		PlayParticle(type, location, (float) offset.getX(), (float) offset.getY(), (float) offset.getZ(), speed, count, dist, UtilServer.getPlayers());
+	}
+	
+	public static void PlayParticle(ParticleType type, Location location, Vector offset, float speed, int count, ViewDist dist, Player... players)
+	{
+		PlayParticle(type, location, (float) offset.getX(), (float) offset.getY(), (float) offset.getZ(), speed, count, dist, players);
+	}
+	
+	public static void PlayParticleToAll(ParticleType type, Location location, float offsetX, float offsetY, float offsetZ,
+			float speed, int count, ViewDist dist)
+	{
+		PlayParticle(type.particleName, location, offsetX, offsetY, offsetZ, speed, count, dist, UtilServer.getPlayers());
+	}
+	
 	public static void PlayParticle(ParticleType type, Location location, float offsetX, float offsetY, float offsetZ,
 			float speed, int count, ViewDist dist, Player... players)
 	{
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
index 7b1b49599..af1712362 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
@@ -4,13 +4,12 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Random;
 import java.util.UUID;
 
-import net.minecraft.server.v1_8_R3.EntityPlayer;
-import net.minecraft.server.v1_8_R3.Packet;
-import net.minecraft.server.v1_8_R3.PlayerConnection;
-
 import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
@@ -21,10 +20,23 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.potion.PotionEffect;
 import org.bukkit.util.Vector;
 
+import net.minecraft.server.v1_8_R3.EntityPlayer;
+import net.minecraft.server.v1_8_R3.Packet;
+import net.minecraft.server.v1_8_R3.PlayerConnection;
+
 public class UtilPlayer
 {
+	private static Random RANDOM = new Random();
+	
+	// A mapping of player names (Keys) to the system time when they last changed active Hotbar Slot
+	private static Map<String, Long> _hotbarUpdates = new HashMap<String, Long>();
+	
+	// The amount of time (in milliseconds) after changin hotbars that you can block
+	public static final long BLOCKING_HOTBAR_DELAY = 100;
+
 	private static boolean hasIntersection(Vector3D p1, Vector3D p2, Vector3D min, Vector3D max)
 	{
 		final double epsilon = 0.0001f;
@@ -154,6 +166,30 @@ public class UtilPlayer
 		return hit;
 	}
 
+	/**
+	 * @param player - the player to be checked for blocking status
+	 * @return true, if the {@code player} is blocking and has not recently
+	 * changed hotbar slots (within {@value BLOCKING_HOTBAR_DELAY} milliseconds), false otherwise.
+	 */
+	public static boolean isBlocking(Player player)
+	{ 
+		String name = player.getName(); 
+		long lastUpdate = _hotbarUpdates.containsKey(name) ? _hotbarUpdates.get(name) : 0;;
+		long duration = System.currentTimeMillis() - lastUpdate;
+		
+		return player.isBlocking();// && UtilItem.isSword(player.getItemInHand())
+				//&& duration >= BLOCKING_HOTBAR_DELAY;
+	}
+	
+	/**
+	 * Mark the {@code player} as having changed hotbar slots.
+	 * @param player - the player to be marked
+	 */
+	public static void onHotbarChange(Player player)
+	{
+		_hotbarUpdates.put(player.getName(), System.currentTimeMillis());
+	}
+	
 	/**
 	 * AviodAllies doesn't work. Leaving as a param as it sounds like something you may want in the future.
 	 */
@@ -392,7 +428,12 @@ public class UtilPlayer
 		return matchList;
 	}
 
-	public static LinkedList<Player> getNearby(Location loc, double maxDist)
+	public static List<Player> getNearby(Location loc, double maxDist)
+	{
+		return getNearby(loc, maxDist, false);
+	}
+
+	public static List<Player> getNearby(Location loc, double maxDist, boolean onlySurvival)
 	{
 		LinkedList<Player> nearbyMap = new LinkedList<Player>();
 
@@ -404,8 +445,10 @@ public class UtilPlayer
 			if (cur.isDead())
 				continue;
 
-			double dist = loc.toVector().subtract(cur.getLocation().toVector()).length();
+			if (onlySurvival && cur.getGameMode() != GameMode.SURVIVAL)
+				continue;
 
+			double dist = loc.distance(cur.getLocation());
 			if (dist > maxDist)
 				continue;
 
@@ -453,7 +496,7 @@ public class UtilPlayer
 		return best;
 	}
 
-	public static Player getClosest(Location loc, Entity ignore)
+	public static Player getClosest(Location loc, Entity... ignore)
 	{
 		Player best = null;
 		double bestDist = 0;
@@ -466,8 +509,14 @@ public class UtilPlayer
 			if (cur.isDead())
 				continue;
 
-			if (ignore != null && ignore.equals(cur))
-				continue;
+			if (ignore != null)
+			{
+				for (int i = 0; i < ignore.length; i++)
+				{
+					if (cur.equals(ignore[i]))
+						continue;
+				}
+			}
 
 			double dist = UtilMath.offset(cur.getLocation(), loc);
 
@@ -498,6 +547,14 @@ public class UtilPlayer
 		if (log)
 			System.out.println("Kicked Client [" + player.getName() + "] for [" + module + " - " + message + "]");
 	}
+	
+	public static void kick(Collection<Player> players, String module, String message, boolean log)
+	{
+		for (Player player : players)
+		{
+			kick(player, module, message, log);
+		}
+	}
 
 	public static HashMap<Player, Double> getInRadius(Location loc, double dR)
 	{
@@ -527,7 +584,7 @@ public class UtilPlayer
 				continue;
 
 			//Get lower offset (eye to eye, eye to feet)
-			double offset = Math.min(UtilMath.offset(player.getEyeLocation(), cur.getEyeLocation()), 
+			double offset = Math.min(UtilMath.offset(player.getEyeLocation(), cur.getEyeLocation()),
 					UtilMath.offset(player.getEyeLocation(), cur.getLocation()));
 
 			if (offset < distance && UtilAlg.isTargetInPlayerPyramid(player, cur, angleLimit))
@@ -590,6 +647,23 @@ public class UtilPlayer
 		return (((CraftEntity) player).getHandle().getDataWatcher().getByte(0) & 1 << 4) != 0;
 	}
 
+	public static void clearInventory(Player player)
+	{
+		player.getInventory().clear();
+		player.getInventory().setHelmet(null);
+		player.getInventory().setChestplate(null);
+		player.getInventory().setLeggings(null);
+		player.getInventory().setBoots(null);
+	}
+
+	public static void clearPotionEffects(Player player)
+	{
+		for (PotionEffect effect : player.getActivePotionEffects())
+		{
+			player.removePotionEffect(effect.getType());
+		}
+	}
+
 	public static void sendPacket(Player player, Packet... packets)
 	{
 		PlayerConnection connection = ((CraftPlayer) player).getHandle().playerConnection;
@@ -603,6 +677,18 @@ public class UtilPlayer
 		}
 	}
 
+	/**
+	 * Get a random player within maxDist of the target location
+	 * @param location The center location to look for the player
+	 * @param maxDist The max distance from location that the player can be
+	 * @return A random player that is within maxDist of location, or null if no players apply
+	 */
+	public static Player getRandomTarget(Location location, double maxDist)
+	{
+		List<Player> nearby = getNearby(location, maxDist, true);
+		return nearby.size() > 0 ? nearby.get(RANDOM.nextInt(nearby.size())) : null;
+	}
+
 	public static boolean isSpectator(Entity player)
 	{
 		if (player instanceof Player)
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java
index bfb69d72c..c56faa15a 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java
@@ -1,5 +1,11 @@
 package mineplex.core.common.util;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.Sound;
@@ -12,6 +18,25 @@ public class UtilServer
 		return getServer().getOnlinePlayers().toArray(new Player[0]);
 	}
 
+	public static List<Player> getSortedPlayers()
+	{
+		return getSortedPlayers(new Comparator<Player>()
+		{
+			@Override
+			public int compare(Player o1, Player o2)
+			{
+				return o1.getName().compareTo(o2.getName());
+			}
+		});
+	}
+
+	public static List<Player> getSortedPlayers(Comparator<Player> comparator)
+	{
+		ArrayList<Player> players = new ArrayList<Player>(getServer().getOnlinePlayers());
+		Collections.sort(players, comparator);
+		return players;
+	}
+
 	public static Server getServer()
 	{
 		return Bukkit.getServer();
@@ -23,6 +48,12 @@ public class UtilServer
 			UtilPlayer.message(cur, message);
 	}
 	
+	public static void broadcast(LinkedList<String> messages)
+	{
+		for (Player cur : getPlayers())
+			UtilPlayer.message(cur, messages);
+	}
+	
 	public static void broadcastSpecial(String event, String message)
 	{
 		for (Player cur : getPlayers())
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilSkull.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilSkull.java
index 9b6044b4e..f3c1ab8b1 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilSkull.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilSkull.java
@@ -1,6 +1,13 @@
 package mineplex.core.common.util;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.Material;
 import org.bukkit.entity.*;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.SkullMeta;
 
 public class UtilSkull
 {
@@ -25,6 +32,19 @@ public class UtilSkull
 		return 3;
 	}
 
+	public static ItemStack getPlayerHead(String playerName, String itemName, List<String> itemLore)
+	{
+		boolean displayHead = !playerName.isEmpty();
+		ItemStack skull = new ItemStack(Material.SKULL_ITEM, 1, (short) 0, displayHead ? (byte) 3 : 0);
+		SkullMeta meta = ((SkullMeta) skull.getItemMeta());
+		if (displayHead)
+			meta.setOwner(playerName);
+		meta.setDisplayName(itemName);
+		meta.setLore(itemLore);
+		skull.setItemMeta(meta);
+		return skull;
+	}
+
 	public static boolean isPlayerHead(byte data)
 	{
 		return data == 3;
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
index 4372b6fba..8bbac15bc 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
@@ -3,6 +3,7 @@ package mineplex.core.common.util;
 import java.util.Collection;
 
 import org.apache.commons.lang.WordUtils;
+import org.bukkit.Material;
 
 public class UtilText {
 	public static <T> String listToString(Collection<T> inputList, boolean comma) {
@@ -95,4 +96,18 @@ public class UtilText {
 	public static String[] wrap(String text, int lineLength, boolean wrapLongerWords) {
 		return WordUtils.wrap(text, lineLength, "\00D0", wrapLongerWords).split("\00D0");
 	}
+	
+	public static String repeat(String txt, int times)
+	{
+		return new String(new byte[times]).replace("\0", txt);
+	}
+	
+	public static boolean plural(int x){
+		return x <= 0 ? true : x > 1;
+	}
+
+	public static String trim(int maxLength, String s) {
+		return s.length() <= maxLength ? s : s.substring(0, maxLength);
+	}
+
 }
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTime.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTime.java
index af77ee996..908272bc6 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTime.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTime.java
@@ -44,12 +44,33 @@ public class UtilTime
 
 	public enum TimeUnit
 	{
-		FIT,
-		DAYS,
-		HOURS,
-		MINUTES,
-		SECONDS,
-		MILLISECONDS
+		FIT(1),
+		DAYS(86400000),
+		HOURS(3600000),
+		MINUTES(60000),
+		SECONDS(1000),
+		MILLISECONDS(1);
+
+		private long _ms;
+
+		TimeUnit(long ms)
+		{
+			_ms = ms;
+		}
+
+		public long getMilliseconds()
+		{
+			return _ms;
+		}
+	}
+
+	/**
+	 * Convert from one TimeUnit to a different one
+	 */
+	public static long convert(long time, TimeUnit from, TimeUnit to)
+	{
+		long milleseconds = time * from.getMilliseconds();
+		return milleseconds / to.getMilliseconds();
 	}
 	
 	public static String since(long epoch)
@@ -103,7 +124,7 @@ public class UtilTime
 			if (type == TimeUnit.DAYS)			text = (num = UtilMath.trim(trim, time / 86400000d)) + " Day";
 			else if (type == TimeUnit.HOURS)	text = (num = UtilMath.trim(trim, time / 3600000d)) + " Hour";
 			else if (type == TimeUnit.MINUTES)	text = (num = UtilMath.trim(trim, time / 60000d)) + " Minute";
-			else if (type == TimeUnit.SECONDS)	text = (int) (num = (int) UtilMath.trim(trim, time / 1000d)) + " Second";
+			else if (type == TimeUnit.SECONDS)	text = (int) (num = (int) UtilMath.trim(trim, time / 1000d)) + " Second"; 
 			else								text = (int) (num = (int) UtilMath.trim(trim, time)) + " Millisecond";
 		}
 		else
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilUI.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilUI.java
new file mode 100644
index 000000000..54c190729
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilUI.java
@@ -0,0 +1,36 @@
+package mineplex.core.common.util;
+
+public class UtilUI
+{
+	public static int[] getIndicesFor(int items, int startingLine, int newLinePadding)
+	{
+		return getIndicesFor(items, startingLine, 5, newLinePadding);
+	}
+	
+	public static int[] getIndicesFor(int items, int startingLine)
+	{
+		return getIndicesFor(items, startingLine, 5, 0);
+	}
+	
+	public static int[] getIndicesFor(int items, int startingLine, int itemsPerLine, int newLinePadding)
+	{
+		itemsPerLine = UtilMath.clamp(itemsPerLine, 1, 5);
+		
+		int[] indices = new int[items];
+		
+		int lines = (int) Math.ceil(items / ((double) itemsPerLine));
+		for (int line = 0; line < lines; line++)
+		{
+			int itemsInCurLine = line == lines - 1 ? items - (line * itemsPerLine) : itemsPerLine;
+			int startIndex = (startingLine * 9) + ((newLinePadding * 9) * line) + 9 * line - itemsInCurLine + 5;
+			
+			for (int item = 0; item < itemsInCurLine; item++)
+			{
+				indices[(line * itemsPerLine) + item] = startIndex + (item * 2);
+			}
+		}
+		
+		return indices;
+	}
+	
+}
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java
index af3aa4f91..c2a3c40ab 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java
@@ -7,6 +7,7 @@ import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
+import org.bukkit.block.Block;
 import org.bukkit.util.Vector;
 
 public class UtilWorld
@@ -45,7 +46,55 @@ public class UtilWorld
 			return null;
 		}
 	}
-	
+
+	public static String blockToStr(Block block)
+	{
+		if (block == null)
+			return "";
+
+		return block.getWorld().getName() + "," +
+				block.getX() + "," +
+				block.getY() + "," +
+				block.getZ();
+	}
+
+	public static String blockToStrClean(Block block)
+	{
+		if (block == null)
+			return "";
+
+		return  "(" + block.getX() + "," +
+				block.getY() + "," +
+				block.getZ() + ")";
+	}
+
+	public static Block strToBlock(String string)
+	{
+		if (string.length() == 0)
+			return null;
+
+		String[] parts = string.split(",");
+
+		try
+		{
+			for (World cur : UtilServer.getServer().getWorlds())
+			{
+				if (cur.getName().equalsIgnoreCase(parts[0]))
+				{
+					int x = Integer.parseInt(parts[1]);
+					int y = Integer.parseInt(parts[2]);
+					int z = Integer.parseInt(parts[3]);
+					return cur.getBlockAt(x, y, z);
+				}
+			}
+		}
+		catch (Exception e)
+		{
+		}
+
+		return null;
+	}
+
 	public static String locToStr(Location loc)
 	{
 		if (loc == null)
@@ -65,6 +114,14 @@ public class UtilWorld
 		return "(" + loc.getBlockX() + ", " + loc.getBlockY() + ", " + loc.getBlockZ() + ")";
 	}
 	
+	public static String vecToStrClean(Vector loc)
+	{
+		if (loc == null)
+			return "Null";
+		
+		return "(" + loc.getX() + ", " + loc.getY() + ", " + loc.getZ() + ")";
+	}
+	
 	public static Location strToLoc(String string)
 	{
 		if (string.length() == 0)
diff --git a/Plugins/Mineplex.Core/Mineplex.Core.iml b/Plugins/Mineplex.Core/Mineplex.Core.iml
index 1714de4b9..06f039df9 100644
--- a/Plugins/Mineplex.Core/Mineplex.Core.iml
+++ b/Plugins/Mineplex.Core/Mineplex.Core.iml
@@ -13,12 +13,12 @@
     <orderEntry type="library" name="jedis" level="project" />
     <orderEntry type="library" name="commons-pool2" level="project" />
     <orderEntry type="module" module-name="Mineplex.Core.Common" />
+    <orderEntry type="module" module-name="Classpath.Dummy" />
     <orderEntry type="module" module-name="Mineplex.ServerData" />
     <orderEntry type="library" name="craftbukkit" level="project" />
     <orderEntry type="module" module-name="Mineplex.Database" />
     <orderEntry type="library" name="jooq" level="project" />
     <orderEntry type="library" name="commons-dbcp2" level="project" />
-    <orderEntry type="module" module-name="Classpath.Dummy" />
     <orderEntry type="library" name="NoCheatPlus" level="project" />
     <orderEntry type="module" module-name="Mineplex.PlayerCache" />
   </component>
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
index df327ad09..790df2c43 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
@@ -19,13 +19,13 @@ import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import net.minecraft.server.v1_8_R3.DataWatcher;
 import net.minecraft.server.v1_8_R3.DataWatcher.WatchableObject;
-import net.minecraft.server.v1_8_R3.MathHelper;
 import net.minecraft.server.v1_8_R3.Packet;
 import net.minecraft.server.v1_8_R3.PacketPlayInUseEntity;
 import net.minecraft.server.v1_8_R3.PacketPlayInUseEntity.EnumEntityUseAction;
 import net.minecraft.server.v1_8_R3.PacketPlayOutAttachEntity;
 import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy;
 import net.minecraft.server.v1_8_R3.PacketPlayOutEntityMetadata;
+import net.minecraft.server.v1_8_R3.PacketPlayOutNamedEntitySpawn;
 import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntity;
 import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntityLiving;
 
@@ -49,8 +49,10 @@ import fr.neatmonster.nocheatplus.hooks.NCPHookManager;
 
 public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 {
-	private NautHashMap<String, NautHashMap<Integer, Integer>> _entityMap = new NautHashMap<String, NautHashMap<Integer, Integer>>();
+	private NautHashMap<String, NautHashMap<Integer, Integer[]>> _entityMap = new NautHashMap<String, NautHashMap<Integer, Integer[]>>();
 	private NautHashMap<String, NautHashMap<Integer, String>> _entityNameMap = new NautHashMap<String, NautHashMap<Integer, String>>();
+	private NautHashMap<String, NautHashMap<Integer, Integer>> _entityRiding = new NautHashMap<String, NautHashMap<Integer, Integer>>();
+
 	private HashSet<String> _loggedIn = new HashSet<String>();
 	private HashSet<Integer> _ignoreSkulls = new HashSet<Integer>();
 
@@ -63,7 +65,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 
 		packetHandler.addPacketHandler(this, true, PacketPlayOutAttachEntity.class, PacketPlayOutEntityDestroy.class,
 				PacketPlayOutEntityMetadata.class, PacketPlayOutSpawnEntity.class, PacketPlayOutSpawnEntityLiving.class,
-				PacketPlayInUseEntity.class);
+				PacketPlayOutNamedEntitySpawn.class, PacketPlayInUseEntity.class, PacketPlayOutAttachEntity.class);
 
 		NCPHookManager.addHook(CheckType.MOVING_SURVIVALFLY, this);
 		NCPHookManager.addHook(CheckType.MOVING_PASSABLE, this);
@@ -75,6 +77,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 	{
 		_entityMap.remove(event.getPlayer().getName());
 		_entityNameMap.remove(event.getPlayer().getName());
+		_entityRiding.remove(event.getPlayer().getName());
 		_loggedIn.remove(event.getPlayer());
 	}
 
@@ -167,6 +170,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 				iterator.remove();
 				_entityMap.remove(player);
 				_entityNameMap.remove(player);
+				_entityRiding.remove(player);
 			}
 		}
 
@@ -190,7 +194,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 		{
 			if (owner.isOnline() && !_entityMap.containsKey(owner.getName()))
 			{
-				_entityMap.put(owner.getName(), new NautHashMap<Integer, Integer>());
+				_entityMap.put(owner.getName(), new NautHashMap<Integer, Integer[]>());
 				_entityNameMap.put(owner.getName(), new NautHashMap<Integer, String>());
 				_loggedIn.add(owner.getName());
 			}
@@ -217,10 +221,15 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 					{
 						if (_entityMap.get(owner.getName()).containsKey(spawnPacket.a))
 						{
-							UtilPlayer.sendPacket(owner, new PacketPlayOutEntityDestroy(new int[]
-								{
-									_entityMap.get(owner.getName()).get(spawnPacket.a)
-								}));
+							Integer[] ids = _entityMap.get(owner.getName()).get(spawnPacket.a);
+							int[] newIds = new int[ids.length];
+
+							for (int a = 0; a < ids.length; a++)
+							{
+								newIds[a] = ids[a];
+							}
+
+							UtilPlayer.sendPacket(owner, new PacketPlayOutEntityDestroy(newIds));
 
 							_entityNameMap.get(owner.getName()).remove(spawnPacket.a);
 							_entityMap.get(owner.getName()).remove(spawnPacket.a);
@@ -236,9 +245,59 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 						int newId = UtilEnt.getNewEntityId();
 
 						_entityNameMap.get(owner.getName()).put(spawnPacket.a, entityName);
-						_entityMap.get(owner.getName()).put(spawnPacket.a, newId);
+						_entityMap.get(owner.getName()).put(spawnPacket.a, new Integer[]
+							{
+								newId
+							});
 
-						sendProtocolPackets(owner, spawnPacket.a, newId, entityName, verifier, true);
+						sendProtocolPackets(owner, spawnPacket.a, newId, entityName, verifier, true, -1);
+						break;
+					}
+				}
+			}
+			else if (packet instanceof PacketPlayOutNamedEntitySpawn)
+			{
+				PacketPlayOutNamedEntitySpawn spawnPacket = (PacketPlayOutNamedEntitySpawn) packet;
+
+				for (WatchableObject watchable : (List<WatchableObject>) spawnPacket.i.c())
+				{
+					if (watchable.a() == 3 && watchable.b() instanceof Byte && ((Byte) watchable.b()) == 1)
+					{
+						if (_entityMap.get(owner.getName()).containsKey(spawnPacket.a))
+						{
+							Integer[] ids = _entityMap.get(owner.getName()).get(spawnPacket.a);
+
+							int[] newIds = new int[ids.length];
+
+							for (int a = 0; a < ids.length; a++)
+							{
+								newIds[a] = ids[a];
+							}
+
+							UtilPlayer.sendPacket(owner, new PacketPlayOutEntityDestroy(newIds));
+
+							_entityNameMap.get(owner.getName()).remove(spawnPacket.a);
+							_entityMap.get(owner.getName()).remove(spawnPacket.a);
+						}
+
+						final String entityName = spawnPacket.i.getString(2);
+
+						if (entityName.isEmpty())
+						{
+							return;
+						}
+
+						int newId = UtilEnt.getNewEntityId();
+						int newId2 = UtilEnt.getNewEntityId();
+
+						_entityNameMap.get(owner.getName()).put(spawnPacket.a, entityName);
+						_entityMap.get(owner.getName()).put(spawnPacket.a, new Integer[]
+							{
+									newId,
+									newId2
+							});
+
+						sendProtocolPackets(owner, spawnPacket.a, newId2, entityName, verifier, true, newId);
 						break;
 					}
 				}
@@ -247,7 +306,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 			{
 				PacketPlayOutEntityMetadata metaPacket = (PacketPlayOutEntityMetadata) packet;
 
-				if (metaPacket.a != 777777 && !_ignoreSkulls.contains(metaPacket.a))
+				if (metaPacket.a != 777777 && !_ignoreSkulls.contains(metaPacket.a) && metaPacket.a != owner.getEntityId())
 				{
 					boolean isDisplaying = _entityMap.get(owner.getName()).containsKey(metaPacket.a);
 					String currentName = _entityNameMap.get(owner.getName()).get(metaPacket.a);
@@ -279,7 +338,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 						// If name is still being displayed
 						if (newDisplay)
 						{
-							int newId;
+							Integer[] newId;
 
 							if (isDisplaying) // Sending metadata
 							{
@@ -288,22 +347,28 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 							else
 							// Spawning new entity
 							{
-								newId = UtilEnt.getNewEntityId();
+								newId = new Integer[]
+									{
+										UtilEnt.getNewEntityId()
+									};
+
 								_entityMap.get(owner.getName()).put(metaPacket.a, newId);
 							}
 
-							sendProtocolPackets(owner, metaPacket.a, newId, newName, verifier, !isDisplaying);
-
 							_entityNameMap.get(owner.getName()).put(metaPacket.a, newName);
+							sendProtocolPackets(owner, metaPacket.a, newId[0], newName, verifier, !isDisplaying, -1);
 						}
 						else
 						{ // Lets delete it
-							int id = _entityMap.get(owner.getName()).get(metaPacket.a);
+							Integer[] ids = _entityMap.get(owner.getName()).get(metaPacket.a);
+							int[] newIds = new int[ids.length];
 
-							UtilPlayer.sendPacket(owner, new PacketPlayOutEntityDestroy(new int[]
-								{
-									id
-								}));
+							for (int a = 0; a < ids.length; a++)
+							{
+								newIds[a] = ids[a];
+							}
+
+							verifier.bypassProcess(new PacketPlayOutEntityDestroy(newIds));
 
 							_entityMap.get(owner.getName()).remove(metaPacket.a);
 							_entityNameMap.get(owner.getName()).remove(metaPacket.a);
@@ -319,10 +384,15 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 					{
 						if (_entityMap.get(owner.getName()).containsKey(id))
 						{
-							UtilPlayer.sendPacket(owner, new PacketPlayOutEntityDestroy(new int[]
-								{
-									_entityMap.get(owner.getName()).get(id)
-								}));
+							Integer[] ids = _entityMap.get(owner.getName()).get(id);
+							int[] newIds = new int[ids.length];
+
+							for (int a = 0; a < ids.length; a++)
+							{
+								newIds[a] = ids[a];
+							}
+
+							UtilPlayer.sendPacket(owner, new PacketPlayOutEntityDestroy(newIds));
 							_entityMap.get(owner.getName()).remove(id);
 							_entityNameMap.get(owner.getName()).remove(id);
 						}
@@ -345,19 +415,79 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 			{
 				PacketPlayInUseEntity usePacket = (PacketPlayInUseEntity) packet;
 
-				for (Entry<Integer, Integer> entry : _entityMap.get(owner.getName()).entrySet())
-				{
-					if (entry.getValue() == usePacket.a)
-					{
-						PacketPlayInUseEntity newPacket = new PacketPlayInUseEntity();
-						newPacket.a = entry.getKey();
-						newPacket.action = usePacket.action == EnumEntityUseAction.ATTACK ? EnumEntityUseAction.ATTACK
-								: EnumEntityUseAction.INTERACT;
+				loop:
 
+				for (Entry<Integer, Integer[]> entry : _entityMap.get(owner.getName()).entrySet())
+				{
+					for (int id : entry.getValue())
+					{
+						if (id == usePacket.a)
 						{
-							((CraftPlayer) owner).getHandle().playerConnection.a(newPacket);
+							PacketPlayInUseEntity newPacket = new PacketPlayInUseEntity();
+							newPacket.a = entry.getKey();
+							newPacket.action = usePacket.action == EnumEntityUseAction.ATTACK ? EnumEntityUseAction.ATTACK
+									: EnumEntityUseAction.INTERACT;
+
+							{
+								((CraftPlayer) owner).getHandle().playerConnection.a(newPacket);
+							}
+
+							break loop;
 						}
-						break;
+					}
+				}
+			}
+			else if (packet instanceof PacketPlayOutAttachEntity)
+			{
+				PacketPlayOutAttachEntity attachPacket = (PacketPlayOutAttachEntity) packet;
+
+				// c = rider, b = ridden
+				// When detaching, c is sent, b is -1
+
+				// If this attach packet is for a player that has the fix
+				// If the attach packet isn't ordained by me
+				if (!_entityMap.containsKey(owner.getName()))
+				{
+					return;
+				}
+
+				if (!_entityRiding.containsKey(owner.getName()))
+				{
+					_entityRiding.put(owner.getName(), new NautHashMap<Integer, Integer>());
+				}
+
+				int vehicleId = -1;
+
+				if (_entityRiding.get(owner.getName()).containsKey(attachPacket.b))
+				{
+					vehicleId = _entityRiding.get(owner.getName()).get(attachPacket.b);
+				}
+
+				if (attachPacket.c == -1 && _entityMap.get(owner.getName()).containsKey(vehicleId))
+				{
+					Integer[] ids = _entityMap.get(owner.getName()).get(vehicleId);
+
+					_entityRiding.get(owner.getName()).remove(attachPacket.b);
+
+					sendProtocolPackets(owner, vehicleId, ids[ids.length - 1],
+							_entityNameMap.get(owner.getName()).get(vehicleId), verifier, true, ids.length > 1 ? ids[0] : -1);
+				}
+				else
+				{
+					Integer[] ids = _entityMap.get(owner.getName()).get(attachPacket.c);
+
+					if (ids != null && ids[0] != attachPacket.b)
+					{
+						_entityRiding.get(owner.getName()).put(attachPacket.b, attachPacket.c);
+
+						int[] newIds = new int[ids.length];
+
+						for (int a = 0; a < ids.length; a++)
+						{
+							newIds[a] = ids[a];
+						}
+
+						UtilPlayer.sendPacket(owner, new PacketPlayOutEntityDestroy(newIds));
 					}
 				}
 			}
@@ -365,7 +495,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 	}
 
 	private void sendProtocolPackets(final Player owner, final int entityId, final int newEntityId, String entityName,
-			final PacketVerifier packetList, final boolean newPacket)
+			final PacketVerifier packetList, final boolean newPacket, final int squidId)
 	{
 		CustomTagEvent event = new CustomTagEvent(owner, entityId, entityName);
 		_plugin.getServer().getPluginManager().callEvent(event);
@@ -375,82 +505,47 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 		{
 			public void run()
 			{
-				final DataWatcher watcher = new DataWatcher(new DummyEntity(((CraftWorld) owner.getWorld()).getHandle()));
+				DataWatcher watcher = new DataWatcher(new DummyEntity(((CraftWorld) owner.getWorld()).getHandle()));
 
-				watcher.a(0, Byte.valueOf((byte) 0));
+				watcher.a(0, (byte) (0 | 1 << 5)); // Invisible
 				watcher.a(1, Short.valueOf((short) 300));
-				watcher.a(2, "");
-				watcher.a(3, Byte.valueOf((byte) 0));
+				watcher.a(2, finalEntityName);
+				watcher.a(3, (byte) 1);
 				watcher.a(4, Byte.valueOf((byte) 0));
 				watcher.a(7, Integer.valueOf(0));
 				watcher.a(8, Byte.valueOf((byte) 0));
 				watcher.a(9, Byte.valueOf((byte) 0));
 				watcher.a(6, Float.valueOf(1.0F));
-				watcher.a(10, Byte.valueOf((byte) 0));
-
-				// Set invisible
-				int i1 = watcher.getByte(0);
-				watcher.watch(0, Byte.valueOf((byte) (i1 | 1 << 5)));
-
-				// Set small
-				byte b1 = watcher.getByte(10);
-				b1 = (byte) (b1 | 0x1);
-
-				watcher.watch(10, Byte.valueOf(b1));
-
-				watcher.watch(2, finalEntityName);
-				watcher.watch(3, Byte.valueOf((byte) 1));
+				watcher.a(10, (byte) (0 | 0x1)); // Small
 
 				if (newPacket)
 				{
+					if (squidId >= 0)
+					{
+						watcher.watch(10, (byte) 16);
+
+						DataWatcher squidWatcher = new DataWatcher(new DummyEntity(((CraftWorld) owner.getWorld()).getHandle()));
+						squidWatcher.a(0, (byte) (0 | 1 << 5));
+
+						final PacketPlayOutSpawnEntityLiving spawnPacket = new PacketPlayOutSpawnEntityLiving();
+						spawnPacket.a = squidId;
+						spawnPacket.b = (byte) EntityType.SQUID.getTypeId();
+
+						spawnPacket.l = squidWatcher;
+
+						UtilPlayer.sendPacket(owner, spawnPacket);
+
+						PacketPlayOutAttachEntity vehiclePacket = new PacketPlayOutAttachEntity();
+						vehiclePacket.a = 0;
+						vehiclePacket.b = spawnPacket.a;
+						vehiclePacket.c = entityId;
+
+						UtilPlayer.sendPacket(owner, vehiclePacket);
+					}
+
 					final PacketPlayOutSpawnEntityLiving spawnPacket = new PacketPlayOutSpawnEntityLiving();
 					spawnPacket.a = newEntityId;
 					spawnPacket.b = (byte) 30;
-					spawnPacket.c = (int) MathHelper.floor(100 * 32);
-					spawnPacket.d = (int) MathHelper.floor(64 * 32.0D);
-					spawnPacket.e = (int) MathHelper.floor(100 * 32);
-					spawnPacket.i = (byte) ((int) (0 * 256.0F / 360.0F));
-					spawnPacket.j = (byte) ((int) (0 * 256.0F / 360.0F));
-					spawnPacket.k = (byte) ((int) (0 * 256.0F / 360.0F));
-
-					double var2 = 3.9D;
-					double var4 = 0;
-					double var6 = 0;
-					double var8 = 0;
-
-					if (var4 < -var2)
-					{
-						var4 = -var2;
-					}
-
-					if (var6 < -var2)
-					{
-						var6 = -var2;
-					}
-
-					if (var8 < -var2)
-					{
-						var8 = -var2;
-					}
-
-					if (var4 > var2)
-					{
-						var4 = var2;
-					}
-
-					if (var6 > var2)
-					{
-						var6 = var2;
-					}
-
-					if (var8 > var2)
-					{
-						var8 = var2;
-					}
-
-					spawnPacket.f = (int) (var4 * 8000.0D);
-					spawnPacket.g = (int) (var6 * 8000.0D);
-					spawnPacket.h = (int) (var8 * 8000.0D);
 
 					spawnPacket.l = watcher;
 
@@ -459,7 +554,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 					PacketPlayOutAttachEntity vehiclePacket = new PacketPlayOutAttachEntity();
 					vehiclePacket.a = 0;
 					vehiclePacket.b = spawnPacket.a;
-					vehiclePacket.c = entityId;
+					vehiclePacket.c = squidId >= 0 ? squidId : entityId;
 
 					UtilPlayer.sendPacket(owner, vehiclePacket);
 				}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
index 5c07e698c..3c01d37a3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
@@ -34,6 +34,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent.Result;
+import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -47,7 +48,7 @@ public class CoreClientManager extends MiniPlugin
 	private AccountRepository _repository;
 	private NautHashMap<String, CoreClient> _clientList;
 	private HashSet<String> _duplicateLoginGlitchPreventionList;
-	
+
 	private NautHashMap<String, ILoginProcessor> _loginProcessors = new NautHashMap<String, ILoginProcessor>();
 	private LinkedList<IQuerylessLoginProcessor> _querylessLoginProcessors = new LinkedList<IQuerylessLoginProcessor>();
 	
@@ -572,4 +573,10 @@ public class CoreClientManager extends MiniPlugin
 		
 		return client.GetRank().has(rank);
 	}
+
+	public int getCachedClientAccountId(UUID uuid)
+	{
+		PlayerInfo playerInfo = PlayerCache.getInstance().getPlayer(uuid);
+		return playerInfo == null ? -1 : playerInfo.getAccountId();
+	}
 }
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java b/Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java
index 2f278165b..7c7db7911 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java
@@ -10,4 +10,4 @@ public interface ILoginProcessor
 	void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException;
 
 	String getQuery(int accountId, String uuid, String name);
-}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
index 0b0db5c51..ae3a81c72 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
@@ -27,14 +27,7 @@ public class UpdateRank extends CommandBase<CoreClientManager>
 
 	@Override
 	public void Execute(final Player caller, String[] args)
-	{
-		if (!Plugin.Get(caller).GetRank(true).has(caller, Rank.ADMIN, true))
-		{
-			return;
-		}
-		
-		boolean testServer = Plugin.getPlugin().getConfig().getString("serverstatus.group").equalsIgnoreCase("Testing");
-
+	{		
 		if (args == null)
 		{			
 			UtilPlayer.message(caller, F.main(Plugin.getName(), "/" + AliasUsed + " joeschmo MODERATOR"));
@@ -62,79 +55,70 @@ public class UpdateRank extends CommandBase<CoreClientManager>
 			
 			final Rank rank = tempRank;
 			 
-			if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.JNR_DEV || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR || rank == Rank.SUPPORT)
+			Plugin.getRepository().matchPlayerName(new Callback<List<String>>()
 			{
-				if (!testServer && rank.has(Rank.ADMIN) && !Plugin.hasRank(caller, Rank.LT))
+				public void run(List<String> matches)
 				{
-					UtilPlayer.message(caller, F.main(Plugin.getName(), ChatColor.RED + "" + ChatColor.BOLD + "Insufficient privileges!"));
-					return;
-				}
-				
-				Plugin.getRepository().matchPlayerName(new Callback<List<String>>()
-				{
-					public void run(List<String> matches)
+					boolean matchedExact = false;
+					
+					for (String match : matches)
 					{
-						boolean matchedExact = false;
-						
-						for (String match : matches)
+						if (match.equalsIgnoreCase(playerName))
 						{
-							if (match.equalsIgnoreCase(playerName))
-							{
-								matchedExact = true;
-							}
+							matchedExact = true;
 						}
-						
-						if (matchedExact)
-						{
-							for (Iterator<String> matchIterator = matches.iterator(); matchIterator.hasNext();)
-							{
-								if (!matchIterator.next().equalsIgnoreCase(playerName))
-								{
-									matchIterator.remove();
-								}
-							}
-						}
-						
-						if (UtilPlayer.isOnline(playerName))
-						{
-							Player p = UtilServer.getServer().getPlayer(playerName);
-							if (Plugin.Get(p).GetRank() != Plugin.Get(p).GetRank(true))
-								Plugin.Get(p).resetTemp();
-							
-							OnlineRankUpdateEvent event = new OnlineRankUpdateEvent(caller, Plugin.Get(caller).GetRank(), rank, true);
-							Plugin.Get(p).SetRank(rank, false);
-							Bukkit.getPluginManager().callEvent(event);
-							
-							UtilPlayer.message(p, F.main(Plugin.getName(), "Your rank has been updated to " + rank.Name + "!"));
-						}
-						
-						UtilPlayer.searchOffline(matches, new Callback<String>()
-						{
-							public void run(final String target)
-							{
-								if (target == null)
-								{
-									return;
-								}
-								
-								UUID uuid = Plugin.loadUUIDFromDB(playerName);
-
-								if (uuid == null)
-									uuid = UUIDFetcher.getUUIDOf(playerName);
-								
-								Plugin.getRepository().saveRank(new Callback<Rank>()
-								{
-									public void run(Rank rank)
-									{
-										caller.sendMessage(F.main(Plugin.getName(), target + "'s rank has been updated to " + rank.Name + "!"));
-									}
-								}, target, uuid, rank, true);
-								
-							}
-						}, caller, playerName, true);
 					}
-				}, playerName);
-			}
+					
+					if (matchedExact)
+					{
+						for (Iterator<String> matchIterator = matches.iterator(); matchIterator.hasNext();)
+						{
+							if (!matchIterator.next().equalsIgnoreCase(playerName))
+							{
+								matchIterator.remove();
+							}
+						}
+					}
+					
+					if (UtilPlayer.isOnline(playerName))
+					{
+						Player p = UtilServer.getServer().getPlayer(playerName);
+						if (Plugin.Get(p).GetRank() != Plugin.Get(p).GetRank(true))
+							Plugin.Get(p).resetTemp();
+						
+						OnlineRankUpdateEvent event = new OnlineRankUpdateEvent(caller, Plugin.Get(caller).GetRank(), rank, true);
+						Plugin.Get(p).SetRank(rank, false);
+						Bukkit.getPluginManager().callEvent(event);
+						
+						UtilPlayer.message(p, F.main(Plugin.getName(), "Your rank has been updated to " + rank.Name + "!"));
+					}
+					
+					UtilPlayer.searchOffline(matches, new Callback<String>()
+					{
+						public void run(final String target)
+						{
+							if (target == null)
+							{
+								return;
+							}
+							
+							UUID uuid = Plugin.loadUUIDFromDB(playerName);
+
+							if (uuid == null)
+								uuid = UUIDFetcher.getUUIDOf(playerName);
+							
+							Plugin.getRepository().saveRank(new Callback<Rank>()
+							{
+								public void run(Rank rank)
+								{
+									caller.sendMessage(F.main(Plugin.getName(), target + "'s rank has been updated to " + rank.Name + "!"));
+								}
+							}, target, uuid, rank, true);
+							
+						}
+					}, caller, playerName, true);
+				}
+			}, playerName);
 		}
 	}
 }
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
index 5953c98fa..6f36f0dd3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
@@ -277,7 +277,7 @@ public enum Achievement
 
 	//Champions
 	CHAMPIONS_WINS("Champion", 600,
-			new String[]{"Champions Domination.Wins", "Champions TDM.Wins", "Champions Capture the Flag.Wins"},
+			new String[]{"Champions Domination.Wins", "Champions TDM.Wins", "Champions CTF.Wins"},
 			new String[]{"Win 80 games of Dominate, TDM, or CTF"},
 			new int[]{80},
 			AchievementCategory.CHAMPIONS),
@@ -295,40 +295,46 @@ public enum Achievement
 			AchievementCategory.CHAMPIONS),
 
 	CHAMPIONS_ASSASSINATION("Assassination", 1000,
-			new String[]{"Champions Domination.Assassination", "Champions TDM.Assassination", "Champions Capture the Flag.Assassination"},
+			new String[]{"Champions Domination.Assassination", "Champions TDM.Assassination", "Champions CTF.Assassination"},
 			new String[]{"Kill 40 players with Backstab without", "taking any damage from them"},
 			new int[]{40},
 			AchievementCategory.CHAMPIONS),
 
 	CHAMPIONS_MASS_ELECTROCUTION("Mass Electrocution", 1200,
-			new String[]{"Champions Domination.MassElectrocution", "Champions TDM.MassElectrocution", "Champions Capture the Flag.MassElectrocution"},
+			new String[]{"Champions Domination.MassElectrocution", "Champions TDM.MassElectrocution", "Champions CTF.MassElectrocution"},
 			new String[]{"Hit 4 enemies with a Lightning Orb"},
 			new int[]{1},
 			AchievementCategory.CHAMPIONS),
 
 	CHAMPIONS_THE_LONGEST_SHOT("The Longest Shot", 1200,
-			new String[]{"Champions Domination.TheLongestShot", "Champions TDM.TheLongestShot", "Champions Capture the Flag.TheLongestShot"},
+			new String[]{"Champions Domination.TheLongestShot", "Champions TDM.TheLongestShot", "Champions CTF.TheLongestShot"},
 			new String[]{"Kill someone using Longshot who", "is over 64 Blocks away from you"},
 			new int[]{1},
 			AchievementCategory.CHAMPIONS),
 
 	CHAMPIONS_EARTHQUAKE("Earthquake", 1200,
-			new String[]{"Champions Domination.Earthquake", "Champions TDM.Earthquake", "Champions Capture the Flag.Earthquake"},
+			new String[]{"Champions Domination.Earthquake", "Champions TDM.Earthquake", "Champions CTF.Earthquake"},
 			new String[]{"Launch 5 enemies using Seismic Slam"},
 			new int[]{1},
 			AchievementCategory.CHAMPIONS),
 			
 	CHAMPIONS_CAPTURES("Sticky Fingers", 2500,
-			new String[]{"Champions Capture the Flag.Captures"},
+			new String[]{"Champions CTF.Captures"},
 			new String[]{"Capture the Enemy Flag 20 times"},
 			new int[]{20},
 			AchievementCategory.CHAMPIONS),
 			
 	CHAMPIONS_CLUTCH("Clutch", 600,
-			new String[]{"Champions Capture the Flag.Clutch"},
+			new String[]{"Champions CTF.Clutch"},
 			new String[]{"Kill the Enemy Flag Carrier in Sudden Death"},
 			new int[]{1},
 			AchievementCategory.CHAMPIONS),
+			
+	CHAMPIONS_SPECIAL_WIN("Champion of Champions", 3000,
+			new String[]{"Champions CTF.SpecialWin"},
+			new String[]{"Win the game with 5 more captures than the other team"},
+			new int[]{1},
+			AchievementCategory.CHAMPIONS),
 
 	//Paintball
 	SUPER_PAINTBALL_WINS("Paintball King", 600,
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
index b7a4af7f5..320bf5bf6 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
@@ -78,7 +78,7 @@ public enum AchievementCategory
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
 			Material.BOOK_AND_QUILL, 0, GameCategory.CLASSICS, "Extra Tools Kit"),
 
-	CHAMPIONS("Champions", new String[] {"Champions Domination", "Champions TDM", "Champions Capture the Flag"},
+	CHAMPIONS("Champions", new String[] {"Champions Domination", "Champions TDM", "Champions CTF"},
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED, new StatDisplay("Flags Captured", "Captures") },
 			Material.BEACON, 0, GameCategory.CHAMPIONS, "Extra Class Skills"),
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
index 7719eca3f..17c4200be 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
@@ -345,7 +345,10 @@ public class AntiHack extends MiniPlugin
 			}
 
 			//Auto-Kick
-			if (!handled && _clientManager.Get(player).GetRank() != Rank.YOUTUBE && _clientManager.Get(player).GetRank() != Rank.TWITCH)
+			if (!handled && 
+					_clientManager.Get(player).GetRank() != Rank.YOUTUBE &&
+					_clientManager.Get(player).GetRank() != Rank.YOUTUBE_SMALL &&
+					_clientManager.Get(player).GetRank() != Rank.TWITCH)
 			{
 				player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 2f, 0.5f);
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockDataRunnable.java b/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockDataRunnable.java
new file mode 100644
index 000000000..99feb9645
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockDataRunnable.java
@@ -0,0 +1,75 @@
+package mineplex.core.blockrestore;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitTask;
+
+import mineplex.core.common.block.BlockData;
+
+public class BlockDataRunnable implements Runnable
+{
+	private JavaPlugin _plugin;
+	private boolean _started;
+	private BukkitTask _task;
+	private List<BlockData> _changedBlocks;
+	private Runnable _onComplete;
+	private int _blocksPerTick;
+	private Iterator<BlockData> _blockIterator;
+
+	public BlockDataRunnable(JavaPlugin plugin, Iterator<BlockData> blockIterator, int blocksPerTick, Runnable onComplete)
+	{
+		_plugin = plugin;
+		_changedBlocks = new ArrayList<BlockData>();
+		_started = false;
+		_blocksPerTick = blocksPerTick;
+		_onComplete = onComplete;
+		_blockIterator = blockIterator;
+	}
+
+	public void start()
+	{
+		if (!_started)
+		{
+			_task = Bukkit.getScheduler().runTaskTimer(_plugin, this, 1, 1);
+			_started = true;
+		}
+	}
+
+	public void pause()
+	{
+		if (_started)
+		{
+			_task.cancel();
+			_started = false;
+		}
+	}
+
+	public void setBlocksPerTick(int blocksPerTick)
+	{
+		_blocksPerTick = blocksPerTick;
+	}
+
+	@Override
+	public void run()
+	{
+		for (int i = 0; i < _blocksPerTick; i++)
+		{
+			if (_blockIterator.hasNext())
+			{
+				BlockData data = _blockIterator.next();
+				data.restore();
+			}
+			else
+			{
+				// We are done
+				_task.cancel();
+				_onComplete.run();
+				return;
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestore.java b/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestore.java
index 3f4621a66..cbffb8a05 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestore.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestore.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 
 import mineplex.core.MiniPlugin;
 import mineplex.core.updater.event.UpdateEvent;
@@ -26,28 +27,40 @@ import org.bukkit.plugin.java.JavaPlugin;
 public class BlockRestore extends MiniPlugin
 {
 	private HashMap<Block, BlockRestoreData> _blocks = new HashMap<Block, BlockRestoreData>();
+	private LinkedList<BlockRestoreMap> _restoreMaps;
 
 	public BlockRestore(JavaPlugin plugin) 
 	{
 		super("Block Restore", plugin);
+
+		_restoreMaps = new LinkedList<BlockRestoreMap>();
 	}
 
 	@EventHandler(priority=EventPriority.LOW)
-	public void BlockBreak(BlockBreakEvent event)
+	public void blockBreak(BlockBreakEvent event)
 	{
-		if (Contains(event.getBlock()))
+		if (contains(event.getBlock()))
+		{
+			BlockRestoreData data = _blocks.get(event.getBlock());
+			if (data != null && data.isRestoreOnBreak())
+			{
+				_blocks.remove(event.getBlock());
+				data.restore();
+			}
+
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority=EventPriority.LOW)
+	public void blockPlace(BlockPlaceEvent event)
+	{
+		if (contains(event.getBlockPlaced()))
 			event.setCancelled(true);
 	}
 
 	@EventHandler(priority=EventPriority.LOW)
-	public void BlockPlace(BlockPlaceEvent event)
-	{
-		if (Contains(event.getBlockPlaced()))
-			event.setCancelled(true);
-	}
-
-	@EventHandler(priority=EventPriority.LOW)
-	public void Piston(BlockPistonExtendEvent event)
+	public void piston(BlockPistonExtendEvent event)
 	{
 		if (event.isCancelled())
 			return;
@@ -60,7 +73,7 @@ public class BlockRestore extends MiniPlugin
 			if (push.getType() == Material.AIR)
 				return;
 
-			if (Contains(push))
+			if (contains(push))
 			{
 				push.getWorld().playEffect(push.getLocation(), Effect.STEP_SOUND, push.getTypeId());
 				event.setCancelled(true);
@@ -70,7 +83,7 @@ public class BlockRestore extends MiniPlugin
 	}
 
 	@EventHandler
-	public void ExpireBlocks(UpdateEvent event)
+	public void expireBlocks(UpdateEvent event)
 	{
 		if (event.getType() != UpdateType.TICK)
 			return;
@@ -86,15 +99,16 @@ public class BlockRestore extends MiniPlugin
 			_blocks.remove(cur);
 	}
 
-	public void Restore(Block block)
+	public boolean restore(Block block)
 	{
-		if (!Contains(block))
-			return;
+		if (!contains(block))
+			return false;
 
 		_blocks.remove(block).restore();
+		return true;
 	}
 	
-	public void RestoreAll()
+	public void restoreAll()
 	{
 		for (BlockRestoreData data : _blocks.values())
 			data.restore();
@@ -102,7 +116,7 @@ public class BlockRestore extends MiniPlugin
 		_blocks.clear();
 	}
 	
-	public HashSet<Location> RestoreBlockAround(Material type, Location location, int radius)
+	public HashSet<Location> restoreBlockAround(Material type, Location location, int radius)
 	{
 		HashSet<Location> restored = new HashSet<Location>();
 		
@@ -128,27 +142,36 @@ public class BlockRestore extends MiniPlugin
 		return restored;
 	}
 
-	
-	public void Add(Block block, int toID, byte toData, long expireTime)
+	public void add(Block block, int toID, byte toData, long expireTime)
 	{
-		Add(block, toID, toData, block.getTypeId(), block.getData(), expireTime);
-	}
-	
-	public void Add(Block block, int toID, byte toData, int fromID, byte fromData, long expireTime)
-	{ 
-		if (!Contains(block))		GetBlocks().put(block, new BlockRestoreData(block, toID, toData, fromID, fromData, expireTime, 0));
-		else						GetData(block).update(toID, toData, expireTime);
+		add(block, toID, toData, expireTime, false);
 	}
 
-	public void Snow(Block block, byte heightAdd, byte heightMax, long expireTime, long meltDelay, int heightJumps)
+	public void add(Block block, int toID, byte toData, long expireTime, boolean restoreOnBreak)
+	{
+		add(block, toID, toData, block.getTypeId(), block.getData(), expireTime, restoreOnBreak);
+	}
+
+	public void add(Block block, int toID, byte toData, int fromID, byte fromData, long expireTime)
+	{
+		add(block, toID, toData, fromID, fromData, expireTime, false);
+	}
+	
+	public void add(Block block, int toID, byte toData, int fromID, byte fromData, long expireTime, boolean restoreOnBreak)
+	{ 
+		if (!contains(block))		getBlocks().put(block, new BlockRestoreData(block, toID, toData, fromID, fromData, expireTime, 0, restoreOnBreak));
+		else						getData(block).update(toID, toData, expireTime);
+	}
+
+	public void snow(Block block, byte heightAdd, byte heightMax, long expireTime, long meltDelay, int heightJumps)
 	{
 		//Fill Above
-		if (((block.getTypeId() == 78 && block.getData() >= (byte)7) || block.getTypeId() == 80) && GetData(block) != null)
+		if (((block.getTypeId() == 78 && block.getData() >= (byte)7) || block.getTypeId() == 80) && getData(block) != null)
 		{
-			GetData(block).update(78, heightAdd, expireTime, meltDelay);
+			getData(block).update(78, heightAdd, expireTime, meltDelay);
 
-			if (heightJumps > 0)	Snow(block.getRelative(BlockFace.UP), heightAdd, heightMax, expireTime, meltDelay, heightJumps-1);
-			if (heightJumps == -1)	Snow(block.getRelative(BlockFace.UP), heightAdd, heightMax, expireTime, meltDelay, -1);
+			if (heightJumps > 0)	snow(block.getRelative(BlockFace.UP), heightAdd, heightMax, expireTime, meltDelay, heightJumps - 1);
+			if (heightJumps == -1)	snow(block.getRelative(BlockFace.UP), heightAdd, heightMax, expireTime, meltDelay, -1);
 
 			return;
 		}
@@ -188,30 +211,59 @@ public class BlockRestore extends MiniPlugin
 				heightAdd = 0;
 
 		//Snow
-		if (!Contains(block))		
-			GetBlocks().put(block, new BlockRestoreData(block, 78, (byte)Math.max(0, heightAdd-1), block.getTypeId(), block.getData(), expireTime, meltDelay));
+		if (!contains(block))
+			getBlocks().put(block, new BlockRestoreData(block, 78, (byte) Math.max(0, heightAdd - 1), block.getTypeId(), block.getData(), expireTime, meltDelay, false));
 		else						
-			GetData(block).update(78, heightAdd, expireTime, meltDelay);
+			getData(block).update(78, heightAdd, expireTime, meltDelay);
 	}
 
-	public boolean Contains(Block block)
+	public boolean contains(Block block)
 	{
-		if (GetBlocks().containsKey(block))
+		if (getBlocks().containsKey(block))
 			return true;
+
+		for (BlockRestoreMap restoreMap : _restoreMaps)
+		{
+			if (restoreMap.contains(block))
+				return true;
+		}
+
 		return false;
 	}
 
-	public BlockRestoreData GetData(Block block)
+	public BlockRestoreData getData(Block block)
 	{
 		if (_blocks.containsKey(block))
 			return _blocks.get(block);
 		return null;
 	}
 
-	public HashMap<Block, BlockRestoreData> GetBlocks()
+	public HashMap<Block, BlockRestoreData> getBlocks()
 	{
 		return _blocks;
 	}
 
-	
+	public BlockRestoreMap createMap()
+	{
+		BlockRestoreMap map = new BlockRestoreMap(this);
+		_restoreMaps.add(map);
+		return map;
+	}
+
+	protected void removeMap(BlockRestoreMap blockRestore)
+	{
+		_restoreMaps.remove(blockRestore);
+	}
+
+	@Override
+	public void disable()
+	{
+		// Clear all restore maps
+		for (BlockRestoreMap restoreMap : _restoreMaps)
+		{
+			restoreMap.restoreInstant();
+		}
+
+		restoreAll();
+	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreData.java b/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreData.java
index a9417c831..9a22c4358 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreData.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreData.java
@@ -25,7 +25,9 @@ public class BlockRestoreData
 	
 	protected HashMap<Location, Byte> _pad = new HashMap<Location, Byte>();
 
-	public BlockRestoreData(Block block, int toID, byte toData, int fromID, byte fromData, long expireDelay, long meltDelay)
+	protected boolean _restoreOnBreak;
+
+	public BlockRestoreData(Block block, int toID, byte toData, int fromID, byte fromData, long expireDelay, long meltDelay, boolean restoreOnBreak)
 	{
 		_block = block;
 
@@ -41,6 +43,8 @@ public class BlockRestoreData
 		_meltDelay = meltDelay;
 		_meltLast = System.currentTimeMillis();
 
+		_restoreOnBreak = restoreOnBreak;
+
 		//Set
 		set();
 	}
@@ -151,6 +155,11 @@ public class BlockRestoreData
 			_block.setTypeIdAndData(_toID, _toData, true);
 	}
 
+	public boolean isRestoreOnBreak()
+	{
+		return _restoreOnBreak;
+	}
+
 	public void restore()
 	{
 		_block.setTypeIdAndData(_fromID, _fromData, true);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java b/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java
new file mode 100644
index 000000000..fb123e315
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java
@@ -0,0 +1,181 @@
+package mineplex.core.blockrestore;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+
+import mineplex.core.common.block.BlockData;
+
+public class BlockRestoreMap
+{
+	private BlockRestore _blockRestore;
+	// The rate at which we restore blocks
+	private int _blocksPerTick;
+	// Easy access to all the blocks we have modified
+	private HashSet<Block> _changedBlocks;
+	// A hashmap for each level, so we can quickly restore top down
+	private HashMap<Block, BlockData>[] _blocks;
+
+	protected BlockRestoreMap(BlockRestore blockRestore)
+	{
+		this(blockRestore, 50);
+	}
+
+	protected BlockRestoreMap(BlockRestore blockRestore, int blocksPerTick)
+	{
+		_blockRestore = blockRestore;
+		_blocksPerTick = blocksPerTick;
+		_changedBlocks = new HashSet<Block>();
+		_blocks = new HashMap[256];
+
+		// Populate Array
+		for (int i = 0; i < 256; i++)
+		{
+			_blocks[i] = new HashMap<Block, BlockData>();
+		}
+	}
+
+	public void addBlockData(BlockData blockData)
+	{
+		Block block = blockData.Block;
+
+		if (!_blocks[block.getY()].containsKey(block))
+			_blocks[block.getY()].put(block, blockData);
+
+		_changedBlocks.add(blockData.Block);
+	}
+
+	public void set(Block block, Material material)
+	{
+		set(block, material, (byte) 0);
+	}
+
+	public void set(Block block, Material material, byte toData)
+	{
+		set(block, material.getId(), toData);
+	}
+
+	public void set(Block block, int toId, byte toData)
+	{
+		addBlockData(new BlockData(block));
+
+		block.setTypeIdAndData(toId, toData, false);
+	}
+
+	public boolean contains(Block block)
+	{
+		return _changedBlocks.contains(block);
+	}
+
+	public HashSet<Block> getChangedBlocks()
+	{
+		return _changedBlocks;
+	}
+
+	/**
+	 * Restore all the blocks changed in this BlockRestoreMap
+	 * NOTE: You should not use the same BlockRestoreMap instance after you run restore.
+	 * You must initialize a new BlockRestoreMap from BlockRestore
+	 */
+	public void restore()
+	{
+		// The idea behind this is that the runnable will restore blocks over time
+		// If the server happens to shutdown while the runnable is running, we will still
+		// restore all our blocks with restoreInstant (as called by BlockRestore)
+		BlockDataRunnable runnable = new BlockDataRunnable(_blockRestore.getPlugin(), new RestoreIterator(), _blocksPerTick, new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				clearMaps();
+				_blockRestore.removeMap(BlockRestoreMap.this);
+			}
+		});
+		runnable.start();
+	}
+
+	private void clearMaps()
+	{
+		for (int i = 0; i < 256; i++)
+		{
+			_blocks[i].clear();
+		}
+
+		_changedBlocks.clear();
+	}
+
+	public void restoreInstant()
+	{
+		for (int i = 0; i < 256; i++)
+		{
+			HashMap<Block, BlockData> map = _blocks[i];
+			for (BlockData data : map.values())
+			{
+				data.restore();
+			}
+		}
+
+		clearMaps();
+	}
+
+	public int getBlocksPerTick()
+	{
+		return _blocksPerTick;
+	}
+
+	public void setBlocksPerTick(int blocksPerTick)
+	{
+		_blocksPerTick = blocksPerTick;
+	}
+
+	private class RestoreIterator implements Iterator<BlockData>
+	{
+		private Iterator<BlockData> _currentIterator;
+		private int _currentIndex;
+
+		public RestoreIterator()
+		{
+			_currentIndex = 255;
+			updateIterator();
+		}
+
+		private void updateIterator()
+		{
+			_currentIterator = _blocks[_currentIndex].values().iterator();
+		}
+
+		@Override
+		public boolean hasNext()
+		{
+			while (!_currentIterator.hasNext() && _currentIndex > 0)
+			{
+				_currentIndex--;
+				updateIterator();
+			}
+
+			return _currentIterator.hasNext();
+		}
+
+		@Override
+		public BlockData next()
+		{
+			while (!_currentIterator.hasNext() && _currentIndex > 0)
+			{
+				_currentIndex--;
+				updateIterator();
+			}
+
+			return _currentIterator.next();
+		}
+
+		@Override
+		public void remove()
+		{
+			_currentIterator.remove();
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
index 922911a59..71ee2abe0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
@@ -732,7 +732,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
 		if (gold > 0)
 		{
 			UtilPlayer.message(player, F.main("Carl", "Rewarded " + F.elem(gold + " Gold")));
-			_donationManager.RewardGold(new Callback<Boolean>()
+			_donationManager.rewardGold(new Callback<Boolean>()
 			{
 				@Override
 				public void run(Boolean data)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/command/CommandBase.java b/Plugins/Mineplex.Core/src/mineplex/core/command/CommandBase.java
index dd274ce22..7a717c725 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/command/CommandBase.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/command/CommandBase.java
@@ -76,7 +76,7 @@ public abstract class CommandBase<PluginType extends MiniPlugin> implements ICom
 		return null;
 	}
 
-	protected List<String> getMatches(String start, List<String> possibleMatches)
+	protected List<String> getMatches(String start, Collection<String> possibleMatches)
 	{
 		List<String> matches = new ArrayList<String>();
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java
index 3b24248d9..2ed930507 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java
@@ -43,6 +43,14 @@ public class MountPage extends ShopPageBase<CosmeticManager, CosmeticShop>
         	if (slot == 26)
         		slot = 28;
         }
+        
+        addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
+		{
+			public void onClick(Player player, ClickType clickType)
+			{
+				getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
+			}
+		});
     }
     
     protected void addMount(Mount<?> mount, int slot)
@@ -76,12 +84,5 @@ public class MountPage extends ShopPageBase<CosmeticManager, CosmeticShop>
     			setItem(slot, new ShopItem(mount.GetDisplayMaterial(), mount.GetDisplayData(), (mount.GetCost(CurrencyType.Coins) < 0 ? "" : "Purchase ") + mount.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false));
     	}
     	
-		addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
-		{
-			public void onClick(Player player, ClickType clickType)
-			{
-				getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
-			}
-		});
     }
 }
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/creature/Creature.java b/Plugins/Mineplex.Core/src/mineplex/core/creature/Creature.java
index bb33f50b0..f5bc05d1b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/creature/Creature.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/creature/Creature.java
@@ -83,7 +83,7 @@ public class Creature extends MiniPlugin
 			return;
 		}
 
-		CreatureSpawnCustomEvent customEvent = new CreatureSpawnCustomEvent(event.getLocation());
+		CreatureSpawnCustomEvent customEvent = new CreatureSpawnCustomEvent(event.getLocation(), event.getSpawnReason());
 
 		_plugin.getServer().getPluginManager().callEvent(customEvent);
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/creature/command/MobCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/creature/command/MobCommand.java
index d1371487f..faf8929e2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/creature/command/MobCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/creature/command/MobCommand.java
@@ -112,7 +112,7 @@ public class MobCommand extends MultiCommandBase<Creature>
 			HashSet<Entity> entSet = new HashSet<Entity>();
 			for (int i = 0 ; i < count ; i++)
 			{
-				entSet.add(Plugin.SpawnEntity(caller.getTargetBlock((Set<Material>) null, 0).getLocation().add(0.5, 1, 0.5), type));
+				entSet.add(Plugin.SpawnEntity(caller.getTargetBlock((Set<Material>) null, 150).getLocation().add(0.5, 1, 0.5), type));
 			}
 
 			//Search Vars
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/creature/event/CreatureSpawnCustomEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/creature/event/CreatureSpawnCustomEvent.java
index 95b19fbc7..477a3f0bc 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/creature/event/CreatureSpawnCustomEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/creature/event/CreatureSpawnCustomEvent.java
@@ -4,6 +4,7 @@ import org.bukkit.Location;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 
 public class CreatureSpawnCustomEvent extends Event implements Cancellable
 {
@@ -11,10 +12,12 @@ public class CreatureSpawnCustomEvent extends Event implements Cancellable
     private boolean _cancelled = false;
  
     private Location _location;
+    private SpawnReason _reason;
     
-    public CreatureSpawnCustomEvent(Location location)
+    public CreatureSpawnCustomEvent(Location location, SpawnReason reason)
     {
     	_location = location;
+    	_reason = reason;
     }
     
     public HandlerList getHandlers()
@@ -43,4 +46,9 @@ public class CreatureSpawnCustomEvent extends Event implements Cancellable
 	{
 		return _location;
 	}
+	
+	public SpawnReason getReason()
+	{
+		return _reason;
+	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/database/RepositoryBase.java b/Plugins/Mineplex.Core/src/mineplex/core/database/RepositoryBase.java
index 2d083f5f3..f96d1b04d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/database/RepositoryBase.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/database/RepositoryBase.java
@@ -1,5 +1,6 @@
 package mineplex.core.database;
 
+import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -46,7 +47,7 @@ public abstract class RepositoryBase implements Listener
 			public void run()
 			{
 				initialize();
-				update();				
+				update();
 			}
 		});
 		
@@ -69,7 +70,7 @@ public abstract class RepositoryBase implements Listener
 	{
 		return DSL.using(DBPool.ACCOUNT, SQLDialect.MYSQL);
 	}
-		
+
 	/**
 	 * Requirements: {@link Connection}s must be closed after usage so they may be returned to the pool!
 	 * @see Connection#close()
@@ -88,7 +89,7 @@ public abstract class RepositoryBase implements Listener
 			return null;
 		}
 	}
-	
+
 	/**
 	 * Execute a query against the repository.
 	 * @param query - the concatenated query to execute in string form.
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
index d2ed8e55b..4b39e5a77 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
@@ -607,6 +607,22 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
 				{
 					entry.getKey().setEntity(entity);
 
+					boolean cancel = entry.getValue().length == 0;
+
+					for (Player player : entry.getValue())
+					{
+						if (player == owner)
+						{
+							cancel = true;
+							break;
+						}
+					}
+
+					if (cancel)
+					{
+						packetInfo.setCancelled(true);
+					}
+
 					disguise(entry.getKey(), false, entry.getValue());
 				}
 			}
@@ -864,8 +880,6 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
 	@EventHandler
 	public void PlayerQuit(PlayerQuitEvent event)
 	{
-		undisguise(event.getPlayer());
-
 		for (DisguiseBase disguise : _disguisePlayerMap.keySet())
 		{
 			_disguisePlayerMap.get(disguise).remove(event.getPlayer());
@@ -875,6 +889,8 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
 		{
 			_lastRabbitHop.get(disguise).remove(event.getPlayer().getEntityId());
 		}
+		
+		undisguise(event.getPlayer());
 	}
 
 	private void prepareChunk(Location loc)
@@ -1046,8 +1062,12 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
 
 		_movePacketMap.remove(entity.getEntityId());
 		_moveTempMap.remove(entity.getEntityId());
-		_blockedNames.remove(((Player) entity).getName());
-
+		
+		if (entity instanceof Player)
+		{
+			_blockedNames.remove(((Player) entity).getName()); 
+		}
+		
 		refreshTrackers(entity, players.toArray(new Player[0]));
 
 		if (_bedPackets && disguise instanceof DisguisePlayer && ((DisguisePlayer) disguise).getSleepingDirection() != null)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseCaveSpider.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseCaveSpider.java
new file mode 100644
index 000000000..abda09d1c
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseCaveSpider.java
@@ -0,0 +1,37 @@
+package mineplex.core.disguise.disguises;
+
+import org.bukkit.entity.EntityType;
+
+public class DisguiseCaveSpider extends DisguiseMonster
+{
+
+	public DisguiseCaveSpider(org.bukkit.entity.Entity entity)
+	{
+		super(EntityType.CAVE_SPIDER, entity);
+
+		DataWatcher.a(16, new Byte((byte) 0));
+	}
+
+	public boolean bT()
+	{
+		return (DataWatcher.getByte(16) & 0x01) != 0;
+	}
+
+	public void a(boolean flag)
+	{
+		byte b0 = DataWatcher.getByte(16);
+
+		if (flag)
+			b0 = (byte) (b0 | 0x1);
+		else
+			b0 = (byte) (b0 & 0xFFFFFFFE);
+
+		DataWatcher.watch(16, Byte.valueOf(b0));
+	}
+
+	protected String getHurtSound()
+	{
+		return "mob.spider.say";
+	}
+
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseGuardian.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseGuardian.java
new file mode 100644
index 000000000..bd2ced0fd
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseGuardian.java
@@ -0,0 +1,38 @@
+package mineplex.core.disguise.disguises;
+
+import org.bukkit.entity.*;
+
+public class DisguiseGuardian extends DisguiseCreature
+{
+	public DisguiseGuardian(org.bukkit.entity.Entity entity)
+	{
+		super(EntityType.GUARDIAN, entity);
+		DataWatcher.a(16, 0);
+		DataWatcher.a(17, 0);
+	}
+
+	public void setTarget(int target)
+	{
+		DataWatcher.watch(17, target);
+	}
+
+	public void setElder(boolean elder)
+	{
+		DataWatcher.watch(16, Integer.valueOf(DataWatcher.getInt(16) | 4));
+	}
+
+	public boolean isElder()
+	{
+		return (this.DataWatcher.getInt(16) & 4) != 0;
+	}
+
+	protected String getHurtSound()
+	{
+		if (isElder())
+		{
+			return "mob.guardian.elder.hit";
+		}
+
+		return "mob.guardian.hit";
+	}
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
index acffc12b4..54209e7db 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
@@ -44,6 +44,7 @@ public class DonationManager extends MiniDbClientPlugin<Donor>
 	@Override
 	public void addCommands()
 	{
+		// TODO: Re-add commands? Where are command implementations, seen as missing at the moment.
 		addCommand(new GemCommand(this));
 		addCommand(new CoinCommand(this));
 		addCommand(new GoldCommand(this));
@@ -62,7 +63,7 @@ public class DonationManager extends MiniDbClientPlugin<Donor>
 		//_repository.updateGemsAndCoins(uuid, Get(token.Name).GetGems(), Get(token.Name).getCoins());
 	}
 	
-	public void PurchaseUnknownSalesPackage(final Callback<TransactionResponse> callback, final String name, final int accountId, final String packageName, final boolean coinPurchase, final int cost, boolean oneTimePurchase) 
+	public void PurchaseUnknownSalesPackage(final Callback<TransactionResponse> callback, final String name, final int accountId, final String packageName, final CurrencyType currencyType, final int cost, boolean oneTimePurchase)
 	{
 		final Donor donor = Bukkit.getPlayerExact(name) != null ? Get(name) : null;
 		
@@ -86,14 +87,14 @@ public class DonationManager extends MiniDbClientPlugin<Donor>
 					if (donor != null)
 					{
 						donor.AddUnknownSalesPackagesOwned(packageName);
-						donor.DeductCost(cost, coinPurchase ? CurrencyType.Coins : CurrencyType.Gems);
+						donor.DeductCost(cost, currencyType);
 					}
 				}
 				
 				if (callback != null)
 					callback.run(response);
 			}
-		}, name, accountId, packageName, coinPurchase, cost);
+		}, name, accountId, packageName, currencyType, cost);
 	}
 	
 	public void PurchaseKnownSalesPackage(final Callback<TransactionResponse> callback, final String name, final UUID uuid, final int cost, final int salesPackageId) 
@@ -295,12 +296,17 @@ public class DonationManager extends MiniDbClientPlugin<Donor>
 		_coinQueue.clear();
 	}
 	
-	public void RewardGold(Callback<Boolean> callback, String caller, String name, int accountId, int amount)
+	public void rewardGold(Callback<Boolean> callback, String caller, Player player, int amount)
 	{
-		RewardGold(callback, caller, name, accountId, amount, true);
+		rewardGold(callback, caller, player.getName(), ClientManager.Get(player).getAccountId(), amount);
+	}
+	
+	public void rewardGold(Callback<Boolean> callback, String caller, String name, int accountId, int amount)
+	{
+		rewardGold(callback, caller, name, accountId, amount, true);
 	}
 
-	public void RewardGold(final Callback<Boolean> callback, final String caller, final String name, final int accountId, final int amount, final boolean updateTotal)
+	public void rewardGold(final Callback<Boolean> callback, final String caller, final String name, final int accountId, final int amount, final boolean updateTotal)
 	{
 		_repository.rewardGold(new Callback<Boolean>()
 		{
@@ -324,7 +330,7 @@ public class DonationManager extends MiniDbClientPlugin<Donor>
 				}
 				
 				if (callback != null)
-					callback.run(true);
+					callback.run(success);
 			}
 		}, caller, name, accountId, amount);
 	}
@@ -349,37 +355,55 @@ public class DonationManager extends MiniDbClientPlugin<Donor>
 	}
 	
 	@EventHandler
-	public void UpdateGoldQueue(UpdateEvent event)
+	public void updateGoldQueue(UpdateEvent event)
 	{
 		if (event.getType() != UpdateType.SLOWER)
 			return;
 		
 		for (Player player : _goldQueue.keySet())
 		{
-			String caller = null;
-			int total = 0;
-			
-			for (String curCaller : _goldQueue.get(player).keySet())
-			{
-				caller = curCaller;
-				total += _goldQueue.get(player).get(curCaller);
-			}
-			
-			if (caller == null)
-				continue;
-
-			//Actually Add Gold
-			RewardGold(null, caller, player.getName(), ClientManager.Get(player).getAccountId(), total, false);
-			
-			System.out.println("Queue Added [" + player + "] with Gold [" + total + "] for [" + caller + "]");
-			
-			//Clean
-			_goldQueue.get(player).clear();
+			updateGoldQueue(null, player);
 		}
 		
 		//Clean
 		_goldQueue.clear();
 	}
+	
+	public void updateGoldQueue(final Callback<Boolean> callback, final Player player)
+	{
+		String tempCaller = null;
+		int tempTotal = 0;
+		
+		for (String curCaller : _goldQueue.get(player).keySet())
+		{
+			tempCaller = curCaller;
+			tempTotal += _goldQueue.get(player).get(curCaller);
+		}
+		
+		final String caller = tempCaller;
+		final int total = tempTotal;
+		
+		if (caller == null)
+			return;
+
+		if (player.isOnline() && player.isValid())
+			rewardGold(callback, caller, player.getName(), ClientManager.Get(player).getAccountId(), total, false);
+		else
+		{
+			Bukkit.getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
+			{
+				public void run()
+				{
+					rewardGold(callback, caller, player.getName(), PlayerCache.getInstance().getPlayer(player.getUniqueId()).getAccountId(), total, false);
+				}
+			});
+		}
+		
+		System.out.println("Queue Added [" + player + "] with Gold [" + total + "] for [" + caller + "]");
+		
+		//Clean
+		_goldQueue.get(player).clear();
+	}
 
 	public void applyKits(String playerName)
 	{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/Donor.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/Donor.java
index e984d3432..7145b3dab 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/donation/Donor.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/Donor.java
@@ -77,6 +77,10 @@ public class Donor
 				_coins -= cost;
 				_update = true;
 				break;
+			case Gold:
+				_gold -= cost;
+				_update = true;
+				break;
 			default:
 				break;
     	}
@@ -90,6 +94,8 @@ public class Donor
 				return _gems;
 			case Coins:
 				return _coins;
+			case Gold:
+				return _gold;
 			case Tokens:
 				return 0;
 			default:
@@ -145,7 +151,8 @@ public class Donor
 	
 	public void addGold(int amount)
 	{
-		_gold += amount;
+		_gold = Math.max(0, _gold + amount);
+		
 	}
 
 	public List<CoinTransactionToken> getCoinTransactions()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/command/GoldCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/command/GoldCommand.java
index 36095de1b..953b2c840 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/donation/command/GoldCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/command/GoldCommand.java
@@ -73,7 +73,7 @@ public class GoldCommand extends CommandBase<DonationManager>
 
 	private void rewardGold(final Player caller, final Player target, final String targetName, final int accountId, final int gold)
 	{
-		Plugin.RewardGold(new Callback<Boolean>()
+		Plugin.rewardGold(new Callback<Boolean>()
 		{
 			public void run(Boolean completed)
 			{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java
index 43d5b23b4..910f03c63 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java
@@ -1,11 +1,15 @@
 package mineplex.core.donation.repository;
 
+import java.sql.CallableStatement;
+import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Types;
 
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import mineplex.core.common.CurrencyType;
 import mineplex.core.common.util.Callback;
 import mineplex.core.database.DBPool;
 import mineplex.core.database.DatabaseRunnable;
@@ -69,12 +73,12 @@ public class DonationRepository extends RepositoryBase
 		}), "Error purchasing known sales package in DonationRepository : ");
 	}
 	
-	public void PurchaseUnknownSalesPackage(final Callback<TransactionResponse> callback, final String name, final int accountId, final String packageName, final boolean coinPurchase, final int cost) 
+	public void PurchaseUnknownSalesPackage(final Callback<TransactionResponse> callback, final String name, final int accountId, final String packageName, final CurrencyType currencyType, final int cost)
 	{
 		final UnknownPurchaseToken token = new UnknownPurchaseToken();
 		token.AccountName = name;
 		token.SalesPackageName = packageName;
-		token.CoinPurchase = coinPurchase;
+		token.CoinPurchase = currencyType == CurrencyType.Coins;
 		token.Cost = cost;
 		token.Premium = false;
 
@@ -84,11 +88,15 @@ public class DonationRepository extends RepositoryBase
 			{
 				if (response == TransactionResponse.Success)
 				{
-					if (coinPurchase)
+					if (currencyType == CurrencyType.Coins)
 					{
 						executeUpdate(UPDATE_ACCOUNT_COINS, new ColumnInt("coins", -cost), new ColumnInt("id", accountId));
 						//executeUpdate(INSERT_COIN_TRANSACTION, new ColumnInt("id", accountId), new ColumnVarChar("reason", 100, "Purchased " + packageName), new ColumnInt("coins", -cost));
 					}
+					else if (currencyType == CurrencyType.Gold)
+					{
+						executeUpdate(UPDATE_ACCOUNT_GOLD, new ColumnInt("gold", -cost), new ColumnInt("id", accountId));
+					}
 				}
 				
 				Bukkit.getServer().getScheduler().runTask(Plugin, new Runnable()
@@ -185,16 +193,12 @@ public class DonationRepository extends RepositoryBase
 		{
 			public void run()
 			{
-				if (executeUpdate(UPDATE_ACCOUNT_GOLD, new ColumnInt("gold", gold), new ColumnInt("id", accountId)) < 1)
-				{
-					callback.run(false);
-				}
-				else
-					callback.run(true);
+				boolean success = executeUpdate(UPDATE_ACCOUNT_GOLD, new ColumnInt("gold", gold), new ColumnInt("id", accountId)) > 0;
+				callback.run(success);
 			}
 		}), "Error updating player gold amount in DonationRepository : ");
 	}
-
+ 
 	@Override
 	protected void initialize()
 	{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java b/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java
index b53fccd66..ab9c70d52 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java
@@ -29,6 +29,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.entity.ItemSpawnEvent;
@@ -134,7 +135,7 @@ public class Explosion extends MiniPlugin
 			else
 			{
 				int heightDiff = cur.getLocation().getBlockY() - event.getEntity().getLocation().getBlockY();
-				_blockRestore.Add(cur, 0, (byte)0, (long) (20000 + (heightDiff*3000) + Math.random()*2900));
+				_blockRestore.add(cur, 0, (byte) 0, (long) (20000 + (heightDiff * 3000) + Math.random() * 2900));
 			}
 
 		}
@@ -175,6 +176,7 @@ public class Explosion extends MiniPlugin
 						if (Math.random() > Math.min(0.975, chance))
 						{
 							FallingBlock fall = cur.getWorld().spawnFallingBlock(cur.getLocation().add(0.5, 0.5, 0.5), blocks.get(cur).getKey(), blocks.get(cur).getValue());
+							fall.setDropItem(false);
 
 							Vector vec =  UtilAlg.getTrajectory(fEnt, fall);
 							if (vec.getY() < 0)			vec.setY(vec.getY() * -1);
@@ -207,6 +209,13 @@ public class Explosion extends MiniPlugin
 		}, 1);	
 	}
 
+	@EventHandler
+	public void ExplosionChangeBlock(EntityChangeBlockEvent event)
+	{
+		if (_explosionBlocks.contains(event.getEntity()))
+			event.setCancelled(true);
+	}
+
 	@EventHandler
 	public void ExplosionBlockUpdate(UpdateEvent event)
 	{
@@ -239,7 +248,7 @@ public class Explosion extends MiniPlugin
 				{
 					if (_temporaryDebris)
 					{
-						_blockRestore.Add(block, cur.getBlockId(), cur.getBlockData(), 10000);
+						_blockRestore.add(block, cur.getBlockId(), cur.getBlockData(), 10000);
 					}
 					else
 					{
@@ -256,14 +265,6 @@ public class Explosion extends MiniPlugin
 		}
 	}
 
-	@EventHandler
-	public void ExplosionItemSpawn(ItemSpawnEvent event)
-	{
-		for (FallingBlock block : _explosionBlocks)
-			if (UtilMath.offset(event.getEntity().getLocation(), block.getLocation()) < 1)
-				event.setCancelled(true);			
-	}
-
 	@EventHandler(priority = EventPriority.LOW)
 	public void ExplosionBlocks(EntityExplodeEvent event)
 	{
@@ -347,6 +348,7 @@ public class Explosion extends MiniPlugin
 					if (Math.random() > Math.min(0.98, chance))
 					{
 						FallingBlock fall = cur.getWorld().spawnFallingBlock(cur.getLocation().add(0.5, 0.5, 0.5), blocks.get(cur).getKey(), blocks.get(cur).getValue());
+						fall.setDropItem(false);
 
 						Vector vec =  UtilAlg.getTrajectory(fLoc, fall.getLocation());
 						if (vec.getY() < 0)			vec.setY(vec.getY() * -1);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
index 7494e9fa6..bb17d1e2f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
@@ -14,6 +14,7 @@ import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.disguise.DisguiseManager;
 import mineplex.core.donation.DonationManager;
+import mineplex.core.gadget.event.GadgetActivateEvent;
 import mineplex.core.gadget.event.GadgetCollideEntityEvent;
 import mineplex.core.gadget.gadgets.ItemBatGun;
 import mineplex.core.gadget.gadgets.ItemCoinBomb;
@@ -63,6 +64,7 @@ import mineplex.core.gadget.types.OutfitGadget.ArmorSlot;
 import mineplex.core.gadget.types.ParticleGadget;
 import mineplex.core.inventory.InventoryManager;
 import mineplex.core.mount.MountManager;
+import mineplex.core.mount.event.MountActivateEvent;
 import mineplex.core.pet.PetManager;
 import mineplex.core.preferences.PreferencesManager;
 import mineplex.core.projectile.ProjectileManager;
@@ -91,6 +93,7 @@ public class GadgetManager extends MiniPlugin
 	private BlockRestore _blockRestore;
 	private ProjectileManager _projectileManager;
 	private AchievementManager _achievementManager;
+	private MountManager _mountManager;
 
 	private NautHashMap<GadgetType, List<Gadget>> _gadgets;
 
@@ -99,6 +102,7 @@ public class GadgetManager extends MiniPlugin
 	
 	private boolean _hideParticles = false;
 	private int _activeItemSlot = 3;
+	private boolean _gadgetsEnabled = true;
 
 	public GadgetManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager,
 			MountManager mountManager, PetManager petManager, PreferencesManager preferencesManager,
@@ -115,6 +119,7 @@ public class GadgetManager extends MiniPlugin
 		_blockRestore = blockRestore;
 		_projectileManager = projectileManager;
 		_achievementManager = achievementManager;
+		_mountManager = mountManager;
 		
 		CreateGadgets();
 	}
@@ -491,6 +496,40 @@ public class GadgetManager extends MiniPlugin
 		
 		return true;
 	}
+
+	public boolean isGadgetEnabled()
+	{
+		return _gadgetsEnabled;
+	}
+
+	public void toggleGadgetEnabled()
+	{
+		setGadgetEnabled(!_gadgetsEnabled);
+	}
+
+	public void setGadgetEnabled(boolean enabled)
+	{
+		if (_gadgetsEnabled != enabled)
+		{
+			_gadgetsEnabled = enabled;
+			DisableAll();
+			_mountManager.DisableAll();
+		}
+	}
+
+	@EventHandler
+	public void GadgetActivate(GadgetActivateEvent event)
+	{
+		if (!_gadgetsEnabled)
+			event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void MountActivate(MountActivateEvent event)
+	{
+		if (!_gadgetsEnabled)
+			event.setCancelled(true);
+	}
 	
 	@EventHandler
 	public void chissMeow(PlayerToggleSneakEvent event)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemFirework.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemFirework.java
index 80a89bb76..114fbeeff 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemFirework.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemFirework.java
@@ -30,7 +30,7 @@ public class ItemFirework extends ItemGadget
 				}, 
 				-1,  
 				Material.FIREWORK, (byte)0, 
-				250, new Ammo("Fireworks", "50 Fireworks", Material.FIREWORK, (byte)0, new String[] { C.cWhite + "50 Fireworks for you to launch!" }, 500, 50));
+				500, new Ammo("Fireworks", "50 Fireworks", Material.FIREWORK, (byte)0, new String[] { C.cWhite + "50 Fireworks for you to launch!" }, 500, 50));
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java
index ea3a786ba..0692aa661 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java
@@ -140,7 +140,7 @@ public class ItemMelonLauncher extends ItemGadget implements IThrown
 		{
 			Item melon = melonIterator.next();
 
-			if (melon.isDead() || !melon.isValid() || melon.getTicksLived() > 400)
+			if (melon.isDead() || !melon.isValid() || melon.getTicksLived() > 100)
 			{
 				melonIterator.remove();
 				melon.remove();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintbrush.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintbrush.java
index 28700ac7f..ba0fd0d76 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintbrush.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintbrush.java
@@ -164,7 +164,7 @@ public class ItemPaintbrush extends ItemGadget
 				continue;
 
 			//Color
-			Manager.getBlockRestore().Add(block, 35, _brushColor.get(player.getName()), 30000);
+			Manager.getBlockRestore().add(block, 35, _brushColor.get(player.getName()), 30000);
 						
 			//Join Dots
 			if (_brushPrevious.containsKey(player.getName()))
@@ -178,7 +178,7 @@ public class ItemPaintbrush extends ItemGadget
 					if (fixBlock.getType() != Material.WOOL)
 						continue;
 			
-					Manager.getBlockRestore().Add(fixBlock, 35, _brushColor.get(player.getName()), 30000);
+					Manager.getBlockRestore().add(fixBlock, 35, _brushColor.get(player.getName()), 30000);
 				}
 			}
 			
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemTNT.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemTNT.java
index 91ac32a93..0bf3531b7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemTNT.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemTNT.java
@@ -61,7 +61,7 @@ public class ItemTNT extends ItemGadget
 		if (!_tnt.remove(event.getEntity()))
 			return;
 		
-		HashMap<Player, Double> players = UtilPlayer.getInRadius(event.getLocation(), 10);
+		HashMap<Player, Double> players = UtilPlayer.getInRadius(event.getLocation(), 8);
 		for (Player player : players.keySet())
 		{
 			if (Manager.collideEvent(this, player))
@@ -70,7 +70,7 @@ public class ItemTNT extends ItemGadget
 			double mult = players.get(player);
 					
 			//Knockback
-			UtilAction.velocity(player, UtilAlg.getTrajectory(event.getLocation(), player.getLocation()), 3 * mult, false, 0, 0.5 + 2 * mult, 10, true);
+			UtilAction.velocity(player, UtilAlg.getTrajectory(event.getLocation(), player.getLocation()), 1 * mult, false, 0, 0.5 + 0.5 * mult, 10, true);
 		}
 
 		// Simulating explosion to prevent water from being evaporated.
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphBat.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphBat.java
index 3b0bfe79d..22cf5855e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphBat.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphBat.java
@@ -85,7 +85,7 @@ public class MorphBat extends MorphGadget implements IThrown
 		if (!UtilEvent.isAction(event, ActionType.L))
 			return;
 
-		if (!Recharge.Instance.use(player, GetName(), 100, false, false))
+		if (!Recharge.Instance.use(player, GetName(), 100, false, false, "Cosmetics"))
 			return;
 
 		//Effect
@@ -106,7 +106,7 @@ public class MorphBat extends MorphGadget implements IThrown
 		if (!IsActive(player))
 			return;
 
-		if (!Recharge.Instance.use(player, "Poop", 4000, true, false))
+		if (!Recharge.Instance.use(player, "Poop", 4000, true, false, "Cosmetics"))
 			return;
 
 		//Action
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphChicken.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphChicken.java
index 2ebb73f20..6e3be5fce 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphChicken.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphChicken.java
@@ -76,7 +76,7 @@ public class MorphChicken extends MorphGadget
 		if (!UtilEvent.isAction(event, ActionType.L))
 			return;
 		
-		if (!Recharge.Instance.use(player, GetName(), 100, false, false))
+		if (!Recharge.Instance.use(player, GetName(), 100, false, false, "Cosmetics"))
 			return;
 		
 		Vector offset = player.getLocation().getDirection();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCow.java
index 07d1ae671..96dcda738 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCow.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCow.java
@@ -57,7 +57,7 @@ public class MorphCow extends MorphGadget
 		if (!UtilEvent.isAction(event, ActionType.L))
 			return;
 		
-		if (!Recharge.Instance.use(player, GetName(), 2500, false, false))
+		if (!Recharge.Instance.use(player, GetName(), 2500, false, false, "Cosmetics"))
 			return;
 		
 		player.getWorld().playSound(player.getLocation(), Sound.COW_IDLE, 1f, 1f);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCreeper.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCreeper.java
index 5cbc89f29..8c9419476 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCreeper.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCreeper.java
@@ -119,7 +119,7 @@ public class MorphCreeper extends MorphGadget
 						double mult = players.get(other);
 
 						//Knockback
-						UtilAction.velocity(other, UtilAlg.getTrajectory(player.getLocation(), other.getLocation()), 1 + 1.5 * mult, false, 0, 0.5 + 1 * mult, 3, true);
+						UtilAction.velocity(other, UtilAlg.getTrajectory(player.getLocation(), other.getLocation()), 1 + 1 * mult, false, 0, 0.6 + 0.6 * mult, 3, true);
 					}
 				}
 			}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphEnderman.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphEnderman.java
index d336a2dbb..72c6518d6 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphEnderman.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphEnderman.java
@@ -78,7 +78,7 @@ public class MorphEnderman extends MorphGadget
 		player.setAllowFlight(false);
 
 		//Set Recharge
-		Recharge.Instance.use(player, GetName(), 2000, false, false);
+		Recharge.Instance.use(player, GetName(), 2000, false, false, "Cosmetics");
 
 		//Smoke Trail
 		Block lastSmoke = player.getLocation().getBlock();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPig.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPig.java
index 44662f5a1..d42b43023 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPig.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPig.java
@@ -73,7 +73,7 @@ public class MorphPig extends MorphGadget
 		if (!UtilEvent.isAction(event, ActionType.L))
 			return;
 		
-		if (!Recharge.Instance.use(player, GetName(), 400, false, false))
+		if (!Recharge.Instance.use(player, GetName(), 400, false, false, "Cosmetics"))
 			return;
 		
 		player.getWorld().playSound(player.getLocation(), Sound.PIG_IDLE, 1f, (float)(0.75 + Math.random() * 0.5));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphSlime.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphSlime.java
index 12f9a3eca..4737cf7ad 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphSlime.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphSlime.java
@@ -83,7 +83,7 @@ public class MorphSlime extends MorphGadget
 		if (!UtilEnt.isGrounded(player))
 			return;
 		
-		if (!Recharge.Instance.use(player, GetName(), 1000, false, false))
+		if (!Recharge.Instance.use(player, GetName(), 1000, false, false, "Cosmetics"))
 			return;
 		
 		player.getWorld().playSound(player.getLocation(), Sound.SLIME_ATTACK, 1f, 1f);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphTitan.java
index 26d1bd925..ed61f6511 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphTitan.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphTitan.java
@@ -1,35 +1,242 @@
 package mineplex.core.gadget.gadgets;
 
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Zombie;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.MapUtil;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilEvent.ActionType;
+import mineplex.core.disguise.disguises.DisguiseBase;
+import mineplex.core.disguise.disguises.DisguiseGuardian;
 import mineplex.core.gadget.GadgetManager;
 import mineplex.core.gadget.types.MorphGadget;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.recharge.RechargedEvent;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
 
 public class MorphTitan extends MorphGadget
 {
+	private HashMap<Player, ArmorStand> _targets = new HashMap<Player, ArmorStand>();
+
 	public MorphTitan(GadgetManager manager)
 	{
-		super(manager, "Titanic Morph", new String[] 
+		super(manager, "Elder Guardian Morph", new String[] 
 				{
-				C.cWhite + "Coming Soon...",
+				C.cWhite + "From the depths of the sea, the",
+				C.cWhite + "Elder Guardian posseses powers",
+				C.cWhite + "more amazing than any seen before!",
 				" ",
 				C.cRed + "Unlocked with Titan Rank",
 				},
 				-1,
-				Material.INK_SACK, (byte)8);
+				Material.PRISMARINE_SHARD, (byte)0);
 	}
 
 	@Override
 	public void EnableCustom(Player player) 
 	{
-		
+		this.ApplyArmor(player);
+
+		DisguiseGuardian disguise = new DisguiseGuardian(player);
+		disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
+		disguise.setCustomNameVisible(true);
+		disguise.setElder(true);
+		Manager.getDisguiseManager().disguise(disguise);
 	}
 
 	@Override
 	public void DisableCustom(Player player) 
 	{
-		
+		this.RemoveArmor(player);
+		Manager.getDisguiseManager().undisguise(player);
+
+		player.setAllowFlight(false);
+		player.setFlying(false);
+
+		Entity ent = _targets.remove(player);
+		if (ent != null)
+			ent.remove();
+	}
+
+	@EventHandler
+	public void lazer(PlayerInteractEvent event)
+	{
+		Player player = event.getPlayer();
+
+		if (!IsActive(player))
+			return;
+
+		if (!UtilEvent.isAction(event, ActionType.L))
+			return;
+
+		if (!Recharge.Instance.use(player, "Guardians Laser", 6000, true, false, "Cosmetics"))
+			return;
+
+		DisguiseBase base = Manager.getDisguiseManager().getDisguise(player);
+		if (base == null || !(base instanceof DisguiseGuardian))
+			return;
+
+		DisguiseGuardian disguise = (DisguiseGuardian)base;
+
+		HashSet<Material> ignore = new HashSet<Material>();
+		ignore.add(Material.AIR);
+
+		Location loc = player.getTargetBlock(ignore, 64).getLocation().add(0.5, 0.5, 0.5);
+
+		ArmorStand stand = loc.getWorld().spawn(loc, ArmorStand.class);
+
+		stand.setVisible(false);
+		stand.setGhost(true);
+		stand.setGravity(false);
+
+		_targets.put(player, stand);
+
+		disguise.setTarget(stand.getEntityId());
+
+		Manager.getDisguiseManager().updateDisguise(disguise);
+
+		//Fake Head
+		UtilEnt.setFakeHead(player, true);
+		Recharge.Instance.useForce(player, GetName() + " FakeHead", 2000);
+	}
+
+	@EventHandler
+	public void lazerEnd(RechargedEvent event)
+	{
+		if (event.GetAbility().equals(GetName() + " FakeHead"))
+		{
+			UtilEnt.setFakeHead(event.GetPlayer(), false);
+
+			//Explode
+			ArmorStand stand = _targets.remove(event.GetPlayer());
+			if (stand != null)
+			{
+				UtilParticle.PlayParticle(ParticleType.HUGE_EXPLOSION, stand.getLocation(), 3f, 3f, 3f, 0, 32, ViewDist.MAX, UtilServer.getPlayers());
+
+				HashMap<Player, Double> players = UtilPlayer.getInRadius(stand.getLocation(), 12d);
+				for (Player ent : players.keySet())
+				{
+					if (ent instanceof Player)
+						if (Manager.collideEvent(this, (Player)ent))
+							continue;
+
+					double mult = players.get(ent);
+
+					//Knockback
+					UtilAction.velocity(ent, UtilAlg.getTrajectory(stand.getLocation(), ent.getLocation()), 2 * mult, false, 0, 1 + 1 * mult, 10, true);
+				}
+
+				//Sound				
+				stand.getWorld().playSound(stand.getLocation(), Sound.ZOMBIE_REMEDY, 6f, 0.75f);
+
+				stand.remove();
+			}
+
+			//Disguise
+			DisguiseBase base = Manager.getDisguiseManager().getDisguise(event.GetPlayer());
+			if (base == null || !(base instanceof DisguiseGuardian))
+				return;
+
+			DisguiseGuardian disguise = (DisguiseGuardian)base;
+			disguise.setTarget(0);
+
+			Manager.getDisguiseManager().updateDisguise(disguise);	
+		}	
+	}
+
+	@EventHandler
+	public void selfParticles(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		for (Player player : _targets.keySet())
+		{
+			Vector dir = UtilAlg.getTrajectory( player.getLocation().add(0, 1.5, 0), _targets.get(player).getLocation());
+			dir.multiply(8);
+
+			UtilParticle.PlayParticle(ParticleType.MAGIC_CRIT, 
+					player.getLocation().add(0, 1.5, 0), 
+					(float)dir.getX(), 
+					(float)dir.getY(), 
+					(float)dir.getZ(), 
+					1, 0, ViewDist.LONG, UtilServer.getPlayers());
+
+			player.playSound(player.getLocation(), Sound.FIREWORK_TWINKLE2, 2f, 2f);
+		}
+	}
+
+	@EventHandler
+	public void flight(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		for (Player player : GetActive())
+		{
+			if (UtilPlayer.isSpectator(player))
+				continue;
+
+			player.setAllowFlight(true);
+			player.setFlying(true);
+
+			if (UtilEnt.isGrounded(player))
+				UtilAction.velocity(player, new Vector(0,1,0));
+		}
+	}
+
+	@EventHandler
+	public void titanOwner(PlayerJoinEvent event)
+	{
+		if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN))
+		{
+			Manager.getDonationManager().Get(event.getPlayer().getName()).AddUnknownSalesPackagesOwned(GetName());
+		}	
+	}
+
+	@EventHandler
+	public void clean(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SLOW)
+			return;
+
+		Iterator<Player> playerIter = _targets.keySet().iterator();
+
+		while (playerIter.hasNext())
+		{
+			Player player = playerIter.next();
+
+			if (!player.isOnline())
+			{
+				Entity ent = _targets.get(player);
+				ent.remove();
+				playerIter.remove();
+			}
+		}
 	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphVillager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphVillager.java
index e0a864177..985247b53 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphVillager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphVillager.java
@@ -87,7 +87,7 @@ public class MorphVillager extends MorphGadget implements IThrown
 			return;
 		}
 		
-		if (!Recharge.Instance.use(player, GetName(), 800, false, false))
+		if (!Recharge.Instance.use(player, GetName(), 800, false, false, "Cosmetics"))
 			return;
 		
 		player.getWorld().playSound(player.getLocation(), Sound.VILLAGER_IDLE, 1f, 1f);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphWither.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphWither.java
index 602868005..506ffc717 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphWither.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphWither.java
@@ -96,7 +96,7 @@ public class MorphWither extends MorphGadget
 		if (!UtilEvent.isAction(event, ActionType.L))
 			return;
 		
-		if (!Recharge.Instance.use(player, GetName(), 1600, false, false))
+		if (!Recharge.Instance.use(player, GetName(), 2500, false, false, "Cosmetics"))
 			return;
 		
 		Vector offset = player.getLocation().getDirection();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
index 22732373a..b6f57d15b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
@@ -94,7 +94,7 @@ public class ParticleBlizzard extends ParticleGadget
 		if (!event.getPlayer().isFlying())
 			if (IsActive(event.getPlayer()))
 				UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, event.getPlayer().getLocation(), 0f, 0f, 0f, 0.6f, 100,
-						ViewDist.NORMAL, UtilServer.getPlayers());
+						ViewDist.LONGER, UtilServer.getPlayers());
 	} 
 	
 	@EventHandler
@@ -122,7 +122,7 @@ public class ParticleBlizzard extends ParticleGadget
 			return;
 		
 		UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, event.getEntity().getLocation(), 0f, 0f, 0f, 0.4f, 12,
-				ViewDist.NORMAL, UtilServer.getPlayers());
+				ViewDist.LONGER, UtilServer.getPlayers());
 	}
 	
 	@EventHandler
@@ -142,7 +142,7 @@ public class ParticleBlizzard extends ParticleGadget
 			else
 			{
 				UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, arrow.getLocation(), 0f, 0f, 0f, 0f, 1,
-						ViewDist.NORMAL, UtilServer.getPlayers());
+						ViewDist.LONGER, UtilServer.getPlayers());
 			}
 		}
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleLegend.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleLegend.java
index 981e9cf53..76e4d277f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleLegend.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleLegend.java
@@ -26,7 +26,7 @@ public class ParticleLegend extends ParticleGadget
 				" ",
 				C.cGreen + "Unlocked with Legend Rank",
 				},
-				-2,
+				-3,
 				Material.ENDER_PORTAL_FRAME, (byte)0);
 	}
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleTitan.java
index e9f3c8022..9ed2bbb06 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleTitan.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleTitan.java
@@ -1,22 +1,202 @@
 package mineplex.core.gadget.gadgets;
 
-import org.bukkit.Material;
+import java.util.HashSet;
+import java.util.Iterator;
 
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.ProjectileHitEvent;
+import org.bukkit.event.entity.ProjectileLaunchEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerToggleFlightEvent;
+import org.bukkit.util.Vector;
+
+import mineplex.core.blood.BloodEvent;
+import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
-import mineplex.core.gadget.types.ParticleGadget;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.core.gadget.GadgetManager;
+import mineplex.core.gadget.types.ParticleGadget;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
 
 public class ParticleTitan extends ParticleGadget
 {
+	private HashSet<Arrow> _arrows = new HashSet<Arrow>();
+	
+	private int _tick;
+	
 	public ParticleTitan(GadgetManager manager)
 	{
-		super(manager, "Titanic Particle", new String[] 
+		super(manager, "Flame of the Titans", new String[] 
 				{
-				C.cWhite + "Coming Soon...",
+				C.cWhite + "These flames are said to be the",
+				C.cWhite + "souls of a lost civilisation of",
+				C.cWhite + "Titans, forgotten by time.",
 				" ",
 				C.cRed + "Unlocked with Titan Rank",
 				},
-				-1,
-				Material.INK_SACK, (byte)8);
+				-3,
+				Material.FIREBALL, (byte)0);
+	}
+	
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+
+			return;
+		
+		_tick++;
+		_tick = _tick%620;
+		
+		for(Player player : GetActive())
+		{
+			if (!shouldDisplay(player)) 
+				continue;
+			
+			double total = 3;
+			double step = (1/total)*Math.PI*2;
+			double offset1 = (step/20)*_tick%20;
+			double offset2 = (step/31)*_tick%31;
+			
+			double r = 3;
+			boolean redstone = false;
+			
+			if(Manager.isMoving(player)) 
+				r = 0.5;
+
+			for(int i = 0; i < total; i++)
+			{
+				double rad = step*i + offset1;
+				
+				double x = Math.sin(rad);
+				double y = 0;
+				double z = Math.cos(rad);
+				
+				
+				Vector v = new Vector(x,y,z).normalize();
+				v.multiply(r);
+				Location loc = player.getLocation();
+				loc.add(0, 0.1, 0);
+				
+				loc.add(v);
+				
+				
+				if(redstone) UtilParticle.PlayParticleToAll(ParticleType.RED_DUST, loc, 1, 0, 0, 1, 0, ViewDist.NORMAL);
+				v.multiply(-1);
+				UtilParticle.PlayParticleToAll(ParticleType.FLAME, loc, v, 0.05f, 0, ViewDist.NORMAL);
+				
+				rad = -(step*i + offset2);
+				x = Math.sin(rad);
+				z = Math.cos(rad);
+				
+				v = new Vector(x,y,z).normalize();
+				v.multiply(r);
+				loc = player.getLocation();
+				loc.add(0, 0.1, 0);
+				
+				loc.add(v);
+				
+				if(redstone) UtilParticle.PlayParticleToAll(ParticleType.RED_DUST, loc, 1, 0, 0, 1, 0, ViewDist.NORMAL);
+				v.multiply(-1);
+				UtilParticle.PlayParticleToAll(ParticleType.FLAME, loc, v, 0.05f, 0, ViewDist.NORMAL);
+			}
+		}
+	}
+	
+	@EventHandler
+	public void jump(PlayerToggleFlightEvent event)
+	{
+		if (!shouldDisplay(event.getPlayer()))
+			return;
+		
+		if (!event.getPlayer().isFlying())
+			if (IsActive(event.getPlayer()))
+			{
+				UtilParticle.PlayParticle(ParticleType.LAVA, event.getPlayer().getLocation(), 0f, 0f, 0f, 0.2f, 40,
+						ViewDist.NORMAL, UtilServer.getPlayers());
+			}
+				
+	} 
+	
+	@EventHandler
+	public void arrow(ProjectileLaunchEvent event)
+	{
+		if (Manager.hideParticles())
+			return;
+		
+		if (event.getEntity() instanceof Arrow)
+		{
+			if (event.getEntity().getShooter() != null)
+			{
+				if (GetActive().contains(event.getEntity().getShooter()))
+				{
+					_arrows.add((Arrow)event.getEntity());
+				}
+			}
+		}
+	} 
+	
+	@EventHandler
+	public void arrow(ProjectileHitEvent event)
+	{
+		if (!_arrows.remove(event.getEntity()))
+			return;
+		
+		UtilParticle.PlayParticle(ParticleType.LAVA, event.getEntity().getLocation(), 0f, 0f, 0f, 0f, 24,
+				ViewDist.LONGER, UtilServer.getPlayers());
+	}
+	
+	@EventHandler
+	public void arrowClean(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+		
+		for (Iterator<Arrow> arrowIterator = _arrows.iterator(); arrowIterator.hasNext();) 
+		{
+			Arrow arrow = arrowIterator.next();
+			
+			if (arrow.isDead() || !arrow.isValid() || arrow.isOnGround())
+			{
+				arrowIterator.remove();
+			}
+			else
+			{
+				UtilParticle.PlayParticle(ParticleType.FLAME, arrow.getLocation(), 0f, 0f, 0f, 0f, 1,
+						ViewDist.LONGER, UtilServer.getPlayers());
+			}
+		}
+	}
+
+	@EventHandler
+	public void death(BloodEvent event)
+	{
+		if (event.getPlayer() == null)
+			return;
+		
+		if (!IsActive(event.getPlayer()))
+			return;
+		
+		if (!shouldDisplay(event.getPlayer()))
+			return;
+			
+		event.setItem(Material.FIREBALL, (byte)0);
+	}
+	
+	@EventHandler
+	public void legendOwner(PlayerJoinEvent event)
+	{
+		if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN))
+		{
+			Manager.getDonationManager().Get(event.getPlayer().getName()).AddUnknownSalesPackagesOwned(GetName());
+		}
 	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java
index f2d6f79af..063495f54 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java
@@ -74,6 +74,8 @@ public abstract class Gadget extends SalesPackageBase implements Listener
 			return;
 		}
 		
+		System.out.println(player.getName() + " has activated " + Name);
+		
 		EnableCustom(player);
 		Manager.setActive(player, this);
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java
index 441f04535..232abb0eb 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java
@@ -153,7 +153,7 @@ public abstract class ItemGadget extends Gadget
 		}
 		
 		//Recharge
-		if (!Recharge.Instance.use(player, GetName(), _recharge, _recharge > 1000, false))
+		if (!Recharge.Instance.use(player, GetName(), GetName(), _recharge, _recharge > 1000, true, false, true, "Cosmetics"))
 		{
 			UtilInv.Update(player);
 			return;	
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
index f7393e9ac..6c43e8729 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
@@ -1,5 +1,6 @@
 package mineplex.core.game;
 
+import org.bukkit.DyeColor;
 import org.bukkit.Material;
 
 public enum GameDisplay
@@ -7,10 +8,10 @@ public enum GameDisplay
 	//Mini
 	BaconBrawl("Bacon Brawl", Material.PORK, (byte)0, GameCategory.ARCADE, 1),
 	Barbarians("A Barbarians Life", Material.WOOD_AXE, (byte)0, GameCategory.EXTRA, 2),
+	BossBattles("Boss Battles", Material.SKULL_ITEM, (byte) 0, GameCategory.EVENT, 55),
 	Bridge("The Bridges", Material.IRON_PICKAXE, (byte)0, GameCategory.SURVIVAL, 3),
 	CastleSiege("Castle Siege", Material.DIAMOND_CHESTPLATE, (byte)0, GameCategory.CLASSICS, 4),
 	ChampionsDominate("Champions Domination", "Champions", Material.BEACON, (byte)0, GameCategory.CHAMPIONS, 6),
-	//ChampionsMOBA(ChampionsMOBA.class, "Champions MOBA", "Champions", Material.SKULL_ITEM, (byte)0, GameCategory.CHAMPIONS, 7),
 	ChampionsTDM("Champions TDM", "Champions", Material.GOLD_SWORD, (byte)0, GameCategory.CHAMPIONS, 5),
 	Christmas("Christmas Chaos", Material.SNOW_BALL, (byte)0, GameCategory.CLASSICS, 8),
 	DeathTag("Death Tag", Material.SKULL_ITEM, (byte)0, GameCategory.ARCADE, 9),
@@ -18,11 +19,10 @@ public enum GameDisplay
 	DragonEscapeTeams("Dragon Escape Teams", Material.DRAGON_EGG, (byte)0, GameCategory.TEAM_VARIANT, 11),
 	DragonRiders("Dragon Riders", Material.DRAGON_EGG, (byte)0, GameCategory.ARCADE, 12),
 	Dragons("Dragons", Material.ENDER_STONE, (byte)0, GameCategory.ARCADE, 13),
-	DragonsTeams("Dragons Teams", Material.ENDER_STONE, (byte)0, GameCategory.TEAM_VARIANT, 14),
+	DragonsTeams("Dragons Teams", Material.DRAGON_EGG, (byte)0, GameCategory.TEAM_VARIANT, 14),
 	Draw("Draw My Thing", Material.BOOK_AND_QUILL, (byte)0, GameCategory.CLASSICS, 15),
 	Evolution("Evolution", Material.EMERALD, (byte)0, GameCategory.ARCADE, 16),
-	//FlappyBird(FlappyBird.class, "Flappy Bird", Material.FEATHER, (byte)0, GameCategory.ARCADE, 17),
-	Gravity("Gravity", Material.SEA_LANTERN, (byte)0, GameCategory.EXTRA, 18),
+	Gravity("Gravity", Material.ENDER_PORTAL_FRAME, (byte)0, GameCategory.EXTRA, 18),
 	Halloween("Halloween Horror", Material.PUMPKIN, (byte)0, GameCategory.CLASSICS, 19),
 	HideSeek("Block Hunt", Material.GRASS, (byte)0, GameCategory.CLASSICS, 20),
 	HoleInTheWall("Hole in the Wall", Material.STAINED_GLASS, (byte) 2, GameCategory.ARCADE, 52),
@@ -64,10 +64,13 @@ public enum GameDisplay
 	Skywars("Skywars", Material.FEATHER, (byte) 0, GameCategory.SURVIVAL, 52),
 	SkywarsTeams("Skywars Teams", "Skywars", Material.FEATHER, (byte)0, GameCategory.TEAM_VARIANT, 53),
 	MonsterMaze("Monster Maze", Material.ROTTEN_FLESH, (byte)0, GameCategory.ARCADE, 55),
+	MonsterLeague("Monster League", Material.MINECART, (byte)0, GameCategory.ARCADE, 56),
 	
 	Lobbers("Bomb Lobbers", Material.FIREBALL, (byte) 0, GameCategory.ARCADE, 54),
 	
-	ChampionsCTF("Champions CTF", "Champions", Material.REDSTONE_BLOCK, (byte)0, GameCategory.CHAMPIONS, 55),
+	ChampionsCTF("Champions CTF", "Champions", Material.BANNER, DyeColor.RED.getDyeData(), GameCategory.CHAMPIONS, 56),
+	
+	BouncyBalls("Bouncy Balls", Material.SLIME_BALL, (byte)0, GameCategory.ARCADE, 57),
 
 	Event("Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999);
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java
index 1329e1045..97257bd98 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/GlobalPacketManager.java
@@ -11,9 +11,19 @@ import mineplex.core.account.CoreClientManager;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.giveaway.GiveawayManager;
 import mineplex.core.globalpacket.command.GlobalPacketCommand;
+import mineplex.core.globalpacket.listeners.GlobalGiveCoins;
+import mineplex.core.globalpacket.listeners.GlobalGiveGems;
+import mineplex.core.globalpacket.listeners.GlobalGiveItem;
+import mineplex.core.globalpacket.listeners.GlobalRawr;
 import mineplex.core.globalpacket.redis.GlobalPacketHandler;
 import mineplex.core.globalpacket.redis.GlobalPacketMessage;
+import mineplex.core.inventory.InventoryManager;
+import mineplex.core.pet.PetManager;
+import mineplex.core.reward.RewardManager;
+import mineplex.core.stats.StatsManager;
 import mineplex.core.status.ServerStatusManager;
 import mineplex.serverdata.commands.ServerCommandManager;
 
@@ -21,15 +31,32 @@ public class GlobalPacketManager extends MiniPlugin
 {
 	private CoreClientManager _clientManager;
 	private ServerStatusManager _statusManager;
+	private InventoryManager _inventoryManager;
+	private DonationManager _donationManager;
+	private RewardManager _rewardManager;
 
-	public GlobalPacketManager(JavaPlugin plugin, CoreClientManager clientManager, ServerStatusManager statusManager)
+	public GlobalPacketManager(JavaPlugin plugin, CoreClientManager clientManager, ServerStatusManager statusManager, InventoryManager inventoryManager, DonationManager donationManager, PetManager petManager, StatsManager statsManager, GiveawayManager giveawayManager)
 	{
 		super("Global Packet Manager", plugin);
 
 		_clientManager = clientManager;
 		_statusManager = statusManager;
+		_inventoryManager = inventoryManager;
+		_donationManager = donationManager;
+
+		_rewardManager = new RewardManager(clientManager, statusManager, donationManager, inventoryManager, petManager, statsManager, giveawayManager,
+				100, 250,
+				500, 1000,
+				1500, 2500,
+				6000, 12000,
+				false, false);
 
 		ServerCommandManager.getInstance().registerCommandType("GlobalPacketMessage", GlobalPacketMessage.class, new GlobalPacketHandler(statusManager));
+
+		getPluginManager().registerEvents(new GlobalGiveItem(inventoryManager, _rewardManager), getPlugin());
+		getPluginManager().registerEvents(new GlobalGiveGems(donationManager), getPlugin());
+		getPluginManager().registerEvents(new GlobalGiveCoins(donationManager, clientManager), getPlugin());
+		getPluginManager().registerEvents(new GlobalRawr(), getPlugin());
 	}
 
 	public void callGlobalCommand(Player caller, String[] args)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/command/GlobalPacketCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/command/GlobalPacketCommand.java
index d30163fe7..994262900 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/command/GlobalPacketCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/command/GlobalPacketCommand.java
@@ -12,7 +12,7 @@ public class GlobalPacketCommand extends CommandBase<GlobalPacketManager>
 {
 	public GlobalPacketCommand(GlobalPacketManager plugin)
 	{
-		super(plugin, Rank.ADMIN, "globalpacket");
+		super(plugin, Rank.JNR_DEV, "global", "globalpacket");
 	}
 
 	@Override
@@ -20,8 +20,8 @@ public class GlobalPacketCommand extends CommandBase<GlobalPacketManager>
 	{
 		if (args == null || args.length < 1)
 		{
-			UtilPlayer.message(caller, F.main("Global", "Please call the globalpacket command with at least 1 argument"));
-			UtilPlayer.message(caller, F.main("Global", "For help please see /globalpacket google doc"));
+			UtilPlayer.message(caller, F.main("Global", "Please call the global command with at least 1 argument"));
+			UtilPlayer.message(caller, F.main("Global", "For help please see /global google doc"));
 			return;
 		}
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java
new file mode 100644
index 000000000..f264b2457
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveCoins.java
@@ -0,0 +1,82 @@
+package mineplex.core.globalpacket.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.globalpacket.event.GlobalPacketEvent;
+
+/**
+ * Created by William (WilliamTiger).
+ * 17/11/15
+ */
+public class GlobalGiveCoins implements Listener
+{
+
+	private DonationManager _donationManager;
+	private CoreClientManager _clientManager;
+
+	public GlobalGiveCoins(DonationManager donationManager, CoreClientManager coreClientManager)
+	{
+		_donationManager = donationManager;
+		_clientManager = coreClientManager;
+	}
+
+	@EventHandler
+	public void giveCoins(final GlobalPacketEvent e)
+	{
+		if (!e.getCallerRank().has(Rank.ADMIN))
+			return;
+
+		if (e.getParts() == null || e.getParts().length < 1)
+			return;
+
+		if (!e.getParts()[0].equalsIgnoreCase("givecoins"))
+			return;
+
+		if (e.getParts().length != 2)
+		{
+			if (e.getCaller() != null)
+				UtilPlayer.message(e.getCaller(), F.main("Global", "/global givecoins <amount>"));
+
+			return;
+		}
+
+		int amount = 1;
+		try
+		{
+			amount = Integer.parseInt(e.getParts()[1]);
+		}
+		catch (Exception ex)
+		{
+			// No number
+			if (e.getCaller() != null)
+				UtilPlayer.message(e.getCaller(), F.main("Global", "[" + F.elem(amount + "") + "] is not a valid amount."));
+
+			return;
+		}
+
+		final int fAmount = amount;
+		for (final Player p : UtilServer.getPlayers())
+		{
+			_donationManager.RewardCoins(new Callback<Boolean>()
+			{
+				@Override
+				public void run(Boolean data)
+				{
+					UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " Coins") + "."));
+					UtilTextMiddle.display(C.cYellow + fAmount + " Coins", C.cGold + "received from " + e.getCallerName() + "!", p);
+				}
+			}, "Global Coins", p.getName(), _clientManager.getAccountId(p), amount);
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java
new file mode 100644
index 000000000..f7763b839
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveGems.java
@@ -0,0 +1,79 @@
+package mineplex.core.globalpacket.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.globalpacket.event.GlobalPacketEvent;
+
+/**
+ * Created by William (WilliamTiger).
+ * 17/11/15
+ */
+public class GlobalGiveGems implements Listener
+{
+
+	private DonationManager _donationManager;
+
+	public GlobalGiveGems(DonationManager donationManager)
+	{
+		_donationManager = donationManager;
+	}
+
+	@EventHandler
+	public void giveGems(final GlobalPacketEvent e)
+	{
+		if (!e.getCallerRank().has(Rank.ADMIN))
+			return;
+
+		if (e.getParts() == null || e.getParts().length < 1)
+			return;
+
+		if (!e.getParts()[0].equalsIgnoreCase("givegems"))
+			return;
+
+		if (e.getParts().length != 2)
+		{
+			if (e.getCaller() != null)
+				UtilPlayer.message(e.getCaller(), F.main("Global", "/global givegems <amount>"));
+
+			return;
+		}
+
+		int amount = 1;
+		try
+		{
+			amount = Integer.parseInt(e.getParts()[1]);
+		}
+		catch (Exception ex)
+		{
+			// No number
+			if (e.getCaller() != null)
+				UtilPlayer.message(e.getCaller(), F.main("Global", "[" + F.elem(amount + "") + "] is not a valid amount."));
+
+			return;
+		}
+
+		final int fAmount = amount;
+		for (final Player p : UtilServer.getPlayers())
+		{
+			_donationManager.RewardGems(new Callback<Boolean>()
+			{
+				@Override
+				public void run(Boolean data)
+				{
+					UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " Gems") + "."));
+					UtilTextMiddle.display(C.cYellow + fAmount + " Gems", C.cGold + "received from " + e.getCallerName() + "!", p);
+				}
+			}, "Global Gems", p.getName(), p.getUniqueId(), amount);
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java
new file mode 100644
index 000000000..1420cac3e
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalGiveItem.java
@@ -0,0 +1,156 @@
+package mineplex.core.globalpacket.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.globalpacket.event.GlobalPacketEvent;
+import mineplex.core.inventory.InventoryManager;
+import mineplex.core.reward.Reward;
+import mineplex.core.reward.RewardData;
+import mineplex.core.reward.RewardManager;
+import mineplex.core.reward.RewardType;
+
+/**
+ * Created by William (WilliamTiger).
+ * 17/11/15
+ */
+public class GlobalGiveItem implements Listener
+{
+
+	private InventoryManager _inventoryManager;
+	private RewardManager _rewardManager;
+
+	public GlobalGiveItem(InventoryManager inventoryManager, RewardManager rewardManager)
+	{
+		_inventoryManager = inventoryManager;
+		_rewardManager = rewardManager;
+	}
+
+	public enum GlobalItem
+	{
+		OLD_CHEST("Old Chest"),
+		ANCIENT_CHEST("Ancient Chest"),
+		MYTHICAL_CHEST("Mythical Chest"),
+
+		GAME_LOOT("Game Loot");
+
+		private String _invName;
+
+		GlobalItem(String invName)
+		{
+			_invName = invName;
+		}
+
+		public String getInvName()
+		{
+			return _invName;
+		}
+	}
+
+	@EventHandler
+	public void giveItem(final GlobalPacketEvent e)
+	{
+		if (!e.getCallerRank().has(Rank.ADMIN))
+			return;
+
+		if (e.getParts() == null || e.getParts().length < 1)
+			return;
+
+		if (!e.getParts()[0].equalsIgnoreCase("giveitem"))
+			return;
+
+		if (e.getParts().length != 3)
+		{
+			if (e.getCaller() != null)
+				UtilPlayer.message(e.getCaller(), F.main("Global", "/global giveitem <item> <amount>"));
+
+			return;
+		}
+
+		GlobalItem item = null;
+
+		try
+		{
+			item = GlobalItem.valueOf(e.getParts()[1]);
+		}
+		catch (Exception ex)
+		{
+			// Wrong item
+
+			if (e.getCaller() != null)
+			{
+				UtilPlayer.message(e.getCaller(), F.main("Global", "That GlobalItem type can't be found. Types:"));
+
+				String list = "";
+				for (GlobalItem i : GlobalItem.values())
+					list += i.toString() + " ";
+
+				UtilPlayer.message(e.getCaller(), C.cYellow + list);
+			}
+
+			return;
+		}
+
+		int amount = 1; // Default, shouldn't happen anyway.
+
+		try
+		{
+			amount = Integer.parseInt(e.getParts()[2]);
+		}
+		catch (Exception ex)
+		{
+			// Not a number
+
+			if (e.getCaller() != null)
+				UtilPlayer.message(e.getCaller(), F.main("Global", "[" + F.elem(e.getParts()[2]) + "] is not a valid number."));
+
+			return;
+		}
+
+		if (item.toString().contains("CHEST"))
+		{
+			for (final Player p : UtilServer.getPlayers())
+			{
+				final int fAmount = amount;
+				final GlobalItem fItem = item;
+				_inventoryManager.addItemToInventory(new Callback<Boolean>()
+				{
+					@Override
+					public void run(Boolean data)
+					{
+						UtilPlayer.message(p, F.main("Global", "You received " + F.elem(fAmount + " " + fItem.getInvName() + "(s)") + " from " + F.name(e.getCallerName()) + "."));
+						UtilTextMiddle.display(C.cYellow + fAmount + " " + fItem.getInvName() + "(s)", C.cGold + "received from " + e.getCallerName() + "!", p);
+					}
+				}, p, item.getInvName(), amount);
+			}
+
+			return;
+		}
+		else if (item.toString().equalsIgnoreCase("GAME_LOOT"))
+		{
+			for (final Player p : UtilServer.getPlayers())
+			{
+				Reward reward = _rewardManager.nextReward(p, null, false, RewardType.GameLoot, true);
+				reward.giveReward(RewardType.GameLoot, p, new Callback<RewardData>()
+				{
+					@Override
+					public void run(RewardData data)
+					{
+						UtilPlayer.message(p, F.main("Global", "You received " + F.elem("Game Loot") + " from " + F.name(e.getCallerName()) + "."));
+						UtilPlayer.message(p, F.main("Global", "You won " + F.elem(data.getFriendlyName()) + "!"));
+						UtilTextMiddle.display(C.cYellow + data.getFriendlyName(), C.cGold + "received from " + e.getCallerName() + "!", p);
+					}
+				});
+			}
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java
new file mode 100644
index 000000000..ffba8fb83
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/globalpacket/listeners/GlobalRawr.java
@@ -0,0 +1,50 @@
+package mineplex.core.globalpacket.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.globalpacket.event.GlobalPacketEvent;
+
+/**
+ * Created by William (WilliamTiger).
+ * 18/11/15
+ */
+public class GlobalRawr implements Listener
+{
+
+	@EventHandler
+	public void globalRawr(GlobalPacketEvent e)
+	{
+		if (e.getParts() == null || e.getParts().length < 1)
+			return;
+
+		if (!e.getParts()[0].equalsIgnoreCase("rawr"))
+			return;
+
+		if (e.getParts().length < 2)
+		{
+			if (e.getCaller() != null)
+				UtilPlayer.message(e.getCaller(), F.main("Global", "/global rawr <msg>"));
+
+			return;
+		}
+
+		String msg = "";
+		for (int i = 1; i < e.getParts().length; i++)
+		{
+			msg += e.getParts()[i] + " ";
+		}
+		msg = msg.trim();
+
+		for (Player p : UtilServer.getPlayers())
+		{
+			UtilTextMiddle.display("§6§lRAWR!", "§e" + msg, p);
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java b/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
index 6be18e222..e772427cc 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
@@ -2,11 +2,8 @@ package mineplex.core.hologram;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Map.Entry;
-
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -34,7 +31,7 @@ public class Hologram
 	/**
 	 * 1.7 packets uses both EntityIDs while 1.8 uses only the first.
 	 */
-	private ArrayList<Entry<Integer, Integer>> _entityIds = new ArrayList<Entry<Integer, Integer>>();
+	private ArrayList<Integer> _entityIds = new ArrayList<Integer>();
 	private Entity _followEntity;
 	private HologramManager _hologramManager;
 	private String[] _hologramText = new String[0];
@@ -53,6 +50,7 @@ public class Hologram
 	private int _viewDistance = 70;
 	protected Vector relativeToEntity;
 	private boolean _hideBoundingBox;
+	private HologramInteraction _interaction;
 
 	public Hologram(HologramManager hologramManager, Location location, String... text)
 	{
@@ -61,6 +59,18 @@ public class Hologram
 		setText(text);
 	}
 
+	public Hologram setInteraction(HologramInteraction interact)
+	{
+		_interaction = interact;
+
+		return this;
+	}
+
+	public HologramInteraction getInteraction()
+	{
+		return _interaction;
+	}
+
 	/**
 	 * Adds the player to the Hologram to be effected by Whitelist or Blacklist
 	 */
@@ -151,6 +161,7 @@ public class Hologram
 				nearbyPlayers.add(player);
 			}
 		}
+
 		return nearbyPlayers;
 	}
 
@@ -229,9 +240,7 @@ public class Hologram
 
 		for (int i = 0; i < _entityIds.size(); i++)
 		{
-			Entry<Integer, Integer> entry = _entityIds.get(i);
-
-			entityIds1_8[i] = entry.getKey();
+			entityIds1_8[i] = _entityIds.get(i);
 		}
 
 		_destroy1_8 = new PacketPlayOutEntityDestroy(entityIds1_8);
@@ -247,7 +256,7 @@ public class Hologram
 
 			for (int i = _entityIds.size(); i < _hologramText.length; i++)
 			{
-				_entityIds.add(new HashMap.SimpleEntry(UtilEnt.getNewEntityId(), UtilEnt.getNewEntityId()));
+				_entityIds.add(UtilEnt.getNewEntityId());
 			}
 		}
 		else
@@ -261,9 +270,7 @@ public class Hologram
 		}
 		for (int textRow = 0; textRow < _hologramText.length; textRow++)
 		{
-			Entry<Integer, Integer> entityIds = this._entityIds.get(textRow);
-
-			Packet[] packets1_8 = makeSpawnPackets1_8(textRow, entityIds.getKey(), _hologramText[textRow]);
+			Packet[] packets1_8 = makeSpawnPackets1_8(textRow, _entityIds.get(textRow), _hologramText[textRow]);
 
 			for (int i = 0; i < packets1_8.length; i++)
 			{
@@ -326,8 +333,7 @@ public class Hologram
 	public Hologram setFollowEntity(Entity entityToFollow)
 	{
 		_followEntity = entityToFollow;
-		relativeToEntity = entityToFollow == null ? null : this._location.clone().subtract(entityToFollow.getLocation())
-				.toVector();
+		relativeToEntity = entityToFollow == null ? null : _location.clone().subtract(entityToFollow.getLocation()).toVector();
 
 		return this;
 	}
@@ -340,7 +346,7 @@ public class Hologram
 	 */
 	public Hologram setHologramTarget(HologramTarget newTarget)
 	{
-		this._target = newTarget;
+		_target = newTarget;
 		return this;
 	}
 
@@ -405,11 +411,11 @@ public class Hologram
 				if (x >= -128 && x <= 127 && y >= -128 && y <= 127 && z >= -128 && z <= 127)
 				{
 					_lastMovement.subtract(new Vector(x / 32D, y / 32D, z / 32D));
-					for (Entry<Integer, Integer> entityId : this._entityIds)
+					for (Integer entityId : _entityIds)
 					{
 						PacketPlayOutEntity.PacketPlayOutRelEntityMove relMove = new PacketPlayOutEntity.PacketPlayOutRelEntityMove();
 
-						relMove.a = entityId.getKey();
+						relMove.a = entityId;
 						relMove.b = (byte) x;
 						relMove.c = (byte) y;
 						relMove.d = (byte) z;
@@ -425,13 +431,12 @@ public class Hologram
 
 					_lastMovement = new Vector(newLocation.getX() - (x / 32D), 0, newLocation.getZ() - (z / 32D));
 
-					for (Entry<Integer, Integer> entityId : this._entityIds)
+					for (Integer entityId : _entityIds)
 					{
 						PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport();
-						teleportPacket.a = entityId.getKey();
+						teleportPacket.a = entityId;
 						teleportPacket.b = x;
-						teleportPacket.c = (int) Math
-								.floor((oldLocation.getY() + (-2.1) + ((double) i * 0.285)) * 32);
+						teleportPacket.c = (int) Math.floor((oldLocation.getY() + (-2.1) + ((double) i * 0.285)) * 32);
 						teleportPacket.d = z;
 
 						packets1_8[i] = teleportPacket;
@@ -458,6 +463,11 @@ public class Hologram
 		return this;
 	}
 
+	public boolean isEntityId(int entityId)
+	{
+		return _entityIds.contains(entityId);
+	}
+
 	/**
 	 * Set the hologram text
 	 */
@@ -491,28 +501,28 @@ public class Hologram
 				{
 					// Add entity id and send spawn packets
 					// You add a entity id because the new hologram needs
-					Entry<Integer, Integer> entry = new HashMap.SimpleEntry(UtilEnt.getNewEntityId(), UtilEnt.getNewEntityId());
-					_entityIds.add(entry);
+					int entityId = UtilEnt.getNewEntityId();
+					_entityIds.add(entityId);
 
-					packets1_8.addAll(Arrays.asList(makeSpawnPackets1_8(i, entry.getKey(), newText[i])));
+					packets1_8.addAll(Arrays.asList(makeSpawnPackets1_8(i, entityId, newText[i])));
 				}
 				// If less lines than previously
 				else if (i >= newText.length)
 				{
 					// Remove entity id and send destroy packets
-					Entry<Integer, Integer> entry = _entityIds.remove(newText.length);
+					Integer entityId = _entityIds.remove(newText.length);
 
 					destroy1_8 = Arrays.copyOf(destroy1_8, destroy1_8.length + 1);
-					destroy1_8[destroy1_8.length - 1] = entry.getKey();
+					destroy1_8[destroy1_8.length - 1] = entityId;
 				}
 				else if (!newText[i].equals(_hologramText[i]))
 				{
 					// Send update metadata packets
-					Entry<Integer, Integer> entry = _entityIds.get(i);
+					Integer entityId = _entityIds.get(i);
 
 					PacketPlayOutEntityMetadata metadata1_8 = new PacketPlayOutEntityMetadata();
 
-					metadata1_8.a = entry.getKey();
+					metadata1_8.a = entityId;
 
 					DataWatcher watcher1_8 = new DataWatcher(null);
 
@@ -552,7 +562,7 @@ public class Hologram
 	 */
 	public Hologram setViewDistance(int newDistance)
 	{
-		this._viewDistance = newDistance;
+		_viewDistance = newDistance;
 		return setLocation(getLocation());
 	}
 
@@ -593,6 +603,7 @@ public class Hologram
 			_playersTracking.clear();
 			_lastMovement = null;
 		}
+
 		return this;
 	}
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/hologram/HologramInteraction.java b/Plugins/Mineplex.Core/src/mineplex/core/hologram/HologramInteraction.java
new file mode 100644
index 000000000..b6bc659e3
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/hologram/HologramInteraction.java
@@ -0,0 +1,9 @@
+package mineplex.core.hologram;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+public interface HologramInteraction
+{
+	public void onClick(Player player, ClickType clickType);
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/hologram/HologramManager.java b/Plugins/Mineplex.Core/src/mineplex/core/hologram/HologramManager.java
index 8be93fc9a..df8a9352b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/hologram/HologramManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/hologram/HologramManager.java
@@ -5,90 +5,106 @@ import java.util.Iterator;
 import java.util.List;
 
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.packethandler.IPacketHandler;
+import mineplex.core.packethandler.PacketHandler;
+import mineplex.core.packethandler.PacketInfo;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
-import net.minecraft.server.v1_8_R3.Packet;
+import net.minecraft.server.v1_8_R3.PacketPlayInUseEntity;
+import net.minecraft.server.v1_8_R3.PacketPlayInUseEntity.EnumEntityUseAction;
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.ClickType;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 
-public class HologramManager implements Listener
+public class HologramManager implements Listener, IPacketHandler
 {
-    private ArrayList<Hologram> _activeHolograms = new ArrayList<Hologram>();
+	private ArrayList<Hologram> _activeHolograms = new ArrayList<Hologram>();
 
-    public HologramManager(JavaPlugin arcadeManager)
-    {
-        Bukkit.getPluginManager().registerEvents(this, arcadeManager);
-    }
+	public HologramManager(JavaPlugin arcadeManager, PacketHandler packetHandler)
+	{
+		Bukkit.getPluginManager().registerEvents(this, arcadeManager);
+		packetHandler.addPacketHandler(this, true, PacketPlayInUseEntity.class);
+	}
 
-    void addHologram(Hologram hologram)
-    {
-        _activeHolograms.add(hologram);
-    }
+	void addHologram(Hologram hologram)
+	{
+		_activeHolograms.add(hologram);
+	}
 
-    void removeHologram(Hologram hologram)
-    {
-        _activeHolograms.remove(hologram);
-    }
+	void removeHologram(Hologram hologram)
+	{
+		_activeHolograms.remove(hologram);
+	}
 
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onTick(UpdateEvent event)
-    {
-        if (event.getType() != UpdateType.TICK || _activeHolograms.isEmpty())
-            return;
-        List<World> worlds = Bukkit.getWorlds();
-        Iterator<Hologram> itel = _activeHolograms.iterator();
-        while (itel.hasNext())
-        {
-            Hologram hologram = itel.next();
-            if (!worlds.contains(hologram.getLocation().getWorld()))
-            {
-                itel.remove();
-                hologram.stop();
-            }
-            else
-            {
-                if (hologram.getEntityFollowing() != null)
-                {
-                    Entity following = hologram.getEntityFollowing();
-                    if (hologram.isRemoveOnEntityDeath() && !following.isValid())
-                    {
-                        itel.remove();
-                        hologram.stop();
-                        continue;
-                    }
-                    if (!hologram.relativeToEntity.equals(following.getLocation().subtract(hologram.getLocation()).toVector()))
-                    {
-                        // And we do this so in the rare offchance it changes by a decimal. It doesn't start turning wonky.
-                        Vector vec = hologram.relativeToEntity.clone();
-                        hologram.setLocation(following.getLocation().add(hologram.relativeToEntity));
-                        hologram.relativeToEntity = vec;
-                        continue; // No need to do the rest of the code as setLocation does it.
-                    }
-                }
-                ArrayList<Player> canSee = hologram.getNearbyPlayers();
-                Iterator<Player> itel2 = hologram.getPlayersTracking().iterator();
-                while (itel2.hasNext())
-                {
-                    Player player = itel2.next();
-                    if (!canSee.contains(player))
-                    {
-                        itel2.remove();
-                        if (player.getWorld() == hologram.getLocation().getWorld())
-                        {
-                            UtilPlayer.sendPacket(player, hologram.getDestroyPacket());
-                        }
-                    }
-                }
-                for (Player player : canSee)
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void onTick(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK || _activeHolograms.isEmpty())
+			return;
+
+		List<World> worlds = Bukkit.getWorlds();
+
+		Iterator<Hologram> itel = _activeHolograms.iterator();
+
+		while (itel.hasNext())
+		{
+			Hologram hologram = itel.next();
+
+			if (!worlds.contains(hologram.getLocation().getWorld()))
+			{
+				itel.remove();
+				hologram.stop();
+			}
+			else
+			{
+				if (hologram.getEntityFollowing() != null)
+				{
+					Entity following = hologram.getEntityFollowing();
+
+					if (hologram.isRemoveOnEntityDeath() && !following.isValid())
+					{
+						itel.remove();
+						hologram.stop();
+						continue;
+					}
+					if (!hologram.relativeToEntity.equals(following.getLocation().subtract(hologram.getLocation()).toVector()))
+					{
+						// And we do this so in the rare offchance it changes by a decimal. It doesn't start turning wonky.
+						Vector vec = hologram.relativeToEntity.clone();
+						hologram.setLocation(following.getLocation().add(hologram.relativeToEntity));
+						hologram.relativeToEntity = vec;
+
+						continue; // No need to do the rest of the code as setLocation does it.
+					}
+				}
+
+				ArrayList<Player> canSee = hologram.getNearbyPlayers();
+
+				Iterator<Player> itel2 = hologram.getPlayersTracking().iterator();
+
+				while (itel2.hasNext())
+				{
+					Player player = itel2.next();
+
+					if (!canSee.contains(player))
+					{
+						itel2.remove();
+						if (player.getWorld() == hologram.getLocation().getWorld())
+						{
+							UtilPlayer.sendPacket(player, hologram.getDestroyPacket());
+						}
+					}
+				}
+
+				for (Player player : canSee)
 				{
 					if (!hologram.getPlayersTracking().contains(player))
 					{
@@ -96,8 +112,28 @@ public class HologramManager implements Listener
 
 						UtilPlayer.sendPacket(player, hologram.getSpawnPackets());
 					}
-                }
-            }
-        }
-    }
+				}
+			}
+		}
+	}
+
+	@Override
+	public void handle(PacketInfo packetInfo)
+	{
+		PacketPlayInUseEntity packetPlayIn = (PacketPlayInUseEntity) packetInfo.getPacket();
+
+		for (Hologram hologram : _activeHolograms)
+		{
+			if (!hologram.isEntityId(packetPlayIn.a))
+				continue;
+
+			if (hologram.getInteraction() != null)
+			{
+				hologram.getInteraction().onClick(packetInfo.getPlayer(),
+						packetPlayIn.action == EnumEntityUseAction.ATTACK ? ClickType.LEFT : ClickType.RIGHT);
+			}
+
+			break;
+		}
+	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java b/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java
index 856b7322a..b598e19c3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java
@@ -708,6 +708,11 @@ public class ItemStackFactory extends MiniPlugin
 		return CreateStack(type.getId(), data, amount, (short)0, name, new String[] {}, null);
 	}
 
+	public ItemStack CreateStack(Material type, byte data, int amount, String name, boolean unbreakable)
+	{
+		return CreateStack(type.getId(), data, amount, (short)0, name, new String[] {}, null, unbreakable);
+	}
+
 	public ItemStack CreateStack(int id, byte data, int amount, String name)
 	{
 		return CreateStack(id, data, amount, (short)0, name, new String[] {}, null);
@@ -763,6 +768,11 @@ public class ItemStackFactory extends MiniPlugin
 		return CreateStack(type.getId(), data, amount, (short)0, name, ArrayToList(lore), owner);
 	}
 
+	public ItemStack CreateStack(Material type, byte data, int amount, String name, String[] lore, String owner, boolean unbreakable)
+	{
+		return CreateStack(type.getId(), data, amount, (short)0, name, ArrayToList(lore), owner, unbreakable);
+	}
+
 	public ItemStack CreateStack(int id,  byte data, int amount, String name, String[] lore, String owner)
 	{
 		return CreateStack(id, data, amount, (short)0, name, ArrayToList(lore), owner);
@@ -778,15 +788,26 @@ public class ItemStackFactory extends MiniPlugin
 		return CreateStack(id, data, amount, damage, name, ArrayToList(lore), owner);
 	}
 
+	public ItemStack CreateStack(int id, byte data, int amount, short damage, String name, String[] lore, String owner, boolean unbreakable)
+	{
+		return CreateStack(id, data, amount, damage, name, ArrayToList(lore), owner, unbreakable);
+	}
+
+
 	public ItemStack CreateStack(Material type, byte data, int amount, short damage, String name, List<String> lore, String owner)
 	{
 		return CreateStack(type.getId(), data, amount, damage, name, lore, owner);
 	}
 
+	public ItemStack CreateStack(int id, byte data, int amount, short damage, String name, List<String> lore, String owner)
+	{
+		return CreateStack(id, data, amount, damage, name, lore, owner, true);
+	}
+
 	//XXX Owner Variant End
 
 	@SuppressWarnings("deprecation")
-	public ItemStack CreateStack(int id, byte data, int amount, short damage, String name, List<String> lore, String owner)
+	public ItemStack CreateStack(int id, byte data, int amount, short damage, String name, List<String> lore, String owner, boolean unbreakable)
 	{
 		ItemStack stack;
 		if (data == 0) 	
@@ -855,16 +876,45 @@ public class ItemStackFactory extends MiniPlugin
 			stack.setItemMeta(itemMeta);
 
 		//Unbreakable
-		if (stack.getType().getMaxDurability() > 1)
+		if (unbreakable)
 		{
-			ItemMeta meta = stack.getItemMeta();
-			meta.spigot().setUnbreakable(true);
-			stack.setItemMeta(meta);
+			if (stack.getType().getMaxDurability() > 1)
+			{
+				ItemMeta meta = stack.getItemMeta();
+				meta.spigot().setUnbreakable(true);
+				stack.setItemMeta(meta);
+			}
 		}
 
 		return stack;
 	}
 
+	public void addOwnerLore(ItemStack item, String owner)
+	{
+		if (owner != null)
+		{
+			ItemMeta itemMeta = item.getItemMeta();
+
+			String[] tokens = owner.split(" ");
+
+			String[] ownerLore = new String[tokens.length + 2];
+
+			ownerLore[0] = C.cGray + "Owner: " + C.cAqua + tokens[0];
+
+			if (ownerLore.length >= 3)
+				ownerLore[1] = C.cGray + "Source: " + C.cAqua + tokens[1];
+
+			ownerLore[ownerLore.length - 2] = C.cGray + "Created: " + C.cAqua + UtilTime.date();
+
+			ownerLore[ownerLore.length - 1] = "";
+
+			if (itemMeta.getLore() != null)		itemMeta.setLore(CombineLore(itemMeta.getLore(), ArrayToList(ownerLore)));
+			else								itemMeta.setLore(ArrayToList(ownerLore));
+
+			item.setItemMeta(itemMeta);
+		}
+	}
+
 	private List<String> CombineLore(List<String> A, List<String> B) 
 	{
 		for (String b : B)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
index 003e0878c..11887cd53 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
@@ -67,7 +67,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
 		MessageHandler messageHandler = new MessageHandler(this);
 
 		ServerCommandManager.getInstance().registerCommandType("AnnouncementCommand", AnnouncementCommand.class,
-				new AnnouncementHandler());
+				new AnnouncementHandler(clientManager));
 
 		ServerCommandManager.getInstance().registerCommandType("RedisMessage", RedisMessage.class, messageHandler);
 		ServerCommandManager.getInstance()
@@ -83,7 +83,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
 		addCommand(new ResendAdminCommand(this));
 
 		addCommand(new AnnounceCommand(this));
-		addCommand(new GlobalCommand(this));
+		//addCommand(new GlobalCommand(this));
 
 		addCommand(new AdminCommand(this));
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AnnounceCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AnnounceCommand.java
index c82cdd800..cbdddc228 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AnnounceCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AnnounceCommand.java
@@ -10,6 +10,7 @@ import mineplex.core.message.MessageManager;
 import mineplex.serverdata.commands.AnnouncementCommand;
 
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
 public class AnnounceCommand extends CommandBase<MessageManager>
@@ -22,13 +23,25 @@ public class AnnounceCommand extends CommandBase<MessageManager>
 	@Override
 	public void Execute(Player caller, String[] args)
 	{
-		if (args == null || args.length == 0)
+		if (args == null || args.length <= 1)
 		{			
 			Plugin.Help(caller);
 		}
 		else
 		{
-			new AnnouncementCommand(true, F.combine(args, 0, null, false)).publish();
+			Rank rank = Rank.ALL;
+
+			try
+			{
+				rank = Rank.valueOf(args[0]);
+			}
+			catch (IllegalArgumentException ex)
+			{
+				UtilPlayer.message(caller, F.main(Plugin.getName(), ChatColor.RED + "" + ChatColor.BOLD + "Invalid rank!"));
+				return;
+			}
+
+			new AnnouncementCommand(true, rank.toString(), F.combine(args, 1, null, false)).publish();
 		}
 	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/GlobalCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/GlobalCommand.java
deleted file mode 100644
index 9c9f12e62..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/GlobalCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package mineplex.core.message.commands;
-
-import mineplex.core.command.CommandBase;
-import mineplex.core.common.Rank;
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.message.MessageManager;
-import mineplex.serverdata.commands.AnnouncementCommand;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-public class GlobalCommand extends CommandBase<MessageManager>
-{
-	public GlobalCommand(MessageManager plugin)
-	{
-		super(plugin, Rank.ADMIN, "global");
-	}
-
-	@Override
-	public void Execute(Player caller, String[] args)
-	{
-		if (args == null || args.length == 0)
-		{			
-			Plugin.Help(caller);
-		}
-		else
-		{
-			new AnnouncementCommand(false, F.combine(args, 0, null, false)).publish();
-		}
-	}
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/redis/AnnouncementHandler.java b/Plugins/Mineplex.Core/src/mineplex/core/message/redis/AnnouncementHandler.java
index 81972dd76..6901ad162 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/redis/AnnouncementHandler.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/redis/AnnouncementHandler.java
@@ -1,5 +1,7 @@
 package mineplex.core.message.redis;
 
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
@@ -13,20 +15,41 @@ import org.bukkit.entity.Player;
 
 public class AnnouncementHandler implements CommandCallback
 {
+	private CoreClientManager _clientManager;
+
+	public AnnouncementHandler(CoreClientManager clientManager)
+	{
+		_clientManager = clientManager;
+	}
+
 	public void run(ServerCommand command)
 	{
 		if (command instanceof AnnouncementCommand)
 		{
 			AnnouncementCommand announcementCommand = (AnnouncementCommand)command;
-			
+
+			Rank rank;
+			try
+			{
+				rank = Rank.valueOf(announcementCommand.getRank());
+			}
+			catch (Exception e)
+			{
+				e.printStackTrace();
+				return;
+			}
+
 			String message = announcementCommand.getMessage();
 			
-			if (announcementCommand.getDisplayTitle())
-				UtilTextMiddle.display(C.cYellow + "Announcement", message, 10, 120, 10);
-			
 			for (Player player : Bukkit.getOnlinePlayers())
 			{
-				UtilPlayer.message(player, F.main("Announcement", C.cAqua + message));
+				if (_clientManager.hasRank(player, rank))
+				{
+					if (announcementCommand.getDisplayTitle())
+						UtilTextMiddle.display(C.cYellow + "Announcement", message, 10, 120, 10, player);
+
+					UtilPlayer.message(player, F.main("Announcement", C.cAqua + message));
+				}
 			}
 		}
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/monitor/LagMeter.java b/Plugins/Mineplex.Core/src/mineplex/core/monitor/LagMeter.java
index 9b7f921a5..12bc7d776 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/monitor/LagMeter.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/monitor/LagMeter.java
@@ -97,11 +97,11 @@ public class LagMeter extends MiniPlugin
         
         _count++;
         
-        if (System.currentTimeMillis() - _start > 60000)
+        if (System.currentTimeMillis() - _start > 30000)
         {
 	        if (_timingsRunning)
 	        {
-	        	if (_ticksPerSecond > 15 || System.currentTimeMillis() - _timingsStarted > 60000)
+	        	if (System.currentTimeMillis() - _timingsStarted > 30000)
 	        	{
 	            	getPlugin().getServer().dispatchCommand(Bukkit.getConsoleSender(), "timings paste");
 	            	_timingsRunning = false;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java
index 8335ef029..1203bad95 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java
@@ -1,7 +1,7 @@
 package mineplex.core.mount;
 
-import mineplex.core.common.util.UtilAlg;
-import mineplex.core.common.util.UtilEnt;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -13,12 +13,14 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-public class DragonData 
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
+
+public class DragonData extends MountData
 {
 	DragonMount Host;
 	
 	public EnderDragon Dragon; 
-	public Player Rider;
 	
 	public Entity TargetEntity = null;
   
@@ -31,9 +33,8 @@ public class DragonData
 	
 	public DragonData(DragonMount dragonMount, Player rider) 
 	{
-		Host = dragonMount;
-		
-		Rider = rider; 
+		super(rider);
+		Host = dragonMount; 
 
 		Velocity = rider.getLocation().getDirection().setY(0).normalize();
 		Pitch = UtilAlg.GetPitch(rider.getLocation().getDirection());
@@ -51,25 +52,34 @@ public class DragonData
 		Chicken = rider.getWorld().spawn(rider.getLocation(), Chicken.class);
 		Dragon.setPassenger(Chicken);
 
-		Chicken.setPassenger(Rider);
+		Chicken.setPassenger(getOwner());
 		
 		Bukkit.getServer().getScheduler().runTaskLater(Host.Manager.getPlugin(), new Runnable()
 		{
 			public void run()
 			{
-				Chicken.setPassenger(Rider);
+				Chicken.setPassenger(getOwner());
 			}
 		}, 10L);
 	}
 	
 	public void Move()
 	{
-		Rider.eject();
+		getOwner().eject();
 		((CraftEnderDragon)Dragon).getHandle().setTargetBlock(GetTarget().getBlockX(), GetTarget().getBlockY(), GetTarget().getBlockZ());
 	}
 	
 	public Location GetTarget()
 	{
-		return Rider.getLocation().add(Rider.getLocation().getDirection().multiply(40));
+		return getOwner().getLocation().add(getOwner().getLocation().getDirection().multiply(40));
+	}
+	
+	@Override
+	public List<Entity> getEntityParts()
+	{
+		List<Entity> list = new ArrayList<Entity>();
+		list.add(Dragon);
+		list.add(Chicken);
+		return list;
 	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java
index af1c1831e..9cf933aac 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java
@@ -5,7 +5,6 @@ import org.bukkit.entity.Player;
 
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.disguise.disguises.DisguiseChicken;
 
 public class DragonMount extends Mount<DragonData>
 {
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java
index d8ec72939..d4267beec 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java
@@ -22,7 +22,7 @@ import org.bukkit.entity.Horse.Style;
 import org.bukkit.event.EventHandler;
 import org.bukkit.inventory.ItemStack;
 
-public class HorseMount extends Mount<Horse>
+public class HorseMount extends Mount<SingleEntityMountData<Horse>>
 {
 	protected Color _color;
 	protected Style _style;
@@ -53,7 +53,7 @@ public class HorseMount extends Mount<Horse>
 		while (activeIterator.hasNext())
 		{
 			Player player = activeIterator.next();
-			Horse horse = _active.get(player);
+			Horse horse = _active.get(player).getEntity();
 			
 			//Invalid (dead)
 			if (!horse.isValid())
@@ -113,15 +113,16 @@ public class HorseMount extends Mount<Horse>
 		UtilPlayer.message(player, F.main("Mount", "You spawned " + F.elem(GetName()) + "."));
 		
 		//Store
-		_active.put(player, horse);
+		SingleEntityMountData<Horse> mount = new SingleEntityMountData<Horse>(player, horse);
+		_active.put(player, mount);
 	}
 	
 	public void Disable(Player player)
 	{
-		Horse horse = _active.remove(player);
-		if (horse != null)
+		SingleEntityMountData<Horse> mount = _active.remove(player);
+		if (mount != null)
 		{
-			horse.remove();
+			mount.remove();
 			
 			//Inform
 			UtilPlayer.message(player, F.main("Mount", "You despawned " + F.elem(GetName()) + "."));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/Mount.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/Mount.java
index 3e346cc57..ad18c3cc8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/Mount.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/Mount.java
@@ -5,6 +5,7 @@ import java.util.HashSet;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -18,7 +19,7 @@ import mineplex.core.common.util.UtilServer;
 import mineplex.core.mount.event.MountActivateEvent;
 import mineplex.core.shop.item.SalesPackageBase;
 
-public abstract class Mount<T> extends SalesPackageBase implements Listener
+public abstract class Mount<T extends MountData> extends SalesPackageBase implements Listener
 {
 	protected HashSet<Player> _owners = new HashSet<Player>();
 	protected HashMap<Player, T> _active = new HashMap<Player, T>();
@@ -51,9 +52,10 @@ public abstract class Mount<T> extends SalesPackageBase implements Listener
 			return;
 		}
 		
-		Manager.setActive(player, this);
 		EnableCustom(player);
+		Manager.setActive(player, this);
 	}
+	
 	public abstract void EnableCustom(Player player);
 	public abstract void Disable(Player player);
 	
@@ -96,4 +98,13 @@ public abstract class Mount<T> extends SalesPackageBase implements Listener
 	{
 		return _owners.contains(player);
 	}
+	
+	public T getMountData(Entity ent)
+	{
+		for(T data : GetActive().values())
+		{
+			if(data.isPartOfMount(ent)) return data;
+		}
+		return null;
+	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/MountData.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/MountData.java
new file mode 100644
index 000000000..6c025dc0e
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/MountData.java
@@ -0,0 +1,43 @@
+package mineplex.core.mount;
+
+import java.util.List;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+public abstract class MountData
+{
+	
+	protected Player _owner;
+	
+	public MountData(Player player)
+	{
+		_owner = player;
+	}
+
+	public boolean isPartOfMount(Entity ent)
+	{
+		return getEntityParts().contains(ent);
+	}
+	
+	public abstract List<Entity> getEntityParts();
+	
+	public boolean ownsMount(Player p)
+	{
+		return _owner.equals(p);
+	}
+	
+	public Player getOwner() 
+	{
+		return _owner;
+	}
+	
+	public void remove()
+	{
+		for(Entity e : getEntityParts())
+		{
+			e.remove();
+		}
+	}
+	 
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
index 78d19c59a..4de2d6666 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
@@ -3,6 +3,17 @@ package mineplex.core.mount;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.bukkit.Material;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.ItemSpawnEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerInteractAtEntityEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
 import mineplex.core.MiniPlugin;
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.blockrestore.BlockRestore;
@@ -22,17 +33,6 @@ import mineplex.core.mount.types.MountTitan;
 import mineplex.core.mount.types.MountUndead;
 import mineplex.core.mount.types.MountZombie;
 
-import org.bukkit.Material;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Horse;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.entity.ItemSpawnEvent;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.plugin.java.JavaPlugin;
-
 public class MountManager extends MiniPlugin
 {
 	private CoreClientManager _clientManager;
@@ -84,32 +84,30 @@ public class MountManager extends MiniPlugin
 	}
 	
 	@EventHandler
-	public void HorseInteract(PlayerInteractEntityEvent event)
+	public void mountInteract(PlayerInteractAtEntityEvent event)
+	{	
+		MountData mount = getMountData(event.getRightClicked());
+		
+		if(mount == null) return;
+		
+		if(mount.ownsMount(event.getPlayer())) return;
+		
+		event.setCancelled(true);
+		
+	}
+	
+	@EventHandler
+	public void mountInteract(PlayerInteractEntityEvent event)
 	{
-		if (!(event.getRightClicked() instanceof Horse))
-			return;
+		MountData mount = getMountData(event.getRightClicked());
 		
-		boolean found = false;
-		for (Mount mount : _playerActiveMountMap.values())
-		{
-			if (mount.GetActive().containsValue(event.getRightClicked()))
-			{
-				found = true;
-				break;
-			}
-		}
+		if(mount == null) return;
 		
-		if (!found)
-			return;
-
-		Player player = event.getPlayer();
-		Horse horse = (Horse)event.getRightClicked();
+		if(mount.ownsMount(event.getPlayer())) return;
+		
+		UtilPlayer.message(event.getPlayer(), F.main("Mount", "This is not your Mount!"));
+		event.setCancelled(true);
 		
-		if (horse.getOwner() == null || !horse.getOwner().equals(player))
-		{
-			UtilPlayer.message(player, F.main("Mount", "This is not your Mount!"));
-			event.setCancelled(true);
-		}
 	}
 	
 	@EventHandler
@@ -178,16 +176,28 @@ public class MountManager extends MiniPlugin
 	{
 		return _disguiseManager;
 	}
-
-	public boolean isMount(Entity ent)
+	
+	public MountData getMountData(Entity ent)
 	{
 		for (Mount<?> mount : _playerActiveMountMap.values())
 		{
-			if (mount.GetActive().values().contains(ent))
-			{
-				return true;
-			}
+			MountData data = mount.getMountData(ent);
+			if(data != null) return data;
 		}
-		return false;
+		return null;
+	}
+	
+	public Mount<?> getMount(Entity ent)
+	{
+		for (Mount<?> mount : _playerActiveMountMap.values())
+		{
+			if(mount.getMountData(ent) != null) return mount;
+		}
+		return null;
+	}
+
+	public boolean isMount(Entity ent)
+	{
+		return getMount(ent) != null;
 	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/SingleEntityMountData.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/SingleEntityMountData.java
new file mode 100644
index 000000000..eab47b74c
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/SingleEntityMountData.java
@@ -0,0 +1,35 @@
+package mineplex.core.mount;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+public class SingleEntityMountData<T extends Entity> extends MountData
+{
+	
+	protected T Entity;
+
+	public SingleEntityMountData(Player player, T ent)
+	{
+		super(player);
+		Entity = ent;
+	}
+
+	@Override
+	public List<Entity> getEntityParts()
+	{
+		List<Entity> list = new ArrayList<Entity>();
+		list.add(Entity);
+		return list;
+	}
+	
+	public T getEntity()
+	{
+		return Entity;
+	}
+	
+	
+
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
index e68074bb2..3abbf00e0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
@@ -1,20 +1,9 @@
 package mineplex.core.mount.types;
 
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilAction;
-import mineplex.core.common.util.UtilAlg;
-import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.mount.Mount;
-import mineplex.core.mount.MountManager;
-import mineplex.core.recharge.Recharge;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.Sound;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftMinecart;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -22,7 +11,20 @@ import org.bukkit.event.entity.EntityTargetEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.vehicle.VehicleDamageEvent;
 
-public class MountCart extends Mount<Minecart>
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.mount.Mount;
+import mineplex.core.mount.MountManager;
+import mineplex.core.mount.SingleEntityMountData;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+
+public class MountCart extends Mount<SingleEntityMountData<Minecart>>
 {
 	public MountCart(MountManager manager)
 	{
@@ -44,7 +46,7 @@ public class MountCart extends Mount<Minecart>
 		//Remove other mounts
 		Manager.DeregisterAll(player);
 		
-		Minecart mount = player.getWorld().spawn(player.getLocation().add(0, 2, 0), Minecart.class);
+		SingleEntityMountData<Minecart> mount = new SingleEntityMountData<Minecart>(player, player.getWorld().spawn(player.getLocation().add(0, 2, 0), Minecart.class));
 		
 		//Inform
 		UtilPlayer.message(player, F.main("Mount", "You spawned " + F.elem(GetName()) + "."));
@@ -55,7 +57,7 @@ public class MountCart extends Mount<Minecart>
 	
 	public void Disable(Player player)
 	{
-		Minecart mount = _active.remove(player);
+		SingleEntityMountData<Minecart> mount = _active.remove(player);
 		if (mount != null)
 		{
 			mount.remove();
@@ -73,14 +75,11 @@ public class MountCart extends Mount<Minecart>
 		if (event.getRightClicked() == null)
 			return;
 		
-		if (!GetActive().containsKey(event.getPlayer()))
-			return;
+		SingleEntityMountData<Minecart> mount = GetActive().get(event.getPlayer());
 		
-		if (!GetActive().get(event.getPlayer()).equals(event.getRightClicked()))
-		{
-			UtilPlayer.message(event.getPlayer(), F.main("Mount", "This is not your Mount!"));
-			return;
-		}
+		if(mount == null) return;
+		
+		if(!mount.ownsMount(event.getPlayer())) return;
 		
 		event.getPlayer().leaveVehicle();
 		event.getPlayer().eject();
@@ -105,17 +104,16 @@ public class MountCart extends Mount<Minecart>
 			return;
 		
 		//Bounce
-		for (Minecart cart : GetActive().values())
+		for (SingleEntityMountData<Minecart> cartData : GetActive().values())
 		{
+			Minecart cart = cartData.getEntity();
+			
 			if (cart.getPassenger() == null)
 				continue;
 			
-			if (!((CraftMinecart) cart).getHandle().onGround)
+			if (!UtilEnt.isGrounded(cart))
 				continue;
 			
-//			if (!UtilEnt.isGrounded(cart))
-//				continue;
-			
 			if (!(cart.getPassenger() instanceof Player))
 				continue;
 			
@@ -128,8 +126,10 @@ public class MountCart extends Mount<Minecart>
 		}
 		
 		//Collide
-		for (Minecart cart : GetActive().values())
+		for (SingleEntityMountData<Minecart> cartData : GetActive().values())
 		{
+			Minecart cart = cartData.getEntity();
+			
 			if (cart.getPassenger() == null)
 				continue;
 			
@@ -141,8 +141,9 @@ public class MountCart extends Mount<Minecart>
 			if (!Recharge.Instance.usable(player, GetName() + " Collide"))
 				continue;
 			
-			for (Minecart other : GetActive().values())
+			for (SingleEntityMountData<Minecart> otherData : GetActive().values())
 			{
+				Minecart other = otherData.getEntity();
 				if (other.equals(cart))
 					continue;
 				
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountFrost.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountFrost.java
index e5b2d2bf8..e948ca9e3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountFrost.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountFrost.java
@@ -9,11 +9,11 @@ import org.bukkit.event.EventHandler;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.core.mount.HorseMount;
 import mineplex.core.mount.MountManager;
+import mineplex.core.mount.SingleEntityMountData;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 
@@ -38,10 +38,12 @@ public class MountFrost extends HorseMount
 	public void Trail(UpdateEvent event)
 	{
 		if (event.getType() == UpdateType.TICK)
-			for (Horse horse : GetActive().values())
-				UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, horse.getLocation().add(0, 1, 0), 
-						0.25f, 0.25f, 0.25f, 0.1f, 4,
-						ViewDist.NORMAL, UtilServer.getPlayers());
+			for (SingleEntityMountData<Horse> horseData : GetActive().values())
+			{
+				Horse horse = horseData.getEntity();
+				UtilParticle.PlayParticleToAll(ParticleType.SNOW_SHOVEL, horse.getLocation().add(0, 1, 0),
+						0.25f, 0.25f, 0.25f, 0.1f, 4, ViewDist.NORMAL);
+			}
 	}
 	
 //	@EventHandler 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSheep.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSheep.java
index e2982d6ab..c2697c771 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSheep.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSheep.java
@@ -5,19 +5,19 @@ import org.bukkit.DyeColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Horse;
 import org.bukkit.entity.Horse.Color;
-import org.bukkit.entity.Player;
 import org.bukkit.entity.Horse.Style;
 import org.bukkit.entity.Horse.Variant;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.inventory.ItemStack;
 
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.disguise.disguises.DisguiseBase;
-import mineplex.core.disguise.disguises.DisguisePig;
 import mineplex.core.disguise.disguises.DisguiseSheep;
 import mineplex.core.mount.HorseMount;
 import mineplex.core.mount.MountManager;
+import mineplex.core.mount.SingleEntityMountData;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 
@@ -45,6 +45,7 @@ public class MountSheep extends HorseMount
 		Manager.DeregisterAll(player);
 		
 		Horse horse = player.getWorld().spawn(player.getLocation(), Horse.class);
+		SingleEntityMountData<Horse> mount = new SingleEntityMountData<Horse>(player, horse);
 		
 		horse.setOwner(player);
 		horse.setMaxDomestication(1);
@@ -59,7 +60,7 @@ public class MountSheep extends HorseMount
 		UtilPlayer.message(player, F.main("Mount", "You spawned " + F.elem(GetName()) + "."));
 		
 		//Store
-		_active.put(player, horse);
+		_active.put(player, mount);
 	}
 	
 	@EventHandler
@@ -68,8 +69,10 @@ public class MountSheep extends HorseMount
 		if (event.getType() != UpdateType.TICK)
 			return;
 		
-		for (Horse horse : GetActive().values())
+		for (SingleEntityMountData<Horse> horseData : GetActive().values())
 		{
+			Horse horse = horseData.getEntity();
+			
 			DisguiseBase base = Manager.getDisguiseManager().getDisguise(horse);
 			if (base == null || !(base instanceof DisguiseSheep))
 				continue;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java
index 1dccbdad5..2a0b3831a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java
@@ -9,6 +9,7 @@ import org.bukkit.entity.Slime;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.EntityTargetEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.util.Vector;
 
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAction;
@@ -18,11 +19,12 @@ import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.mount.Mount;
 import mineplex.core.mount.MountManager;
+import mineplex.core.mount.SingleEntityMountData;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 
-public class MountSlime extends Mount<Slime>
+public class MountSlime extends Mount<SingleEntityMountData<Slime>>
 {
 	public MountSlime(MountManager manager)
 	{
@@ -44,10 +46,10 @@ public class MountSlime extends Mount<Slime>
 		//Remove other mounts
 		Manager.DeregisterAll(player);
 		
-		Slime mount = player.getWorld().spawn(player.getLocation(), Slime.class);
-		mount.setSize(2);
+		SingleEntityMountData<Slime> mount = new SingleEntityMountData<Slime>(player, player.getWorld().spawn(player.getLocation(), Slime.class));
+		mount.getEntity().setSize(2);
 		
-		mount.setCustomName(player.getName() + "'s " + GetName());
+		mount.getEntity().setCustomName(player.getName() + "'s " + GetName());
 
 		//Inform
 		UtilPlayer.message(player, F.main("Mount", "You spawned " + F.elem(GetName()) + "."));
@@ -58,7 +60,7 @@ public class MountSlime extends Mount<Slime>
 	
 	public void Disable(Player player)
 	{
-		Slime mount = _active.remove(player);
+		SingleEntityMountData<Slime> mount = _active.remove(player);
 		if (mount != null)
 		{
 			mount.remove();
@@ -79,11 +81,8 @@ public class MountSlime extends Mount<Slime>
 		if (!GetActive().containsKey(event.getPlayer()))
 			return;
 		
-		if (!GetActive().get(event.getPlayer()).equals(event.getRightClicked()))
-		{
-			UtilPlayer.message(event.getPlayer(), F.main("Mount", "This is not your Mount!"));
+		if(!GetActive().get(event.getPlayer()).ownsMount(event.getPlayer()))
 			return;
-		}
 		
 		event.getPlayer().leaveVehicle();
 		event.getPlayer().eject();
@@ -108,10 +107,15 @@ public class MountSlime extends Mount<Slime>
 			return;
 		
 		//Bounce
-		for (Slime slime : GetActive().values())
+		for (SingleEntityMountData<Slime> slimeData : GetActive().values())
 		{
+			Slime slime = slimeData.getEntity();
+			
 			if (slime.getPassenger() == null)
+			{
+				UtilEnt.setFakeHead(slime, false);
 				continue;
+			}
 			
 			if (!UtilEnt.isGrounded(slime))
 				continue;
@@ -124,14 +128,19 @@ public class MountSlime extends Mount<Slime>
 			if (!Recharge.Instance.use(player, GetName(), 200, false, false))
 				continue;
 
-			UtilAction.velocity(slime, slime.getPassenger().getLocation().getDirection(), 1, true, 0, 0.4, 1, true);
+			Vector dir = slime.getPassenger().getLocation().getDirection();
+			
+			UtilAction.velocity(slime, dir, 1, true, 0, 0.4, 1, true);
+			
+			UtilEnt.CreatureForceLook(slime, 0, UtilAlg.GetYaw(dir));
 			
 			slime.getWorld().playSound(slime.getLocation(), Sound.SLIME_WALK, 1f, 0.75f);
 		}
 		
 		//Collide
-		for (Slime slime : GetActive().values())
+		for (SingleEntityMountData<Slime> slimeData : GetActive().values())
 		{
+			Slime slime = slimeData.getEntity();
 			if (slime.getPassenger() == null)
 				continue;
 			
@@ -143,8 +152,10 @@ public class MountSlime extends Mount<Slime>
 			if (!Recharge.Instance.usable(player, GetName() + " Collide"))
 				continue;
 			
-			for (Slime other : GetActive().values())
+			for (SingleEntityMountData<Slime> otherSlime : GetActive().values())
 			{
+				Slime other = otherSlime.getEntity();
+				
 				if (other.equals(slime))
 					continue;
 				
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSpider.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSpider.java
index 3667a10d1..57ca4045b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSpider.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSpider.java
@@ -4,21 +4,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Map.Entry;
 
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilAction;
-import mineplex.core.common.util.UtilBlock;
-import mineplex.core.common.util.UtilEnt;
-import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.disguise.disguises.DisguiseSpider;
-import mineplex.core.mount.HorseMount;
-import mineplex.core.mount.MountManager;
-import mineplex.core.recharge.Recharge;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-import net.minecraft.server.v1_8_R3.EntityLiving;
-
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
@@ -32,6 +17,22 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.disguise.disguises.DisguiseSpider;
+import mineplex.core.mount.HorseMount;
+import mineplex.core.mount.MountManager;
+import mineplex.core.mount.SingleEntityMountData;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import net.minecraft.server.v1_8_R3.EntityLiving;
+
 public class MountSpider extends HorseMount
 {	
 	/**
@@ -87,7 +88,8 @@ public class MountSpider extends HorseMount
 		UtilPlayer.message(player, F.main("Mount", "You spawned " + F.elem(GetName()) + "."));
 
 		//Store
-		_active.put(player, horse);
+		SingleEntityMountData<Horse> mount = new SingleEntityMountData<Horse>(player, horse);
+		_active.put(player, mount);
 
 		DisguiseSpider spider = new DisguiseSpider(horse);
 		spider.setName(player.getName() + "'s Spider Mount");
@@ -105,7 +107,7 @@ public class MountSpider extends HorseMount
 		ArrayList<Horse> used = new ArrayList<Horse>();
 		for (Player player : GetActive().keySet())
 		{
-			Horse horse = GetActive().get(player);
+			Horse horse = GetActive().get(player).getEntity();
 			
 			used.add(horse);
 			
@@ -126,21 +128,24 @@ public class MountSpider extends HorseMount
 		if (event.getType() != UpdateType.TICK)
 			return;
 
-		for (Entry<Player, Horse> horse : GetActive().entrySet())
+		for (Entry<Player, SingleEntityMountData<Horse>> entry : GetActive().entrySet())
 		{
-			if (horse.getValue().getPassenger() != horse.getKey())
+			Player player = entry.getKey();
+			Horse horse = entry.getValue().getEntity();
+			
+			if (horse.getPassenger() != player)
 				continue;
 			
 			//If player is looking up
-			if (horse.getKey().getEyeLocation().getPitch() > -45)
+			if (player.getEyeLocation().getPitch() > -45)
 				continue;
 
-			for (Block block : UtilBlock.getSurrounding(horse.getValue().getLocation().getBlock(), true))
+			for (Block block : UtilBlock.getSurrounding(horse.getLocation().getBlock(), true))
 			{	
 				if (UtilBlock.airFoliage(block) || block.isLiquid())
 					continue;
 
-				UtilAction.velocity(horse.getValue(), new Vector(horse.getValue().getVelocity().getX(), 0.2, horse.getValue().getVelocity().getZ()));
+				UtilAction.velocity(horse, new Vector(horse.getVelocity().getX(), 0.2, horse.getVelocity().getZ()));
 				continue;
 			}
 		}
@@ -191,7 +196,7 @@ public class MountSpider extends HorseMount
 		
 		for (Player player : GetActive().keySet())
 		{
-			final Horse horse = GetActive().get(player);
+			final Horse horse = GetActive().get(player).getEntity();
 
 			if (horse.getPassenger() != player)
 				continue;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
index e4ea28811..4001f5184 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
@@ -1,27 +1,140 @@
 package mineplex.core.mount.types;
 
 import org.bukkit.Material;
-import org.bukkit.entity.Horse.Color;
-import org.bukkit.entity.Horse.Style;
-import org.bukkit.entity.Horse.Variant;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.player.PlayerInteractAtEntityEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
 
+import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
-import mineplex.core.mount.HorseMount;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.mount.Mount;
 import mineplex.core.mount.MountManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
 
-public class MountTitan extends HorseMount
+public class MountTitan extends Mount<MountTitanData>
 {
-	public MountTitan(MountManager manager) 
+	public MountTitan(MountManager manager)
 	{
-		super(manager, "Titanic Mount", new String[]
+		super(manager, "Molten Snake", Material.MAGMA_CREAM, (byte)0, new String[]
 				{
-				C.cWhite + "Coming Soon...",
+				C.cWhite + "Deep under the earths surface, there",
+				C.cWhite + "exists a mythical species of Molten",
+				C.cWhite + "Snakes. This one will serve you eternally.",
 				" ",
 				C.cRed + "Unlocked with Titan Rank",
-				},
-				Material.INK_SACK,
-				(byte)8,
-				-1,
-				Color.BLACK, Style.BLACK_DOTS, Variant.UNDEAD_HORSE, 0.8, null);
+				}, -1);
+	}
+
+	@Override
+	public void EnableCustom(Player player) 
+	{
+		player.leaveVehicle();
+		player.eject();
+		
+		//Remove other mounts
+		Manager.DeregisterAll(player);
+		
+		//Inform
+		UtilPlayer.message(player, F.main("Mount", "You spawned " + F.elem(GetName()) + "."));
+				
+		//Store
+		_active.put(player, new MountTitanData(player, GetName()));
+	}
+
+	@Override
+	public void Disable(Player player) 
+	{
+		MountTitanData data = _active.remove(player);
+		if (data != null)
+		{
+			data.clean();
+			
+			//Inform
+			UtilPlayer.message(player, F.main("Mount", "You despawned " + F.elem(GetName()) + "."));
+			
+			Manager.removeActive(player);
+		}	
+	}
+	
+	@EventHandler
+	public void update(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+		
+		for (MountTitanData data : _active.values())
+		{
+			data.update();
+		}
+	}
+	
+	@EventHandler
+	public void interactMount(PlayerInteractAtEntityEvent event)
+	{
+		if (event.getRightClicked() == null)
+			return;
+
+		for(MountTitanData mount : GetActive().values())
+		{
+			if(mount.isPartOfMount(event.getRightClicked()))
+			{
+				event.setCancelled(true);
+				if(event.getRightClicked().getType() == EntityType.ARMOR_STAND) return;
+			}
+		}
+		
+		if (!GetActive().containsKey(event.getPlayer()))
+			return;
+		
+		if (!GetActive().get(event.getPlayer()).ownsMount(event.getPlayer()))
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Mount", "This is not your Mount!"));
+			return;
+		}
+
+		event.getPlayer().leaveVehicle();
+		event.getPlayer().eject();
+			
+		GetActive().get(event.getPlayer()).mount(event.getPlayer(), event.getRightClicked());
+	}
+	
+	@EventHandler
+	public void target(EntityTargetEvent event)
+	{	
+		if (!(event.getEntity() instanceof Player))
+			return;
+		
+		if (!GetActive().containsKey(event.getTarget()))
+			return;
+		
+		if (!GetActive().get(event.getTarget()).ownsMount((Player)event.getEntity()))
+			event.setCancelled(true);
+	}
+	
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void target(EntityDamageEvent event)
+	{
+		for (MountTitanData data : _active.values())
+		{
+			if (data.isPartOfMount(event.getEntity()))
+				event.setCancelled(true);
+		}
+	}
+		
+	@EventHandler
+	public void titanOwner(PlayerJoinEvent event)
+	{
+		if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN))
+		{
+			Manager.getDonationManager().Get(event.getPlayer().getName()).AddUnknownSalesPackagesOwned(GetName());
+		}	
 	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
new file mode 100644
index 000000000..137ae9bbe
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
@@ -0,0 +1,149 @@
+
+
+package mineplex.core.mount.types;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.MagmaCube;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Slime;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.EulerAngle;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.mount.MountData;
+
+public class MountTitanData extends MountData
+{
+
+	private Slime _head;
+
+	private ArrayList<ArmorStand> _nodes;
+
+	public MountTitanData(Player player, String name) 
+	{
+		super(player);
+
+		Location loc = player.getLocation();
+		loc.setPitch(0);
+		loc.setYaw(0);
+		
+		//Nodes
+		_nodes = new ArrayList<ArmorStand>();
+
+		for (int i=0 ; i<30 ; i++)
+		{
+			ArmorStand node = loc.getWorld().spawn(loc, ArmorStand.class);
+
+			node.setVisible(false);
+			node.setGravity(false);
+			node.setGhost(true);
+
+			node.setHelmet(new ItemStack(Material.NETHERRACK));
+			
+			UtilEnt.setFakeHead(node, true);
+			
+			_nodes.add(node);
+		}
+
+		//Head
+		_head = player.getWorld().spawn(loc, MagmaCube.class);
+		_head.setSize(2);
+		UtilEnt.ghost(_head, true, false);
+
+		_head.setCustomName(player.getName() + "'s " + name);
+	}
+
+	public void mount(Player player, Entity entity)
+	{
+		if (_head.equals(entity) || _nodes.contains(entity))
+			_head.setPassenger(player);
+	}
+
+	public void update()
+	{			
+		//Head
+		if (_head.getPassenger() != null)
+		{
+			Vector dir = _head.getPassenger().getLocation().getDirection().multiply(0.8).add(new Vector(0,0.2,0));
+			_head.setVelocity(dir);
+			UtilEnt.CreatureLook(_head, dir);
+		}
+
+		Location infront = _head.getLocation().add(0, -1.5, 0);
+
+		//Move
+		for (int i=0 ; i<30 ; i++)
+		{
+			ArmorStand node = _nodes.get(i);
+
+			Location old = node.getLocation();
+			
+			infront.setPitch(node.getLocation().getPitch());
+			infront.setYaw(node.getLocation().getYaw());
+			
+			//Move
+			if (i == 0)
+				node.teleport(infront);
+			else if (UtilMath.offset(node.getLocation(), infront) > 0.6)
+				node.teleport(infront.add(UtilAlg.getTrajectory(infront, node.getLocation()).multiply(0.6)));
+
+			//Rotation
+			Vector vector = UtilAlg.getTrajectory(old, node.getLocation());
+
+			node.setHeadPose(new EulerAngle(
+					Math.toRadians(UtilAlg.GetPitch(vector)), 
+					Math.toRadians(UtilAlg.GetYaw(vector)),
+					0));
+						
+			infront = node.getLocation();
+		}
+
+
+		//Shuffle In
+		if (_head.getPassenger() == null) 
+		{
+			for (int i=_nodes.size()-1 ; i>=0 ; i--)
+			{
+				ArmorStand node = _nodes.get(i);
+
+				if (i>0)
+					infront = _nodes.get(i-1).getLocation(); 
+				else
+					infront = _head.getLocation().add(0, -1.5, 0);
+
+				infront.setPitch(node.getLocation().getPitch());
+				infront.setYaw(node.getLocation().getYaw());
+				
+				node.teleport(infront);
+			}
+		}
+	}
+
+
+
+	public void clean() 
+	{
+		_head.remove();
+
+		for (ArmorStand stand : _nodes)
+			stand.remove();
+	}
+	
+	@Override
+	public List<Entity> getEntityParts()
+	{
+		List<Entity> entities = new ArrayList<Entity>();
+		entities.addAll(_nodes);
+		entities.add(_head);
+		return entities;
+	}
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountUndead.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountUndead.java
index ebe2216c5..3bf4bb80e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountUndead.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountUndead.java
@@ -1,15 +1,5 @@
 package mineplex.core.mount.types;
 
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilParticle.ParticleType;
-import mineplex.core.common.util.UtilParticle.ViewDist;
-import mineplex.core.common.util.UtilServer;
-import mineplex.core.mount.HorseMount;
-import mineplex.core.mount.MountManager;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-
 import org.bukkit.Material;
 import org.bukkit.entity.Horse;
 import org.bukkit.entity.Horse.Color;
@@ -17,6 +7,16 @@ import org.bukkit.entity.Horse.Style;
 import org.bukkit.entity.Horse.Variant;
 import org.bukkit.event.EventHandler;
 
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.mount.HorseMount;
+import mineplex.core.mount.MountManager;
+import mineplex.core.mount.SingleEntityMountData;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+
 public class MountUndead extends HorseMount
 {
 	public MountUndead(MountManager manager) 
@@ -37,16 +37,20 @@ public class MountUndead extends HorseMount
 	public void Trail(UpdateEvent event)
 	{
 		if (event.getType() == UpdateType.TICK)
-			for (Horse horse : GetActive().values())
-				UtilParticle.PlayParticle(ParticleType.FLAME, horse.getLocation().add(0, 1, 0),
-						0.25f, 0.25f, 0.25f, 0, 2,
-						ViewDist.NORMAL, UtilServer.getPlayers());
+			for (SingleEntityMountData<Horse> horseData : GetActive().values())
+			{
+				Horse horse = horseData.getEntity();
+				UtilParticle.PlayParticleToAll(ParticleType.FLAME, horse.getLocation().add(0, 1, 0),
+						0.25f, 0.25f, 0.25f, 0, 2,ViewDist.NORMAL);
+			}
 
 		if (event.getType() == UpdateType.FAST)
-			for (Horse horse : GetActive().values())
-				UtilParticle.PlayParticle(ParticleType.LAVA, horse.getLocation().add(0, 1, 0),
-						0.25f, 0.25f, 0.25f, 0, 1,
-						ViewDist.NORMAL, UtilServer.getPlayers());
+			for (SingleEntityMountData<Horse> horseData : GetActive().values())
+			{
+				Horse horse = horseData.getEntity();
+				UtilParticle.PlayParticleToAll(ParticleType.LAVA, horse.getLocation().add(0, 1, 0),
+						0.25f, 0.25f, 0.25f, 0, 1, ViewDist.NORMAL);
+			}
 		
 	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
index da8736f6d..5e971bf50 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
@@ -174,8 +174,7 @@ public class NpcManager extends MiniPlugin
 
 	public Npc getNpcByEntity(Entity entity)
 	{
-		if (entity == null)
-			return null;
+		if (entity == null)	return null;
 
 		return getNpcByEntityUUID(entity.getUniqueId());
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java
index 5de1e1525..e17daf159 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java
@@ -13,7 +13,7 @@ public class AddCommand extends CommandBase<NpcManager>
 {
 	public AddCommand(NpcManager plugin)
 	{
-		super(plugin, Rank.DEVELOPER, "add");
+		super(plugin, Rank.JNR_DEV, "add");
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java
index 71dce58c0..f6a698add 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java
@@ -12,7 +12,7 @@ public class DeleteCommand extends CommandBase<NpcManager>
 {
 	public DeleteCommand(NpcManager plugin)
 	{
-		super(plugin, Rank.DEVELOPER, "del");
+		super(plugin, Rank.JNR_DEV, "del");
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java
index 5e66eee21..81bd78c4a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java
@@ -10,7 +10,7 @@ public class NpcCommand extends MultiCommandBase<NpcManager>
 {
 	public NpcCommand(NpcManager plugin)
 	{
-		super(plugin, Rank.DEVELOPER, new Rank[] {Rank.JNR_DEV}, "npc");
+		super(plugin, Rank.JNR_DEV, "npc");
 
 		AddCommand(new AddCommand(plugin));
 		AddCommand(new DeleteCommand(plugin));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java b/Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
index 5d6027624..44f2086be 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
@@ -56,7 +56,7 @@ public class PacketHandler extends MiniPlugin
 	{
 		if (!_packetHandlers.containsKey(packetInfo.getPacket().getClass()))
 		{
-			// aSystem.err.print("Received packet " + packetInfo.getPacket().getClass() + " but am not listening for it!");
+			System.err.print("Received packet " + packetInfo.getPacket().getClass() + " but am not listening for it!");
 			return true;
 		}
 
@@ -79,6 +79,7 @@ public class PacketHandler extends MiniPlugin
 	public void onPlayerQuit(PlayerQuitEvent event)
 	{
 		((CraftPlayer) event.getPlayer()).getHandle().playerConnection.PacketVerifier.setPacketVerifier(null);
+		_playerVerifierMap.remove(event.getPlayer());
 	}
 
 	public PacketVerifier getPacketVerifier(Player player)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java
index dcf6403e0..b79283d76 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java
@@ -86,6 +86,9 @@ public class PartyManager extends MiniPlugin
 	@EventHandler
 	public void serverTransfer(ServerTransferEvent event)
 	{
+		if (event.isDraggedByParty())
+			return;
+
 		Party party = _partyLeaderMap.get(event.getPlayer().getName());
 		
 		if (party != null)
@@ -100,7 +103,7 @@ public class PartyManager extends MiniPlugin
 			{
 				if (player != event.getPlayer())
 				{
-					_portal.sendPlayerToServer(player, event.getServer(), false);
+					_portal.sendPlayerToServer(player, event.getServer(), true);
 				}
 			}
 		}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetFactory.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetFactory.java
index 84a1a2664..56cab2079 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetFactory.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetFactory.java
@@ -42,6 +42,7 @@ public class PetFactory
 		_pets.put(EntityType.OCELOT, new Pet("Cat", EntityType.OCELOT, 6000));
 		_pets.put(EntityType.MUSHROOM_COW, new Pet("Mooshroom", EntityType.MUSHROOM_COW, 5000));
 		_pets.put(EntityType.WITHER, new Pet("Widder", EntityType.WITHER, -1));
+		_pets.put(EntityType.SKELETON, new Pet("Guardian", EntityType.SKELETON, -1));
 	}
 
 	private void CreatePetExtras()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
index 9d631ff8d..d111bc6a7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
@@ -14,9 +14,12 @@ import mineplex.core.account.event.ClientWebResponseEvent;
 import mineplex.core.blockrestore.BlockRestore;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.disguise.DisguiseManager;
+import mineplex.core.disguise.disguises.DisguiseGuardian;
 import mineplex.core.disguise.disguises.DisguiseWither;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.inventory.InventoryManager;
@@ -38,8 +41,10 @@ import org.bukkit.entity.Ageable;
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Guardian;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Skeleton;
 import org.bukkit.entity.Villager;
 import org.bukkit.entity.Zombie;
 import org.bukkit.event.EventHandler;
@@ -159,6 +164,12 @@ public class PetManager extends MiniClientPlugin<PetClient>
 			if (!Get(p).GetPets().containsKey(EntityType.WITHER))
 				Get(p).GetPets().put(EntityType.WITHER, "Widder");
 		}
+		
+		if (rank.has(Rank.TITAN))
+		{
+			if (!Get(p).GetPets().containsKey(EntityType.SKELETON))
+				Get(p).GetPets().put(EntityType.SKELETON, "Guardian");
+		}
 	}
 	
 	public void AddPetOwner(Player player, EntityType entityType, Location location)
@@ -175,6 +186,7 @@ public class PetManager extends MiniClientPlugin<PetClient>
 		
 		Creature pet;
 		
+		//Wither Spawn
 		if (entityType == EntityType.WITHER)
 		{ 
 			_creatureModule.SetForce(true);
@@ -196,6 +208,7 @@ public class PetManager extends MiniClientPlugin<PetClient>
 
 			_creatureModule.SetForce(false);
 		}
+		//Default Spawn
 		else
 		{
 		    pet = (Creature)_creatureModule.SpawnEntity(location, entityType);
@@ -220,6 +233,20 @@ public class PetManager extends MiniClientPlugin<PetClient>
 			((Villager) pet).setBaby();
 			((Villager) pet).setAgeLock(true);
 		}
+		else if (pet instanceof Skeleton)
+		{
+			pet.getEquipment().setHelmet(new ItemStack(Material.PUMPKIN));	//stop burning
+			UtilEnt.silence(pet, true);
+			
+			DisguiseGuardian disguise = new DisguiseGuardian(pet);
+
+			if (Get(player).GetPets().get(entityType) != null && Get(player).GetPets().get(entityType).length() > 0)
+			{
+				disguise.setName(Get(player).GetPets().get(entityType));
+			}
+			
+			_disguiseManager.disguise(disguise);
+		}
 		
 		_activePetOwners.put(player.getName(), pet);
 		_failedAttempts.put(player.getName(), 0);
@@ -335,6 +362,12 @@ public class PetManager extends MiniClientPlugin<PetClient>
 			xDiff = Math.abs(petSpot.getBlockX() - ownerSpot.getBlockX());
 			yDiff = Math.abs(petSpot.getBlockY() - ownerSpot.getBlockY());
 			zDiff = Math.abs(petSpot.getBlockZ() - ownerSpot.getBlockZ());
+			
+			//Guardian
+			if (pet instanceof Skeleton && Math.random() > 0.66 && UtilEnt.isGrounded(pet))
+			{
+				UtilAction.velocity(pet, UtilAlg.getTrajectory(pet, owner), Math.random() * 0.3 + 0.3, false, 0, 0.3, 1, true);
+			}
 		
 			if ((xDiff + yDiff + zDiff) > 4)
 			{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
index 70ab28680..d5a24913f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
@@ -80,19 +80,16 @@ public class Portal extends MiniPlugin
 	
 	public void sendPlayerToServer(Player player, String serverName)
 	{
-		sendPlayerToServer(player, serverName, true);
+		sendPlayerToServer(player, serverName, false);
 	}
 	
-	public void sendPlayerToServer(final Player player, final String serverName, boolean callEvent)
+	public void sendPlayerToServer(final Player player, final String serverName, boolean draggedByParty)
 	{
 		if (_connectingPlayers.contains(player.getName()))
 			return;
-		
-		if (callEvent)
-		{
-			ServerTransferEvent event = new ServerTransferEvent(player, serverName);
-			Bukkit.getPluginManager().callEvent(event);
-		}
+
+		ServerTransferEvent event = new ServerTransferEvent(player, serverName, draggedByParty);
+		Bukkit.getPluginManager().callEvent(event);
 
 		final boolean override = serverName.equalsIgnoreCase("Lobby");
 		final Rank playerRank = _clientManager.Get(player).GetRank();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/ServerTransferEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/ServerTransferEvent.java
index 69ddf086f..94262b8d7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/portal/ServerTransferEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/ServerTransferEvent.java
@@ -10,11 +10,18 @@ public class ServerTransferEvent extends Event
 	private static final HandlerList _handlers = new HandlerList();
 	private Player _player;
 	private String _server;
+	private boolean _draggedByParty;
 
-	public ServerTransferEvent(Player player, String server)
+	public ServerTransferEvent(Player player, String server, boolean draggedByParty)
 	{
 		_player = player;
 		_server = server;
+		_draggedByParty = draggedByParty;
+	}
+
+	public boolean isDraggedByParty()
+	{
+		return _draggedByParty;
 	}
 
 	public HandlerList getHandlers()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
index c69ab7bed..82eec02d1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
@@ -13,6 +13,7 @@ import mineplex.core.common.util.UtilInv;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.preferences.command.PreferencesCommand;
+import mineplex.core.preferences.ui.ExclusivePreferencesShop;
 import mineplex.core.preferences.ui.PreferencesShop;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
@@ -32,6 +33,7 @@ public class PreferencesManager extends MiniDbClientPlugin<UserPreferences>
 {
 	private PreferencesRepository _repository;
 	private PreferencesShop _shop;
+	private ExclusivePreferencesShop _exclusiveShop;
 	
 	private NautHashMap<String, UserPreferences> _saveBuffer = new NautHashMap<String, UserPreferences>();
 	
@@ -42,7 +44,10 @@ public class PreferencesManager extends MiniDbClientPlugin<UserPreferences>
 		super("Preferences", plugin, clientManager);
 		
 		_repository = new PreferencesRepository(plugin);
-		_shop = new PreferencesShop(this, clientManager, donationManager);
+		_exclusiveShop = new ExclusivePreferencesShop(this, clientManager, donationManager);
+		_shop = new PreferencesShop(this, clientManager, donationManager, _exclusiveShop);
+		
+		_exclusiveShop.setPreferencesShop(_shop);
 		
 		addCommand(new PreferencesCommand(this));
 	}
@@ -131,6 +136,6 @@ public class PreferencesManager extends MiniDbClientPlugin<UserPreferences>
 	@Override
 	public String getQuery(int accountId, String uuid, String name)
 	{
-		return "SELECT games, visibility, showChat, friendChat, privateMessaging, partyRequests, invisibility, forcefield, showMacReports, ignoreVelocity, pendingFriendRequests, friendDisplayInventoryUI FROM accountPreferences WHERE accountPreferences.uuid = '" + uuid + "' LIMIT 1;";
+		return "SELECT games, visibility, showChat, friendChat, privateMessaging, partyRequests, invisibility, forcefield, showMacReports, ignoreVelocity, pendingFriendRequests, friendDisplayInventoryUI, clanTips FROM accountPreferences WHERE accountPreferences.uuid = '" + uuid + "' LIMIT 1;";
 	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
index 44852c23e..7449c83c9 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
@@ -14,11 +14,18 @@ import mineplex.core.database.RepositoryBase;
 import mineplex.core.database.column.ColumnVarChar;
 
 public class PreferencesRepository extends RepositoryBase
-{	
-	//private static String CREATE_ACCOUNT_TABLE = "CREATE TABLE IF NOT EXISTS accountPreferences (id INT NOT NULL AUTO_INCREMENT, uuid VARCHAR(256), games BOOL NOT NULL DEFAULT 1, visibility BOOL NOT NULL DEFAULT 1, showChat BOOL NOT NULL DEFAULT 1, friendChat BOOL NOT NULL DEFAULT 1, privateMessaging BOOL NOT NULL DEFAULT 1, partyRequests BOOL NOT NULL DEFAULT 0, invisibility BOOL NOT NULL DEFAULT 0, forcefield BOOL NOT NULL DEFAULT 0, showMacReports BOOL NOT NULL DEFAULT 0, ignoreVelocity BOOL NOT NULL DEFAULT 0, PRIMARY KEY (id), UNIQUE INDEX uuid_index (uuid));";
+{
+	// private static String CREATE_ACCOUNT_TABLE = "CREATE TABLE IF NOT EXISTS
+	// accountPreferences (id INT NOT NULL AUTO_INCREMENT, uuid VARCHAR(256),
+	// games BOOL NOT NULL DEFAULT 1, visibility BOOL NOT NULL DEFAULT 1,
+	// showChat BOOL NOT NULL DEFAULT 1, friendChat BOOL NOT NULL DEFAULT 1,
+	// privateMessaging BOOL NOT NULL DEFAULT 1, partyRequests BOOL NOT NULL
+	// DEFAULT 0, invisibility BOOL NOT NULL DEFAULT 0, forcefield BOOL NOT NULL
+	// DEFAULT 0, showMacReports BOOL NOT NULL DEFAULT 0, ignoreVelocity BOOL
+	// NOT NULL DEFAULT 0, PRIMARY KEY (id), UNIQUE INDEX uuid_index (uuid));";
 	private static String INSERT_ACCOUNT = "INSERT INTO accountPreferences (uuid) VALUES (?) ON DUPLICATE KEY UPDATE uuid=uuid;";
-	private static String UPDATE_ACCOUNT_PREFERENCES = "UPDATE accountPreferences SET games = ?, visibility = ?, showChat = ?, friendChat = ?, privateMessaging = ?, partyRequests = ?, invisibility = ?, forcefield = ?, showMacReports = ?, ignoreVelocity = ?, pendingFriendRequests = ?, friendDisplayInventoryUI = ? WHERE uuid=?;";
-
+	private static String UPDATE_ACCOUNT_PREFERENCES = "UPDATE accountPreferences SET games = ?, visibility = ?, showChat = ?, friendChat = ?, privateMessaging = ?, partyRequests = ?, invisibility = ?, forcefield = ?, showMacReports = ?, ignoreVelocity = ?, pendingFriendRequests = ?, friendDisplayInventoryUI = ?, clanTips = ? WHERE uuid=?;";
+	
 	public PreferencesRepository(JavaPlugin plugin)
 	{
 		super(plugin, DBPool.ACCOUNT);
@@ -27,9 +34,9 @@ public class PreferencesRepository extends RepositoryBase
 	@Override
 	protected void initialize()
 	{
-		//executeUpdate(CREATE_ACCOUNT_TABLE);
+		// executeUpdate(CREATE_ACCOUNT_TABLE);
 	}
-
+	
 	@Override
 	protected void update()
 	{
@@ -37,11 +44,7 @@ public class PreferencesRepository extends RepositoryBase
 	
 	public void saveUserPreferences(NautHashMap<String, UserPreferences> preferences)
 	{
-		try 
-			(
-				Connection connection = getConnection();
-				PreparedStatement preparedStatement = connection.prepareStatement(UPDATE_ACCOUNT_PREFERENCES);
-			)
+		try (Connection connection = getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(UPDATE_ACCOUNT_PREFERENCES);)
 		{
 			for (Entry<String, UserPreferences> entry : preferences.entrySet())
 			{
@@ -55,13 +58,15 @@ public class PreferencesRepository extends RepositoryBase
 				preparedStatement.setBoolean(8, entry.getValue().HubForcefield);
 				preparedStatement.setBoolean(9, entry.getValue().ShowMacReports);
 				preparedStatement.setBoolean(10, entry.getValue().IgnoreVelocity);
-                preparedStatement.setBoolean(11, entry.getValue().PendingFriendRequests);
-                preparedStatement.setBoolean(12, entry.getValue().friendDisplayInventoryUI);
-				preparedStatement.setString(13, entry.getKey());
+				preparedStatement.setBoolean(11, entry.getValue().PendingFriendRequests);
+				preparedStatement.setBoolean(12, entry.getValue().friendDisplayInventoryUI);
+				preparedStatement.setBoolean(13, entry.getValue().ClanTips);
+				System.out.println(">> " + entry.getValue().ClanTips);
+				preparedStatement.setString(14, entry.getKey());
 				
 				preparedStatement.addBatch();
 			}
-
+			
 			int[] rowsAffected = preparedStatement.executeBatch();
 			int i = 0;
 			
@@ -82,20 +87,22 @@ public class PreferencesRepository extends RepositoryBase
 					preparedStatement.setBoolean(9, entry.getValue().ShowMacReports);
 					preparedStatement.setBoolean(10, entry.getValue().IgnoreVelocity);
 					preparedStatement.setBoolean(11, entry.getValue().PendingFriendRequests);
-	                preparedStatement.setBoolean(12, entry.getValue().friendDisplayInventoryUI);
-	                preparedStatement.setString(13, entry.getKey());
+					preparedStatement.setBoolean(12, entry.getValue().friendDisplayInventoryUI);
+					preparedStatement.setBoolean(13, entry.getValue().ClanTips);
+					System.out.println(">> " + entry.getValue().ClanTips);
+					preparedStatement.setString(14, entry.getKey());
 					preparedStatement.execute();
 				}
 				
 				i++;
 			}
-		}		
+		}
 		catch (Exception exception)
 		{
 			exception.printStackTrace();
 		}
 	}
-
+	
 	public UserPreferences loadClientInformation(final ResultSet resultSet) throws SQLException
 	{
 		final UserPreferences preferences = new UserPreferences();
@@ -114,6 +121,8 @@ public class PreferencesRepository extends RepositoryBase
 			preferences.IgnoreVelocity = resultSet.getBoolean(10);
 			preferences.PendingFriendRequests = resultSet.getBoolean(11);
 			preferences.friendDisplayInventoryUI = resultSet.getBoolean(12);
+			preferences.ClanTips = resultSet.getBoolean(13);
+			System.out.println("<< " + resultSet.getBoolean(13));
 		}
 		
 		return preferences;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
index e52e7d249..728f549e2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
@@ -15,4 +15,5 @@ public class UserPreferences
 	public boolean IgnoreVelocity = false;
 	public boolean PendingFriendRequests = true;
 	public boolean friendDisplayInventoryUI = true;
+	public boolean ClanTips = true;
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
new file mode 100644
index 000000000..53c774a0e
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
@@ -0,0 +1,194 @@
+package mineplex.core.preferences.ui;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilUI;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.preferences.PreferencesManager;
+import mineplex.core.preferences.UserPreferences;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+
+public class ExclusivePreferencesPage extends ShopPageBase<PreferencesManager, ExclusivePreferencesShop>
+{
+	private IButton _toggleHubInvisibility;
+	private IButton _toggleHubForcefield;
+	private IButton _toggleHubIgnoreVelocity;
+	private IButton _toggleMacReports;
+	
+	private boolean _hubInvisibilityToggled;
+	private boolean _hubForcefieldToggled;
+	private boolean _hubIgnoreVelocityToggled;
+	private boolean _macReportsToggled;
+	
+	private PreferencesShop _preferencesShop;
+	
+	public ExclusivePreferencesPage(PreferencesManager plugin, ExclusivePreferencesShop shop, CoreClientManager clientManager, DonationManager donationManager, String name, Player player, PreferencesShop preferencesShop)
+	{
+		super(plugin, shop, clientManager, donationManager, name, player, 54);
+		
+		_preferencesShop = preferencesShop;
+		
+		createButtons();
+		buildPage();
+	}
+	
+	private void createButtons()
+	{
+		_toggleHubInvisibility = new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				toggleHubInvisibility(player);
+			}
+		};
+		
+		_toggleHubForcefield = new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				toggleHubForcefield(player);
+			}
+		};
+		
+		_toggleMacReports = new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				toggleMacReports(player);
+			}
+		};
+		
+		_toggleHubIgnoreVelocity = new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				toggleHubIgnoreVelocity(player);
+			}
+		};
+	}
+	
+	@Override
+	public void playerClosed()
+	{
+		super.playerClosed();
+		if (preferencesChanged())
+		{
+			getPlugin().savePreferences(getPlayer());
+		}
+	}
+	
+	@Override
+	protected void buildPage()
+	{
+		clear();
+		
+		UserPreferences userPreferences = getPlugin().Get(getPlayer());
+		Rank rank = getClientManager().Get(getPlayer()).GetRank();
+		
+		addButton(45, new ShopItem(Material.REDSTONE_COMPARATOR, (byte) 0, C.cAqua + "/prefs", new String[] { C.cGold + "Return back to the regular preferences" }, 1, false, false), new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				player.closeInventory();
+				_preferencesShop.attemptShopOpen(player);
+			}
+		});
+		
+		if (rank.has(Rank.ADMIN) || rank == Rank.JNR_DEV)
+		{
+			int[] indices = UtilUI.getIndicesFor(4, 0, 2);
+			
+			buildPreference(indices[0], Material.NETHER_STAR, "Hub Invisibility", userPreferences.Invisibility, _toggleHubInvisibility);
+			buildPreference(indices[1], Material.SLIME_BALL, "Hub Forcefield", userPreferences.HubForcefield, _toggleHubForcefield);
+			buildPreference(indices[2], Material.PAPER, "Mac Reports", userPreferences.ShowMacReports, _toggleMacReports);
+			buildPreference(indices[3], Material.SADDLE, "Hub Ignore Velocity", userPreferences.IgnoreVelocity, _toggleHubIgnoreVelocity);
+		}
+		else if (rank.has(Rank.MODERATOR))
+		{
+			int[] indices = UtilUI.getIndicesFor(3, 0, 2);
+			
+			buildPreference(indices[0], Material.NETHER_STAR, "Hub Invisibility", userPreferences.Invisibility, _toggleHubInvisibility);
+			buildPreference(indices[1], Material.PAPER, "Mac Reports", userPreferences.ShowMacReports, _toggleMacReports);
+			buildPreference(indices[2], Material.SADDLE, "Hub Ignore Velocity", userPreferences.IgnoreVelocity, _toggleHubIgnoreVelocity);
+		}
+		else if (rank == Rank.YOUTUBE || rank == Rank.TWITCH)
+		{
+			int[] indices = UtilUI.getIndicesFor(3, 0, 2);
+			
+			buildPreference(indices[0], Material.NETHER_STAR, "Hub Invisibility & Flight", userPreferences.Invisibility, _toggleHubInvisibility);
+			buildPreference(indices[1], Material.SLIME_BALL, "Hub Forcefield", userPreferences.HubForcefield, _toggleHubForcefield);
+			buildPreference(indices[2], Material.SADDLE, "Hub Ignore Velocity", userPreferences.IgnoreVelocity, _toggleHubIgnoreVelocity);
+		}
+	}
+	
+	private void toggleHubForcefield(org.bukkit.entity.Player player)
+	{
+		getPlugin().Get(player).HubForcefield = !getPlugin().Get(player).HubForcefield;
+		_hubForcefieldToggled = !_hubForcefieldToggled;
+		buildPage();
+	}
+	
+	private void toggleHubInvisibility(org.bukkit.entity.Player player)
+	{
+		getPlugin().Get(player).Invisibility = !getPlugin().Get(player).Invisibility;
+		
+		// Dont save for Mod/SnrMod - prevents them just being invis 24/7
+		if (getPlugin().Get(player).Invisibility)
+		{
+			if (getClient().GetRank().has(Rank.ADMIN) || getClient().GetRank() == Rank.YOUTUBE || getClient().GetRank() == Rank.YOUTUBE_SMALL || getClient().GetRank() == Rank.TWITCH)
+			{
+				_hubInvisibilityToggled = !_hubInvisibilityToggled;
+			}
+		}
+		
+		player.setFlying(false);
+		player.setAllowFlight(false);
+		
+		buildPage();
+	}
+	
+	private void toggleMacReports(org.bukkit.entity.Player player)
+	{
+		getPlugin().Get(player).ShowMacReports = !getPlugin().Get(player).ShowMacReports;
+		_macReportsToggled = !_macReportsToggled;
+		buildPage();
+	}
+	
+	private void toggleHubIgnoreVelocity(org.bukkit.entity.Player player)
+	{
+		getPlugin().Get(player).IgnoreVelocity = !getPlugin().Get(player).IgnoreVelocity;
+		_hubIgnoreVelocityToggled = !_hubIgnoreVelocityToggled;
+		buildPage();
+	}
+	
+	private void buildPreference(int index, Material material, String name, boolean preference, IButton button)
+	{
+		buildPreference(index, material, (byte) 0, name, preference, button);
+	}
+	
+	private void buildPreference(int index, Material material, byte data, String name, boolean preference, IButton button)
+	{
+		String[] description = new String[] { "" + (preference ? ChatColor.GREEN + "Enabled" : ChatColor.RED + "Disabled"), ChatColor.RED + " ", ChatColor.RESET + "Click to " + (preference ? "Disable" : "Enable") };
+		
+		addButton(index, new ShopItem(material, data, (preference ? ChatColor.GREEN : ChatColor.RED) + name, description, 1, false, false), button);
+		addButton(index + 9, new ShopItem(Material.INK_SACK, (preference ? (byte) 10 : (byte) 8), (preference ? ChatColor.GREEN : ChatColor.RED) + name, description, 1, false, false), button);
+	}
+	
+	public boolean preferencesChanged()
+	{
+		return _hubInvisibilityToggled || _macReportsToggled || _hubInvisibilityToggled || _hubForcefieldToggled;
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesShop.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesShop.java
new file mode 100644
index 000000000..ba8ec291a
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesShop.java
@@ -0,0 +1,29 @@
+package mineplex.core.preferences.ui;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.preferences.PreferencesManager;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+
+public class ExclusivePreferencesShop extends ShopBase<PreferencesManager>
+{
+	private PreferencesShop _preferencesShop;
+	
+	public ExclusivePreferencesShop(PreferencesManager plugin, CoreClientManager clientManager, mineplex.core.donation.DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager, "Exclusive Preferences");
+	}
+	
+	public void setPreferencesShop(PreferencesShop preferencesShop)
+	{
+		_preferencesShop = preferencesShop;
+	}
+	
+	@Override
+	protected ShopPageBase<PreferencesManager, ? extends ShopBase<PreferencesManager>> buildPagesFor(Player player)
+	{
+		return new ExclusivePreferencesPage(getPlugin(), this, getClientManager(), getDonationManager(), "Exclusive Preferences", player, _preferencesShop);
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
index b051b051c..7cd111100 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
@@ -7,6 +7,8 @@ import org.bukkit.event.inventory.ClickType;
 
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilUI;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.preferences.PreferencesManager;
 import mineplex.core.preferences.UserPreferences;
@@ -22,30 +24,28 @@ public class PreferencesPage extends ShopPageBase<PreferencesManager, Preference
 	private IButton _togglePrivateChat;
 	private IButton _toggleHubPartyRequests;
 	private IButton _togglePendingFriendRequests;
-	private IButton _toggleHubInvisibility;
-	private IButton _toggleHubForcefield;
-	private IButton _toggleHubIgnoreVelocity;
-	private IButton _toggleMacReports;
-
+	private IButton _toggleClanTips;
+	
 	private boolean _hubGamesToggled;
 	private boolean _hubPlayersToggled;
 	private boolean _hubChatToggled;
 	private boolean _hubPrivateChatToggled;
 	private boolean _hubPartyRequestsToggled;
 	private boolean _pendingFriendRequestsToggled;
-	private boolean _hubInvisibilityToggled;
-	private boolean _hubForcefieldToggled;
-	private boolean _macReportsToggled;
-	private boolean _hubIgnoreVelocityToggled;
+	private boolean _clanTipsToggled;
 	
-	public PreferencesPage(PreferencesManager plugin, PreferencesShop shop, CoreClientManager clientManager, DonationManager donationManager, String name, Player player)
+	private ExclusivePreferencesShop _exclusiveShop;
+	
+	public PreferencesPage(PreferencesManager plugin, PreferencesShop shop, CoreClientManager clientManager, DonationManager donationManager, String name, Player player, ExclusivePreferencesShop exclusiveShop)
 	{
 		super(plugin, shop, clientManager, donationManager, name, player, 54);
 		
-		createButtons();		
+		_exclusiveShop = exclusiveShop;
+		
+		createButtons();
 		buildPage();
 	}
-
+	
 	private void createButtons()
 	{
 		_toggleHubGames = new IButton()
@@ -56,6 +56,14 @@ public class PreferencesPage extends ShopPageBase<PreferencesManager, Preference
 				toggleHubGames(player);
 			}
 		};
+		_toggleClanTips = new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				toggleClanTips(player);
+			}
+		};
 		
 		_toggleHubPlayers = new IButton()
 		{
@@ -101,198 +109,116 @@ public class PreferencesPage extends ShopPageBase<PreferencesManager, Preference
 				togglePendingFriendRequests(player);
 			}
 		};
-		
-		_toggleHubInvisibility = new IButton()
-		{
-			@Override
-			public void onClick(Player player, ClickType clickType)
-			{
-				toggleHubInvisibility(player);
-			}
-		};
-		
-		_toggleHubForcefield = new IButton()
-		{
-			@Override
-			public void onClick(Player player, ClickType clickType)
-			{
-				toggleHubForcefield(player);
-			}
-		};
-
-		_toggleMacReports = new IButton()
-		{
-			@Override
-			public void onClick(Player player, ClickType clickType)
-			{
-				toggleMacReports(player);
-			}
-		};
-
-		_toggleHubIgnoreVelocity = new IButton()
-		{
-			@Override
-			public void onClick(Player player, ClickType clickType)
-			{
-				toggleHubIgnoreVelocity(player);
-			}
-		};
 	}
 	
-	private void buildPreference(int index, Material material, String name, boolean preference, IButton button)
-	{
-		buildPreference(index, material, (byte)0, name, preference, button);
-	}
-
-	private void buildPreference(int index, Material material, byte data, String name, boolean preference, IButton button)
-	{
-		String[] description = new String[] {
-				"" + (preference ? ChatColor.GREEN + "Enabled" : ChatColor.RED + "Disabled"), 
-				ChatColor.RED + " ", 
-				ChatColor.RESET + "Click to " + (preference ? "Disable" : "Enable") };
-		
-		addButton(index, new ShopItem(material, data, (preference ? ChatColor.GREEN : ChatColor.RED) + name, description, 1, false, false), button);
-		addButton(index + 9, new ShopItem(Material.INK_SACK, (preference ? (byte) 10 : (byte) 8), (preference ? ChatColor.GREEN : ChatColor.RED) + name, description, 1, false, false), button);
-	}
-	
-	protected void toggleHubForcefield(org.bukkit.entity.Player player)
-	{
-		getPlugin().Get(player).HubForcefield = !getPlugin().Get(player).HubForcefield;
-		_hubForcefieldToggled = !_hubForcefieldToggled;
-		buildPage();
-	}
-
-	protected void toggleHubInvisibility(org.bukkit.entity.Player player)
-	{
-		getPlugin().Get(player).Invisibility = !getPlugin().Get(player).Invisibility;
-		
-		//Dont save for Mod/SnrMod - prevents them just being invis 24/7
-		if (getPlugin().Get(player).Invisibility)
-		{
-			if (getClient().GetRank().has(Rank.ADMIN) || 
-					getClient().GetRank() == Rank.YOUTUBE ||
-					getClient().GetRank() == Rank.YOUTUBE_SMALL ||
-					getClient().GetRank() == Rank.TWITCH)
-			{
-				_hubInvisibilityToggled = !_hubInvisibilityToggled;
-			}
-		}
-		
-		player.setFlying(false);
-		player.setAllowFlight(false);
-		
-		buildPage();
-	}
-
-	protected void toggleHubPartyRequests(org.bukkit.entity.Player player)
+	private void toggleHubPartyRequests(Player player)
 	{
 		getPlugin().Get(player).PartyRequests = !getPlugin().Get(player).PartyRequests;
 		_hubPartyRequestsToggled = !_hubPartyRequestsToggled;
 		buildPage();
 	}
 	
-	protected void togglePendingFriendRequests(org.bukkit.entity.Player player)
+	private void togglePendingFriendRequests(Player player)
 	{
 		getPlugin().Get(player).PendingFriendRequests = !getPlugin().Get(player).PendingFriendRequests;
 		_pendingFriendRequestsToggled = !_pendingFriendRequestsToggled;
 		buildPage();
 	}
-
-	protected void togglePrivateChat(org.bukkit.entity.Player player)
+	
+	private void togglePrivateChat(Player player)
 	{
 		getPlugin().Get(player).PrivateMessaging = !getPlugin().Get(player).PrivateMessaging;
 		_hubPrivateChatToggled = !_hubPrivateChatToggled;
 		buildPage();
 	}
-
-	protected void toggleChat(org.bukkit.entity.Player player)
+	
+	private void toggleChat(Player player)
 	{
 		getPlugin().Get(player).ShowChat = !getPlugin().Get(player).ShowChat;
 		_hubChatToggled = !_hubChatToggled;
 		buildPage();
 	}
-
-	protected void toggleHubPlayers(org.bukkit.entity.Player player)
+	
+	private void toggleHubPlayers(Player player)
 	{
 		getPlugin().Get(player).ShowPlayers = !getPlugin().Get(player).ShowPlayers;
 		_hubPlayersToggled = !_hubPlayersToggled;
 		buildPage();
 	}
-
-	protected void toggleHubGames(org.bukkit.entity.Player player)
+	
+	private void toggleClanTips(Player player)
+	{
+		getPlugin().Get(player).ClanTips = !getPlugin().Get(player).ClanTips;
+		_clanTipsToggled = !_clanTipsToggled;
+		buildPage();
+	}
+	
+	private void toggleHubGames(Player player)
 	{
 		getPlugin().Get(player).HubGames = !getPlugin().Get(player).HubGames;
 		_hubGamesToggled = !_hubGamesToggled;
 		buildPage();
 	}
-
-	protected void toggleMacReports(org.bukkit.entity.Player player)
-	{
-		getPlugin().Get(player).ShowMacReports = !getPlugin().Get(player).ShowMacReports;
-		_macReportsToggled = !_macReportsToggled;
-		buildPage();
-	}
-
-	protected void toggleHubIgnoreVelocity(org.bukkit.entity.Player player)
-	{
-		getPlugin().Get(player).IgnoreVelocity = !getPlugin().Get(player).IgnoreVelocity;
-		_hubIgnoreVelocityToggled = !_hubIgnoreVelocityToggled;
-		buildPage();
-	}
 	
 	@Override
 	public void playerClosed()
 	{
 		super.playerClosed();
+		
+		System.out.println("Prefs have changed: " + preferencesChanged());
 		if (preferencesChanged())
 		{
 			getPlugin().savePreferences(getPlayer());
 		}
 	}
-
+	
 	@Override
 	protected void buildPage()
 	{
 		clear();
 		
 		UserPreferences userPreferences = getPlugin().Get(getPlayer());
-		int index = 9;
+		Rank rank = getClientManager().Get(getPlayer()).GetRank();
 		
-		buildPreference(index, Material.FIREBALL, "Hub Player Stacker", userPreferences.HubGames, _toggleHubGames);
-		index += 2;
-		buildPreference(index, Material.EYE_OF_ENDER, "Hub Player Visibility", userPreferences.ShowPlayers, _toggleHubPlayers);
-		index += 2;
-		buildPreference(index, Material.PAPER, "Player Chat", userPreferences.ShowChat, _toggleChat);
-		index += 2;
-		buildPreference(index, Material.EMPTY_MAP, "Private Messaging", userPreferences.PrivateMessaging, _togglePrivateChat);
-		index += 2;
-		buildPreference(index, Material.SKULL_ITEM, (byte)3, "Hub Party Requests", userPreferences.PartyRequests, _toggleHubPartyRequests);		
+		int[] indices = UtilUI.getIndicesFor(7, 0, 2);
 		
-		buildPreference(40, Material.RED_ROSE, "Show Pending Friend Requests", userPreferences.PendingFriendRequests, _togglePendingFriendRequests);
-
-		if (getClientManager().Get(getPlayer()).GetRank().has(Rank.ADMIN) || getClientManager().Get(getPlayer()).GetRank() == Rank.JNR_DEV)
+		buildPreference(indices[0], Material.FIREBALL, "Hub Player Stacker", userPreferences.HubGames, _toggleHubGames);
+		buildPreference(indices[1], Material.EYE_OF_ENDER, "Hub Player Visibility", userPreferences.ShowPlayers, _toggleHubPlayers);
+		buildPreference(indices[2], Material.PAPER, "Player Chat", userPreferences.ShowChat, _toggleChat);
+		buildPreference(indices[3], Material.EMPTY_MAP, "Private Messaging", userPreferences.PrivateMessaging, _togglePrivateChat);
+		buildPreference(indices[4], Material.SKULL_ITEM, (byte) 3, "Hub Party Requests", userPreferences.PartyRequests, _toggleHubPartyRequests);
+		buildPreference(indices[5], Material.RED_ROSE, "Show Pending Friend Requests", userPreferences.PendingFriendRequests, _togglePendingFriendRequests);
+		buildPreference(indices[6], Material.IRON_SWORD, "Show Clan Tips", userPreferences.ClanTips, _toggleClanTips);
+		
+		if (rank.has(Rank.MODERATOR) || rank == Rank.YOUTUBE || rank == Rank.TWITCH)
 		{
-			buildPreference(36, Material.NETHER_STAR, "Hub Invisibility", userPreferences.Invisibility, _toggleHubInvisibility);
-			buildPreference(38, Material.SLIME_BALL, "Hub Forcefield", userPreferences.HubForcefield, _toggleHubForcefield);
-			buildPreference(42, Material.PAPER, "Mac Reports", userPreferences.ShowMacReports, _toggleMacReports);
-			buildPreference(44, Material.SADDLE, "Hub Ignore Velocity", userPreferences.IgnoreVelocity, _toggleHubIgnoreVelocity);
-		}
-		else if (getClientManager().Get(getPlayer()).GetRank().has(Rank.MODERATOR))
-		{
-			buildPreference(38, Material.NETHER_STAR, "Hub Invisibility", userPreferences.Invisibility, _toggleHubInvisibility);
-			buildPreference(42, Material.PAPER, "Mac Reports", userPreferences.ShowMacReports, _toggleMacReports);
-			buildPreference(44, Material.SADDLE, "Hub Ignore Velocity", userPreferences.IgnoreVelocity, _toggleHubIgnoreVelocity);
-		}
-		else if (getClientManager().Get(getPlayer()).GetRank() == Rank.YOUTUBE || getClientManager().Get(getPlayer()).GetRank() == Rank.TWITCH)
-		{
-			buildPreference(38, Material.NETHER_STAR, "Hub Invisibility & Flight", userPreferences.Invisibility, _toggleHubInvisibility);
-			buildPreference(42, Material.SLIME_BALL, "Hub Forcefield", userPreferences.HubForcefield, _toggleHubForcefield);
-			buildPreference(44, Material.SADDLE, "Hub Ignore Velocity", userPreferences.IgnoreVelocity, _toggleHubIgnoreVelocity);
+			addButton(53, new ShopItem(Material.DIAMOND, (byte) 0, C.cAqua + "Exclusive Preferences", new String[]{C.cGold + "This will open a page of preferences", C.cGold + "that are only available to you."}, 1, false, false), new IButton()
+			{
+				@Override
+				public void onClick(Player player, ClickType clickType)
+				{
+					player.closeInventory();
+					_exclusiveShop.attemptShopOpen(player);
+				}
+			});
 		}
 	}
 	
+	private void buildPreference(int index, Material material, String name, boolean preference, IButton button)
+	{
+		buildPreference(index, material, (byte) 0, name, preference, button);
+	}
+	
+	private void buildPreference(int index, Material material, byte data, String name, boolean preference, IButton button)
+	{
+		String[] description = new String[] { "" + (preference ? ChatColor.GREEN + "Enabled" : ChatColor.RED + "Disabled"), ChatColor.RED + " ", ChatColor.RESET + "Click to " + (preference ? "Disable" : "Enable") };
+		
+		addButton(index, new ShopItem(material, data, (preference ? ChatColor.GREEN : ChatColor.RED) + name, description, 1, false, false), button);
+		addButton(index + 9, new ShopItem(Material.INK_SACK, (preference ? (byte) 10 : (byte) 8), (preference ? ChatColor.GREEN : ChatColor.RED) + name, description, 1, false, false), button);
+	}
+	
 	public boolean preferencesChanged()
 	{
-		return 	_hubGamesToggled || _hubPlayersToggled || _hubChatToggled || _hubPrivateChatToggled || _hubPartyRequestsToggled || _hubInvisibilityToggled || _hubForcefieldToggled || _pendingFriendRequestsToggled || _macReportsToggled || _hubIgnoreVelocityToggled;
+		return _hubGamesToggled || _hubPlayersToggled || _hubChatToggled || _hubPrivateChatToggled || _hubPartyRequestsToggled || _pendingFriendRequestsToggled || _clanTipsToggled;
 	}
 }
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesShop.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesShop.java
index 444886c46..e3b172414 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesShop.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesShop.java
@@ -1,23 +1,25 @@
 package mineplex.core.preferences.ui;
 
+import org.bukkit.entity.Player;
+
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.preferences.PreferencesManager;
 import mineplex.core.shop.ShopBase;
 import mineplex.core.shop.page.ShopPageBase;
 
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-
 public class PreferencesShop extends ShopBase<PreferencesManager>
 {
-	public PreferencesShop(PreferencesManager plugin, CoreClientManager clientManager, mineplex.core.donation.DonationManager donationManager)
+	private ExclusivePreferencesShop _exclusiveShop;
+	
+	public PreferencesShop(PreferencesManager plugin, CoreClientManager clientManager, mineplex.core.donation.DonationManager donationManager, ExclusivePreferencesShop exclusiveShop)
 	{
 		super(plugin, clientManager, donationManager, "My Preferences");
+		_exclusiveShop = exclusiveShop;
 	}
-
+	
 	@Override
 	protected ShopPageBase<PreferencesManager, ? extends ShopBase<PreferencesManager>> buildPagesFor(Player player)
 	{
-		return new PreferencesPage(getPlugin(), this, getClientManager(), getDonationManager(),"My Preferences", player);
+		return new PreferencesPage(getPlugin(), this, getClientManager(), getDonationManager(), "My Preferences", player, _exclusiveShop);
 	}
 }
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/profileCache/ProfileCacheManager.java b/Plugins/Mineplex.Core/src/mineplex/core/profileCache/ProfileCacheManager.java
new file mode 100644
index 000000000..3f2af0ea7
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/profileCache/ProfileCacheManager.java
@@ -0,0 +1,81 @@
+//package mineplex.core.profileCache;
+//
+//import java.util.UUID;
+//
+//import org.bukkit.plugin.java.JavaPlugin;
+//import net.minecraft.util.com.google.gson.Gson;
+//import net.minecraft.util.com.google.gson.GsonBuilder;
+//import net.minecraft.util.com.mojang.authlib.GameProfile;
+//import net.minecraft.util.com.mojang.authlib.properties.PropertyMap;
+//import net.minecraft.util.com.mojang.authlib.yggdrasil.ProfileCache;
+//import net.minecraft.util.com.mojang.authlib.yggdrasil.YggdrasilGameProfileRepository;
+//import net.minecraft.util.com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService;
+//import net.minecraft.util.com.mojang.authlib.yggdrasil.response.ProfileSearchResultsResponse;
+//import net.minecraft.util.com.mojang.util.UUIDTypeAdapter;
+//
+//import mineplex.core.MiniPlugin;
+//import mineplex.serverdata.Region;
+//import mineplex.serverdata.redis.RedisDataRepository;
+//import mineplex.serverdata.servers.ServerManager;
+//
+//public class ProfileCacheManager extends MiniPlugin implements ProfileCache
+//{
+//	private RedisDataRepository<ProfileData> _profileRepository;
+//	private Gson _gson;
+//
+//	public ProfileCacheManager(JavaPlugin plugin)
+//	{
+//		super("Profile Cache", plugin);
+//
+//		_profileRepository = new RedisDataRepository<ProfileData>(ServerManager.getMasterConnection(), ServerManager.getSlaveConnection(),
+//				Region.ALL, ProfileData.class, "profileCacheRepo");
+//
+//		GsonBuilder builder = new GsonBuilder();
+//		builder.registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer());
+//		builder.registerTypeAdapter(UUID.class, new UUIDTypeAdapter());
+//		builder.registerTypeAdapter(ProfileSearchResultsResponse.class, new net.minecraft.util.com.mojang.authlib.yggdrasil.response.ProfileSearchResultsResponse.Serializer());
+//		_gson = builder.create();
+//
+//		try
+//		{
+//			YggdrasilMinecraftSessionService.setProfileCache(this);
+//			YggdrasilGameProfileRepository.setProfileCache(this);
+//		}
+//		catch (Exception e)
+//		{
+//			System.out.println("================================================");
+//			System.out.println("Failed to load Profile Cache (Skins)");
+//			System.out.println("Are you using the correct modified Craftbukkit?");
+//			System.out.println("================================================");
+//		}
+//	}
+//
+//
+//	@Override
+//	public GameProfile attemptToLoadProfile(String playerName)
+//	{
+//		ProfileData profile = _profileRepository.getElement(playerName.toLowerCase());
+//
+//		if (profile != null)
+//		{
+//			PropertyMap propertyMap = _gson.fromJson(profile.getPropertyMap(), PropertyMap.class);
+//			GameProfile gameProfile = new GameProfile(profile.getUuid(), profile.getPlayerName());
+//			gameProfile.getProperties().putAll(propertyMap);
+//
+////			System.out.println("Loaded profile " + playerName + " from repository!");
+//			return gameProfile;
+//		}
+//
+////		System.out.println("Profile Null");
+//
+//		return null;
+//	}
+//
+//	@Override
+//	public void cacheProfile(GameProfile profile)
+//	{
+////		System.out.println("Cached profile: " + profile.getName());
+//		ProfileData data = new ProfileData(profile.getId(), profile.getName(), _gson.toJson(profile.getProperties()));
+//		_profileRepository.addElement(data, 60 * 60 * 24); // 1 day
+//	}
+//}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/profileCache/ProfileData.java b/Plugins/Mineplex.Core/src/mineplex/core/profileCache/ProfileData.java
new file mode 100644
index 000000000..8c55a8073
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/profileCache/ProfileData.java
@@ -0,0 +1,40 @@
+package mineplex.core.profileCache;
+
+import java.util.UUID;
+
+import mineplex.serverdata.data.Data;
+
+public class ProfileData implements Data
+{
+	private UUID _uuid;
+	private String _playerName;
+	private String _propertyMap;
+
+	public ProfileData(UUID uuid, String playerName, String propertyMap)
+	{
+		_uuid = uuid;
+		_playerName = playerName;
+		_propertyMap = propertyMap;
+	}
+
+	public String getPlayerName()
+	{
+		return _playerName;
+	}
+
+	public String getPropertyMap()
+	{
+		return _propertyMap;
+	}
+
+	public UUID getUuid()
+	{
+		return _uuid;
+	}
+
+	@Override
+	public String getDataId()
+	{
+		return _playerName.toLowerCase();
+	}
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileManager.java b/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileManager.java
index d34e42c11..ceb014de4 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileManager.java
@@ -31,6 +31,21 @@ public class ProjectileManager extends MiniPlugin
 		super("Throw", plugin);
 	}
 	
+	/**
+	 * @param thrown - the thrown {@link Entity} whose thrower is to be fetched
+	 * @return the {@link LivingEntity} that threw the {@code thrown} entity, if one
+	 * can be found, null otherwise.
+	 */
+	public LivingEntity getThrower(Entity thrown)
+	{
+		if (_thrown.containsKey(thrown))
+		{
+			return _thrown.get(thrown).GetThrower();
+		}
+		
+		return null;
+	}
+	
 	public void AddThrow(Entity thrown, LivingEntity thrower, IThrown callback, 
 			long expireTime, boolean hitPlayer, boolean hitNonPlayerEntity, boolean hitBlock, boolean idle, float hitboxGrow)
 	{
@@ -135,6 +150,12 @@ public class ProjectileManager extends MiniPlugin
 				expireTime, hitPlayer, hitNonPlayerEntity, hitBlock, idle, false,
 				sound, soundVolume, soundPitch, null, 0, effectRate, particle, pX, pY, pZ, pS, pC, hitboxMult, canHit));
 	}
+	
+	public void deleteThrown(Entity thrown)
+	{
+		_thrown.remove(thrown);
+		thrown.remove();
+	}
 		
 	@EventHandler
 	public void Update(UpdateEvent event)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java b/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
index af01bf478..8a17080cd 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
@@ -269,6 +269,13 @@ public class ProjectileUser
 						nmsEntity.locY -= nmsEntity.motY / f2 * 0.0500000007450581D;
 						nmsEntity.locZ -= nmsEntity.motZ / f2 * 0.0500000007450581D;
 						
+						if (nmsEntity.locX == Double.NaN)
+							System.out.println(_thrown + " has made " + nmsEntity + "'s locX NaN.");
+						if (nmsEntity.locY == Double.NaN)
+							System.out.println(_thrown + " has made " + nmsEntity + "'s locY NaN.");
+						if (nmsEntity.locZ == Double.NaN)
+							System.out.println(_thrown + " has made " + nmsEntity + "'s locZ NaN.");
+						
 						_callback.Collide(null, block, this);
 						return true;
 					}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java b/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java
index 8b9efbc51..34c2a8c1f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java
@@ -1,8 +1,10 @@
 package mineplex.core.recharge;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -27,6 +29,9 @@ public class Recharge extends MiniPlugin
 	public HashSet<String> informSet = new HashSet<String>();
 	public NautHashMap<String, NautHashMap<String, RechargeData>> _recharge = new NautHashMap<String, NautHashMap<String, RechargeData>>();
 	
+	//Used to increase cooldown when gadgets are being spammed
+	public NautHashMap<String, ArrayList<Long>> _gadgetSlow = new NautHashMap<String, ArrayList<Long>>();
+	
 	protected Recharge(JavaPlugin plugin)
 	{
 		super("Recharge", plugin);
@@ -40,7 +45,22 @@ public class Recharge extends MiniPlugin
 	@EventHandler
 	public void PlayerDeath(PlayerDeathEvent event)
 	{
-		Get(event.getEntity().getName()).clear();
+		NautHashMap<String, RechargeData> data = Get(event.getEntity().getName());
+		List<RechargeData> rechargeDatas = new ArrayList<RechargeData>(data.values());
+		
+		// Remove/clear all cooldowns that are flagged as ClearOnDeath
+		for (RechargeData rechargeData : rechargeDatas)
+		{
+			if (rechargeData.ClearOnDeath)
+			{
+				data.remove(rechargeData.Name);
+				System.out.println("Cleared " + rechargeData.Name);
+			}
+			else
+			{
+				System.out.println("Didn't clear: " + rechargeData.Name);
+			}
+		}
 	}
 	
 	public NautHashMap<String, RechargeData> Get(String name)
@@ -59,10 +79,22 @@ public class Recharge extends MiniPlugin
 	@EventHandler
 	public void update(UpdateEvent event)
 	{
-		if (event.getType() != UpdateType.TICK)
-			return; 
+		if (event.getType() == UpdateType.TICK)
+			recharge();
 		
-		recharge();
+		if (event.getType() == UpdateType.SLOW)
+			for (ArrayList<Long> times : _gadgetSlow.values())
+			{
+				Iterator<Long> timeIter = times.iterator();
+				
+				while (timeIter.hasNext())
+				{
+					long time = timeIter.next();
+					
+					if (UtilTime.elapsed(time, 20000))
+						timeIter.remove();
+				}
+			}
 	}
 	
 	public void recharge()
@@ -95,23 +127,40 @@ public class Recharge extends MiniPlugin
 	
 	public boolean use(Player player, String ability, long recharge, boolean inform, boolean attachItem)
 	{
-		return use(player, ability, ability, recharge, inform, attachItem);
+		return use(player, ability, ability, recharge, inform, attachItem, false, true, null);
+	}
+	
+	public boolean use(Player player, String ability, long recharge, boolean inform, boolean attachItem, String cooldownPool)
+	{
+		return use(player, ability, ability, recharge, inform, attachItem, false, true, cooldownPool);
 	}
 	
 	public boolean use(Player player, String ability, String abilityFull, long recharge, boolean inform, boolean attachItem)
 	{
-		return use(player, ability, abilityFull, recharge, inform, attachItem, false);
+		return use(player, ability, abilityFull, recharge, inform, attachItem, false, true, null);
 	}
 	
 	public boolean use(Player player, String ability, long recharge, boolean inform, boolean attachItem, boolean attachDurability)
 	{
-		return use(player, ability, ability, recharge, inform, attachItem, attachDurability);
+		return use(player, ability, ability, recharge, inform, attachItem, attachDurability, true, null);
 	}
 	
-	public boolean use(Player player, String ability, String abilityFull, long recharge, boolean inform, boolean attachItem, boolean attachDurability)
+	public boolean use(Player player, String ability, String abilityFull, long recharge, boolean inform, 
+						boolean attachItem, boolean attachDurability, boolean clearOnDeath, String cooldownPool)
 	{
 		if (recharge == 0)
 			return true;
+		
+		//Cooldown Pool
+		if (cooldownPool != null)
+		{
+			 if (!_gadgetSlow.containsKey(cooldownPool))
+				 _gadgetSlow.put(cooldownPool, new ArrayList<Long>());
+			 			 
+			 int count = _gadgetSlow.get(cooldownPool).size();
+			 
+			 recharge += count * 40;
+		}
 
 		//Ensure Expirey
 		recharge();
@@ -131,9 +180,13 @@ public class Recharge extends MiniPlugin
 
 			return false;
 		}
+		
+		//Add Slow
+		if (cooldownPool != null)
+			_gadgetSlow.get(cooldownPool).add(System.currentTimeMillis());
 
 		//Insert
-		UseRecharge(player, ability, recharge, attachItem, attachDurability);
+		UseRecharge(player, ability, recharge, attachItem, attachDurability, clearOnDeath);
 
 		return true;
 	}
@@ -145,7 +198,7 @@ public class Recharge extends MiniPlugin
 	
 	public void useForce(Player player, String ability, long recharge, boolean attachItem)
 	{
-		UseRecharge(player, ability, recharge, attachItem, false);
+		UseRecharge(player, ability, recharge, attachItem, false, true);
 	}
 	
 	public boolean usable(Player player, String ability)
@@ -172,14 +225,14 @@ public class Recharge extends MiniPlugin
 		}
 	}
 	
-	public void UseRecharge(Player player, String ability, long recharge, boolean attachItem, boolean attachDurability)
+	public void UseRecharge(Player player, String ability, long recharge, boolean attachItem, boolean attachDurability, boolean clearOnDeath)
 	{
 		//Event
 		RechargeEvent rechargeEvent = new RechargeEvent(player, ability, recharge);
 		UtilServer.getServer().getPluginManager().callEvent(rechargeEvent);
 		
 		Get(player).put(ability, new RechargeData(this, player, ability, player.getItemInHand(), 
-				rechargeEvent.GetRecharge(), attachItem, attachDurability));
+				rechargeEvent.GetRecharge(), attachItem, attachDurability, clearOnDeath));
 	}
 	
 	public void recharge(Player player, String ability)
@@ -188,9 +241,15 @@ public class Recharge extends MiniPlugin
 	}
 
 	@EventHandler
-	public void clearPlayer(ClientUnloadEvent event)
+	public void clearPlayer(final ClientUnloadEvent event)
 	{
-		_recharge.remove(event.GetName());
+		UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(_plugin, new Runnable() {
+				public void run()
+				{
+					_recharge.remove(event.GetName());
+				}
+			}
+		, 20 * 60 * 2); // Retain info for 2 minutes
 	}
 	
 	public void setDisplayForce(Player player, String ability, boolean displayForce)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/recharge/RechargeData.java b/Plugins/Mineplex.Core/src/mineplex/core/recharge/RechargeData.java
index a47354f03..14dadc3ab 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/recharge/RechargeData.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/recharge/RechargeData.java
@@ -1,22 +1,14 @@
 package mineplex.core.recharge;
 
-import mineplex.core.common.util.C;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
+import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilGear;
-import mineplex.core.common.util.UtilInv;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTextBottom;
 import mineplex.core.common.util.UtilTime;
 
-import org.bukkit.ChatColor;
-import org.bukkit.Sound;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.entity.Player;
-
 public class RechargeData
 {
 	public Recharge Host;
@@ -33,8 +25,10 @@ public class RechargeData
 	public boolean Countdown = false; 		//This will make the output a countdown, instead of a recharge.
 	public boolean AttachItem;
 	public boolean AttachDurability;
+	public boolean ClearOnDeath;			// Determines whether the cooldon is cleared when a player dies
 
-	public RechargeData(Recharge host, Player player, String name, ItemStack stack, long rechargeTime, boolean attachitem, boolean attachDurability)
+	public RechargeData(Recharge host, Player player, String name, ItemStack stack, long rechargeTime, 
+						boolean attachitem, boolean attachDurability, boolean clearOnDeath)
 	{
 		Host = host;
 
@@ -46,6 +40,12 @@ public class RechargeData
 		
 		AttachItem = attachitem;
 		AttachDurability = attachDurability;
+		ClearOnDeath = clearOnDeath;
+	}
+	
+	public RechargeData(Recharge host, Player player, String name, ItemStack stack, long rechargeTime, boolean attachitem, boolean attachDurability)
+	{
+		this(host, player, name, stack, rechargeTime, attachitem, attachDurability, true);
 	}
 
 	public boolean Update()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResPackManager.java b/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResPackManager.java
index cbc2c24ff..f51ee8b96 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResPackManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResPackManager.java
@@ -32,7 +32,7 @@ public class ResPackManager implements CommandCallback
 			{
 				if (_packUnloadCheck.canSendUnload(player))
 				{
-					player.setResourcePack("http://www.chivebox.com/file/c/empty.zip");
+					player.setResourcePack("http://file.mineplex.com/ResReset.zip");
 				}
 			}
 		}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
index 6464a22a5..8c548df93 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
@@ -1,5 +1,7 @@
 package mineplex.core.reward;
 
+import java.util.ArrayList;
+
 public enum RewardType
 {
 	//% Chances			Mythic		Legend		Rare		Uncommon
@@ -38,4 +40,43 @@ public enum RewardType
 
 		return rarity;
 	}
+
+	public static void main(String[] args)
+	{
+		int maxCount = Integer.MAX_VALUE;
+		int openCount = 0;
+		RewardType type = RewardType.MythicalChest;
+		ArrayList<RewardTest> data = new ArrayList<RewardTest>();
+
+		for (RewardRarity rarity : RewardRarity.values())
+		{
+			data.add(rarity.ordinal(), new RewardTest(rarity));
+		}
+
+		for (int i = 0; i < maxCount; i++)
+		{
+			RewardRarity rarity = type.generateRarity(false);
+			data.get(rarity.ordinal()).Count++;
+			openCount++;
+			if (rarity == RewardRarity.MYTHICAL) break;
+		}
+
+		System.out.printf("Opened %10d rewards using type " + type.name() + "\n", openCount);
+		for (RewardTest test : data)
+		{
+			System.out.printf("Opened %10d of reward type %10s", test.Count, test.Rarity.name());
+			System.out.println();
+		}
+	}
+
+	private static class RewardTest
+	{
+		public final RewardRarity Rarity;
+		public int Count;
+
+		public RewardTest(RewardRarity rare)
+		{
+			Rarity = rare;
+		}
+	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/PetReward.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/PetReward.java
index 672839e88..113f8a6cf 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/PetReward.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/PetReward.java
@@ -61,7 +61,7 @@ public class PetReward extends UnknownPackageReward
 	@Override
 	public boolean canGiveReward(Player player)
 	{
-		if (DonationManager.Get(player.getName()) == null)
+		if (_donationManager.Get(player.getName()) == null)
 		{
 			System.out.println("Could not give reward " + getPackageName() + " to Offline Player: " + player.getName());
 			return false;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
index 70f1cae85..a4012e21b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
@@ -3,15 +3,20 @@ package mineplex.core.reward.rewards;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+import mineplex.core.common.CurrencyType;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.reward.Reward;
 import mineplex.core.reward.RewardData;
+import mineplex.core.reward.RewardManager;
 import mineplex.core.reward.RewardRarity;
 import mineplex.core.reward.RewardType;
 
+/**
+ * Created by shaun on 14-09-12.
+ */
 public class UnknownPackageReward extends Reward
 {
-	protected DonationManager DonationManager;
+	protected DonationManager _donationManager;
 	private ItemStack _itemStack;
 	private String _name;
 	private String _packageName;
@@ -19,16 +24,16 @@ public class UnknownPackageReward extends Reward
 	public UnknownPackageReward(DonationManager donationManager, String name, String packageName, ItemStack itemStack, RewardRarity rarity, int weight)
 	{
 		super(rarity, weight);
-		DonationManager = donationManager;
+		_donationManager = donationManager;
 		_name = name;
 		_packageName = packageName;
 		_itemStack = itemStack;
 	}
 
 	@Override
-	protected RewardData giveRewardCustom(Player player, RewardType rewardType)
+	protected RewardData giveRewardCustom(Player player, RewardType type)
 	{
-		DonationManager.PurchaseUnknownSalesPackage(null, player.getName(), DonationManager.getClientManager().Get(player).getAccountId(), _packageName, true, 0, true);
+		_donationManager.PurchaseUnknownSalesPackage(null, player.getName(), _donationManager.getClientManager().Get(player).getAccountId(), _packageName, CurrencyType.Coins, 0, true);
 
 		return new RewardData(getRarity().getColor() + _name, _itemStack, getRarity());
 	}
@@ -36,13 +41,13 @@ public class UnknownPackageReward extends Reward
 	@Override
 	public boolean canGiveReward(Player player)
 	{
-		if (DonationManager.Get(player.getName()) == null)
+		if (_donationManager.Get(player.getName()) == null)
 		{
 			System.out.println("Could not give reward " + _packageName + " to Offline Player: " + player.getName());
 			return false;
 		}
-
-		return !DonationManager.Get(player.getName()).OwnsUnknownPackage(_packageName);
+		
+		return !_donationManager.Get(player.getName()).OwnsUnknownPackage(_packageName);
 	}
 
 	@Override
@@ -66,7 +71,7 @@ public class UnknownPackageReward extends Reward
 	{
 		if (obj instanceof UnknownPackageReward)
 		{
-			return _packageName.equals(((UnknownPackageReward) obj).getPackageName());
+			return ((UnknownPackageReward) obj).getPackageName().equals(_packageName);
 		}
 		return false;
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/PlayerScoreboard.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/PlayerScoreboard.java
index 86c226a5f..ef8e05796 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/PlayerScoreboard.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/PlayerScoreboard.java
@@ -2,10 +2,6 @@ package mineplex.core.scoreboard;
 
 import java.util.ArrayList;
 
-import mineplex.core.common.Rank;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilMath;
-
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -14,6 +10,9 @@ import org.bukkit.scoreboard.Objective;
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.Team;
 
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+
 public class PlayerScoreboard
 {
 	private ScoreboardManager _manager;
@@ -30,11 +29,9 @@ public class PlayerScoreboard
 	public PlayerScoreboard(ScoreboardManager manager, Player player)
 	{
 		_manager = manager;
-
-
 	}
 
-	private void addTeams(Player player)
+	protected void addTeams(Player player)
 	{
 		for (Rank rank : Rank.values())
 		{
@@ -48,6 +45,9 @@ public class PlayerScoreboard
 
 		for (Player otherPlayer : Bukkit.getOnlinePlayers())
 		{
+			if (otherPlayer.equals(player))
+				continue;
+
 			if (_manager.getClients().Get(otherPlayer) == null)
 				continue;
 
@@ -90,10 +90,12 @@ public class PlayerScoreboard
 		if (data == null)
 			return;
 
-		for (int i=0 ; i<data.getLines(manager, player).size() ; i++)
+		ArrayList<String> lines = data.getLines(manager, player);
+
+		for (int i=0 ; i<lines.size() ; i++)
 		{
 			//Get New Line
-			String newLine = data.getLines(manager, player).get(i);
+			String newLine = lines.get(i);
 
 			//Check if Unchanged
 			if (_currentLines.size() > i)
@@ -111,26 +113,26 @@ public class PlayerScoreboard
 				System.out.println("Scoreboard Error: Line Team Not Found!");
 				return;
 			}
-
+			
 			//Set Line Prefix/Suffix
 			team.setPrefix(newLine.substring(0, Math.min(newLine.length(), 16)));
-			team.setSuffix(ChatColor.getLastColors(newLine) + newLine.substring(team.getPrefix().length(), Math.min(newLine.length(), 32)));
+			team.setSuffix(ChatColor.getLastColors(team.getPrefix()) + newLine.substring(team.getPrefix().length(), Math.min(newLine.length(), 32)));
 
 			//Line
 			_sideObjective.getScore(_teamNames[i]).setScore(15-i);
 		}
 
 		//Hide Old Unused
-		if (_currentLines.size() > data.getLines(manager, player).size())		
+		if (_currentLines.size() > lines.size())
 		{
-			for (int i=data.getLines(manager, player).size() ; i<_currentLines.size() ; i++)
+			for (int i=lines.size() ; i<_currentLines.size() ; i++)
 			{
 				_scoreboard.resetScores(_teamNames[i]);
 			}
 		}
 
 		//Save New State
-		_currentLines = data.getLines(manager, player);
+		_currentLines = lines;
 	}
 
 	public void setTitle(String out)
@@ -138,13 +140,18 @@ public class PlayerScoreboard
 		_sideObjective.setDisplayName(out);
 	}
 
+	public void assignScoreboard(Player player)
+	{
+		assignScoreboard(player, getData());
+	}
+
 	public void assignScoreboard(Player player, ScoreboardData data)
 	{
 		//Scoreboard
 		_scoreboard = Bukkit.getScoreboardManager().getNewScoreboard();
 
 		//Side Obj
-		_sideObjective = _scoreboard.registerNewObjective(player.getName() + UtilMath.r(999999999), "dummy");
+		_sideObjective = _scoreboard.registerNewObjective("side", "dummy");
 		_sideObjective.setDisplaySlot(DisplaySlot.SIDEBAR);
 		_sideObjective.setDisplayName(C.Bold + "   MINEPLEX   ");
 
@@ -192,4 +199,9 @@ public class PlayerScoreboard
 		//Set Scoreboard
 		player.setScoreboard(_scoreboard);
 	}
+
+	protected Scoreboard getScoreboard()
+	{
+		return _scoreboard;
+	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/ScoreboardData.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/ScoreboardData.java
index 13699bf0a..1881d7357 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/ScoreboardData.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/ScoreboardData.java
@@ -21,7 +21,7 @@ public class ScoreboardData
 		ArrayList<String> output = new ArrayList<String>();
 
 		for (ScoreboardElement elem : _elements)
-			output.addAll(elem.GetLines(manager, player));
+			output.addAll(elem.getLines(manager, player, output));
 
 		return output;
 	}
@@ -86,11 +86,21 @@ public class ScoreboardData
 		_elements.add(new ScoreboardElementScores(key, line, value, true));
 	}
 
+	public void writeElement(ScoreboardElement element)
+	{
+		_elements.add(element);
+	}
+
 	public void writeEmpty()
 	{
 		_elements.add(new ScoreboardElementText(" "));
 	}
 
+	public void writePlayerGold()
+	{
+		_elements.add(new ScoreboardElementGoldCount());
+	}
+
 	public void writePlayerGems()
 	{
 		_elements.add(new ScoreboardElementGemCount());
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/ScoreboardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/ScoreboardManager.java
index 87ded7d97..0df5fc25c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/ScoreboardManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/ScoreboardManager.java
@@ -50,10 +50,28 @@ public class ScoreboardManager extends MiniPlugin
 		return _donationManager;
 	}
 
+	public String getTitle()
+	{
+		return _title;
+	}
+
+	public void setTitle(String title)
+	{
+		_title = title;
+		_shineIndex = 0;
+	}
+
+	protected PlayerScoreboard createScoreboard(Player player)
+	{
+		return new PlayerScoreboard(this, player);
+	}
+
 	@EventHandler
 	public void playerJoin(PlayerJoinEvent event)
 	{
-		_playerScoreboards.put(event.getPlayer(), new PlayerScoreboard(this, event.getPlayer()));
+		PlayerScoreboard scoreboard = createScoreboard(event.getPlayer());
+		scoreboard.assignScoreboard(event.getPlayer());
+		_playerScoreboards.put(event.getPlayer(), scoreboard);
 	}
 
 	@EventHandler
@@ -81,7 +99,10 @@ public class ScoreboardManager extends MiniPlugin
 		}
 	}
 
-
+	public PlayerScoreboard getCurrentScoreboard(Player player)
+	{
+		return _playerScoreboards.get(player);
+	}
 	
 	public ScoreboardData getData(String scoreboardName, boolean create)
 	{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElement.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElement.java
index 8d4bac166..cdb8a2e9b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElement.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElement.java
@@ -1,12 +1,12 @@
 package mineplex.core.scoreboard.elements;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import org.bukkit.entity.Player;
 
 import mineplex.core.scoreboard.ScoreboardManager;
 
-public abstract class ScoreboardElement
+public interface ScoreboardElement
 {
-	public abstract ArrayList<String> GetLines(ScoreboardManager manager, Player player);
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out);
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementCoinCount.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementCoinCount.java
index 154370e08..9d7281cd3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementCoinCount.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementCoinCount.java
@@ -1,18 +1,19 @@
 package mineplex.core.scoreboard.elements;
 
 import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
 
 import mineplex.core.common.CurrencyType;
 import mineplex.core.scoreboard.ScoreboardManager;
 
-import org.bukkit.entity.Player;
-
-public class ScoreboardElementCoinCount extends ScoreboardElement
+public class ScoreboardElementCoinCount implements ScoreboardElement
 {
 	@Override
-	public ArrayList<String> GetLines(ScoreboardManager manager, Player player)
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
 	{
-		ArrayList<String> output = new ArrayList<String>();
+		List<String> output = new ArrayList<String>();
 		output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.Coins) + "");
 		return output;
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGemCount.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGemCount.java
index ceb9c8791..e685ff6f1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGemCount.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGemCount.java
@@ -1,18 +1,19 @@
 package mineplex.core.scoreboard.elements;
 
 import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
 
 import mineplex.core.common.CurrencyType;
 import mineplex.core.scoreboard.ScoreboardManager;
 
-import org.bukkit.entity.Player;
-
-public class ScoreboardElementGemCount extends ScoreboardElement
+public class ScoreboardElementGemCount implements ScoreboardElement
 {
 	@Override
-	public ArrayList<String> GetLines(ScoreboardManager manager, Player player)
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
 	{
-		ArrayList<String> output = new ArrayList<String>();
+		List<String> output = new ArrayList<String>();
 		output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.Gems) + "");
 		return output;
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGoldCount.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGoldCount.java
new file mode 100644
index 000000000..a95508b36
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGoldCount.java
@@ -0,0 +1,20 @@
+package mineplex.core.scoreboard.elements;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.common.CurrencyType;
+import mineplex.core.scoreboard.ScoreboardManager;
+
+public class ScoreboardElementGoldCount implements ScoreboardElement
+{
+	@Override
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
+	{
+		List<String> output = new ArrayList<String>();
+		output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.Gold) + "");
+		return output;
+	}
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementRank.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementRank.java
index 694e600f3..93af0af7e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementRank.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementRank.java
@@ -1,18 +1,19 @@
 package mineplex.core.scoreboard.elements;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.bukkit.entity.Player;
 
 import mineplex.core.common.Rank;
 import mineplex.core.scoreboard.ScoreboardManager;
 
-public class ScoreboardElementRank extends ScoreboardElement
+public class ScoreboardElementRank implements ScoreboardElement
 {
 	@Override
-	public ArrayList<String> GetLines(ScoreboardManager manager, Player player)
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
 	{
-		ArrayList<String> output = new ArrayList<String>();
+		List<String> output = new ArrayList<String>();
 
 		if (manager.getClients().Get(player).GetRank().has(Rank.ULTRA))
 		{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementScores.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementScores.java
index 2f5b0681c..73ced3d5b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementScores.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementScores.java
@@ -2,12 +2,13 @@ package mineplex.core.scoreboard.elements;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-
-import mineplex.core.scoreboard.ScoreboardManager;
+import java.util.List;
 
 import org.bukkit.entity.Player;
 
-public class ScoreboardElementScores extends ScoreboardElement
+import mineplex.core.scoreboard.ScoreboardManager;
+
+public class ScoreboardElementScores implements ScoreboardElement
 {
 	private String _key;
 	
@@ -27,9 +28,9 @@ public class ScoreboardElementScores extends ScoreboardElement
 	}
 	
 	@Override
-	public ArrayList<String> GetLines(ScoreboardManager manager, Player player)
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
 	{
-		ArrayList<String> orderedScores = new ArrayList<String>();
+		List<String> orderedScores = new ArrayList<String>();
 		
 		//Order Scores
 		while (orderedScores.size() < _scores.size())
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementText.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementText.java
index a5ecf9f6e..b17be47ce 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementText.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementText.java
@@ -1,12 +1,13 @@
 package mineplex.core.scoreboard.elements;
 
 import java.util.ArrayList;
-
-import mineplex.core.scoreboard.ScoreboardManager;
+import java.util.List;
 
 import org.bukkit.entity.Player;
 
-public class ScoreboardElementText extends ScoreboardElement
+import mineplex.core.scoreboard.ScoreboardManager;
+
+public class ScoreboardElementText implements ScoreboardElement
 {
 	private String _line;
 	
@@ -16,9 +17,9 @@ public class ScoreboardElementText extends ScoreboardElement
 	}
 	
 	@Override
-	public ArrayList<String> GetLines(ScoreboardManager manager, Player player)
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
 	{
-		ArrayList<String> orderedScores = new ArrayList<String>();
+		List<String> orderedScores = new ArrayList<String>();
 		
 		orderedScores.add(_line);
 		
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java b/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
index efd8dfa97..f57097c2d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
@@ -36,7 +36,7 @@ public class ServerConfiguration extends MiniPlugin
 		
 		if (_serverGroup == null)
 			return;
-		
+
 		try
 		{
 			_playerListMaxPlayers = PlayerList.class.getDeclaredField("maxPlayers");
@@ -50,7 +50,7 @@ public class ServerConfiguration extends MiniPlugin
 		
 		_plugin.getServer().setWhitelist(_serverGroup.getWhitelist());
 		((CraftServer)_plugin.getServer()).getServer().setPVP(_serverGroup.getPvp());
-		//((CraftServer)_plugin.getServer()).getServer().setTexturePack(_serverGroup.getResourcePack());
+//		((CraftServer)_plugin.getServer()).getServer().setResourcePack(_serverGroup.getResourcePack());
 	}
 	
 	@EventHandler
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
index 05fca2996..d2fe4c26e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
@@ -10,6 +10,7 @@ import net.minecraft.server.v1_8_R3.EntityPlayer;
 import org.bukkit.ChatColor;
 import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_8_R3.event.CraftEventFactory;
+import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -17,6 +18,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
@@ -118,7 +120,7 @@ public abstract class ShopBase<PluginType extends MiniPlugin> implements Listene
 		return false;
     }
     
-	protected ShopPageBase<PluginType, ? extends ShopBase<PluginType>> getOpeningPageForPlayer(Player player)
+	protected ShopPageBase<PluginType, ? extends ShopBase<PluginType>> getOpeningPageForPlayer(HumanEntity player)
 	{
 		return _playerPageMap.get(player.getName());
 	}
@@ -126,10 +128,33 @@ public abstract class ShopBase<PluginType extends MiniPlugin> implements Listene
 	@EventHandler
 	public void onInventoryClick(InventoryClickEvent event)
 	{
-		if (_playerPageMap.containsKey(event.getWhoClicked().getName()) && _playerPageMap.get(event.getWhoClicked().getName()).getName().equalsIgnoreCase(event.getInventory().getName()))
+		if (isPlayerInShop(event.getWhoClicked()))
 		{
-			_playerPageMap.get(event.getWhoClicked().getName()).playerClicked(event);
-			event.setCancelled(true);
+			ShopPageBase<?,?> page = getOpeningPageForPlayer(event.getWhoClicked());
+			
+			if (page.matchesInventory(event.getInventory()))
+			{
+				page.playerClicked(event);
+				
+				if (event.getRawSlot() < page.getSize())
+				{
+					event.setCancelled(true);	
+				}
+			}
+		}
+	}
+	
+	@EventHandler
+	public void onInventoryDrag(InventoryDragEvent event)
+	{
+		if (isPlayerInShop(event.getWhoClicked()))
+		{
+			ShopPageBase<?,?> page = getOpeningPageForPlayer(event.getWhoClicked());
+			
+			if (page.matchesInventory(event.getInventory()))
+			{
+				event.setCancelled(true);	// Prevent players from dragging items into NPC shop inventories
+			}
 		}
 	}
 	
@@ -238,7 +263,7 @@ public abstract class ShopBase<PluginType extends MiniPlugin> implements Listene
 	
 	protected abstract ShopPageBase<PluginType, ? extends ShopBase<PluginType>> buildPagesFor(Player player);
 
-	public boolean isPlayerInShop(Player player)
+	public boolean isPlayerInShop(HumanEntity player)
 	{
 		return _playerPageMap.containsKey(player.getName());
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/item/DisplayButton.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/item/DisplayButton.java
new file mode 100644
index 000000000..9697e4934
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/item/DisplayButton.java
@@ -0,0 +1,23 @@
+package mineplex.core.shop.item;
+
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.shop.item.IButton;
+
+public class DisplayButton implements IButton
+{
+
+	public DisplayButton()
+	{
+		
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		// Display button doesn't activate any on click events
+	}
+
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/item/ShopItem.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/item/ShopItem.java
index 37622a13b..342784570 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/shop/item/ShopItem.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/item/ShopItem.java
@@ -19,6 +19,11 @@ public class ShopItem extends ItemStack
 	private boolean _locked;
 	private boolean _displayItem;
 
+	public ShopItem(ItemStack itemStack, boolean locked, boolean displayItem)
+	{
+		this(itemStack, itemStack.getItemMeta().getDisplayName(), itemStack.getItemMeta().getDisplayName(), 1, locked, displayItem);
+	}
+	
 	public ShopItem(ItemStack itemStack, String name, String deliveryName, int deliveryAmount, boolean locked, boolean displayItem)
 	{
 		super(itemStack);
@@ -157,15 +162,19 @@ public class ShopItem extends ItemStack
 		return _displayItem;
 	}
 	
-	public void addGlow()
+	public ShopItem addGlow()
 	{
 		UtilInv.addDullEnchantment(this);
+		
+		return this;
 	}
 
-	public void SetLocked(boolean owns)
+	public ShopItem SetLocked(boolean owns)
 	{
 		_locked = owns;
 		UpdateVisual(false);
+		
+		return this;
 	}
 
 	public String GetName()
@@ -173,12 +182,14 @@ public class ShopItem extends ItemStack
 		return _name;
 	}
 	
-	public void SetName(String name)
+	public ShopItem SetName(String name)
 	{
 		_name = name;
+		
+		return this;
 	}
 
-	public void SetLore(String[] string)
+	public ShopItem SetLore(String[] string)
 	{
 		_lore = string; 
 
@@ -196,5 +207,7 @@ public class ShopItem extends ItemStack
 		ItemMeta meta = getItemMeta();
 		meta.setLore(lore);
 		setItemMeta(meta);
+		
+		return this;
 	} 
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java
index 89b05f239..b253a4ea7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java
@@ -79,7 +79,7 @@ public class ConfirmationPage<PluginType extends MiniPlugin, ShopType extends Sh
 		buildSquareAt(_okSquareSlotStart, new ShopItem(Material.EMERALD_BLOCK, (byte) 0, ChatColor.GREEN + "OK", null, 1, false, true), okClicked);
 		buildSquareAt(_okSquareSlotStart + 6, new ShopItem(Material.REDSTONE_BLOCK, (byte) 0, ChatColor.RED + "CANCEL", null, 1, false, true), cancelClicked);
 		
-		this.getInventory().setItem(4, new ShopItem(getCurrencyType().GetDisplayMaterial(), (byte)0, getCurrencyType().toString(), new String[] { C.cGray + _salesItem.GetCost(getCurrencyType()) + " " + getCurrencyType().toString() + " will be deducted from your account balance." }, 1, false, true).getHandle());
+		this.getInventory().setItem(4, new ShopItem(getCurrencyType().GetDisplayMaterial(), (byte)0, getCurrencyType().toString(), new String[] { C.cGray + _salesItem.GetCost(getCurrencyType()) + " " + getCurrencyType().toString() + " will be", "deducted from your account balance." }, 1, false, true).getHandle());
 	}
 	
 	protected void okClicked(Player player)
@@ -128,26 +128,58 @@ public class ConfirmationPage<PluginType extends MiniPlugin, ShopType extends Sh
 		}
 		
 		_processing = true;
-		
-		if (_salesItem.IsKnown())
+
+		if (getCurrencyType() == CurrencyType.Gold)
 		{
-			getDonationManager().PurchaseKnownSalesPackage(new Callback<TransactionResponse>()
+			int goldCount = getDonationManager().Get(getPlayer()).getGold();
+			int cost = _salesItem.GetCost(getCurrencyType());
+
+			if (cost > goldCount)
+				showResultsPage(TransactionResponse.InsufficientFunds);
+			else
 			{
-				public void run(TransactionResponse response)
+				getDonationManager().rewardGold(new Callback<Boolean>()
 				{
-					showResultsPage(response);
-				}
-			}, getPlayer().getName(), getPlayer().getUniqueId(), _salesItem.GetCost(getCurrencyType()), _salesItem.GetSalesPackageId());
+					@Override
+					public void run(Boolean data)
+					{
+						if (data)
+						{
+							showResultsPage(TransactionResponse.Success);
+							getPlayer().playSound(getPlayer().getLocation(), Sound.LEVEL_UP, 2f, 1.5f);
+						}
+						else
+						{
+							showResultsPage(TransactionResponse.Failed);
+						}
+					}
+				}, "Energy Purchase", getPlayer().getName(), getClientManager().Get(getPlayer()).getAccountId(), -cost);
+
+			}
+
 		}
 		else
 		{
-			getDonationManager().PurchaseUnknownSalesPackage(new Callback<TransactionResponse>()
+			if (_salesItem.IsKnown())
 			{
-				public void run(TransactionResponse response)
+				getDonationManager().PurchaseKnownSalesPackage(new Callback<TransactionResponse>()
 				{
-					showResultsPage(response);
-				}
-			}, getPlayer().getName(), getClientManager().Get(getPlayer()).getAccountId(), _salesItem.GetName(), getCurrencyType() == CurrencyType.Coins, _salesItem.GetCost(getCurrencyType()), _salesItem.OneTimePurchase());
+					public void run(TransactionResponse response)
+					{
+						showResultsPage(response);
+					}
+				}, getPlayer().getName(), getPlayer().getUniqueId(), _salesItem.GetCost(getCurrencyType()), _salesItem.GetSalesPackageId());
+			}
+			else
+			{
+				getDonationManager().PurchaseUnknownSalesPackage(new Callback<TransactionResponse>()
+				{
+					public void run(TransactionResponse response)
+					{
+						showResultsPage(response);
+					}
+				}, getPlayer().getName(), getClientManager().Get(getPlayer()).getAccountId(), _salesItem.GetName(), getCurrencyType(), _salesItem.GetCost(getCurrencyType()), _salesItem.OneTimePurchase());
+			}
 		}
 		
 		_taskId = getPlugin().getScheduler().scheduleSyncRepeatingTask(getPlugin().getPlugin(), this, 2L, 2L);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
index 51450bfb9..56fa078f7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
@@ -6,7 +6,9 @@ import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventoryCustom;
 import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
 import mineplex.core.MiniPlugin;
@@ -134,21 +136,25 @@ public abstract class ShopPageBase<PluginType extends MiniPlugin, ShopType exten
 
 	public void playerClicked(InventoryClickEvent event)
 	{
-		if (_buttonMap.containsKey(event.getRawSlot()))
+		ClickType clickType = event.getClick();
+		boolean shiftClick = (clickType == ClickType.SHIFT_LEFT || clickType == ClickType.SHIFT_RIGHT);
+		int rawSlot = event.getRawSlot(); 
+		
+		if (_buttonMap.containsKey(rawSlot))
 		{
 			_buttonMap.get(event.getRawSlot()).onClick(_player, event.getClick());
+			event.setCancelled(true);
 		}
-		else if (event.getRawSlot() >= 0)
+		else if ((rawSlot >= 0 && rawSlot < inventory.getSize()) || shiftClick)
 		{
-			if (event.getInventory().getTitle() == inventory.getName() && (inventory.getSize() <= event.getSlot() || inventory.getItem(event.getSlot()) != null))
-			{
-				playDenySound(_player);
-			}
-			else if (event.getInventory() == _player.getInventory() && _player.getInventory().getItem(event.getSlot()) != null)
-			{
-				playDenySound(_player);
-			}
-		}
+			playDenySound(_player);
+			event.setCancelled(true);
+		} 
+	}
+	
+	public boolean matchesInventory(Inventory newInventory)
+	{
+		return getName().equalsIgnoreCase(newInventory.getName());
 	}
 	
 	public void playerOpened()
@@ -226,7 +232,7 @@ public abstract class ShopPageBase<PluginType extends MiniPlugin, ShopType exten
 		return _player;
 	}
 
-	protected CoreClient getClient()
+	public CoreClient getClient()
 	{
 		return _client;
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java
index a51b92a7f..e4109626e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java
@@ -48,7 +48,7 @@ public class ServerStatusManager extends MiniPlugin
 		_clientManager = clientManager;
 		_lagMeter = lagMeter;
 		
-		if (new File("IgnoreUpdates.dat").exists())
+		if (new File("IgnoreUpdates.dat").exists() && !(new File("EnableStatus.dat").exists()))
 			_enabled = false;
 		
 		setupConfigValues();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java b/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
index 03ebb5a82..3a9e8601f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
@@ -18,6 +18,8 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 public class TaskManager extends MiniDbClientPlugin<TaskClient>
 {
+	public static TaskManager Instance;
+	
 	private static Object _taskLock = new Object();
 	private TaskRepository _repository;
 	
@@ -27,6 +29,8 @@ public class TaskManager extends MiniDbClientPlugin<TaskClient>
 	{
 		super("Task Manager", plugin, clientManager);
 		
+		Instance = this;
+		
 		_repository = new TaskRepository(plugin);
 		updateTasks();
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java b/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java
index 09aabb2ac..db766014d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java
@@ -4,6 +4,7 @@ import java.util.LinkedList;
 import java.util.UUID;
 
 import mineplex.core.MiniPlugin;
+import mineplex.core.account.CoreClientManager;
 import mineplex.core.teleport.command.LocateCommand;
 import mineplex.core.teleport.command.TeleportCommand;
 import mineplex.core.teleport.event.MineplexTeleportEvent;
@@ -40,12 +41,14 @@ public class Teleport extends MiniPlugin
 	private NautHashMap<String, LinkedList<Location>> _tpHistory = new NautHashMap<String, LinkedList<Location>>();
 	private NautHashMap<UUID, BukkitRunnable> _failedRedisLocates = new NautHashMap<UUID, BukkitRunnable>();
 	private String _serverName;
+	private CoreClientManager _clientManager;
 
-	public Teleport(JavaPlugin plugin) 
+	public Teleport(JavaPlugin plugin, CoreClientManager clientManager)
 	{
 		super("Teleport", plugin);
 		
 		_serverName = getPlugin().getConfig().getString("serverstatus.name");
+		_clientManager = clientManager;
 
 		RedisLocateHandler locateHandler = new RedisLocateHandler(this);
 
@@ -295,4 +298,14 @@ public class Teleport extends MiniPlugin
 	{
 		return _tpHistory.get(player.getName());
 	}
+
+	public String getServerName()
+	{
+		return _serverName;
+	}
+
+	public CoreClientManager getClientManager()
+	{
+		return _clientManager;
+	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/teleport/command/TeleportCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/teleport/command/TeleportCommand.java
index fd3f76684..600f3fe6b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/teleport/command/TeleportCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/teleport/command/TeleportCommand.java
@@ -6,6 +6,7 @@ import mineplex.core.command.MultiCommandBase;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.status.ServerStatusManager;
 import mineplex.core.teleport.Teleport;
 
 public class TeleportCommand extends MultiCommandBase<Teleport>
@@ -13,7 +14,7 @@ public class TeleportCommand extends MultiCommandBase<Teleport>
 	public TeleportCommand(Teleport plugin)
 	{
 		super(plugin, Rank.MODERATOR, "tp", "teleport");
-		
+		 
 		AddCommand(new AllCommand(plugin));
 		AddCommand(new BackCommand(plugin));
 		AddCommand(new HereCommand(plugin));
@@ -22,6 +23,12 @@ public class TeleportCommand extends MultiCommandBase<Teleport>
 	@Override
 	protected void Help(Player caller, String[] args)
 	{
+		if (Plugin.getServerName().contains("Clans") && !Plugin.getClientManager().hasRank(caller, Rank.ADMIN) && !caller.isOp())
+		{
+			caller.sendMessage(F.main("Clans", "You cannot use /tp in clans!"));
+			return;
+		}
+
 		//Caller to Player
 		if (args.length == 1 && CommandCenter.GetClientManager().Get(caller).GetRank().has(caller, Rank.MODERATOR, true))
 			Plugin.playerToPlayer(caller, caller.getName(), args[0]);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java
index c5f591843..43447a030 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java
@@ -12,6 +12,7 @@ import mineplex.core.common.util.UtilTextMiddle;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.gadget.event.GadgetBlockEvent;
 import mineplex.core.hologram.Hologram;
+import mineplex.core.hologram.HologramInteraction;
 import mineplex.core.hologram.HologramManager;
 import mineplex.core.inventory.InventoryManager;
 import mineplex.core.reward.Reward;
@@ -32,6 +33,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
+import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
@@ -63,7 +65,20 @@ public class TreasureLocation implements Listener
 		_hologramManager = hologramManager;
 		_statusManager = statusManager;
 		_currentTreasure = null;
-		_hologram = new Hologram(_hologramManager, chestBlock.getLocation().add(0.5, 2.5, 0.5), C.cGreen + C.Bold + "Open Treasure");
+		_hologram = new Hologram(_hologramManager, chestBlock.getLocation().add(0.5, 2.5, 0.5), C.cGreen + C.Bold
+				+ "Open Treasure");
+		_hologram.setInteraction(new HologramInteraction()
+		{
+
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				if (clickType == ClickType.LEFT)
+					return;
+
+				openShop(player);
+			}
+		});
 		setHoloChestVisible(true);
 		_shop = new TreasureShop(treasureManager, _inventoryManager, clientManager, donationManager, this);
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/updater/UpdateType.java b/Plugins/Mineplex.Core/src/mineplex/core/updater/UpdateType.java
index 558312fc0..0b6c89cfb 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/updater/UpdateType.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/updater/UpdateType.java
@@ -5,14 +5,20 @@ import mineplex.core.common.util.UtilTime;
 public enum UpdateType  
 {
 	MIN_64(3840000),
+	HOUR_01(3600000),
 	MIN_32(1920000),
+	MIN_30(1800000),
 	MIN_16(960000),
+	MIN_10(600000),
 	MIN_08(480000),
+	MIN_05(300000),
 	MIN_04(240000),
 	MIN_02(120000),
 	MIN_01(60000),
 	SLOWEST(32000),
+	SEC_30(30000),
 	SLOWER(16000),
+	SEC_08(8000),
 	SLOW(4000),
 	TWOSEC(2000),
 	SEC(1000),
@@ -58,4 +64,9 @@ public enum UpdateType
 		System.out.println(this.name() + " in a second: " + _timeSpent);
 		_timeSpent = 0;
 	}
+
+	public long getMilliseconds()
+	{
+		return _time;
+	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/visibility/VisibilityManager.java b/Plugins/Mineplex.Core/src/mineplex/core/visibility/VisibilityManager.java
index bcbb9453e..26fe0e706 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/visibility/VisibilityManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/visibility/VisibilityManager.java
@@ -97,7 +97,6 @@ public class VisibilityManager extends MiniPlugin
 		if (event.getType() != UpdateType.MIN_01)
 			return;
 		
-		System.out.println("          ");
 		TimingManager.endTotal("VisMan update", true);
 		TimingManager.endTotal("VisMan setVis", true);
 		TimingManager.endTotal("VisData attemptToProcess", true);
@@ -106,6 +105,5 @@ public class VisibilityManager extends MiniPlugin
 		TimingManager.endTotal("VisData attemptToProcessUpdate lastState", true);
 		TimingManager.endTotal("Hide Player", true);
 		TimingManager.endTotal("Show Player", true);
-		System.out.println("          ");
 	}
 }
diff --git a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java
index e77a79480..4d12be94d 100644
--- a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java
+++ b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java
@@ -17,6 +17,7 @@ import org.bukkit.plugin.java.JavaPlugin;
 import mineplex.core.MiniPlugin;
 import mineplex.core.account.CoreClient;
 import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.CurrencyType;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.Callback;
 import mineplex.core.common.util.NautHashMap;
@@ -236,7 +237,7 @@ public class Enjin extends MiniPlugin implements CommandExecutor
 					_purchaseManager.addAccountPurchaseToQueue(client.getAccountId(), packageName, amount, data == TransactionResponse.Success);
 				}
 			}
-		}, name, client.getAccountId(), amount == 1 ? packageName : packageName + " " + amount, false, 0, false);
+		}, name, client.getAccountId(), amount == 1 ? packageName : packageName + " " + amount, CurrencyType.Gems, 0, false);
 		
 		return true;
 	}
diff --git a/Plugins/Mineplex.Game.Clans.Core/.classpath b/Plugins/Mineplex.Game.Clans.Core/.classpath
new file mode 100644
index 000000000..fa4ddd8ed
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans.Core/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Database"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jooq-3.5.2.jar"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.ServerData"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Plugins/Mineplex.Game.Clans.Core/.project b/Plugins/Mineplex.Game.Clans.Core/.project
new file mode 100644
index 000000000..fb0cce853
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans.Core/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Mineplex.Game.Clans.Core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/Plugins/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml b/Plugins/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml
new file mode 100644
index 000000000..d33a27278
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml
@@ -0,0 +1,17 @@
+<?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$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Mineplex.ServerData" />
+    <orderEntry type="module" module-name="Mineplex.Core.Common" />
+    <orderEntry type="module" module-name="Mineplex.Core" />
+    <orderEntry type="module" module-name="Mineplex.Database" />
+    <orderEntry type="library" name="craftbukkit" level="project" />
+    <orderEntry type="library" name="jooq" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/ClanDeleteCommand.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/ClanDeleteCommand.java
new file mode 100644
index 000000000..ed982367b
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/ClanDeleteCommand.java
@@ -0,0 +1,29 @@
+package mineplex.game.clans.core;
+
+import mineplex.game.clans.core.repository.tokens.SimpleClanToken;
+import mineplex.serverdata.commands.ServerCommand;
+
+
+public class ClanDeleteCommand extends ServerCommand
+{
+	private String _clanName;
+	public String getClanName() { return _clanName; }
+	
+	public ClanDeleteCommand(String serverName, String clanName)
+	{
+		super(serverName);
+		
+		_clanName = clanName;
+	}
+	
+	public ClanDeleteCommand(SimpleClanToken clan)
+	{
+		this(clan.getHomeServer(), clan.getClanName());
+	}
+	
+	@Override
+	public void run() 
+	{
+		// Utilitizes a callback functionality to seperate dependencies
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/ClanLoadCommand.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/ClanLoadCommand.java
new file mode 100644
index 000000000..b0d28e6bd
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/ClanLoadCommand.java
@@ -0,0 +1,23 @@
+package mineplex.game.clans.core;
+
+import mineplex.serverdata.commands.ServerCommand;
+
+
+public class ClanLoadCommand extends ServerCommand
+{
+	private String _clanName;
+	public String getClanName() { return _clanName; }
+	
+	public ClanLoadCommand(String serverName, String clanName)
+	{
+		super(serverName);
+		
+		_clanName = clanName;
+	}
+	
+	@Override
+	public void run() 
+	{
+		// Utilitizes a callback functionality to seperate dependencies
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java
new file mode 100644
index 000000000..037593a54
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java
@@ -0,0 +1,574 @@
+package mineplex.game.clans.core.repository;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.Collection;
+import java.util.UUID;
+
+import mineplex.core.common.util.Callback; 
+import mineplex.core.common.util.NautHashMap;
+import mineplex.core.database.DBPool;
+import mineplex.core.database.RepositoryBase;
+import mineplex.core.database.ResultSetCallable;
+import mineplex.core.database.column.Column;
+import mineplex.core.database.column.ColumnBoolean;
+import mineplex.core.database.column.ColumnInt;
+import mineplex.core.database.column.ColumnTimestamp;
+import mineplex.core.database.column.ColumnVarChar;
+import mineplex.database.tables.records.ClansRecord;
+import mineplex.game.clans.core.repository.tokens.ClanAllianceToken;
+import mineplex.game.clans.core.repository.tokens.ClanMemberToken;
+import mineplex.game.clans.core.repository.tokens.ClanTerritoryToken;
+import mineplex.game.clans.core.repository.tokens.ClanToken;
+import mineplex.game.clans.core.repository.tokens.SimpleClanToken;
+  
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.game.clans.core.repository.tokens.ClanWarToken;
+import mineplex.game.clans.core.war.ClanWarData;
+import org.jooq.DSLContext;
+
+import static mineplex.database.Tables.*;
+import static org.jooq.impl.DSL.*;
+
+public class ClanRepository extends RepositoryBase
+{
+	private static String CREATE_CLAN_TABLE = "CREATE TABLE IF NOT EXISTS clans (id INT NOT NULL AUTO_INCREMENT, serverId INT NOT NULL, name VARCHAR(100), description VARCHAR(140), home VARCHAR(140), admin BIT(1), dateCreated DATETIME, lastOnline DATETIME, energy INT, PRIMARY KEY (id), INDEX clanName (name));";
+	private static String CREATE_ACCOUNT_CLAN_TABLE = "CREATE TABLE IF NOT EXISTS accountClan (id INT NOT NULL AUTO_INCREMENT, accountId INT, clanId INT, clanRole VARCHAR(140), PRIMARY KEY (id), FOREIGN KEY (accountId) REFERENCES accounts(id), FOREIGN KEY (clanId) REFERENCES clans(id), INDEX clanIdIndex (clanId));";
+	private static String CREATE_CLAN_TERRITORY_TABLE = "CREATE TABLE IF NOT EXISTS clanTerritory (id INT NOT NULL AUTO_INCREMENT, clanId INT, chunk VARCHAR(100), safe BIT(1), PRIMARY KEY (id), FOREIGN KEY (clanId) REFERENCES clans(id));";
+	private static String CREATE_CLAN_ALLIANCE_TABLE = "CREATE TABLE IF NOT EXISTS clanAlliances (id INT NOT NULL AUTO_INCREMENT, clanId INT, otherClanId INT, trusted BIT(1), PRIMARY KEY (id), FOREIGN KEY (otherClanId) REFERENCES clans(id), FOREIGN KEY (clanId) REFERENCES clans(id), INDEX clanIdIndex (clanId));";
+
+	private static String RETRIEVE_CLAN_INFO = "SELECT c.id, c.name, c.description, c.home, c.admin, c.energy, c.kills, c.murder, c.deaths, c.warWins, c.warLosses, c.generator, c.generatorStock, c.dateCreated, c.lastOnline FROM clans AS c WHERE lower(c.name) = ?;";
+	private static String RETRIEVE_PLAYER_CLAN_INFO = "SELECT clans.name, accountClan.clanRole, clanServer.serverName, clans.id FROM accountClan INNER JOIN clans ON clans.id = accountClan.clanId INNER JOIN clanServer ON clans.serverId = clanServer.id WHERE accountClan.accountId = ?;";
+	private static String RETRIEVE_START_CLAN_INFO = "SELECT c.id, c.name, c.description, c.home, c.admin, c.energy, c.kills, c.murder, c.deaths, c.warWins, c.warLosses, c.generator, c.generatorStock, c.dateCreated, c.lastOnline, ct.chunk, ct.safe FROM clans AS c LEFT JOIN clanTerritory AS ct ON ct.clanId = c.id WHERE c.serverId = ? OR c.admin = 1;";
+	private static String RETRIEVE_CLAN_MEMBER_INFO = "SELECT c.name, a.name, a.uuid, clanRole FROM accountClan AS ac INNER JOIN accounts AS a ON a.id = ac.accountId INNER JOIN clans AS c on c.id = ac.clanId WHERE c.serverId = ?;";
+	private static String RETRIEVE_CLAN_MEMBERS = "SELECT c.name, a.name, a.uuid, clanRole FROM accountClan AS ac INNER JOIN accounts AS a ON a.id = ac.accountId INNER JOIN clans AS c on c.id = ac.clanId WHERE lower(c.name) = ?;";
+	private static String RETRIEVE_CLAN_ALLIANCE_INFO = "SELECT c.name, cOther.name, ca.trusted FROM clanAlliances AS ca INNER JOIN clans AS c ON c.id = ca.clanId INNER JOIN clans as cOther ON cOther.id = ca.otherClanId WHERE c.serverId = ?;";
+//	private static String RETRIEVE_CLAN_ENEMY_INFO = "SELECT c.name, cOther.name, clanScore, otherClanScore, clanKills, otherClanKills, timeFormed FROM clanEnemies AS ce INNER JOIN clans AS c ON c.id = ce.clanId INNER JOIN clans as cOther ON cOther.id = ce.otherClanId WHERE c.serverId = ?;";
+	private static String RETRIEVE_CLAN_WAR_INFO = "SELECT c.name, cOther.name, cw.score, cw.created, cw.ended, cw.lastUpdated FROM clanWar AS cw INNER JOIN clans AS c on c.id = cw.initiatorId INNER JOIN clans as cOther ON cOther.id = cw.clanId WHERE c.serverId = ? AND completed = FALSE";
+	private static String RETRIEVE_CLAN_WAR_FROM_CLAN_IDS = "SELECT c.name, cOther.name, cw.score, cw.created, cw.ended, cw.lastUpdated FROM clanWar AS cw INNER JOIN clans AS c on c.id = cw.initiatorId INNER JOIN clans as cOther ON cOther.id = cw.clanId WHERE cw.initiatorId = ? AND cw.clanId = ? AND completed = FALSE";
+
+	private static String DELETE_CLAN_MEMBER = "DELETE aC FROM accountClan AS aC INNER JOIN accounts ON accounts.id = aC.accountId WHERE aC.clanId = ? AND accounts.name = ?;";
+	private static String DELETE_CLAN_MEMBERS = "DELETE FROM accountClan WHERE clanId = ?;";	
+	private static String DELETE_CLAN_TERRITORY = "DELETE FROM clanTerritory WHERE clanId = ? AND chunk = ?;";
+	private static String DELETE_CLAN_ALL_TERRITORY = "DELETE FROM clanTerritory WHERE clanId = ?;"; //
+	private static String DELETE_CLAN_TERRITORIES = "DELETE FROM clanTerritory WHERE clanId = ?;"; //
+	private static String DELETE_CLAN_ALLIANCE = "DELETE FROM clanAlliances WHERE clanId = ? AND otherClanId = ?;";
+	private static String DELETE_CLAN_ALLIANCES = "DELETE FROM clanAlliances WHERE clanId = ? OR otherClanId = ?;";
+//	private static String DELETE_CLAN_ENEMIES = "DELETE FROM clanEnemies WHERE clanId = ? OR otherClanId = ?;";
+	private static String DELETE_CLAN = "DELETE FROM clans WHERE id = ?;";
+	private static String DELETE_ALL_WAR = "DELETE FROM clanWar WHERE initiatorId = ? OR clanId = ?";
+	
+	private static String ADD_CLAN = "INSERT INTO clans (serverId, name, description, home, admin, dateCreated, energy, lastOnline) VALUES (?, ?, ?, ?, ?, now(), ?, now());";
+	private static String ADD_CLAN_MEMBER = "INSERT INTO accountClan (accountId, clanId, clanRole) SELECT accounts.id, ?, ? FROM accounts WHERE accounts.name = ?;";
+	private static String ADD_CLAN_ALLIANCE = "INSERT INTO clanAlliances (clanId, otherClanId, trusted) VALUES (?, ?, ?);";
+	private static String ADD_CLAN_WAR = "INSERT INTO clanWar (initiatorId, clanId, score, created, lastUpdated) VALUES (?, ?, ?, ?, ?)";
+	private static String ADD_CLAN_TERRITORY = "INSERT INTO clanTerritory (clanId, chunk, safe) VALUES (?, ?, ?);";
+	
+	private static String UPDATE_CLAN = "UPDATE clans SET name = ?, description = ?, home = ?, admin = ?, energy = ?, kills = ?, murder = ?, deaths = ?, warWins = ?, warLosses = ?, lastOnline = ? WHERE id = ?;";
+	private static String UPDATE_CLAN_MEMBER = "UPDATE accountClan AS AC INNER JOIN accounts ON accounts.id = AC.accountId SET AC.clanRole = ? WHERE AC.clanId = ? AND accounts.name = ?;";
+	private static String UPDATE_CLAN_ALLIANCE = "UPDATE clanAlliances SET trusted = ? WHERE clanId = ? AND otherClanId = ?;";
+	private static String UPDATE_CLAN_TERRITORY = "UPDATE clanTerritory SET safe = ? WHERE chunk = ?;"; //
+	private static String UPDATE_CLAN_WAR = "UPDATE clanWar SET score = ?, lastUpdated = ? WHERE initiatorId = ? AND clanId = ?";
+	private static String UPDATE_CLAN_SERVER_ID = "UPDATE clans SET serverId = ?, home = '', generator = '' WHERE id = ?;";
+	private static String UPDATE_CLAN_GENERATOR = "UPDATE clans SET generator = ?, generatorStock = ? WHERE id = ?;";
+
+	private static String GET_CLAN_SERVER = "SELECT id FROM clanServer WHERE clanServer.serverName = ?"; 
+	private static String ADD_CLAN_SERVER = "INSERT INTO clanServer (serverName) VALUES (?);";
+	
+	private String _serverName;
+	private int _serverId;
+	
+	public ClanRepository(JavaPlugin plugin, String serverName, boolean isClansServer)
+	{
+		super(plugin, DBPool.ACCOUNT);
+		
+		_serverName = serverName;
+		_serverId = -1; 
+
+		if (isClansServer)
+		{
+			loadServerId();
+		}
+	}
+	
+	public ClanRepository(JavaPlugin plugin, String serverName)
+	{
+		this(plugin, serverName, false);
+	}
+
+	private void loadServerId()
+	{
+		ResultSetCallable callable = new ResultSetCallable()
+		{
+			@Override
+			public void processResultSet(ResultSet resultSet) throws SQLException
+			{
+				while (resultSet.next())
+				{
+					_serverId = resultSet.getInt(1);
+				}
+			}
+		};
+
+		executeQuery(GET_CLAN_SERVER, callable, new ColumnVarChar("serverName", 100, _serverName));
+
+		if (_serverId == -1)
+		{
+			// Need to insert server into database
+			executeInsert(ADD_CLAN_SERVER, callable, new ColumnVarChar("serverName", 100, _serverName));
+
+			if (_serverId == -1)
+			{
+				System.out.println("Error loading serverId from database. Shutting down server!");
+				Bukkit.shutdown();
+				return;
+			}
+		}
+
+		System.out.println("Loaded Server ID: " + _serverId);
+	}
+
+	@Override
+	protected void initialize()
+	{
+		executeUpdate(CREATE_CLAN_TABLE);
+		executeUpdate(CREATE_ACCOUNT_CLAN_TABLE);
+		executeUpdate(CREATE_CLAN_TERRITORY_TABLE);
+		executeUpdate(CREATE_CLAN_ALLIANCE_TABLE);
+	}
+	
+	/**
+	 * Updates a clan's home server while removing all 
+	 * alliances, enemies, teritory claims and homes set on 
+	 * originating server.
+	 * @param clanId - the id of the clan to move
+	 * @param serverId - the id of the destination server being moved to
+	 */
+	public void moveClanServer(final int clanId, String serverName, final Callback<Boolean> callback)
+	{
+		executeQuery(GET_CLAN_SERVER, new ResultSetCallable()
+		{
+			@Override
+			public void processResultSet(ResultSet resultSet) throws SQLException
+			{
+				boolean success = resultSet.next();
+				
+				if (success)
+				{
+					int serverId = resultSet.getInt(1);
+					ColumnInt clanIdCol = new ColumnInt("clanId", clanId);
+					ColumnInt serverIdCol = new ColumnInt("serverId", serverId);
+					
+					executeUpdate(DELETE_CLAN_ALLIANCES, clanIdCol, clanIdCol);
+					deleteAllWar(clanId);
+					executeUpdate(DELETE_CLAN_TERRITORIES, clanIdCol);
+					executeUpdate(UPDATE_CLAN_SERVER_ID, serverIdCol, clanIdCol);
+				}
+				
+				callback.run(success); 
+			}
+		}, new ColumnVarChar("serverName", 100, serverName));
+		
+	}
+	
+	public ClanToken retrieveClan(String clanName)
+	{
+		final ClanToken clan = new ClanToken();
+		
+		executeQuery(RETRIEVE_CLAN_INFO, new ResultSetCallable()
+		{
+			@Override
+			public void processResultSet(ResultSet resultSet) throws SQLException
+			{
+				if (resultSet.next())
+				{
+					clan.Id = resultSet.getInt(1);
+					clan.Name = resultSet.getString(2);
+					clan.Description = resultSet.getString(3);
+					clan.Home = resultSet.getString(4);
+					clan.Admin = resultSet.getBoolean(5);
+					clan.Energy = resultSet.getInt(6);
+					clan.Kills = resultSet.getInt(7);
+					clan.Murder = resultSet.getInt(8);
+					clan.Deaths = resultSet.getInt(9);
+					clan.WarWins = resultSet.getInt(10);
+					clan.WarLosses = resultSet.getInt(11);
+					clan.Generator = resultSet.getString(12);
+					clan.GeneratorStock = resultSet.getInt(13);
+					clan.DateCreated = resultSet.getTimestamp(14);
+					clan.LastOnline = resultSet.getTimestamp(15);
+				}
+			}
+		}, new ColumnVarChar("name", 100, clanName.toLowerCase()));
+		
+		executeQuery(RETRIEVE_CLAN_MEMBERS, new ResultSetCallable()
+		{
+			@Override
+			public void processResultSet(ResultSet resultSet) throws SQLException
+			{
+				while (resultSet.next())
+				{
+					String clanName = resultSet.getString(1);
+					
+					ClanMemberToken memberToken = new ClanMemberToken();
+					memberToken.Name = resultSet.getString(2);
+					memberToken.PlayerUUID = UUID.fromString(resultSet.getString(3));
+					memberToken.ClanRole = resultSet.getString(4);
+					
+					clan.Members.add(memberToken);
+				}
+			}
+			
+		}, new ColumnVarChar("name", 100, clanName.toLowerCase()));
+		
+		return clan;
+	}
+	
+	public void clanExists(String clanName, final Callback<Boolean> callback)
+	{
+		executeQuery(RETRIEVE_CLAN_INFO, new ResultSetCallable()
+		{
+			@Override
+			public void processResultSet(ResultSet resultSet) throws SQLException
+			{
+				boolean clanExists = resultSet.next();
+				callback.run(clanExists); 
+			}
+		}, new ColumnVarChar("name", 100, clanName.toLowerCase()));
+	}
+
+	public void retrievePlayersClan(int accountId, final Callback<SimpleClanToken> callback)
+	{
+		executeQuery(RETRIEVE_PLAYER_CLAN_INFO, new ResultSetCallable()
+		{
+			@Override
+			public void processResultSet(ResultSet resultSet) throws SQLException
+			{
+				SimpleClanToken clanToken = null;
+				if (resultSet.next())
+				{
+					String clanName = resultSet.getString(1);
+					String clanRole = resultSet.getString(2);
+					String homeServer = resultSet.getString(3);
+					int clanId = resultSet.getInt(4);
+					clanToken = new SimpleClanToken(clanName, clanRole, homeServer, clanId);
+				}
+				
+				callback.run(clanToken);
+			}
+		}, new ColumnInt("accountId", accountId));
+	}
+		
+	public Collection<ClanToken> retrieveClans()
+	{
+		System.out.println("Beginning to load clans from database...");
+		final NautHashMap<String, ClanToken> clans = new NautHashMap<String, ClanToken>();
+		
+		executeQuery(RETRIEVE_START_CLAN_INFO, new ResultSetCallable()
+		{
+			@Override
+			public void processResultSet(ResultSet resultSet) throws SQLException
+			{
+				while (resultSet.next())
+				{ 
+					ClanToken token = new ClanToken();
+					token.Id = resultSet.getInt(1);
+					token.Name = resultSet.getString(2);
+					token.Description = resultSet.getString(3);
+					token.Home = resultSet.getString(4);
+					token.Admin = resultSet.getBoolean(5);
+					token.Energy = resultSet.getInt(6);
+					token.Kills = resultSet.getInt(7);
+					token.Murder = resultSet.getInt(8);
+					token.Deaths = resultSet.getInt(9);
+					token.WarWins = resultSet.getInt(10);
+					token.WarLosses = resultSet.getInt(11);
+					token.Generator = resultSet.getString(12);
+					token.GeneratorStock = resultSet.getInt(13);
+					token.DateCreated = resultSet.getTimestamp(14);
+					token.LastOnline = resultSet.getTimestamp(15);
+					
+					ClanTerritoryToken territoryToken = new ClanTerritoryToken();
+					territoryToken.ClanName = token.Name;
+					territoryToken.Chunk = resultSet.getString(16);
+					territoryToken.Safe = resultSet.getBoolean(17);
+					
+					if (!clans.containsKey(token.Name))
+					{
+						clans.put(token.Name, token);
+					}
+					
+					if (territoryToken.Chunk != null)
+						clans.get(token.Name).Territories.add(territoryToken);
+				}
+			}
+			
+		}, new ColumnInt("serverId", _serverId));
+		
+		System.out.println("1");
+		
+		executeQuery(RETRIEVE_CLAN_MEMBER_INFO, new ResultSetCallable()
+		{
+			@Override
+			public void processResultSet(ResultSet resultSet) throws SQLException
+			{
+				while (resultSet.next())
+				{
+					String clanName = resultSet.getString(1);
+					
+					if (clans.containsKey(clanName))
+					{
+						ClanMemberToken memberToken = new ClanMemberToken();
+						memberToken.Name = resultSet.getString(2);
+						memberToken.PlayerUUID = UUID.fromString(resultSet.getString(3));
+						memberToken.ClanRole = resultSet.getString(4);
+						
+						clans.get(clanName).Members.add(memberToken);
+					}
+				}
+			}
+			
+		}, new ColumnInt("serverId", _serverId));
+
+		System.out.println("2");
+		
+		executeQuery(RETRIEVE_CLAN_ALLIANCE_INFO, new ResultSetCallable()
+		{
+			@Override
+			public void processResultSet(ResultSet resultSet) throws SQLException
+			{
+				while (resultSet.next())
+				{
+					String clanName = resultSet.getString(1);
+
+					if (clans.containsKey(clanName))
+					{
+						ClanAllianceToken allianceToken = new ClanAllianceToken();
+						allianceToken.ClanName = resultSet.getString(2);
+						allianceToken.Trusted = resultSet.getBoolean(3);
+
+						clans.get(clanName).Alliances.add(allianceToken);
+					}
+				}
+			}
+
+		}, new ColumnInt("serverId", _serverId));
+
+		System.out.println("3");
+
+		executeQuery(RETRIEVE_CLAN_WAR_INFO, new ResultSetCallable()
+		{
+			@Override
+			public void processResultSet(ResultSet resultSet) throws SQLException
+			{
+				while (resultSet.next())
+				{
+					ClanWarToken warToken = new ClanWarToken();
+					String clanA = resultSet.getString(1);
+					String clanB = resultSet.getString(2);
+					int score = resultSet.getInt(3);
+					Timestamp created = resultSet.getTimestamp(4);
+//					warToken.Ended = resultSet.getTimestamp(5);
+					Timestamp updated = resultSet.getTimestamp(6);
+					ClanWarData warData = new ClanWarData(clanA, clanB, score, created, updated, 0);
+					warToken.WarData = warData;
+
+					if (clans.containsKey(warToken.WarData.getClanA()) && clans.containsKey(warToken.WarData.getClanB()))
+					{
+						System.out.println("Loaded War Token: " + warToken.WarData.getClanA());
+						clans.get(warToken.WarData.getClanA()).WarsOut.add(warToken);
+						clans.get(warToken.WarData.getClanB()).WarsIn.add(warToken);
+					}
+				}
+			}
+		}, new ColumnInt("serverId", _serverId));
+
+		System.out.println("Finished loading clans from database...");
+		return clans.values();
+	}
+	
+	@Override
+	protected void update()
+	{
+	}
+
+	public boolean deleteClan(int clanId)
+	{
+		return jooq().delete(clans).where(clans.id.equal(clanId)).execute() == 1;
+	}
+
+	public int addClan(ClanToken token)
+	{
+		ClansRecord record = jooq().newRecord(clans);
+		record.setServerId(_serverId);
+		record.setName(token.Name);
+		record.setDescription(token.Description);
+		record.setHome(token.Home);
+		record.setAdmin(token.Admin);
+		record.setEnergy(token.Energy);
+
+		if (record.store() == 1)
+		{
+			return record.getId();
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+	@Deprecated
+	public boolean addMember(int clanId, String playerName, String role)
+	{
+		DSLContext create = jooq();
+		int out = create.insertInto(accountClan)
+				.set(accountClan.accountId, select(accounts.id).from(accounts).where(accounts.name.eq(playerName)))
+				.set(accountClan.clanId, clanId)
+				.set(accountClan.clanRole, role).execute();
+
+		return out == 1;
+	}
+
+	public boolean addMember(int clanId, UUID playerUUID, String role)
+	{
+		int out = jooq().insertInto(accountClan)
+				.set(accountClan.accountId, select(accounts.id).from(accounts).where(accounts.uuid.eq(playerUUID.toString())))
+				.set(accountClan.clanId, clanId)
+				.set(accountClan.clanRole, role).execute();
+
+		return out == 1;
+	}
+
+	public boolean removeMember(int clanId, String playerName)
+	{
+		return executeUpdate(DELETE_CLAN_MEMBER, new ColumnInt("clanid", clanId), new ColumnVarChar("name", 100, playerName)) == 1;
+	}
+
+	public void updateMember(int clanId, String playerName, String role)
+	{
+		executeUpdate(UPDATE_CLAN_MEMBER, new ColumnVarChar("clanRole", 100, role) , new ColumnInt("clanid", clanId), new ColumnVarChar("name", 100, playerName));
+	}
+
+	public void addClanRelationship(int clanId, int otherClanId, boolean trusted)
+	{
+		executeUpdate(ADD_CLAN_ALLIANCE, new ColumnInt("clanid", clanId), new ColumnInt("otherClanId", otherClanId), new ColumnBoolean("trusted", trusted));
+	}
+
+	public void updateClanRelationship(int clanId, int otherClanId, boolean trusted)
+	{
+		executeUpdate(UPDATE_CLAN_ALLIANCE, new ColumnBoolean("trusted", trusted), new ColumnInt("clanid", clanId), new ColumnInt("otherClanId", otherClanId));
+	}
+
+	public void removeClanRelationship(int clanId, int otherClanId)
+	{
+		executeUpdate(DELETE_CLAN_ALLIANCE, new ColumnInt("clanid", clanId), new ColumnInt("otherClanId", otherClanId));
+	}
+
+	public boolean addTerritoryClaim(int clanId, String chunk, boolean safe)
+	{
+		return executeUpdate(ADD_CLAN_TERRITORY, new ColumnInt("clanId", clanId), new ColumnVarChar("chunk", 100, chunk), new ColumnBoolean("safe", safe)) == 1;
+	}
+	
+	public boolean addTerritoryClaims(int clanId, boolean safe, String... chunks)
+	{
+		int affectedRows = 0;
+		int size = chunks.length;
+		String query = "INSERT INTO clanTerritory (clanId, chunk, safe) VALUES";
+		for (int i = 0; i < size; i++)
+		{
+			query += " (?, ?, ?)";
+			
+			if (i < (size - 1))
+				query += ",";
+		}
+		query += ";";
+		
+		try (Connection connection = getConnection();
+			 PreparedStatement preparedStatement = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS))
+		{
+			Column<?> clanIdCol = new ColumnInt("clanId", clanId);
+			Column<?> safeCol = new ColumnBoolean("safe", safe);
+			
+			int i = 0;
+			for (String chunk : chunks)
+			{
+				Column<?> chunkCol = new ColumnVarChar("chunk", 100, chunk);
+				clanIdCol.setValue(preparedStatement, i + 1);
+				chunkCol.setValue(preparedStatement, i + 2);
+				safeCol.setValue(preparedStatement, i + 3);
+				i += 3;
+			}
+			
+			affectedRows = preparedStatement.executeUpdate();
+		}
+		catch (Exception exception)
+		{
+			exception.printStackTrace();
+		}
+
+		return affectedRows == size;
+	}
+
+	public void addWar(int initiatorId, int clanId, int score, Timestamp currentTime)
+	{
+		executeUpdate(ADD_CLAN_WAR, new ColumnInt("initiatorId", initiatorId), new ColumnInt("clanId", clanId), new ColumnInt("score", score),
+				new ColumnTimestamp("created", currentTime), new ColumnTimestamp("lastUpdated", currentTime));
+	}
+
+	public boolean updateWar(int initiatorId, int clanId, int score, Timestamp lastUpdated)
+	{
+		return 1 == executeUpdate(UPDATE_CLAN_WAR, new ColumnInt("score", score),
+				new ColumnTimestamp("lastUpdated", lastUpdated), new ColumnInt("initiatorId", initiatorId), new ColumnInt("clanId", clanId));
+	}
+
+	public void deleteAllWar(int clanId)
+	{
+		executeUpdate(DELETE_ALL_WAR, new ColumnInt("initiatorId", clanId), new ColumnInt("clanId", clanId));
+	}
+
+//	public void addEnemy(int clanId, int otherClanId)
+//	{
+//		executeUpdate(ADD_CLAN_ENEMY, new ColumnInt("clanId", clanId), new ColumnInt("otherClanId", otherClanId));
+//	}
+
+	public void removeTerritoryClaim(int clanId, String chunk)
+	{
+		executeUpdate(DELETE_CLAN_TERRITORY, new ColumnInt("clanId", clanId), new ColumnVarChar("chunk", 100, chunk));
+	}
+	
+	public void removeTerritoryClaims(int clanId)
+	{
+		executeUpdate(DELETE_CLAN_ALL_TERRITORY, new ColumnInt("clanId", clanId));
+	}
+
+	public void updateClan(int clanId, String name, String desc, String home, boolean admin, int energy, int kills, int murder, int deaths, int warWins, int warLosses, Timestamp lastOnline)
+	{
+		executeUpdate(UPDATE_CLAN, new ColumnVarChar("name", 100, name), new ColumnVarChar("desc", 100, desc), new ColumnVarChar("home", 100, home), new ColumnBoolean("admin", admin),
+				new ColumnInt("energy", energy), new ColumnInt("kills", kills), new ColumnInt("murder", murder), new ColumnInt("deaths", deaths),
+				new ColumnInt("warWins", warWins), new ColumnInt("warLosses", warLosses), new ColumnTimestamp("lastOnline", lastOnline), new ColumnInt("clanId", clanId));
+	}
+
+//	public void updateEnemy(int clanId, int otherClanId, int clanScore, int otherClanScore, int clanKills, int otherClanKills)
+//	{
+//		executeUpdate(UPDATE_CLAN_ENEMY, new ColumnInt("clanId", clanId), new ColumnInt("otherClanId", otherClanId),
+//				new ColumnInt("clanScore", clanScore), new ColumnInt("otherClanScore", otherClanScore), new ColumnInt("clanKills", clanKills),
+//				new ColumnInt("otherClanKills", otherClanKills), new ColumnInt("clanId", clanId), new ColumnInt("otherClanId", otherClanId));
+//	}
+
+	public boolean updateClanGenerator(int clanId, String generator, int generatorStock)
+	{
+		return executeUpdate(UPDATE_CLAN_GENERATOR, new ColumnVarChar("generator", 140, generator), new ColumnInt("generatorStock", generatorStock), new ColumnInt("clanId", clanId))
+				> 0;
+	}
+
+	public void updateTerritoryClaim(String chunk, boolean safe)
+	{
+		executeUpdate(UPDATE_CLAN_TERRITORY, new ColumnBoolean("safe", safe), new ColumnVarChar("chunk", 100, chunk));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanTerritory.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanTerritory.java
similarity index 51%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanTerritory.java
rename to Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanTerritory.java
index c13d2a36c..904388533 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanTerritory.java
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanTerritory.java
@@ -1,6 +1,8 @@
-package mineplex.game.clans.clans.repository;
+package mineplex.game.clans.core.repository;
 
-import mineplex.game.clans.clans.repository.tokens.ClanTerritoryToken;
+import org.bukkit.Location;
+
+import mineplex.game.clans.core.repository.tokens.ClanTerritoryToken;
 
 public class ClanTerritory
 {
@@ -16,4 +18,14 @@ public class ClanTerritory
 	public boolean Safe;
 	public String Owner = "";
 	public String Chunk = "";
+	
+	public boolean isSafe(Location location)
+	{
+		if (Owner.equals("Spawn"))
+		{
+			return location.getY() > 190;
+		}
+		
+		return Safe;
+	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanAllianceToken.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanAllianceToken.java
similarity index 61%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanAllianceToken.java
rename to Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanAllianceToken.java
index fe4520969..c749feec1 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanAllianceToken.java
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanAllianceToken.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.clans.repository.tokens;
+package mineplex.game.clans.core.repository.tokens;
 
 public class ClanAllianceToken
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanEnemyToken.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanEnemyToken.java
similarity index 77%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanEnemyToken.java
rename to Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanEnemyToken.java
index 3aa201763..8fb9e1ed1 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanEnemyToken.java
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanEnemyToken.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.clans.repository.tokens;
+package mineplex.game.clans.core.repository.tokens;
 
 import java.sql.Timestamp;
 
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanMemberToken.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanMemberToken.java
similarity index 70%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanMemberToken.java
rename to Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanMemberToken.java
index 4af96feb0..9fab8c68a 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanMemberToken.java
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanMemberToken.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.clans.repository.tokens;
+package mineplex.game.clans.core.repository.tokens;
 
 import java.util.UUID;
 
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanTerritoryToken.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanTerritoryToken.java
similarity index 74%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanTerritoryToken.java
rename to Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanTerritoryToken.java
index 5b7ca2108..d7c6cbfde 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanTerritoryToken.java
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanTerritoryToken.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.clans.repository.tokens;
+package mineplex.game.clans.core.repository.tokens;
 
 public class ClanTerritoryToken
 {
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanToken.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanToken.java
similarity index 60%
rename from Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanToken.java
rename to Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanToken.java
index f9881aa51..1d49a9d62 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/tokens/ClanToken.java
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanToken.java
@@ -1,4 +1,4 @@
-package mineplex.game.clans.clans.repository.tokens;
+package mineplex.game.clans.core.repository.tokens;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -12,12 +12,19 @@ public class ClanToken
 	public String Home;
 	public boolean Admin;
 	public int Energy;
+	public int Kills;
+	public int Murder;
+	public int Deaths;
+	public int WarWins;
+	public int WarLosses;
+	public String Generator;
+	public int GeneratorStock;
 	public Timestamp DateCreated;
 	public Timestamp LastOnline;
 
-	public ClanEnemyToken EnemyToken;
-	
 	public List<ClanMemberToken> Members = new ArrayList<ClanMemberToken>();
 	public List<ClanTerritoryToken> Territories = new ArrayList<ClanTerritoryToken>();
 	public List<ClanAllianceToken> Alliances = new ArrayList<ClanAllianceToken>();
+	public List<ClanWarToken> WarsIn = new ArrayList<ClanWarToken>();
+	public List<ClanWarToken> WarsOut = new ArrayList<ClanWarToken>();
 }
diff --git a/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanWarToken.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanWarToken.java
new file mode 100644
index 000000000..ad917de74
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/ClanWarToken.java
@@ -0,0 +1,8 @@
+package mineplex.game.clans.core.repository.tokens;
+
+import mineplex.game.clans.core.war.ClanWarData;
+
+public class ClanWarToken
+{
+	public ClanWarData WarData;
+}
diff --git a/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/SimpleClanToken.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/SimpleClanToken.java
new file mode 100644
index 000000000..70757bd98
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/tokens/SimpleClanToken.java
@@ -0,0 +1,25 @@
+package mineplex.game.clans.core.repository.tokens;
+
+public class SimpleClanToken 
+{
+
+	private String _clanName;
+	public String getClanName() { return _clanName; }
+	
+	private String _clanRole;
+	public String getClanRole() { return _clanRole; }
+	
+	private String _homeServer;
+	public String getHomeServer() { return _homeServer; }
+	
+	private int _clanId;
+	public int getClanId() { return _clanId; }
+	
+	public SimpleClanToken(String clanName, String clanRole, String homeServer, int clanId)
+	{
+		_clanName = clanName;
+		_clanRole = clanRole;
+		_homeServer = homeServer;
+		_clanId = clanId;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/war/ClanWarData.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/war/ClanWarData.java
new file mode 100644
index 000000000..6fdb566fc
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/war/ClanWarData.java
@@ -0,0 +1,111 @@
+package mineplex.game.clans.core.war;
+
+import java.sql.Timestamp;
+
+public class ClanWarData
+{
+	private String _clanA;
+	private String _clanB;
+	private volatile int _clanAPoints;
+	private Timestamp _timeFormed;
+	private Timestamp _lastUpdated;
+	private long _cooldown;
+
+	public ClanWarData(String clanA, String clanB, int clanAPoints, Timestamp timeFormed, Timestamp lastUpdated, long cooldown)
+	{
+		_clanA = clanA;
+		_clanB = clanB;
+		_clanAPoints = clanAPoints;
+		_timeFormed = timeFormed;
+		_lastUpdated = lastUpdated;
+		_cooldown = cooldown;
+	}
+
+	public String getClanA()
+	{
+		return _clanA;
+	}
+
+	public String getClanB()
+	{
+		return _clanB;
+	}
+
+	public int getClanAPoints()
+	{
+		return _clanAPoints;
+	}
+
+	public int getClanBPoints()
+	{
+		return -_clanAPoints;
+	}
+
+	public int getPoints(String clan)
+	{
+		if (_clanA.equals(clan))
+			return getClanAPoints();
+		else if (_clanB.equals(clan))
+			return getClanBPoints();
+
+		throw new RuntimeException("ClanWarData::getPoints Invalid Clan for War. ClanA: " + _clanA + ", ClanB: " + _clanB + ", Lookup Clan: " + clan);
+	}
+
+	public int getPoints()
+	{
+		return _clanAPoints;
+	}
+
+	public Timestamp getTimeFormed()
+	{
+		return _timeFormed;
+	}
+
+	public Timestamp getLastUpdated()
+	{
+		return _lastUpdated;
+	}
+
+	public void setLastUpdated(Timestamp lastUpdated)
+	{
+		_lastUpdated = lastUpdated;
+	}
+
+	public long getCooldown()
+	{
+		return _cooldown;
+	}
+
+	public void setCooldown(long cooldown)
+	{
+		_cooldown = System.currentTimeMillis() + cooldown;
+	}
+
+	public boolean isOnCooldown()
+	{
+		return _cooldown >= System.currentTimeMillis();
+	}
+
+	public void resetPoints()
+	{
+		update();
+
+		_clanAPoints = 0;
+	}
+
+	public void increment(String clan)
+	{
+		update();
+
+		if (_clanA.equals(clan))
+			_clanAPoints++;
+		else if (_clanB.equals(clan))
+			_clanAPoints--;
+		else throw new RuntimeException("ClanWarData::increment Invalid Clan for War. ClanA: " + _clanA + ", ClanB: " + _clanB + ", Lookup Clan: " + clan);
+	}
+
+	private void update()
+	{
+		setLastUpdated(new Timestamp(System.currentTimeMillis()));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/.classpath b/Plugins/Mineplex.Game.Clans/.classpath
index 075cca472..4a7e01944 100644
--- a/Plugins/Mineplex.Game.Clans/.classpath
+++ b/Plugins/Mineplex.Game.Clans/.classpath
@@ -8,5 +8,9 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Minecraft.Game.ClassCombat"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Minecraft.Game.Core"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar" sourcepath="/REPO_DIR/GitHubLibraries/CraftBukkit/src"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/gson-2.2.1.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Database"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jooq-3.5.2.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Game.Clans.Core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Plugins/Mineplex.Game.Clans/Mineplex.Game.Clans.iml b/Plugins/Mineplex.Game.Clans/Mineplex.Game.Clans.iml
index 82d2e5104..c5914c65c 100644
--- a/Plugins/Mineplex.Game.Clans/Mineplex.Game.Clans.iml
+++ b/Plugins/Mineplex.Game.Clans/Mineplex.Game.Clans.iml
@@ -5,15 +5,17 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Mineplex.Core" />
     <orderEntry type="module" module-name="Mineplex.Core.Common" />
     <orderEntry type="module" module-name="Mineplex.Minecraft.Game.ClassCombat" />
     <orderEntry type="module" module-name="Mineplex.Minecraft.Game.Core" />
+    <orderEntry type="module" module-name="Mineplex.Game.Clans.Core" />
     <orderEntry type="module" module-name="Mineplex.ServerData" />
     <orderEntry type="library" name="craftbukkit" level="project" />
     <orderEntry type="module" module-name="Mineplex.Database" />
     <orderEntry type="library" name="jooq" level="project" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" name="gson" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
index ac3c3dc40..0e35252e8 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
@@ -1,8 +1,12 @@
 package mineplex.game.clans;
 
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
 import org.bukkit.plugin.java.JavaPlugin;
-import net.minecraft.server.v1_7_R4.MinecraftServer;
 
+import mineplex.core.CustomTagFix;
+import mineplex.core.FoodDupeFix;
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.achievement.AchievementManager;
 import mineplex.core.antihack.AntiHack;
@@ -12,12 +16,15 @@ import mineplex.core.command.CommandCenter;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.explosion.Explosion;
 import mineplex.core.friend.FriendManager;
+import mineplex.core.give.Give;
+import mineplex.core.hologram.HologramManager;
 import mineplex.core.ignore.IgnoreManager;
 import mineplex.core.inventory.InventoryManager;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.memory.MemoryFix;
 import mineplex.core.message.MessageManager;
 import mineplex.core.monitor.LagMeter;
+import mineplex.core.packethandler.PacketHandler;
 import mineplex.core.portal.Portal;
 import mineplex.core.preferences.PreferencesManager;
 import mineplex.core.punish.Punish;
@@ -29,75 +36,135 @@ import mineplex.core.status.ServerStatusManager;
 import mineplex.core.teleport.Teleport;
 import mineplex.core.updater.FileUpdater;
 import mineplex.core.updater.Updater;
+import mineplex.core.visibility.VisibilityManager;
 import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.items.GearManager;
 import mineplex.game.clans.shop.building.BuildingShop;
+import mineplex.game.clans.shop.farming.FarmingShop;
+import mineplex.game.clans.shop.mining.MiningShop;
 import mineplex.game.clans.shop.pvp.PvpShop;
+import mineplex.game.clans.spawn.travel.TravelShop;
+import mineplex.game.clans.world.WorldManager;
+import net.minecraft.server.v1_8_R3.MinecraftServer;
 
 public class Clans extends JavaPlugin
-{      
+{
+	public static final String VERSION = "0.16";
 	private String WEB_CONFIG = "webServer";
- 
-	//Modules   
-	private CoreClientManager _clientManager;
-	private DonationManager _donationManager; 
 
-	@Override     
-	public void onEnable() 
+	// Modules
+	private CoreClientManager _clientManager;
+	private DonationManager _donationManager;
+	private ClansManager _clansManager;
+	
+	@Override
+	public void onEnable()
 	{
-		//Configs
+		// Configs
 		getConfig().addDefault(WEB_CONFIG, "http://accounts.mineplex.com/");
 		getConfig().set(WEB_CONFIG, getConfig().getString(WEB_CONFIG));
 		saveConfig();
 		
 		String webServerAddress = getConfig().getString(WEB_CONFIG);
 
-		//Logger.initialize(this);
+		// Logger.initialize(this);
 
-		//Static Modules
-		CommandCenter.Initialize(this);		
+		// Static Modules
+		CommandCenter.Initialize(this);
 		_clientManager = new CoreClientManager(this, webServerAddress);
 		CommandCenter.Instance.setClientManager(_clientManager);
 
-		ItemStackFactory.Initialize(this, false);  
-		Recharge.Initialize(this);   
+		ItemStackFactory.Initialize(this, false);
+		
+		Recharge.Initialize(this);
+		VisibilityManager.Initialize(this);
+		// new ProfileCacheManager(this);
 
 		_donationManager = new DonationManager(this, _clientManager, webServerAddress);
-
+		
 		new ServerConfiguration(this, _clientManager);
 		
 		PreferencesManager preferenceManager = new PreferencesManager(this, _clientManager, _donationManager);
 
 		ServerStatusManager serverStatusManager = new ServerStatusManager(this, _clientManager, new LagMeter(this, _clientManager));
+		
+		// TODO: Add spawn locations to a configuration file of some sort?
 		new Spawn(this, serverStatusManager.getCurrentServerName());
-		Teleport teleport = new Teleport(this);
+		Give.Initialize(this);
+
+		Teleport teleport = new Teleport(this, _clientManager);
 		Portal portal = new Portal(this, _clientManager, serverStatusManager.getCurrentServerName());
 		new FileUpdater(this, portal, serverStatusManager.getCurrentServerName(), serverStatusManager.getRegion());
 
-
 		Punish punish = new Punish(this, webServerAddress, _clientManager);
 		AntiHack.Initialize(this, punish, portal, preferenceManager, _clientManager);
 		AntiHack.Instance.setKick(false);
 
 		BlockRestore blockRestore = new BlockRestore(this);
- 
+
 		IgnoreManager ignoreManager = new IgnoreManager(this, _clientManager, preferenceManager, portal);
-		Chat chat = new Chat(this, _clientManager, preferenceManager, new AchievementManager(new StatsManager(this, _clientManager), _clientManager, _donationManager), serverStatusManager.getCurrentServerName());
+
+		StatsManager statsManager = new StatsManager(this, _clientManager);
+		AchievementManager achievementManager = new AchievementManager(statsManager, _clientManager, _donationManager);
+		Chat chat = new Chat(this, _clientManager, preferenceManager, achievementManager, serverStatusManager.getCurrentServerName());
 		new MessageManager(this, _clientManager, preferenceManager, ignoreManager, punish, new FriendManager(this, _clientManager, preferenceManager, portal), chat);
 
 		new MemoryFix(this);
+		new FoodDupeFix(this);
 		new Explosion(this, blockRestore);
 		new FriendManager(this, _clientManager, preferenceManager, portal);
 		new InventoryManager(this, _clientManager);
 		
-		ClansManager clans = new ClansManager(this, serverStatusManager.getCurrentServerName(), _clientManager, _donationManager, blockRestore, teleport, webServerAddress);	
+		// Enable custom-gear related managers
+		PacketHandler packetHandler = new PacketHandler(this);
+		new CustomTagFix(this, packetHandler);
+		GearManager customGear = new GearManager(this, packetHandler, _clientManager, _donationManager);
+
+		HologramManager hologram = new HologramManager(this, packetHandler);
+		_clansManager = new ClansManager(this, serverStatusManager.getCurrentServerName(), packetHandler, _clientManager, _donationManager, preferenceManager, blockRestore, teleport, chat, customGear, hologram, webServerAddress);
 		new Recipes(this);
 		new Farming(this);
-		new BuildingShop(clans, _clientManager, _donationManager);
-		new PvpShop(clans, _clientManager, _donationManager);
+		new BuildingShop(_clansManager, _clientManager, _donationManager);
+		new PvpShop(_clansManager, _clientManager, _donationManager);
+		new FarmingShop(_clansManager, _clientManager, _donationManager);
+		new TravelShop(_clansManager, _clientManager, _donationManager);
+		new MiningShop(_clansManager, _clientManager, _donationManager);
+		new WorldManager(this);
+		
+		// Disable spigot item merging
+		for (World world : getServer().getWorlds())
+		{
+			// Disable item merging
+			((CraftWorld) world).getHandle().spigotConfig.itemMerge = 0;
+		}
 		
 		//Updates
-		getServer().getScheduler().scheduleSyncRepeatingTask(this, new Updater(this), 1, 1);
+		new Updater(this);
 		
 		MinecraftServer.getServer().getPropertyManager().setProperty("debug", true);
+		
+		getServer().setWhitelist(false); // TODO: remove
+	}
+
+	public static String prettifyName(Material material)
+	{
+		String name = "";
+		String[] words = material.toString().split("_");
+		
+		for (String word : words)
+		{
+			word = word.toLowerCase();
+			name += word.substring(0, 1).toUpperCase() + word.substring(1) + " ";
+		}
+		
+		return name;
+	}
+
+	@Override
+	public void onDisable()
+	{
+		// Need to notify WorldEventManager of server shutdown, this seemed like
+		// the only decent way to do it
+		_clansManager.onDisable();
 	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Farming.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Farming.java
index 8abcc527d..f7145451e 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Farming.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Farming.java
@@ -7,6 +7,7 @@ import mineplex.core.common.util.UtilPlayer;
 
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -18,7 +19,7 @@ public class Farming extends MiniPlugin
 	}
 	
 	@EventHandler
-	public void BlockBreak(BlockPlaceEvent event)
+	public void BlockBreak(BlockBreakEvent event)
 	{
 		if (event.isCancelled())
 			return;
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Recipes.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Recipes.java
index a0fc7dbd1..26c41fd33 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Recipes.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Recipes.java
@@ -1,45 +1,56 @@
 package mineplex.game.clans;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.UtilGear;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilServer;
 
 import org.bukkit.Material;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.inventory.CraftItemEvent;
 import org.bukkit.event.inventory.PrepareItemCraftEvent;
 import org.bukkit.inventory.CraftingInventory;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.Recipe;
 import org.bukkit.inventory.ShapedRecipe;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class Recipes extends MiniPlugin
 {
-	public Recipes(JavaPlugin plugin) 
+	public Recipes(JavaPlugin plugin)
 	{
 		super("Recipes", plugin);
-		
-		ShapedRecipe goldAxe = new ShapedRecipe(new ItemStack(Material.GOLD_AXE, 1));
+
+		ItemStack boosterAxe = ItemStackFactory.Instance.CreateStack(Material.GOLD_AXE, (byte) 0, 1, "Booster Axe", false);
+		ShapedRecipe goldAxe = new ShapedRecipe(boosterAxe);
 		goldAxe.shape("#MM","#SM","#S#");
 		goldAxe.setIngredient('M', Material.GOLD_BLOCK);
 		goldAxe.setIngredient('S', Material.STICK);
 		UtilServer.getServer().addRecipe(goldAxe);
 
-		ShapedRecipe diamondAxe = new ShapedRecipe(new ItemStack(Material.DIAMOND_AXE, 1));
+		ItemStack powerAxe = ItemStackFactory.Instance.CreateStack(Material.DIAMOND_AXE, (byte) 0, 1, "Power Axe", false);
+		ShapedRecipe diamondAxe = new ShapedRecipe(powerAxe);
 		diamondAxe.shape("#MM","#SM","#S#");
 		diamondAxe.setIngredient('M', Material.DIAMOND_BLOCK);
 		diamondAxe.setIngredient('S', Material.STICK);
 		UtilServer.getServer().addRecipe(diamondAxe);
 
-		ShapedRecipe goldSword = new ShapedRecipe(new ItemStack(Material.GOLD_SWORD, 1));
+		ItemStack boosterSword = ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte) 0, 1, "Booster Sword", false);
+		ShapedRecipe goldSword = new ShapedRecipe(boosterSword);
 		goldSword.shape("M","M","S");
 		goldSword.setIngredient('M', Material.GOLD_BLOCK);
 		goldSword.setIngredient('S', Material.STICK);
 		UtilServer.getServer().addRecipe(goldSword);
 
-		ShapedRecipe diamondSword = new ShapedRecipe(new ItemStack(Material.DIAMOND_SWORD, 1));
+		ItemStack powerSword = ItemStackFactory.Instance.CreateStack(Material.DIAMOND_SWORD, (byte) 0, 1, "Power Sword", false);
+		ShapedRecipe diamondSword = new ShapedRecipe(powerSword);
 		diamondSword.shape("M","M","S");
 		diamondSword.setIngredient('M', Material.DIAMOND_BLOCK);
 		diamondSword.setIngredient('S', Material.STICK);
@@ -131,6 +142,24 @@ public class Recipes extends MiniPlugin
 
 		UtilServer.getServer().addRecipe(chainBoots2);
 	}
+
+	@EventHandler(priority = EventPriority.LOW)
+	public void addLore(PrepareItemCraftEvent event)
+	{
+		if (event.getView().getPlayer() instanceof Player)
+		{
+			Player player = ((Player) event.getView().getPlayer());
+			CraftingInventory inv = (CraftingInventory)event.getInventory();
+
+			ItemStack itemStack = inv.getResult();
+
+			if (UtilGear.isWeapon(itemStack))
+			{
+				ItemStackFactory.Instance.addOwnerLore(itemStack, player.getName() + " Crafting");
+				inv.setResult(itemStack);
+			}
+		}
+	}
 	
 	@EventHandler(priority = EventPriority.HIGH)
 	public void ReplaceDoor(PrepareItemCraftEvent event)
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/BedStatus.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/BedStatus.java
new file mode 100644
index 000000000..08f3c89b4
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/BedStatus.java
@@ -0,0 +1,9 @@
+package mineplex.game.clans.clans;
+
+public enum BedStatus
+{
+	EXISTS_AND_UNOBSTRUCTED,
+	EXISTS_AND_OBSTRUCTED,
+	DESTROYED,
+	DOESNT_EXIST;
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ChunkData.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ChunkData.java
new file mode 100644
index 000000000..9eccb5170
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ChunkData.java
@@ -0,0 +1,28 @@
+package mineplex.game.clans.clans;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Color;
+
+public class ChunkData 
+{
+	
+	private int _x;
+	public int getX() { return _x; }
+	
+	private int _z;
+	public int getZ() { return _z; }
+	
+	private ChatColor _color;
+	public ChatColor getColor() { return _color; }
+	
+	private String _clanName;
+	public String getClanName() { return _clanName; }
+	
+	public ChunkData(int x, int z, ChatColor color, String clanName)
+	{
+		_x = x;
+		_z = z;
+		_color = color;
+		_clanName = clanName;
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyManager.java
index aa14e48e6..38ccfd24f 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyManager.java
@@ -1,10 +1,13 @@
 package mineplex.game.clans.clans;
 
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import mineplex.core.MiniPlugin;
 import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.Callback;
 import mineplex.core.common.util.F;
 import mineplex.core.donation.DonationManager;
 import mineplex.game.clans.shop.energy.EnergyShop;
@@ -12,6 +15,7 @@ import mineplex.game.clans.shop.energy.EnergyShop;
 public class ClanEnergyManager extends MiniPlugin implements Runnable
 {
 	private ClansManager _clansManager;
+	private DonationManager _donationManager;
 	private EnergyShop _shop;
 	private int tickCount;
 
@@ -19,7 +23,8 @@ public class ClanEnergyManager extends MiniPlugin implements Runnable
 	{
 		super("Clan Energy", plugin);
 		_clansManager = clansManager;
-		_shop = new EnergyShop(clansManager, clientManager, donationManager);
+		_donationManager = donationManager;
+		_shop = new EnergyShop(this, clientManager, donationManager);
 
 		// Wait 5 seconds and then tick every 60 seconds
 		_plugin.getServer().getScheduler().runTaskTimer(_plugin, this, 20 * 5, 20 * 60);
@@ -64,17 +69,33 @@ public class ClanEnergyManager extends MiniPlugin implements Runnable
 		}
 	}
 
+	public void purchaseEnergy(Player player, ClanInfo clanInfo, int energy, Callback<Boolean> callback)
+	{
+
+
+	}
+
 	public void openShop(Player player)
 	{
 		_shop.attemptShopOpen(player);
 	}
 
-//	@EventHandler
-//	public void command(PlayerCommandPreprocessEvent event)
-//	{
-//		if (event.getMessage().startsWith("/energyshop"))
-//		{
-//			openShop(event.getPlayer());
-//		}
-//	}
+	public ClansManager getClansManager()
+	{
+		return _clansManager;
+	}
+
+	@EventHandler
+	public void command(PlayerCommandPreprocessEvent event)
+	{
+		if (event.getMessage().startsWith("/energyshop"))
+		{
+			openShop(event.getPlayer());
+		}
+	}
+
+	public int convertEnergyToGold(int energy)
+	{
+		return (energy / 8) + (energy % 8 == 0 ? 0 : 1);
+	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
new file mode 100644
index 000000000..307768c84
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
@@ -0,0 +1,70 @@
+package mineplex.game.clans.clans;
+
+import java.util.EnumMap;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.lang3.tuple.Triple;
+import org.bukkit.event.EventHandler;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClanTips.TipType;
+
+public class ClanEnergyTracker extends MiniPlugin
+{
+	private ClansManager _clans;
+	private EnumMap<UpdateType, Triple<Long, Long, String[]>> _updateMap;
+	
+	public ClanEnergyTracker(JavaPlugin plugin, ClansManager clans)
+	{
+		super("Clan Energy Tracker", plugin);
+		_clans = clans;
+		
+		_updateMap = new EnumMap<>(UpdateType.class);
+		_updateMap.put(UpdateType.MIN_05, Triple.of(0L, TimeUnit.HOURS.toMillis(1), new String[] { C.cRed + "Urgent", "Clan Energy is almost depleted" }));
+		_updateMap.put(UpdateType.MIN_10, Triple.of(TimeUnit.HOURS.toMillis(1), TimeUnit.HOURS.toMillis(4), new String[] { C.cGold + "Warning", "Clan Energy is low" }));
+		_updateMap.put(UpdateType.MIN_30, Triple.of(TimeUnit.HOURS.toMillis(4), TimeUnit.DAYS.toMillis(1), new String[] { C.cGold + "Notice", "Clan Energy is running low" }));
+	}
+	
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (_updateMap.containsKey(event.getType()))
+		{
+			for (ClanInfo clan : _clans.getClanMap().values())
+			{
+				display(clan, event.getType());
+			}
+		}
+	}
+	
+	private void display(ClanInfo clan, UpdateType type)
+	{
+		// No point in doing anything if nobody is online!
+		if (!clan.isOnlineNow())
+		{
+			return;
+		}
+		
+		// Avoid divide by 0
+		if (clan.getEnergyCostPerMinute() <= 0)
+		{
+			return;
+		}
+		
+		// Energy Remaining in milliseconds
+		long energyRemaining = (clan.getEnergy() / clan.getEnergyCostPerMinute()) * 60000L;
+		
+		Triple<Long, Long, String[]> energyBounds = _updateMap.get(type);
+		
+		if (energyBounds != null && energyRemaining > energyBounds.getLeft() && energyRemaining < energyBounds.getMiddle())
+		{
+			_clans.middleTextClan(clan, energyBounds.getRight()[0], energyBounds.getRight()[1], 20, 200, 80);
+			_clans.sendTipToClan(clan, TipType.ENERGY);
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
index 0dda88280..dc53b6069 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
@@ -2,29 +2,37 @@ package mineplex.game.clans.clans;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
 import org.bukkit.Location;
 import org.bukkit.Sound;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilTime.TimeUnit;
 import mineplex.core.common.util.UtilWorld;
 import mineplex.game.clans.clans.ClansUtility.ClanRelation;
-import mineplex.game.clans.clans.repository.tokens.ClanAllianceToken;
-import mineplex.game.clans.clans.repository.tokens.ClanEnemyToken;
-import mineplex.game.clans.clans.repository.tokens.ClanMemberToken;
-import mineplex.game.clans.clans.repository.tokens.ClanTerritoryToken;
-import mineplex.game.clans.clans.repository.tokens.ClanToken;
+import mineplex.game.clans.core.war.ClanWarData;
+import net.minecraft.server.v1_8_R3.Material;
+import mineplex.game.clans.core.repository.tokens.ClanAllianceToken;
+import mineplex.game.clans.core.repository.tokens.ClanMemberToken;
+import mineplex.game.clans.core.repository.tokens.ClanTerritoryToken;
+import mineplex.game.clans.core.repository.tokens.ClanToken;
+
+import mineplex.game.clans.clans.tntGenerator.TntGenerator;
+import mineplex.game.clans.core.repository.tokens.ClanWarToken;
 
 public class ClanInfo
 {
@@ -32,18 +40,31 @@ public class ClanInfo
 	private String _name = "";
 	private String _desc = "";
 	private Location _home = null;
-	private int _energy = 1440;
+	private int _energy = 4320;
+
+	// Stats
+	private int _kills;
+	private int _murder;
+	private int _deaths;
+	private int _warWins;
+	private int _warLosses;
 
 	private boolean _admin = false;
 
-	private Timestamp _dateCreated = null;
+	private Timestamp _dateCreated;
 	private Timestamp _lastOnline = null;
 
+	private TntGenerator _generator;
+
 	// Loaded from Client
-	private NautHashMap<String, ClanRole> _memberMap = new NautHashMap<String, ClanRole>();
+	private NautHashMap<UUID, ClansPlayer> _memberMap = new NautHashMap<UUID, ClansPlayer>();
 	private NautHashMap<String, Boolean> _allyMap = new NautHashMap<String, Boolean>();
-	private HashSet<String> _claimSet = new HashSet<String>();
-	private EnemyData _enemyData;
+	private Set<String> _claimSet = new HashSet<String>();
+
+	// Wars Initiated By Others
+	private HashMap<String, ClanWarData> _warIn = new HashMap<String, ClanWarData>();
+	// Wars Initiated By Self
+	private HashMap<String, ClanWarData> _warOut = new HashMap<String, ClanWarData>();
 
 	// Temporary
 	private NautHashMap<String, Long> _inviteeMap = new NautHashMap<String, Long>();
@@ -53,6 +74,8 @@ public class ClanInfo
 	private NautHashMap<String, Long> _requestMap = new NautHashMap<String, Long>();
 
 	public ClansManager Clans;
+	
+	private BedStatus _bedStatus = null;
 
 	public ClanInfo(ClansManager clans, ClanToken token)
 	{
@@ -71,15 +94,56 @@ public class ClanInfo
 
 		}
 		
+		if (_home != null)
+		{
+			if (UtilBlock.isValidBed(_home))
+			{
+				if (_home.clone().add(0, 1,0).getBlock().getType().equals(Material.AIR))
+				{
+					_bedStatus = BedStatus.EXISTS_AND_UNOBSTRUCTED;
+				}
+				else
+				{
+					_bedStatus = BedStatus.EXISTS_AND_OBSTRUCTED;
+				}
+			}
+			else
+			{
+				_bedStatus = BedStatus.DESTROYED;
+			}
+		}
+		else
+		{
+			_bedStatus = BedStatus.DOESNT_EXIST;
+		}
+
+		try
+		{
+			if (token.Generator != null && token.Generator.length() > 0)
+			{
+				Block block = UtilWorld.strToBlock(token.Generator);
+				if (block != null)
+				{
+					_generator = new TntGenerator(block);
+					_generator.setStock(token.GeneratorStock);
+				}
+			}
+		}
+		catch (Exception e)
+		{
+
+		}
+		
 		_energy = token.Energy;
 		_admin = token.Admin;
 
-		_dateCreated = token.DateCreated;
-		_lastOnline = token.LastOnline;
+		_dateCreated = (token.DateCreated != null) ? token.DateCreated : new Timestamp(System.currentTimeMillis());
+		_lastOnline = (token.LastOnline != null) ? token.LastOnline : new Timestamp(System.currentTimeMillis());
 		
 		for (ClanMemberToken memberToken : token.Members)
 		{
-			_memberMap.put(memberToken.Name, ClanRole.valueOf(memberToken.ClanRole));
+			ClanRole role = ClanRole.valueOf(memberToken.ClanRole);
+			_memberMap.put(memberToken.PlayerUUID, new ClansPlayer(memberToken.Name, memberToken.PlayerUUID, role));
 		}
 		
 		for (ClanTerritoryToken territoryToken : token.Territories)
@@ -92,14 +156,16 @@ public class ClanInfo
 			_allyMap.put(allianceToken.ClanName, allianceToken.Trusted);
 		}
 
-		updateEnemy(token.EnemyToken);
-	}
-
-	public void updateEnemy(ClanEnemyToken enemyToken)
-	{
-		if (enemyToken != null)
+		for (ClanWarToken warToken : token.WarsIn)
 		{
-			_enemyData = new EnemyData(enemyToken.EnemyName, enemyToken.Initiator, enemyToken.Score, enemyToken.Kills, enemyToken.TimeFormed);
+			ClanWarData warData = warToken.WarData;
+			_warIn.put(warData.getClanA(), warData);
+		}
+
+		for (ClanWarToken warToken : token.WarsOut)
+		{
+			ClanWarData warData = warToken.WarData;
+			_warOut.put(warData.getClanB(), warData);
 		}
 	}
 
@@ -113,7 +179,7 @@ public class ClanInfo
 		if (ssAdmin())
 			return 1000;
 
-		return 2 + getMembers().size();
+		return Math.min(8, 2 + getMembers().size());
 	}
 
 	public int getAllies()
@@ -128,6 +194,16 @@ public class ClanInfo
 
 		return Math.max(2, 9 - _memberMap.size());
 	}
+	
+	public BedStatus getBedStatus()
+	{
+		return _bedStatus;
+	}
+	
+	public void setBedStatus(BedStatus bedStatus)
+	{
+		_bedStatus = bedStatus;
+	}
 
 	public boolean isRequested(String clan)
 	{
@@ -151,9 +227,14 @@ public class ClanInfo
 		return true;
 	}
 
-	public boolean isMember(String other)
+	public boolean isMember(Player player)
 	{
-		return getMembers().containsKey(other);
+		return getMembers().containsKey(player.getUniqueId());
+	}
+	
+	public boolean isMember(UUID uuid)
+	{
+		return getMembers().containsKey(uuid);
 	}
 
 	public boolean isAlly(String other)
@@ -161,6 +242,11 @@ public class ClanInfo
 		return getAllyMap().containsKey(other);
 	}
 
+	public boolean isAlly(ClanInfo other)
+	{
+		return isAlly(other.getName());
+	}
+	
 	public boolean isSelf(String other)
 	{
 		return this.getName().equals(other);
@@ -185,7 +271,7 @@ public class ClanInfo
 		return getAllyMap().get(clan);
 	}
 	
-	public LinkedList<String> mDetails(String caller)
+	public LinkedList<String> mDetails(Player caller)
 	{
 		LinkedList<String> stringList = new LinkedList<String>();
 
@@ -202,6 +288,9 @@ public class ClanInfo
 
 		// Land
 		stringList.add(F.value("Territory", getClaims() + "/" + getClaimsMax()));
+		
+		// Member count
+		stringList.add(F.value("Members", getSize() + "/" + getMaxSize()));
 
 		// Energy
 		int energy = getEnergy();
@@ -229,22 +318,22 @@ public class ClanInfo
 
 		// Members
 		String members = "";
-		for (String cur : UtilAlg.sortKey(getMembers().keySet()))
+		for (ClansPlayer cur : UtilAlg.sortSet(getMembers().values(), new ClansPlayerComparator()))
 		{
-			String name = C.listValueOff + cur;
-			if (UtilPlayer.isOnline(cur))
-				name = C.listValueOn + cur;
+			String name = C.listValueOff + cur.getPlayerName();
+			if (cur.isOnline())
+				name = C.listValueOn + cur.getPlayerName();
 
-			if (getMembers().get(cur) == ClanRole.LEADER)
+			if (cur.getRole() == ClanRole.LEADER)
 				members += C.listValue + "L." + name + C.mBody + ", ";
 
-			if (getMembers().get(cur) == ClanRole.ADMIN)
+			if (cur.getRole() == ClanRole.ADMIN)
 				members += C.listValue + "A." + name + C.mBody + ", ";
 
-			if (getMembers().get(cur) == ClanRole.MEMBER)
+			if (cur.getRole() == ClanRole.MEMBER)
 				members += C.listValue + "M." + name + C.mBody + ", ";
 
-			if (getMembers().get(cur) == ClanRole.RECRUIT)
+			if (cur.getRole() == ClanRole.RECRUIT)
 				members += C.listValue + "R." + name + C.mBody + ", ";
 		}
 		stringList.add(F.value("Members", members));
@@ -255,27 +344,6 @@ public class ClanInfo
 		return stringList;
 	}
 
-	public LinkedList<String> mEnemy()
-	{
-		LinkedList<String> stringList = new LinkedList<String>();
-
-		if (_enemyData == null)
-		{
-			stringList.add(F.main("Clans", "You do not have an enemy!"));
-		}
-		else
-		{
-			stringList.add(F.main("Clans", "Enemy Details"));
-			String enemyName = _enemyData.getEnemyName();
-			EnemyData otherEnemyData = Clans.getClanUtility().getClanByClanName(enemyName).getEnemyData();
-			stringList.add(F.value("Enemy", _enemyData.getEnemyName()));
-			stringList.add(F.value("Formed", _enemyData.getRelativeTimeFormed()));
-			stringList.add(F.value("War Score", _enemyData.getScore() + " : " + otherEnemyData.getScore()));
-		}
-
-		return stringList;
-	}
-
 	public LinkedList<String> mTerritory()
 	{
 		LinkedList<String> stringList = new LinkedList<String>();
@@ -292,16 +360,16 @@ public class ClanInfo
 
 	public void inform(String message, String ignore)
 	{
-		for (String cur : getMembers().keySet())
+		for (UUID cur : getMembers().keySet())
 		{
-			if (ignore != null && cur.equals(ignore))
-				continue;
-
-			Player player = UtilPlayer.searchOnline(null, cur, false);
+			Player player = UtilPlayer.searchExact(cur);
 
 			if (player == null)
 				continue;
 
+			if (player.getName().equals(ignore))
+				continue;
+
 			UtilPlayer.message(player, F.main("Clans", message));
 			player.playSound(player.getLocation(), Sound.NOTE_PLING, 1f, 2f);
 		}
@@ -322,19 +390,19 @@ public class ClanInfo
 		_desc = desc;
 	}
 
-	public NautHashMap<String, ClanRole> getMembers()
+	public NautHashMap<UUID, ClansPlayer> getMembers()
 	{
 		return _memberMap;
 	}
 
-	public HashSet<String> getClaimSet()
+	public Set<String> getClaimSet()
 	{
 		return _claimSet;
 	}
 
 	public Location getHome()
 	{
-		return _home;
+		return _home != null ? _home.clone() : null;
 	}
 
 	public void setHome(Location loc)
@@ -389,26 +457,18 @@ public class ClanInfo
 
 	public boolean isOnlineNow()
 	{
-		for (String cur : getMembers().keySet())
-			if (UtilPlayer.isOnline(cur))
-				return true;
-
-		return false;
+		return _onlinePlayers.size() > 0;
 	}
 
 	public boolean isOnline()
 	{
-		for (String cur : getMembers().keySet())
-			if (UtilPlayer.isOnline(cur))
-				return true;
-
-		return System.currentTimeMillis() - _lastOnline.getTime() < Clans.getOnlineTime();
+		return isOnlineNow() || System.currentTimeMillis() - _lastOnline.getTime() < Clans.getOnlineTime();
 	}
 
 	public String getProtected()
 	{
-		for (String cur : getMembers().keySet())
-			if (UtilPlayer.isOnline(cur))
+		for (ClansPlayer cur : getMembers().values())
+			if (cur.isOnline())
 				return C.cRed + "No - Clan Members are Online";
 
 		if (System.currentTimeMillis() - _lastOnline.getTime() > Clans.getOnlineTime())
@@ -420,6 +480,16 @@ public class ClanInfo
 						TimeUnit.FIT) + " to Protection";
 	}
 
+	public TntGenerator getGenerator()
+	{
+		return _generator;
+	}
+
+	public void setGenerator(TntGenerator generator)
+	{
+		_generator = generator;
+	}
+
 	public boolean isAdmin()
 	{
 		return _admin;
@@ -440,16 +510,140 @@ public class ClanInfo
 		return _energy;
 	}
 
-	public EnemyData getEnemyData()
+	public String getEnergyLeftString()
 	{
-		return _enemyData;
+		if (getEnergyCostPerMinute() > 0)
+			return UtilTime.convertString(60000L * getEnergy() / getEnergyCostPerMinute(), 1, TimeUnit.FIT);
+
+		return "Infinite";
 	}
 
-	public boolean hasEnemy()
+	public int getKills()
 	{
-		return _enemyData != null;
+		return _kills;
 	}
-	
+
+	public void addKills(int amount)
+	{
+		_kills += amount;
+	}
+
+	public int getMurder()
+	{
+		return _murder;
+	}
+
+	public void addMurder(int amount)
+	{
+		_murder += amount;
+	}
+
+	public int getDeaths()
+	{
+		return _deaths;
+	}
+
+	public void addDeaths(int amount)
+	{
+		_deaths += amount;
+	}
+
+	public int getWarWins()
+	{
+		return _warWins;
+	}
+
+	public void addWarWins(int amount)
+	{
+		_warWins += amount;
+	}
+
+	public int getWarLosses()
+	{
+		return _warLosses;
+	}
+
+	public void addWarLosses(int amount)
+	{
+		_warLosses += amount;
+	}
+
+	public ClanWarData getWarData(ClanInfo against)
+	{
+		ClanWarData data = null;
+
+		data = _warIn.get(against.getName());
+		if (data == null) data = _warOut.get(against.getName());
+
+		return data;
+	}
+
+	public int getWarPoints(ClanInfo against)
+	{
+		int warPoints = 0;
+
+		if (against != null)
+		{
+			ClanWarData data = _warIn.get(against.getName());
+			if (data != null)
+			{
+				warPoints = data.getClanBPoints();
+			}
+			else if ((data = _warOut.get(against.getName())) != null)
+			{
+				warPoints = data.getClanAPoints();
+			}
+		}
+
+		return warPoints;
+	}
+
+	public String getFormattedWarPoints(ClanInfo clan)
+	{
+		String warString = "";
+		int warPoints = getWarPoints(clan);
+
+		String prefix;
+		if (warPoints >= 5) 		prefix = C.cPurple;
+		else if (warPoints <= -5)	prefix = C.cRed;
+		else 						prefix = C.cWhite;
+
+		warString += prefix;
+		if (warPoints > 0) warString += "+";
+		warString += warPoints;
+
+		return warString;
+	}
+
+	public void addWar(ClanWarData war)
+	{
+		if (war.getClanA().equals(getName()))
+			_warOut.put(war.getClanB(), war);
+		else if (war.getClanB().equals(getName()))
+			_warIn.put(war.getClanA(), war);
+		else throw new RuntimeException("Failed to add war to clan `" + getName() + "` ClanA: " + war.getClanA() + ", ClanB: " + war.getClanB());
+	}
+
+	public List<ClanWarData> getWars()
+	{
+		List<ClanWarData> wars = new LinkedList<ClanWarData>();
+		wars.addAll(_warIn.values());
+		wars.addAll(_warOut.values());
+		return wars;
+	}
+
+	public void clearWar(String againstClan)
+	{
+		_warIn.remove(againstClan);
+		_warOut.remove(againstClan);
+	}
+
+	public boolean isEnemy(ClanInfo againstClan)
+	{
+		int warPoints = getWarPoints(againstClan);
+		return warPoints >= 5 || warPoints <= -5;
+	}
+
 	public void adjustEnergy(int energy)
 	{
 		_energy += energy;
@@ -464,11 +658,19 @@ public class ClanInfo
 	{
 		return _memberMap.size();
 	}
+	
+	public int getMaxSize()
+	{
+		if (ssAdmin())
+			return 1000;
+
+		return 20;
+	}
 
 	public int getEnergyMax()
 	{
 		// 10080 = 7 days of minutes
-		return 1440 + (getEnergyCostPerMinute() * 10080);
+		return Math.max(10080, getEnergyCostPerMinute() * 60 * 24 * 7);
 	}
 
 	public int getEnergyCostPerMinute()
@@ -476,10 +678,14 @@ public class ClanInfo
 		return (getSize() * getClaimCount());
 	}
 
+	public int getEnergyPurchasableMinutes()
+	{
+		return getEnergyPurchasable() / getEnergyCostPerMinute();
+	}
+
 	public int getEnergyPurchasable()
 	{
-		int diff = getEnergyMax() - getEnergy();
-		return diff > 0 ? diff : 0;
+		return Math.max(getEnergyMax() - getEnergy(), 0);
 	}
 
 	public List<Player> getOnlinePlayers()
@@ -492,13 +698,85 @@ public class ClanInfo
 		return players;
 	}
 
-	protected void playerOnline(Player player)
+	public Player[] getOnlinePlayersArray()
 	{
-		_onlinePlayers.add(player.getUniqueId());
+		Player[] players = new Player[_onlinePlayers.size()];
+		for (int i = 0; i < _onlinePlayers.size(); i++)
+		{
+			players[i] = UtilPlayer.searchExact(_onlinePlayers.get(i));
+		}
+		return players;
 	}
 
-	protected void playerOffline(Player player)
+	public int getOnlinePlayerCount()
 	{
+		return _onlinePlayers.size();
+	}
+
+	public void playerOnline(Player player)
+	{
+		ClansPlayer clansPlayer = _memberMap.get(player.getUniqueId());
+
+		_onlinePlayers.add(player.getUniqueId());
+		clansPlayer.setPlayerName(player.getName());
+		clansPlayer.setOnline(true);
+	}
+
+	public void playerOnline(String player)
+	{
+		Player p = UtilPlayer.searchExact(player);
+		if (p != null) playerOnline(p);
+	}
+
+	public void playerOffline(String player)
+	{
+		Player p = UtilPlayer.searchExact(player);
+		if (p != null) playerOffline(p);
+	}
+
+	@Override
+	public String toString()
+	{
+		return _id + "," + _name;
+	}
+
+	public void playerOffline(Player player)
+	{
+		ClansPlayer clansPlayer = _memberMap.get(player.getUniqueId());
+
+		if (clansPlayer != null)
+		{
+			clansPlayer.setOnline(false);
+		}
+
 		_onlinePlayers.remove(player.getUniqueId());
 	}
+
+	public Set<String> getMemberNameSet()
+	{
+		HashSet<String> set = new HashSet<String>();
+
+		for (ClansPlayer cp : _memberMap.values())
+		{
+			set.add(cp.getPlayerName());
+		}
+
+		return set;
+	}
+
+	public ClansPlayer getClansPlayerFromName(String playerName)
+	{
+		for (ClansPlayer cp : _memberMap.values())
+		{
+			if (cp.getPlayerName().equals(playerName))
+				return cp;
+		}
+
+		return null;
+	}
+
+	public String getBedStatusStr()
+	{
+		return _bedStatus == BedStatus.DESTROYED ? C.cRed + "Destroyed" : (_bedStatus == BedStatus.DOESNT_EXIST ? C.cWhite + "None" : (_bedStatus == BedStatus.EXISTS_AND_OBSTRUCTED ? C.cRed + "Obstructed" : (_bedStatus == BedStatus.EXISTS_AND_UNOBSTRUCTED ? C.cGreen + UtilWorld.locToStrClean(_home) : "N/A")));
+	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanRole.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanRole.java
index 83901e238..d7eb15b50 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanRole.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanRole.java
@@ -2,5 +2,30 @@ package mineplex.game.clans.clans;
 
 public enum ClanRole
 {
-	NONE, RECRUIT, MEMBER, ADMIN, LEADER
+	NONE(0, "None"), RECRUIT(100, "Recruit"), MEMBER(500, "Member"), ADMIN(1000, "Admin"), LEADER(Integer.MAX_VALUE, "Leader");
+
+	private int _powerValue;
+	private String _friendlyName;
+
+	ClanRole(int powerValue, String friendlyName)
+	{
+		_powerValue = powerValue;
+		_friendlyName = friendlyName;
+	}
+
+	public boolean has(ClanRole role)
+	{
+		return getPowerValue() >= role.getPowerValue();
+	}
+
+	public String getFriendlyName()
+	{
+		return _friendlyName;
+	}
+
+	public int getPowerValue()
+	{
+		return _powerValue;
+	}
 }
+
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanTips.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanTips.java
new file mode 100644
index 000000000..c4e4f8f87
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanTips.java
@@ -0,0 +1,246 @@
+package mineplex.game.clans.clans;
+
+import java.util.LinkedList;
+
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.preferences.PreferencesManager;
+import mineplex.game.clans.clans.event.ClanTipEvent;
+import mineplex.game.clans.clans.event.PlayerClaimTerritoryEvent;
+import mineplex.game.clans.clans.event.PlayerEnterTerritoryEvent;
+import mineplex.game.clans.clans.event.PlayerUnClaimTerritoryEvent;
+import net.minecraft.server.v1_8_R3.EnumDirection;
+
+public class ClanTips extends MiniPlugin
+{
+	private PreferencesManager _preferences;
+	private ClansManager _clans;
+	
+	public ClanTips(final JavaPlugin plugin, final ClansManager clans, final PreferencesManager preferences)
+	{
+		super("Clans Tips", plugin);
+		
+		_clans = clans;
+		_preferences = preferences;
+	}
+	
+	@EventHandler
+	public void onEnterTerritory(final PlayerEnterTerritoryEvent event)
+	{
+		if (event.getLastTerritory().equals(event.getNewTerritory()))
+		{
+			return;
+		}
+		
+		final Player player = event.getPlayer();
+		final String newTerritory = event.getNewTerritory();
+		
+		if (_preferences.Get(player).ClanTips)
+		{
+			if (newTerritory.equals("Fields"))
+			{
+				displayTip(TipType.ENTER_FIELDS, player);
+			}
+			else if (newTerritory.equals("Shop") && event.isSafe())
+			{
+				displayTip(TipType.ENTER_SHOP, player);
+			}
+			else if (newTerritory.equals("Borderlands"))
+			{
+				displayTip(TipType.ENTER_BORDERLANDS, player);
+			}
+			else if (newTerritory.equals("Spawn"))
+			{
+				displayTip(TipType.ENTER_SPAWN, player);
+			}
+		}
+	}
+	
+	@EventHandler
+	public void onClaimTerritory(final PlayerClaimTerritoryEvent event)
+	{
+		if (event.getClan().getClaimCount() == 0)
+		{
+			displayTip(TipType.FIRST_CLAIM_SETHOME, event.getClaimer());
+			
+			// Place New
+			boolean bedPlaced = UtilBlock.placeBed(event.getClaimer().getLocation(), BlockFace.valueOf(EnumDirection.fromAngle(event.getClaimer().getLocation().getYaw()).name()), true, true);
+			
+			if (!bedPlaced)
+			{
+				UtilPlayer.message(event.getClaimer(), F.main("Clans", "This is not a suitable place for a bed."));
+				return;
+			}
+			
+			// Cleanup old
+			if (event.getClan().getHome() != null)
+			{
+				System.out.println("<-old bed cleanup-> <--> " + UtilBlock.deleteBed(event.getClan().getHome()));
+			}
+			
+			// Task
+			_clans.getClanDataAccess().setHome(event.getClan(), event.getClaimer().getLocation(), event.getClaimer().getName());
+			
+			return;
+		}
+		displayTip(TipType.CLAIM, event.getClaimer());
+	}
+	
+	@EventHandler
+	public void onUnClaimTerritory(final PlayerUnClaimTerritoryEvent event)
+	{
+		displayTip(TipType.UNCLAIM, event.getUnClaimer());
+	}
+	
+	public void displayTip(TipType tip, Player player)
+	{
+		if (tip == null)
+		{
+			return;
+		}
+		
+		if (player == null)
+		{
+			return;
+		}
+		
+		if (!_preferences.Get(player).ClanTips && !tip._ignorePreferences)
+		{
+			return;
+		}
+		
+		ClanTipEvent event = new ClanTipEvent(tip, player);
+		
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
+		{
+			return;
+		}
+		
+		UtilPlayer.message(player, "   ");
+		UtilPlayer.message(player, tip._messages);
+		
+		if (!tip._ignorePreferences)
+		{
+			UtilPlayer.message(player, C.cGray + "(You can disable these Clans Tips in the " + F.elem("/prefs") + " menu.)");
+		}
+		
+		UtilPlayer.message(player, "   ");
+	}
+	
+	public static enum TipType
+	{
+		UNCLAIM(
+				new String[] {
+						C.cDAquaB + "You unclaimed some Clan Territory!",
+						C.cAqua + "When territory is unclaimed, it cannot be reclaimed by anyone for 30 minutes."
+					}),
+		
+		CLAIM(
+				new String[] {
+						C.cDAquaB + "You claimed some Clan Territory!",
+						C.cAqua + "Clan Territory is an area of the map that only your Clan is allowed to edit! This means that you can build a base and stash your loot safely inside.",
+						C.cAqua + "Each territory is a 16x16 area, which extends from bedrock to the sky!", C.cGreen + "The borders are marked with glowstone."
+					}),
+		
+		ENTER_FIELDS(
+				new String[] {
+						C.cDRedB + "Fields",
+						C.cRed + "Fields is a very lucrative area, filled with ores that periodically respawn over time. This is a great place to get a large amount of resources for your clan; however, be aware of other clans who may also be after the riches buried within the fields."
+					}),
+		
+		ENTER_SHOP(
+				new String[] {
+						C.cDGreenB + "Shops",
+						C.cGreen + "Shops is a safe area where combat is disabled between players! Use this safety to purchase food, building blocks, armor, weapons, and other valuable resources. Be careful when leaving though, others may be hiding just outside the gates, eager to steal your recent purchases."
+					}),
+		
+		ENTER_BORDERLANDS(
+				new String[] {
+						C.cDRedB + "Borderlands",
+						C.cRed + "The Borderlands are the very outer reaches of the map, out here you can not edit the terrain. Be careful as very powerful boss monsters will periodically spawn out here! Don't try to fight them alone! If you do manage to slay one of these powerful beasts, you'll be handsomely rewarded with powerful gear or legendary weapons."
+					}),
+		
+		ENTER_SPAWN(
+				new String[] {
+						C.cDGreenB + "Spawn",
+						C.cGreen + "Spawn is a Safe Zone where you spawn after dying. No one can attack you here, and you cannot attack anyone else. If you have set your Clan Home, you are able to teleport to it from Spawns."
+					}),
+		
+		FIRST_CLAIM_SETHOME(
+				new String[] {
+						C.cDAquaB + "First Claim",
+						C.cAqua + "Congratulations on your first Clan Claim.",
+						C.cAqua + "We have automatically placed your Clan Home where you are currently standing.",
+						C.cAqua + "In the future, to set your Clan Home elsewhere, use the " + F.elem("/c sethome") + " command.",
+						C.cAqua + "You can return to your Clan Home by using " + F.elem("/c home") + C.cAqua + ", but remember, you must be in a Safe Spawn location to do this.",
+						C.cAqua + "When you die and respawn, you are also given an option to spawn at your Clan Home."
+					}),
+
+		DOMINANCE_RIP(
+				new String[] {
+						C.cDAquaB + "Lost War Point",
+	                    C.cAqua + "You were killed by another Clan and they have gained 1 War Point against you.",
+	                    C.cAqua + "If your War Points with them reaches -20, they will get to invade your Territory, giving them full access for 15 minutes."
+					}),
+
+		DOMINANCE_NOOICE(
+				new String[] {
+						C.cDAquaB + "Gained War Point",
+                        C.cAqua + "You killed someone in another Clan and you have gained 1 War Point against them.",
+                        C.cAqua + "If your War Points with them reaches +20, you will get to invade their Territory, giving you full access for 15 minutes."
+					}),
+
+		ENERGY(
+				new String[] {
+						C.cDAquaB + "Energy",
+						C.cAqua + "To top up your energy, go to the Shop and buy some in the Energy Shop.",
+						C.cAqua + "To find the Shop, look at your map (use " + C.cYellow + "/map" + C.cAqua + " if you don't have one) and go to either the top-most highlighted area, or the bottom-most highlighted area.",
+					}),
+		
+		NPC_RIPPARONI(
+				new String[] {
+						C.cDAqua + "Logout NPC",
+						C.cAqua + "When you quit Clans, a copy of you will remain in the game for 30 seconds. Other players are able to kill this copy and take your items. Make sure you quit somewhere safe!",
+					}),
+		
+		SETHOME(
+				new String[] {
+						C.cDAqua + "Clan Home",
+						C.cAqua + "Your Clan Home is a bed in your Territory which you can teleport to from the Spawn Islands. However, you are unable to teleport to your Clan Home if the bed is broken, blocks have been placed above the bed, or enemies are in your Territory."
+					}),
+		;
+		
+		// this is only LinkedList because UtilPlayer.message wants it
+		private LinkedList<String> _messages;
+		private boolean _ignorePreferences;
+		
+		TipType(String[] messages)
+		{
+			this(messages, false);
+		}
+		
+		TipType(String[] messages, boolean ignorePreferences)
+		{
+			_messages = new LinkedList();
+			
+			for (String message : messages)
+			{
+				_messages.add(message);
+			}
+			
+			_ignorePreferences = ignorePreferences;
+		}
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java
index 301683c26..2de32fd0b 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java
@@ -9,7 +9,7 @@ import mineplex.core.common.util.UtilInput;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilWorld;
-import mineplex.game.clans.clans.repository.ClanTerritory;
+import mineplex.game.clans.core.repository.ClanTerritory;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -25,6 +25,11 @@ public class ClansAdmin
 
 	public void command(Player caller, String[] args) 
 	{
+		if (!Clans.getClientManager().hasRank(caller, Rank.ADMIN) && !caller.isOp())
+		{
+			return;
+		}
+
 		if (args.length == 1)
 			help(caller);
 		
@@ -55,8 +60,8 @@ public class ClansAdmin
 		else if (args[1].equalsIgnoreCase("ally") || args[1].equalsIgnoreCase("a"))
 			ally(caller, args);
 
-		else if (args[1].equalsIgnoreCase("trust"))
-			trust(caller, args);
+//		else if (args[1].equalsIgnoreCase("trust"))
+//			trust(caller, args);
 
 		else if (args[0].equalsIgnoreCase("neutral") || args[0].equalsIgnoreCase("neut") || args[0].equalsIgnoreCase("n"))
 			neutral(caller, args);
@@ -183,17 +188,13 @@ public class ClansAdmin
 
 			if (args[2].length() > Clans.getNameMax())
 			{
-				UtilPlayer.message(caller, F.main("Clans Admin", "Clan name too long. Maximum length is + " + (Clans.getNameMax()) + "."));
+				UtilPlayer.message(caller, F.main("Clans Admin", "Clan name too long. Maximum length is " + (Clans.getNameMax()) + "."));
 				return;
 			}
 
-			for (String cur : Clans.denyClan)
+			if (!ClansBlacklist.isValidClanName(args[2]))
 			{
-				if (cur.equalsIgnoreCase(args[2]))
-				{
-					UtilPlayer.message(caller, F.main("Clans Admin", "Clan name cannot be a Clan command."));
-					return;
-				}
+				UtilPlayer.message(caller, F.main("Clans Admin", "Clan name cannot be a Clan command."));
 			}
 
 			if (Clans.getClan(args[2]) != null)
@@ -214,17 +215,28 @@ public class ClansAdmin
 								UtilPlayer.message(caller, F.main("Clans Admin", "Clan name cannot be a Player name."));
 							else
 							{
-								//Inform
-								UtilServer.broadcast(F.main("Clans Admin", caller.getName() + " formed " + F.elem("Admin Clan " + args[2]) + "."));
+								Clans.getClanDataAccess().create(caller.getName(), args[2], true, new Callback<ClanInfo>()
+								{
+									@Override
+									public void run(ClanInfo data)
+									{
+										if (data != null)
+										{
+											//Inform
+											UtilServer.broadcast(F.main("Clans Admin", caller.getName() + " formed " + F.elem("Admin Clan " + args[2]) + "."));
 
-								// Create and Join
-								Clans.getClanDataAccess().create(caller.getName(), args[2], true);
+											// Set Mimic
+											Clans.Get(caller).setMimic(args[2]);
 
-								// Set Mimic
-								Clans.Get(caller).setMimic(args[2]);
-
-								// Inform
-								UtilPlayer.message(caller, F.main("Clans Admin", "You are mimicing Clan " + args[2] + "."));
+											// Inform
+											UtilPlayer.message(caller, F.main("Clans Admin", "You are mimicing Clan " + args[2] + "."));
+										}
+										else
+										{
+											UtilPlayer.message(caller, F.main("Clans", "There was an error creating a clan! Try again later"));
+										}
+									}
+								});
 							}
 						}
 					});
@@ -232,18 +244,30 @@ public class ClansAdmin
 			}, args[2]);
 	}
 
-	public void delete(Player caller, String[] args)
+	public void delete(final Player caller, String[] args)
 	{
-		ClanInfo clan = getMimic(caller, true);
+		final ClanInfo clan = getMimic(caller, true);
 
 		if (clan == null)
 			return;	
 
 		//Task
-		Clans.getClanDataAccess().delete(clan);
-
-		//Inform
-		UtilServer.broadcast(F.main("Clans Admin", caller.getName() + " disbanded " + F.elem("Clan " + clan.getName()) + "."));
+		Clans.getClanDataAccess().delete(clan, new Callback<Boolean>()
+		{
+			@Override
+			public void run(Boolean data)
+			{
+				if (data)
+				{
+					//Inform
+					UtilServer.broadcast(F.main("Clans Admin", caller.getName() + " disbanded " + F.elem("Clan " + clan.getName()) + "."));
+				}
+				else
+				{
+					UtilPlayer.message(caller, F.main("Clans", "There was an error disbanding your clan! Try again later"));
+				}
+			}
+		});
 	}
 
 	public void invite(Player caller, String[] args)
@@ -291,12 +315,13 @@ public class ClansAdmin
 			return;
 		}
 
-		String target = UtilPlayer.searchCollection(caller, args[2], clan.getMembers().keySet(), "Clan Member", true);
+		String target = UtilPlayer.searchCollection(caller, args[2], clan.getMemberNameSet(), "Clan Member", true);
+		ClansPlayer clansPlayer = clan.getClansPlayerFromName(target);
 
-		if (target == null)
+		if (target == null || clansPlayer == null)
 			return;
 
-		if (clan.getMembers().get(target) == ClanRole.LEADER)
+		if (clansPlayer.getRole() == ClanRole.LEADER)
 		{
 			UtilPlayer.message(caller, F.main("Clans Admin", "You cannot promote " + F.name(target) + " any further."));
 			return;
@@ -304,19 +329,19 @@ public class ClansAdmin
 		
 		//Task
 		String newRank = "?";
-		if (clan.getMembers().get(target) == ClanRole.RECRUIT)
+		if (clansPlayer.getRole() == ClanRole.RECRUIT)
 		{
-			Clans.getClanDataAccess().role(clan, target, ClanRole.MEMBER);
+			Clans.getClanDataAccess().role(clan, clansPlayer.getUuid(), ClanRole.MEMBER);
 			newRank = "Member";
 		}
-		else if (clan.getMembers().get(target) == ClanRole.MEMBER)
+		else if (clansPlayer.getRole() == ClanRole.MEMBER)
 		{
-			Clans.getClanDataAccess().role(clan, target, ClanRole.ADMIN);
+			Clans.getClanDataAccess().role(clan, clansPlayer.getUuid(), ClanRole.ADMIN);
 			newRank = "Admin";
 		}
-		else if (clan.getMembers().get(target) == ClanRole.ADMIN)
+		else if (clansPlayer.getRole() == ClanRole.ADMIN)
 		{
-			Clans.getClanDataAccess().role(clan, target, ClanRole.LEADER);
+			Clans.getClanDataAccess().role(clan, clansPlayer.getUuid(), ClanRole.LEADER);
 			newRank = "Leader";
 		}
 
@@ -338,11 +363,12 @@ public class ClansAdmin
 			return;
 		}
 
-		String target = UtilPlayer.searchCollection(caller, args[2], clan.getMembers().keySet(), "Clan Member", true);
-		if (target == null)
+		String target = UtilPlayer.searchCollection(caller, args[2], clan.getMemberNameSet(), "Clan Member", true);
+		ClansPlayer clansPlayer = clan.getClansPlayerFromName(target);
+		if (target == null || clansPlayer == null)
 			return;
 
-		if (clan.getMembers().get(target) == ClanRole.RECRUIT)
+		if (clansPlayer.getRole() == ClanRole.RECRUIT)
 		{
 			UtilPlayer.message(caller, F.main("Clans Admin", "You cannot demote " + F.name(target) + " any further."));
 			return;
@@ -350,19 +376,19 @@ public class ClansAdmin
 		
 		//Task
 		String newRank = "?";
-		if (clan.getMembers().get(target) == ClanRole.MEMBER)
+		if (clansPlayer.getRole() == ClanRole.MEMBER)
 		{
-			Clans.getClanDataAccess().role(clan, target, ClanRole.RECRUIT);
+			Clans.getClanDataAccess().role(clan, clansPlayer.getUuid(), ClanRole.RECRUIT);
 			newRank = "Recruit";
 		}
-		else if (clan.getMembers().get(target) == ClanRole.ADMIN)
+		else if (clansPlayer.getRole() == ClanRole.ADMIN)
 		{
-			Clans.getClanDataAccess().role(clan, target, ClanRole.MEMBER);
+			Clans.getClanDataAccess().role(clan, clansPlayer.getUuid(), ClanRole.MEMBER);
 			newRank = "Member";
 		}
-		else if (clan.getMembers().get(target) == ClanRole.LEADER)
+		else if (clansPlayer.getRole() == ClanRole.LEADER)
 		{
-			Clans.getClanDataAccess().role(clan, target, ClanRole.ADMIN);
+			Clans.getClanDataAccess().role(clan, clansPlayer.getUuid(), ClanRole.ADMIN);
 			newRank = "Admin";
 		}
 
@@ -371,9 +397,9 @@ public class ClansAdmin
 		clan.inform(F.main("Clans Admin", caller.getName() + " demoted " + target + " to " + newRank + "."), null);
 	}
 
-	public void kick(Player caller, String[] args)
+	public void kick(final Player caller, String[] args)
 	{
-		ClanInfo clan = getMimic(caller, true);
+		final ClanInfo clan = getMimic(caller, true);
 
 		if (clan == null)
 			return;		
@@ -384,18 +410,36 @@ public class ClansAdmin
 			return;
 		}
 
-		String targetName = UtilPlayer.searchCollection(caller, args[2], clan.getMembers().keySet(), "Clan Member", true);
+		final String target = UtilPlayer.searchCollection(caller, args[2], clan.getMemberNameSet(), "Clan Member", true);
+		ClansPlayer clansPlayer = clan.getClansPlayerFromName(target);
 
-		if (targetName == null)
+		if (target == null || clansPlayer == null)
 			return;
 
-		//Task
-		Clans.getClanDataAccess().leave(clan, targetName);
+		final Player player = UtilPlayer.searchExact(clansPlayer.getUuid());
 
-		//Inform
-		UtilPlayer.message(UtilPlayer.searchOnline(null, targetName, false), F.main("Clans Admin", caller.getName() + " kicked you from " + F.elem("Clan " + clan.getName()) + "."));
-		UtilPlayer.message(caller, F.main("Clans Admin", "You kicked " + targetName + " from your Clan."));
-		clan.inform(F.main("Clans Admin", caller.getName() + " kicked " + targetName + " from your Clan."), caller.getName());
+		Callback<Boolean> callback = new Callback<Boolean>()
+		{
+			@Override
+			public void run(Boolean data)
+			{
+				if (data)
+				{
+					//Inform
+					if (player != null)
+						UtilPlayer.message(player, F.main("Clans Admin", caller.getName() + " kicked you from " + F.elem("Clan " + clan.getName()) + "."));
+					UtilPlayer.message(caller, F.main("Clans Admin", "You kicked " + target + " from your Clan."));
+					clan.inform(F.main("Clans Admin", caller.getName() + " kicked " + target + " from your Clan."), caller.getName());
+				}
+				else
+				{
+					UtilPlayer.message(caller, F.main("Clans Admin", "There was an error processing your request"));
+				}
+			}
+		};
+
+		if (player != null) Clans.getClanDataAccess().leave(clan, player, callback);
+		else				Clans.getClanDataAccess().leave(clan, clansPlayer, callback);
 	}
 
 	public void ally(Player caller, String[] args)
@@ -450,46 +494,46 @@ public class ClansAdmin
 		}
 	}
 
-	public void trust(Player caller, String[] args)
-	{
-		ClanInfo callerClan = getMimic(caller, true);
-
-		if (callerClan == null)
-			return;		
-
-		if (args.length < 3)
-		{
-			UtilPlayer.message(caller, F.main("Clans Admin", "You did not input a Clan to enemy."));
-			return;
-		}
-
-		ClanInfo otherClan = Clans.getClanUtility().searchClanPlayer(caller, args[2], true);
-
-		if (otherClan == null)
-			return;
-
-		if (!callerClan.isAlly(otherClan.getName()))
-		{
-			UtilPlayer.message(caller, F.main("Clans Admin", "You cannot give trust to enemies."));
-			return;
-		}
-
-		//Task
-		if (Clans.getClanDataAccess().trust(callerClan, otherClan, caller.getName()))
-		{
-			//Inform
-			UtilPlayer.message(caller, F.main("Clans Admin", "You gave trust to Clan " + otherClan.getName() + "."));
-			callerClan.inform(caller.getName() + " has given trust to Clan " + otherClan.getName() + ".", caller.getName());
-			otherClan.inform("Clan " + callerClan.getName() + " has given trust to you.", null);	
-		}
-		else
-		{
-			//Inform
-			UtilPlayer.message(caller, F.main("Clans Admin", "You revoked trust to Clan " + otherClan.getName() + "."));
-			callerClan.inform(caller.getName() + " has revoked trust to Clan " + otherClan.getName() + ".", caller.getName());
-			otherClan.inform("Clan " + callerClan.getName() + " has revoked trust to you.", null);	
-		}
-	}
+//	public void trust(Player caller, String[] args)
+//	{
+//		ClanInfo callerClan = getMimic(caller, true);
+//
+//		if (callerClan == null)
+//			return;		
+//
+//		if (args.length < 3)
+//		{
+//			UtilPlayer.message(caller, F.main("Clans Admin", "You did not input a Clan to enemy."));
+//			return;
+//		}
+//
+//		ClanInfo otherClan = Clans.getClanUtility().searchClanPlayer(caller, args[2], true);
+//
+//		if (otherClan == null)
+//			return;
+//
+//		if (!callerClan.isAlly(otherClan.getName()))
+//		{
+//			UtilPlayer.message(caller, F.main("Clans Admin", "You must be allied to trust a clan!"));
+//			return;
+//		}
+//
+//		//Task
+//		if (Clans.getClanDataAccess().trust(callerClan, otherClan, caller.getName()))
+//		{
+//			//Inform
+//			UtilPlayer.message(caller, F.main("Clans Admin", "You gave trust to Clan " + otherClan.getName() + "."));
+//			callerClan.inform(caller.getName() + " has given trust to Clan " + otherClan.getName() + ".", caller.getName());
+//			otherClan.inform("Clan " + callerClan.getName() + " has given trust to you.", null);	
+//		}
+//		else
+//		{
+//			//Inform
+//			UtilPlayer.message(caller, F.main("Clans Admin", "You revoked trust to Clan " + otherClan.getName() + "."));
+//			callerClan.inform(caller.getName() + " has revoked trust to Clan " + otherClan.getName() + ".", caller.getName());
+//			otherClan.inform("Clan " + callerClan.getName() + " has revoked trust to you.", null);	
+//		}
+//	}
 
 	public void neutral(Player caller, String[] args)
 	{
@@ -555,7 +599,7 @@ public class ClansAdmin
 		if (ownerClan != null)
 		{
 			UtilPlayer.message(caller, F.main("Clans Admin", "This Territory is claimed by " + 
-					Clans.getClanUtility().mRel(Clans.getClanUtility().relPC(caller.getName(), ownerClan), ownerClan.getName(), true) + "."));
+					Clans.getClanUtility().mRel(Clans.getClanUtility().relPC(caller, ownerClan), ownerClan.getName(), true) + "."));
 			return;
 		}
 
@@ -567,7 +611,7 @@ public class ClansAdmin
 		clientClan.inform(caller.getName() + " claimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + ".", caller.getName());
 	}
 
-	public void unclaim(Player caller, String args[])
+	public void unclaim(Player caller, String[] args)
 	{
 		if (args.length > 2)
 		{
@@ -651,7 +695,7 @@ public class ClansAdmin
 		}
 
 		//Do
-		Clans.getTeleport().TP(caller, clan.getHome());
+		Clans.getTeleport().TP(caller, clan.getHome().add(0, .6, 0));
 
 		//Inform
 		UtilPlayer.message(caller, F.main("Clans Admin", "You teleported to your Clan Home " + UtilWorld.locToStrClean(caller.getLocation()) + "."));
@@ -677,7 +721,7 @@ public class ClansAdmin
 		}
 
 		//Task
-		Clans.getClanDataAccess().home(clan, caller.getLocation(), caller.getName());
+		Clans.getClanDataAccess().setHome(clan, caller.getLocation(), caller.getName());
 
 		//Inform
 		UtilPlayer.message(caller, F.main("Clans Admin", "You set Clan Home to " + UtilWorld.locToStrClean(caller.getLocation()) + "."));
@@ -698,6 +742,6 @@ public class ClansAdmin
 		Clans.getClanDataAccess().safe(claim, caller.getName());
 		
 		//Inform
-		UtilPlayer.message(caller, F.main("Clans Admin", "Territory Safe Zone: " + F.tf(claim.Safe)));
+		UtilPlayer.message(caller, F.main("Clans Admin", "Territory Safe Zone: " + F.tf(claim.isSafe(caller.getLocation()))));
 	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAlphaManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAlphaManager.java
new file mode 100644
index 000000000..df206e60e
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAlphaManager.java
@@ -0,0 +1,75 @@
+package mineplex.game.clans.clans;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.task.TaskManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+
+public class ClansAlphaManager extends MiniPlugin
+{
+	private static final LinkedList<LinkedList<String>> ANNOUNCEMENTS = new LinkedList<>(Arrays.asList(new LinkedList<>(Arrays.asList(C.cDAquaB + "Welcome to Clans Alpha", C.cAqua + "Clans is in early Alpha stages so expect there to be bugs/issues. Please report any bugs to staff, we hope you enjoy this early test!"))));
+	
+	private static final boolean RANDOM_ANNOUNCEMENT = true;
+	
+	/**
+	 * This is useful if the above boolean (RANDOM_ANNOUNCEMENT) is set to
+	 * false, then the announcement at index SET_ANNOUNCEMENT will be used every
+	 * time.
+	 */
+	private static final int SET_ANNOUNCEMENT = 0;
+	
+	private static final LinkedList<String> FIRST_JOIN_MESSAGES = new LinkedList<>(ANNOUNCEMENTS.getFirst());
+	private static final UpdateType ANNOUNCEMENT_DELAY = UpdateType.MIN_16;
+	
+	private TaskManager _taskManager;
+	
+	public ClansAlphaManager(ClansManager manager, TaskManager taskManager)
+	{
+		super("Announcements", manager.getPlugin());
+		
+		_taskManager = taskManager;
+	}
+	
+	@EventHandler
+	public void onPlayerJoin(final PlayerJoinEvent event)
+	{
+		if (!_taskManager.hasCompletedTask(event.getPlayer(), "ClansAlphaJoinMessage"))
+		{
+			_taskManager.completedTask(new Callback<Boolean>()
+			{
+				public void run(Boolean data)
+				{
+					UtilPlayer.message(event.getPlayer(), FIRST_JOIN_MESSAGES);
+				}
+			}, event.getPlayer(), "ClansAlphaJoinMessage");
+		}
+	}
+	
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType().equals(ANNOUNCEMENT_DELAY))
+		{
+			if (RANDOM_ANNOUNCEMENT)
+			{
+				UtilServer.broadcast(UtilMath.randomElement(ANNOUNCEMENTS));
+			}
+			else
+			{
+				UtilServer.broadcast(ANNOUNCEMENTS.get(SET_ANNOUNCEMENT));
+			}
+		}
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansBlacklist.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansBlacklist.java
new file mode 100644
index 000000000..dc0b837f7
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansBlacklist.java
@@ -0,0 +1,45 @@
+package mineplex.game.clans.clans;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * ClansBlacklist represents the blacklist of all disallowed names for clan creation.
+ * @author MrTwiggy
+ *
+ */
+public class ClansBlacklist 
+{
+
+	// Set of all blacklisted clan names that are NOT valid.
+	private final static List<String> BLACKLISTED_NAMES = Arrays.asList(new String[] 
+			{
+		"Youtube", "Owner", "Admin", "Mod", "Trainee", "Twitch", 
+		"Wilderness", "Shops", "Builder", "Spawn", "Clan", "Clans",
+		"Fields", "Sr.Mod", "Sr. Mod", "Dev", "Jr.Dev", "Jr. Dev", "create",
+		"join", "leave", "map", "cc", "ac", "invite", "kick", "neutral",
+		"enemy", "trust", "unclaim", "claim", "delete", "SrMod", "Twitch", "YouTube", "Event",
+		"Media", "MapLead", "JrDev", "Developer", "Leader", "LT", "Support"
+			});
+	
+	/**
+	 * @param clanName - the name of the clan to validate
+	 * @return true, if {@code clanName} is a valid and non-blacklisted clan name, false otherwise.
+	 */
+	public static boolean isValidClanName(String clanName)
+	{
+		for (String blacklistedName : BLACKLISTED_NAMES)
+		{
+			if (blacklistedName.equalsIgnoreCase(clanName))
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+
+	public static void addBlacklist(String blacklist) {
+		BLACKLISTED_NAMES.add(blacklist);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
index a0303b953..7cfea3b08 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
@@ -1,343 +1,792 @@
 package mineplex.game.clans.clans;
 
 import java.sql.Timestamp;
+import java.util.UUID;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
 
+import mineplex.core.common.util.Callback;
 import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilWorld;
-import mineplex.game.clans.clans.repository.ClanRepository;
-import mineplex.game.clans.clans.repository.ClanTerritory;
-import mineplex.game.clans.clans.repository.tokens.ClanEnemyToken;
-import mineplex.game.clans.clans.repository.tokens.ClanToken;
+import mineplex.game.clans.clans.event.ClanCreatedEvent;
+import mineplex.game.clans.clans.event.ClanDeleteEvent;
+import mineplex.game.clans.clans.event.ClanSetHomeEvent;
+import mineplex.game.clans.clans.scoreboard.ClansScoreboardManager;
+import mineplex.game.clans.clans.tntGenerator.TntGenerator;
+import mineplex.game.clans.core.war.ClanWarData;
+import mineplex.game.clans.core.repository.ClanRepository;
+import mineplex.game.clans.core.repository.ClanTerritory;
+import mineplex.game.clans.core.repository.tokens.ClanToken;
 
-public class ClansDataAccessLayer 
+public class ClansDataAccessLayer
 {
 	private ClansManager _manager;
 	private ClanRepository _repository;
+	private ClansScoreboardManager _scoreboard;
 	
-	public ClansDataAccessLayer(ClansManager clans)
+	public ClansDataAccessLayer(ClansManager clans, ClansScoreboardManager scoreboard)
 	{
 		_manager = clans;
-		_repository = new ClanRepository(clans.getPlugin(), clans.getServerName());
+		_scoreboard = scoreboard;
+		_repository = new ClanRepository(clans.getPlugin(), clans.getServerName(), true);
 	}
-
-	public void delete(ClanInfo clan)
+	
+	public void delete(final ClanInfo clan, final Callback<Boolean> callback)
 	{
-		//Territory Unclaim
-		for (String cur : clan.getClaimSet())
-			_manager.getClaimMap().remove(cur);
-
-		_manager.getClanMap().remove(clan.getName());
-
-		for (String cur : clan.getMembers().keySet())
+		runAsync(new Runnable()
 		{
-			_manager.getClanMemberMap().remove(cur);
+			@Override
+			public void run()
+			{
+				final boolean out = _repository.deleteClan(clan.getId());
+				
+				if (out)
+				{
+					runSync(new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							deleteLocally(clan);
+							
+							if (callback != null) callback.run(out);
+						}
+					});
+				}
+				
+			}
+		});
+	}
+	
+	public void deleteLocally(ClanInfo clan)
+	{
+		// Territory Unclaim
+		for (String cur : clan.getClaimSet())
+		{
+			_manager.getClaimMap().remove(cur);
 		}
-
-		//Clean from Others
+		
+		_manager.getClanMap().remove(clan.getName());
+		
+		for (ClansPlayer player : clan.getMembers().values())
+		{
+			_manager.getClanMemberUuidMap().remove(player.getUuid());
+		}
+		
+		// Clean from Others
 		for (ClanInfo cur : _manager.getClanMap().values())
 		{
 			cur.getAllyMap().remove(clan.getName());
 			cur.getRequestMap().remove(clan.getName());
+			cur.clearWar(cur.getName());
 		}
-
-		//Save
-		_repository.deleteClan(clan.getId());
-
-		//Log
+		
+		// Scoreboard
+		_scoreboard.refresh(clan);
+		
+		// Log
 		_manager.log("Deleted [" + clan.getName() + "].");
+		
+		ClanDeleteEvent event = new ClanDeleteEvent(clan);
+		Bukkit.getServer().getPluginManager().callEvent(event);
 	}
-
-	public ClanInfo create(String creator, String name, boolean admin) 
+	
+	public void createAndJoin(final Player player, final String name, final Callback<ClanInfo> callback)
 	{
-		ClanToken token = new ClanToken();
+		create(player.getName(), name, false, new Callback<ClanInfo>()
+		{
+			@Override
+			public void run(final ClanInfo clan)
+			{
+				if (clan != null)
+				{
+					runAsync(new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							final ClanRole role = ClanRole.LEADER;
+							_repository.addMember(clan.getId(), player.getUniqueId(), role.toString());
+							runSync(new Runnable()
+							{
+								@Override
+								public void run()
+								{
+									updateJoinCache(clan, player, role);
+									
+									// Log
+									_manager.log("Added [" + player + "] to [" + clan.getName() + "].");
+									
+									if (callback != null) callback.run(clan);
+								}
+							});
+						}
+					});
+				}
+				else
+				{
+					if (callback != null) callback.run(null);
+				}
+			}
+		});
+	}
+	
+	public void create(final String creator, final String name, final boolean admin, final Callback<ClanInfo> callback)
+	{
+		final ClanToken token = new ClanToken();
 		token.Name = name;
 		token.Description = "No Description";
 		token.Home = "";
 		token.Admin = admin;
-
-		//Create Clan
-		ClanInfo clan = new ClanInfo(_manager, token);
-		_manager.getClanMap().put(name, clan);
-
-		//Save
-		_repository.addClan(clan, token);
-
-		//Log
-		_manager.log("[" + clan.getName() + "] with Admin [" + admin + "] created by [" + creator + "].");
-
-		return clan;
-	}
-
-	public void join(ClanInfo clan, String player, ClanRole role)
-	{
-		if (_manager.getClanMemberMap().containsKey(player))
-			leave(_manager.getClanUtility().getClanByPlayer(player), player);
-
-		//Update Clan
-		clan.getMembers().put(player, role);
-		_manager.getClanMemberMap().put(player, clan);
-		clan.getInviteeMap().remove(player);
-		clan.getInviterMap().remove(player);
-
-		//Save
-		_repository.addMember(clan.getId(), player, role.toString());
-
-		//Log
-		_manager.log("Added [" + player + "] to [" + clan.getName() + "].");
-	}
-
-	public void leave(ClanInfo clan, String player)
-	{
-		if (clan == null)
+		token.Energy = 4320;
+		
+		ClanCreatedEvent event = new ClanCreatedEvent(token, Bukkit.getPlayer(creator));
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
+		{
 			return;
-
-		//Update Clan
-		clan.getMembers().remove(player);
-		_manager.getClanMemberMap().remove(player);
-
-		//Save
-		_repository.removeMember(clan.getId(), player);
-
-		//Log
-		_manager.log("Removed [" + player + "] from [" + clan.getName() + "].");
+		}
+		
+		token.Id = event.getId();
+		token.Name = event.getName();
+		token.Description = creator;
+		token.Home = event.getHome();
+		token.Admin = event.isAdmin();
+		token.Energy = event.getEnergy();
+		token.Kills = event.getKills();
+		token.Murder = event.getMurders();
+		token.Deaths = event.getDeaths();
+		token.WarWins = event.getWarWins();
+		token.WarLosses = event.getWarLosses();
+		token.DateCreated = event.getDateCreated();
+		token.LastOnline = event.getLastOnline();
+		
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				final int clanId = _repository.addClan(token);
+				final boolean response = clanId != -1;
+				
+				runSync(new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						ClanInfo clanInfo = null;
+						
+						if (response)
+						{
+							token.Id = clanId;
+							clanInfo = new ClanInfo(_manager, token);
+							_manager.getClanMap().put(name, clanInfo);
+							_manager.log("[" + clanInfo.getName() + "] with Admin [" + admin + "] created by [" + creator + "].");
+						}
+						
+						if (callback != null) callback.run(clanInfo);
+					}
+				});
+			}
+		});
 	}
-
-	public void role(ClanInfo clan, String player, ClanRole role)
+	
+	public void join(final ClanInfo clan, final Player player, final ClanRole role, final Callback<Boolean> callback)
 	{
-		//Update Clan
-		clan.getMembers().put(player, role);
-
-		//Save
-		_repository.updateMember(clan.getId(), player, role.toString());
-
-		//Log
-		_manager.log("Removed [" + player + "] from [" + clan.getName() + "].");
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				final boolean success = _repository.addMember(clan.getId(), player.getUniqueId(), role.toString());
+				
+				runSync(new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						if (success)
+						{
+							updateJoinCache(clan, player, role);
+							
+							// Log
+							_manager.log("Added [" + player + "] to [" + clan.getName() + "].");
+						}
+						
+						if (callback != null) callback.run(success);
+					}
+				});
+				
+			}
+		});
 	}
-
+	
+	private void updateJoinCache(ClanInfo clan, Player player, ClanRole role)
+	{
+		if (_manager.getClanMemberUuidMap().containsKey(player.getUniqueId())) leave(_manager.getClanUtility().getClanByPlayer(player), player, null);
+		
+		// Update Clan
+		ClansPlayer cp = new ClansPlayer(player.getName(), player.getUniqueId(), role);
+		clan.getMembers().put(player.getUniqueId(), cp);
+		_manager.getClanMemberUuidMap().put(player.getUniqueId(), clan);
+		clan.getInviteeMap().remove(player.getName());
+		clan.getInviterMap().remove(player.getName());
+		clan.playerOnline(player);
+		
+		// Scoreboard
+		_scoreboard.refresh(player);
+	}
+	
+	public void leave(ClanInfo clan, Player player, Callback<Boolean> callback)
+	{
+		ClansPlayer clansPlayer = clan.getMembers().get(player.getUniqueId());
+		if (clansPlayer != null)
+		{
+			leave(clan, clansPlayer, callback);
+			_scoreboard.refresh(player);
+		}
+	}
+	
+	public void leave(final ClanInfo clan, final ClansPlayer clansPlayer, final Callback<Boolean> callback)
+	{
+		if (clan == null) return;
+		
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				final boolean success = _repository.removeMember(clan.getId(), clansPlayer.getPlayerName());
+				
+				runSync(new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						if (success)
+						{
+							// Update Clan
+							clan.getMembers().remove(clansPlayer.getUuid());
+							_manager.getClanMemberUuidMap().remove(clansPlayer.getUuid());
+							clan.playerOffline(clansPlayer.getPlayerName());
+							// Log
+							_manager.log("Removed [" + clansPlayer.getPlayerName() + "] from [" + clan.getName() + "].");
+						}
+						
+						if (callback != null) callback.run(success);
+					}
+				});
+			}
+		});
+	}
+	
+	public void role(final ClanInfo clan, final UUID uuid, final ClanRole role)
+	{
+		final ClansPlayer clansPlayer = clan.getMembers().get(uuid);
+		
+		if (clansPlayer != null)
+		{
+			// Update Clan
+			clansPlayer.setRole(role);
+			
+			// Save
+			runAsync(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					_repository.updateMember(clan.getId(), clansPlayer.getPlayerName(), role.toString());
+				}
+			});
+			
+			// Log
+			_manager.log("Removed [" + clansPlayer.getPlayerName() + "] from [" + clan.getName() + "].");
+		}
+	}
+	
 	public void invite(ClanInfo clan, String player, String inviter)
 	{
 		clan.getInviteeMap().put(player, System.currentTimeMillis());
 		clan.getInviterMap().put(player, inviter);
-
-		//Log
+		
+		// Log
 		_manager.log("Invited [" + player + "] to [" + clan.getName() + "] by [" + inviter + "].");
 	}
-
+	
 	public void requestAlly(ClanInfo clan, ClanInfo target, String player)
 	{
 		clan.getRequestMap().put(target.getName(), System.currentTimeMillis());
-
-		//Log
+		
+		// Log
 		_manager.log("Alliance Request to [" + target.getName() + "] from [" + clan.getName() + "] by [" + player + "].");
 	}
-
-	public void ally(ClanInfo cA, ClanInfo cB, String player)
+	
+	public void ally(final ClanInfo cA, final ClanInfo cB, String player)
 	{
-		//Remove Requests
+		// Remove Requests
 		cA.getRequestMap().remove(cB.getName());
 		cB.getRequestMap().remove(cA.getName());
-
-		//Update ClansManager
+		
+		// Update ClansManager
 		cA.getAllyMap().put(cB.getName(), false);
 		cB.getAllyMap().put(cA.getName(), false);
-
-		//Save
-		_repository.addClanRelationship(cA.getId(), cB.getId(), false);
-		_repository.addClanRelationship(cB.getId(), cA.getId(), false);
-
-		//Log
+		
+		// Save
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				_repository.addClanRelationship(cA.getId(), cB.getId(), false);
+				_repository.addClanRelationship(cB.getId(), cA.getId(), false);
+			}
+		});
+		
+		// Scoreboard
+		_scoreboard.refresh(cA);
+		
+		// Log
 		_manager.log("Added Ally for [" + cB.getName() + "] and [" + cA.getName() + "] by [" + player + "].");
 	}
-
-	public void enemy(ClanInfo clan, ClanInfo otherClan, String player)
+	
+	/*
+	 * public void enemy(final ClanInfo clan, final ClanInfo otherClan, String
+	 * player) { runAsync(new Runnable() {
+	 * @Override public void run() { _repository.addEnemy(clan.getId(),
+	 * otherClan.getId()); } }); // Memory Timestamp currDate = new
+	 * Timestamp(System.currentTimeMillis()); ClanEnemyToken clanEnemyToken =
+	 * new ClanEnemyToken(); clanEnemyToken.Initiator = true;
+	 * clanEnemyToken.TimeFormed = currDate; clanEnemyToken.Score = 0;
+	 * clanEnemyToken.EnemyName = otherClan.getName();
+	 * clan.updateEnemy(clanEnemyToken); ClanEnemyToken otherClanEnemyToken =
+	 * new ClanEnemyToken(); otherClanEnemyToken.Initiator = false;
+	 * otherClanEnemyToken.TimeFormed = currDate; otherClanEnemyToken.Score = 0;
+	 * otherClanEnemyToken.EnemyName = clan.getName();
+	 * otherClan.updateEnemy(otherClanEnemyToken); //Scoreboard
+	 * _scoreboard.refresh(clan); _manager.log("Added Enemy for [" +
+	 * clan.getName() + "] and [" + otherClan.getName() + "] by [" + player +
+	 * "]."); }
+	 */
+	
+//	public boolean trust(final ClanInfo ownerClan, final ClanInfo otherClan, String player)
+//	{
+//		if (!ownerClan.getAllyMap().containsKey(otherClan.getName())) return false;
+//		
+//		final boolean trust = !ownerClan.getAllyMap().get(otherClan.getName());
+//		
+//		// Memory
+//		ownerClan.getAllyMap().put(otherClan.getName(), trust);
+//		
+//		// Save
+//		runAsync(new Runnable()
+//		{
+//			@Override
+//			public void run()
+//			{
+//				_repository.updateClanRelationship(ownerClan.getId(), otherClan.getId(), trust);
+//			}
+//		});
+//		
+//		// Scoreboard
+//		_scoreboard.refresh(ownerClan);
+//		
+//		// Log
+//		_manager.log((trust ? "Gave" : "Revoked") + " Trust [" + trust + "] to [" + otherClan.getName() + "] for [" + ownerClan.getName() + "] by [" + player + "].");
+//		
+//		return trust;
+//	}
+	
+	public void neutral(final ClanInfo cA, final ClanInfo cB, String player, boolean bothClansManager)
 	{
-		_repository.addEnemy(clan.getId(), otherClan.getId());
-		Timestamp currDate = new Timestamp(System.currentTimeMillis());
-
-		ClanEnemyToken clanEnemyToken = new ClanEnemyToken();
-		clanEnemyToken.Initiator = true;
-		clanEnemyToken.TimeFormed = currDate;
-		clanEnemyToken.EnemyName = otherClan.getName();
-		clan.updateEnemy(clanEnemyToken);
-
-		ClanEnemyToken otherClanEnemyToken = new ClanEnemyToken();
-		otherClanEnemyToken.Initiator = false;
-		otherClanEnemyToken.TimeFormed = currDate;
-		otherClanEnemyToken.EnemyName = clan.getName();
-		otherClan.updateEnemy(otherClanEnemyToken);
-
-		_manager.log("Added Enemy for [" + clan.getName() + "] and [" + otherClan.getName() + "] by [" + player + "].");
-	}
-
-	public boolean trust(ClanInfo ownerClan, ClanInfo otherClan, String player)
-	{
-		if (!ownerClan.getAllyMap().containsKey(otherClan.getName()))
-			return false;
-
-		boolean trust = !ownerClan.getAllyMap().get(otherClan.getName());
-
-		//Memory
-		ownerClan.getAllyMap().put(otherClan.getName(), trust);
-
-		//Save
-		_repository.updateClanRelationship(ownerClan.getId(), otherClan.getId(), trust);
-
-		//Log
-		_manager.log((trust ? "Gave" : "Revoked") + " Trust [" + trust + "] to [" + otherClan.getName() + "] for [" + ownerClan.getName() + "] by [" + player + "].");
-
-		return trust;
-	}
-
-	public void neutral(ClanInfo cA, ClanInfo cB, String player, boolean bothClansManager) 
-	{
-		//Update ClansManager
+		// Update ClansManager
 		cA.getAllyMap().remove(cB.getName());
 		cB.getAllyMap().remove(cA.getName());
-
-		//Save
-		_repository.removeClanRelationship(cA.getId(), cB.getId());
-		_repository.removeClanRelationship(cB.getId(), cA.getId());
-
-		//Log
+		
+		// Save
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				_repository.removeClanRelationship(cA.getId(), cB.getId());
+				_repository.removeClanRelationship(cB.getId(), cA.getId());
+			}
+		});
+		
+		// Scoreboard
+		_scoreboard.refresh(cA);
+		
+		// Log
 		_manager.log("Added Neutral between [" + cA.getName() + "] and [" + cB.getName() + "] by [" + player + "].");
 	}
-
-	@SuppressWarnings("deprecation")
-	public boolean claim(String name, String chunk, String player, boolean safe)
+	
+	public boolean claimAll(final String name, final String player, final boolean safe, final String... chunks)
 	{
-		if (!_manager.getClanMap().containsKey(name))
-			return false;
-
-		ClanInfo clan = _manager.getClanMap().get(name);
-
-		//Unclaim
-		if (_manager.getClaimMap().containsKey(chunk))
-			unclaim(chunk, player, false);
-
-		//Memory
+		if (!_manager.getClanMap().containsKey(name)) return false;
+		
+		final ClanInfo clan = _manager.getClanMap().get(name);
+		
+		// Unclaim
+		for (String chunk : chunks)
+		{
+			if (_manager.getClaimMap().containsKey(chunk))
+			{
+				unclaim(chunk, player, false);
+			}
+			
+			// Memory
+			ClanTerritory claim = new ClanTerritory();
+			claim.Owner = name;
+			claim.Safe = safe;
+			clan.getClaimSet().add(chunk);
+			_manager.getClaimMap().put(chunk, claim);
+		}
+		
+		// Save
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				_repository.addTerritoryClaims(clan.getId(), safe, chunks);
+				
+				// Log
+				_manager.log("Successfully added [" + chunks.length + "] Claims for [" + name + "] by [" + player + "].");
+			}
+		});
+		
+		return true;
+	}
+	
+	@SuppressWarnings("deprecation")
+	public boolean claim(String name, final String chunk, String player, final boolean safe)
+	{
+		if (!_manager.getClanMap().containsKey(name)) return false;
+		
+		final ClanInfo clan = _manager.getClanMap().get(name);
+		
+		// Unclaim
+		if (_manager.getClaimMap().containsKey(chunk)) unclaim(chunk, player, false);
+		
+		// Memory
 		ClanTerritory claim = new ClanTerritory();
 		claim.Owner = name;
 		claim.Safe = safe;
+		claim.Chunk = chunk;
 		clan.getClaimSet().add(chunk);
 		_manager.getClaimMap().put(chunk, claim);
-
-		//Save
-		_repository.addTerritoryClaim(clan.getId(), chunk, safe);
-
-		//Visual
+		
+		// Save
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				_repository.addTerritoryClaim(clan.getId(), chunk, safe);
+			}
+		});
+		
+		// Visual
 		Chunk c = UtilWorld.strToChunk(chunk);
 		if (!clan.isAdmin())
-			for (int i = 0 ; i < 3 ; i++)
-				for (int x=0 ; x < 16 ; x++)
-					for (int z=0 ; z < 16 ; z++)
-						if (z == 0 || z == 15 || x == 0 || x == 15)
-						{
-							Block down = UtilBlock.getHighest(c.getWorld(), c.getBlock(x, 0, z).getX(), c.getBlock(x, 0, z).getZ()).getRelative(BlockFace.DOWN);
-
-							if (down.getTypeId() == 1 || down.getTypeId() == 2 || down.getTypeId() == 3 || down.getTypeId() == 12 || down.getTypeId() == 8)
-								_manager.getBlockRestore().Add(down, 89, (byte)0, 180000);
-						}
-
-		//Log
-		_manager.log("Added Claim for [" + name + "] at [" + chunk + "] by [" + player + "].");
-
+		{
+			for (int x = 0; x < 16; x++)
+			{
+				for (int z = 0; z < 16; z++)
+				{
+					if (z == 0 || z == 15 || x == 0 || x == 15)
+					{
+						Block down = UtilBlock.getHighest(c.getWorld(), c.getBlock(x, 0, z).getX(), c.getBlock(x, 0, z).getZ()).getRelative(BlockFace.DOWN);
+						if (down.getTypeId() == 1 || down.getTypeId() == 2 || down.getTypeId() == 3 || down.getTypeId() == 12 || down.getTypeId() == 8) _manager.getBlockRestore().add(down, 89, (byte) 0, 180000, true);
+					}
+				}
+			}
+		}
+		
+		// Log
+		// _manager.log("Added Claim for [" + name + "] at [" + chunk + "] by ["
+		// + player + "].");
+		
 		return true;
 	}
-
-	public boolean unclaim(String chunk, String player, boolean sql)
+	
+	public boolean unclaim(final String chunk, String player, boolean sql)
 	{
 		ClanTerritory claim = _manager.getClaimMap().remove(chunk);
-
+		
 		if (claim == null)
 		{
 			_manager.log("Unclaiming NULL Chunk Failed.");
 			return false;
 		}
-
-		ClanInfo clan = _manager.getClanMap().get(claim.Owner);
-
+		
+		final ClanInfo clan = _manager.getClanMap().get(claim.Owner);
+		
 		if (clan == null)
 		{
 			_manager.log("Unclaiming from NULL Clan Failed.");
 			return false;
 		}
-
-		//Memory
+		
+		// Memory
 		clan.getClaimSet().remove(chunk);
-
-		//Save
-		_repository.removeTerritoryClaim(clan.getId(), chunk);
-
-		//Register
-		// _manager.getUnclaimMap().put(chunk, System.currentTimeMillis());
-
-		//Log
-		if (player != null)
-			_manager.log("Removed Claim for [" + clan.getName() + "] at [" + chunk + "] by [" + player + "].");
-
+		_manager.getUnclaimMap().put(chunk, System.currentTimeMillis());
+		
+		// Save
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				_repository.removeTerritoryClaim(clan.getId(), chunk);
+			}
+		});
+		
+		// Restore any glowstone blocks
+		Chunk c = UtilWorld.strToChunk(chunk);
+		if (!clan.isAdmin())
+		{
+			for (int x = 0; x < 16; x++)
+			{
+				for (int z = 0; z < 16; z++)
+				{
+					if (z == 0 || z == 15 || x == 0 || x == 15)
+					{
+						for (int y = 0; y < 256; y++)
+						{
+							Block block = c.getBlock(x, y, z);
+							if (block.getType() == Material.GLOWSTONE)
+							{
+								if (!_manager.getBlockRestore().restore(block)) block.setType(Material.STONE);
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		// Log
+		if (player != null) _manager.log("Removed Claim for [" + clan.getName() + "] at [" + chunk + "] by [" + player + "].");
+		
+		// Bed Removal
+		if (clan.getHome() != null && UtilWorld.chunkToStr(clan.getHome().getChunk()).equals(chunk))
+		{
+			UtilBlock.deleteBed(clan.getHome());
+			clan.setHome(null);
+			clan.inform("Clan has lost it's Home because of a Territory loss.", null);
+		}
+		
 		return true;
 	}
-
+	
 	public boolean unclaimSilent(String chunk, boolean sql)
 	{
 		return unclaim(chunk, null, sql);
 	}
-
-	public void home(ClanInfo clan, Location loc, String player)
+	
+	public void setHome(final ClanInfo clan, Location loc, String player)
 	{
-		//Memory
+		// Event
+		ClanSetHomeEvent event = new ClanSetHomeEvent(clan, Bukkit.getPlayer(player), loc);
+		Bukkit.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
+		{
+			return;
+		}
+		
+		// Memory
 		clan.setHome(loc);
-
-		//Save
-		_repository.updateClan(clan.getId(), clan.getName(), clan.getDesc(), UtilWorld.locToStr(clan.getHome()), clan.isAdmin(), clan.getEnergy(), clan.getLastOnline());
-
-		//Log
+		
+		// Save
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				_repository.updateClan(clan.getId(), clan.getName(), clan.getDesc(), UtilWorld.locToStr(clan.getHome()), clan.isAdmin(), clan.getEnergy(), clan.getKills(), clan.getMurder(), clan.getDeaths(), clan.getWarWins(), clan.getWarLosses(), clan.getLastOnline());
+			}
+		});
+		
+		// Log
 		_manager.log("Set Home for [" + clan.getName() + "] to " + UtilWorld.locToStrClean(loc) + " by [" + player + "].");
 	}
-
-	public void updateEnemy(ClanInfo clan, ClanInfo otherClan)
+	
+	public void saveClan(final ClanInfo clan)
 	{
-		assert clan.getEnemyData() != null && otherClan.getEnemyData() != null;
-		assert clan.getEnemyData().getEnemyName() == otherClan.getName() && otherClan.getEnemyData().getEnemyName() == clan.getName();
-
-		ClanInfo initiator = clan.getEnemyData().isInitiator() ? clan : otherClan;
-		EnemyData iData = initiator.getEnemyData();
-		ClanInfo other = clan == initiator ? otherClan : clan;
-		EnemyData oData = other.getEnemyData();
-		_repository.updateEnemy(initiator.getId(), other.getId(), iData.getScore(), oData.getScore(), iData.getKills(), oData.getKills());
-
-		//Log
-		_manager.log("Updated Enemy Data for [" + clan.getName() + ", " + otherClan.getName() + "]");
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				_repository.updateClan(clan.getId(), clan.getName(), clan.getDesc(), UtilWorld.locToStr(clan.getHome()), clan.isAdmin(), clan.getEnergy(), clan.getKills(), clan.getMurder(), clan.getDeaths(), clan.getWarWins(), clan.getWarLosses(), clan.getLastOnline());
+			}
+		});
+	}
+	
+	public void war(final ClanInfo clanA, final ClanInfo clanB, final int score, final Callback<ClanWarData> warCallback)
+	{
+		final Timestamp currentTime = new Timestamp(System.currentTimeMillis());
+		final ClanWarData war = new ClanWarData(clanA.getName(), clanB.getName(), score, currentTime, currentTime, 0);
+		
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				_repository.addWar(clanA.getId(), clanB.getId(), score, currentTime);
+				
+				runSync(new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						// Memory
+						clanA.addWar(war);
+						clanB.addWar(war);
+						
+						_manager.log("Initiator war for [" + clanA.getName() + "] against [" + clanB.getName() + "].");
+						
+						if (warCallback != null) warCallback.run(war);
+					}
+				});
+			}
+		});
+		
+	}
+	
+	public void updateWar(final ClanInfo clanA, final ClanInfo clanB, final ClanWarData war, final Callback<Boolean> callback)
+	{
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				final boolean ran = _repository.updateWar(clanA.getId(), clanB.getId(), war.getPoints(), war.getLastUpdated());
+				runSync(new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						if (callback != null) callback.run(ran);
+					}
+				});
+			}
+		});
+	}
+	
+	/*
+	 * public void updateEnemy(ClanInfo clan, ClanInfo otherClan) { assert
+	 * clan.getEnemyData() != null && otherClan.getEnemyData() != null; assert
+	 * clan.getEnemyData().getEnemyName() == otherClan.getName() &&
+	 * otherClan.getEnemyData().getEnemyName() == clan.getName(); ClanInfo
+	 * initiator = clan.getEnemyData().isInitiator() ? clan : otherClan;
+	 * EnemyData iData = initiator.getEnemyData(); ClanInfo other = clan ==
+	 * initiator ? otherClan : clan; EnemyData oData = other.getEnemyData();
+	 * _repository.updateEnemy(initiator.getId(), other.getId(),
+	 * iData.getClanAScore(), oData.getClanAScore(), iData.getKills(),
+	 * oData.getKills()); //Log _manager.log("Updated Enemy Data for [" +
+	 * clan.getName() + ", " + otherClan.getName() + "]"); }
+	 */
+	
+	public void updateGenerator(final ClanInfo clanInfo, final Callback<Boolean> callback)
+	{
+		TntGenerator generator = clanInfo.getGenerator();
+		final String location;
+		final int generatorStock;
+		
+		if (generator != null)
+		{
+			location = UtilWorld.blockToStr(generator.getBlock());
+			generatorStock = generator.getStock();
+		}
+		else
+		{
+			location = "";
+			generatorStock = 0;
+		}
+		
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				final boolean ran = _repository.updateClanGenerator(clanInfo.getId(), location, generatorStock);
+				runSync(new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						if (callback != null)
+						{
+							callback.run(ran);
+						}
+					}
+				});
+			}
+		});
 	}
 	
 	public void updateEnergy(ClanInfo clan)
 	{
-		//Save
-		_repository.updateClan(clan.getId(), clan.getName(), clan.getDesc(), UtilWorld.locToStr(clan.getHome()), clan.isAdmin(), clan.getEnergy(), clan.getLastOnline());
-
-		//Log
+		// Save
+		// TODO: query to only update energy?
+		_repository.updateClan(clan.getId(), clan.getName(), clan.getDesc(), UtilWorld.locToStr(clan.getHome()), clan.isAdmin(), clan.getEnergy(), clan.getKills(), clan.getMurder(), clan.getDeaths(), clan.getWarWins(), clan.getWarLosses(), clan.getLastOnline());
+		
+		// Log
 		_manager.log("Updated Energy for [" + clan.getName() + "] to " + clan.getEnergy() + ".");
 	}
-
+	
 	public void safe(ClanTerritory claim, String player)
 	{
-		//Memory
+		// Memory
 		claim.Safe = !claim.Safe;
-
-		//Save
+		
+		// Save
 		_repository.updateTerritoryClaim(claim.Chunk, claim.Safe);
-
-		//Log
+		
+		// Log
 		_manager.log("Safe Zone at [" + claim.Chunk + "] set to [" + claim.Safe + "] by [" + player + "].");
 	}
-
+	
+	public void retrieveClan(final String clanName, final Callback<ClanToken> callback)
+	{
+		runAsync(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				ClanToken clan = _repository.retrieveClan(clanName);
+				callback.run(clan);
+			}
+		});
+	}
+	
+	public void clanExists(String clanName, Callback<Boolean> callback)
+	{
+		_repository.clanExists(clanName, callback);
+	}
+	
 	public ClanRepository getRepository()
 	{
 		return _repository;
 	}
+	
+	private void runAsync(Runnable runnable)
+	{
+		_manager.runAsync(runnable);
+	}
+	
+	private void runSync(Runnable runnable)
+	{
+		_manager.runSync(runnable);
+	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDisplay.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDisplay.java
index 4e346e626..7e8723996 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDisplay.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDisplay.java
@@ -2,26 +2,26 @@ package mineplex.game.clans.clans;
 
 import java.util.LinkedList;
 
-import mineplex.core.MiniPlugin;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilWorld;
-import mineplex.core.recharge.Recharge;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.game.clans.clans.ClansUtility.ClanRelation;
-import mineplex.game.clans.clans.repository.ClanTerritory;
-
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World.Environment;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansUtility.ClanRelation;
+import mineplex.game.clans.clans.event.PlayerEnterTerritoryEvent;
+import mineplex.game.clans.core.repository.ClanTerritory;
+
 public class ClansDisplay extends MiniPlugin
 {
 	private ClansManager Clans;
@@ -36,233 +36,235 @@ public class ClansDisplay extends MiniPlugin
 	@EventHandler
 	public void Update(UpdateEvent event)
 	{
-		if (event.getType() != UpdateType.FASTER)
-			return;
+		if (event.getType() != UpdateType.FASTER) return;
 		
 		for (Player cur : UtilServer.getPlayers())
 			Update(cur);
 	}
 	
-	public void Update(Player player) 
+	public void Update(Player player)
 	{
-		if (player.getWorld().getEnvironment() != Environment.NORMAL)
-			return;
-
-		ClientClan client = Clans.Get(player);	
-		if (client == null)		return;
-
-		//Same Chunk
-		if (client.getTerritory().equals(UtilWorld.chunkToStr(player.getLocation().getChunk())))
-			return;
-
-		//Update Territory
-		client.setTerritory(UtilWorld.chunkToStr(player.getLocation().getChunk()));
-
-		//AutoClaim
-		if (client.isAutoClaim())
-			Clans.getClanAdmin().claim(player);
+		if (player.getWorld().getEnvironment() != Environment.NORMAL) return;
 		
-		//Map
-		String owner = "?";
+		ClientClan client = Clans.Get(player);
+		if (client == null) return;
+		
+		// Same Chunk
+		if (client.getTerritory().equals(UtilWorld.chunkToStr(player.getLocation().getChunk()))) return;
+		
+		// Update Territory
+		client.setTerritory(UtilWorld.chunkToStr(player.getLocation().getChunk()));
+		
+		// AutoClaim
+		if (client.isAutoClaim()) Clans.getClanAdmin().claim(player);
+		
+		// Map
+		String owner = "Wilderness";
 		ClanInfo ownerClan = Clans.getClanUtility().getOwner(player.getLocation());
-		if (ownerClan != null)
-			owner = ownerClan.getName();
-
+		if (ownerClan != null) owner = ownerClan.getName();
+		
 		boolean safe = Clans.getClanUtility().isSafe(player);
-
+		
+		UtilServer.getServer().getPluginManager().callEvent(new PlayerEnterTerritoryEvent(player, client.getOwner(), owner, owner.equals("Wilderness") ? false : Clans.getClanUtility().getClaim(player.getLocation()).isSafe(player.getLocation())));
+		
 		if (!client.isMapOn())
 		{
 			boolean showChange = false;
-
-			//Owner Change
+			
+			// Owner Change
 			if (!client.getOwner().equals(owner))
 			{
 				client.setOwner(owner);
 				showChange = true;
 			}
-
-			//Safe Change
+			
+			// Safe Change
 			if (safe != client.isSafe())
 			{
 				client.setSafe(safe);
 				showChange = true;
 			}
-
+			
 			if (showChange)
+			{
 				displayOwner(player);
-		}		
+				// Event
+			}
+		}
 		else
 		{
 			displayOwner(player);
-			displayMap(player);	
+			displayMap(player);
 		}
 	}
-
+	
 	public void displayOwner(Player player)
 	{
-		//Name 
+		// Name
 		String ownerString = C.xWilderness + "Wilderness";
-
+		
 		ClanTerritory claim = Clans.getClanUtility().getClaim(player.getLocation());
-		String append = "";
-		if (claim != null)	
+		if (claim != null)
 		{
-			//Relation
-			ClanRelation relation = Clans.getClanUtility().relPT(player.getName(), claim.Chunk);
+			// Relation
+			ClanRelation relation = Clans.getClanUtility().relPT(player, claim.Chunk);
 			
-			//Name
+			// Name
 			ownerString = Clans.getClanUtility().mRel(relation, claim.Owner, false);
-
-			//Trust
-			if (relation == ClanRelation.ALLY_TRUST)
-				append = C.mBody + "(" + C.mElem + "Trusted" + C.mBody + ")";
+			
+			// Trust
+			if (relation == ClanRelation.ALLY_TRUST) ownerString += " " + C.mBody + "(" + C.mElem + "Trusted" + C.mBody + ")";
 		}
-
-		UtilPlayer.message(player, F.main("Clans", ownerString + " " + append));
+		
+		UtilTextMiddle.display("", ownerString, 0, 25, 10, player);
+		UtilPlayer.message(player, F.main("Territory", ownerString));
 	}
-
+	
 	public int width = 8;
 	public int height = 4;
-
+	
 	public void displayMap(Player player)
 	{
-		if (player.getWorld().getEnvironment().equals(Environment.NETHER))
-			return;
-
-		//Get Local
+		if (player.getWorld().getEnvironment().equals(Environment.NETHER)) return;
+		
+		// Get Local
 		LinkedList<String> local = mLocalMap(player, player.getLocation().getChunk(), true);
-
-		//Get Home
+		
+		// Get Home
 		LinkedList<String> home = null;
-
+		
 		if (player.getItemInHand().getType() == Material.MAP)
 		{
 			ClanInfo clan = Clans.getClanUtility().getClanByPlayer(player);
-			if (clan != null)
-				if (clan.getHome() != null)
-					home = mLocalMap(player, clan.getHome().getChunk(), false);
+			if (clan != null) if (clan.getHome() != null) home = mLocalMap(player, clan.getHome().getChunk(), false);
 		}
-
-		//Display
+		
+		// Display
 		if (home == null || local.size() != home.size())
 			UtilPlayer.message(player, local);
-
+			
 		else
-			for (int i = 0 ; i < local.size() ; i++)
+			for (int i = 0; i < local.size(); i++)
 				UtilPlayer.message(player, local.get(i) + "            " + home.get(i));
+				
+		// Display legend for map symbols
+		UtilPlayer.message(player, C.xNone + "X: Current, #: Claimed, H: Home");
+		UtilPlayer.message(player, C.xNone + "S: Safe, +: Admin, -: Unclaimed");
 	}
-
+	
 	public LinkedList<String> mLocalMap(Player player, Chunk chunk, boolean local)
 	{
-		if (chunk == null)
-			return null;
-
+		if (chunk == null) return null;
+		
 		LinkedList<String> localMap = new LinkedList<String>();
-
-		for (int i=(chunk.getX()-height) ; i <= (chunk.getX()+height) ; i++)
+		
+		for (int i = (chunk.getX() - height); i <= (chunk.getX() + height); i++)
 		{
 			String output = C.xNone + "<";
-
-			for (int j=(chunk.getZ()+width) ; j >= (chunk.getZ()-width) ; j--)
+			
+			for (int j = (chunk.getZ() + width); j >= (chunk.getZ() - width); j--)
 			{
 				Chunk curChunk = player.getWorld().getChunkAt(i, j);
-
-				//Count Players
+				
+				// Count Players
 				int pCount = 0;
 				if (player.getItemInHand().getType() == Material.MAP)
 				{
 					for (Player cur : UtilServer.getPlayers())
-						if (cur.getLocation().getChunk().toString().equals(curChunk.toString()))
-							pCount++;
+						if (cur.getLocation().getChunk().toString().equals(curChunk.toString())) pCount++;
 				}
-
-				//Get Data
+				
+				// Get Data
 				ClanInfo curOwner = Clans.getClanUtility().getOwner(UtilWorld.chunkToStr(curChunk));
 				ClanTerritory curClaim = Clans.getClanUtility().getClaim(UtilWorld.chunkToStr(curChunk));
-
-				//Add Icon
+				
+				// Add Icon
 				if (i == chunk.getX() && j == chunk.getZ())
-					output += getMapIcon(Clans.getClanUtility().relPC(player.getName(), curOwner), curClaim, curOwner, curChunk, pCount, true, local);
+					output += getMapIcon(Clans.getClanUtility().relPC(player, curOwner), curClaim, curOwner, curChunk, pCount, true, local);
 				else
-					output += getMapIcon(Clans.getClanUtility().relPC(player.getName(), curOwner), curClaim, curOwner, curChunk, pCount, false, local);
+					output += getMapIcon(Clans.getClanUtility().relPC(player, curOwner), curClaim, curOwner, curChunk, pCount, false, local);
 			}
-
+			
 			output += ">";
-
-			//Send
+			
+			// Send
 			localMap.add(output);
 		}
-
+		
 		return localMap;
 	}
-
+	
 	public String getMapIcon(ClanRelation relation, ClanTerritory claim, ClanInfo owner, Chunk chunk, int players, boolean mid, boolean local)
 	{
-		if (players > 9)
-			players = 9;
-
+		if (players > 9) players = 9;
+		
 		if (mid && local)
 		{
-			if (players > 0)	return "" + C.cWhite + players;
-			else				return "" + C.cWhite + "X";
+			if (players > 0)
+				return "" + C.cWhite + players;
+			else
+				return "" + C.cWhite + "X";
 		}
-
-		if (owner == null || claim == null)			
+		
+		if (owner == null || claim == null)
 		{
-			if (players > 0)	return "" + C.xNone + players;
-			else				return "" + C.xNone + "-";
+			if (players > 0)
+				return "" + C.xNone + players;
+			else
+				return "" + C.xNone + "-";
 		}
-
+		
 		if (claim.Safe)
 		{
-			if (players > 0)	return "" + C.xSafe + players;
-			else				return "" + C.xSafe + "S";
+			if (players > 0)
+				return "" + C.xSafe + players;
+			else
+				return "" + C.xSafe + "S";
 		}
-
-		if (owner.isAdmin())		
+		
+		if (owner.isAdmin())
 		{
-			if (players > 0)	return "" + C.xAdmin + players;
-			else				return "" + C.xAdmin + "+";
+			if (players > 0)
+				return "" + C.xAdmin + players;
+			else
+				return "" + C.xAdmin + "+";
 		}
-
-
+		
 		if (relation == ClanRelation.SELF)
 		{
-			if (players > 0)									return "" + C.xSelf + players;
-			else if (Clans.getClanUtility().isChunkHome(owner, chunk))	return "" + C.xSelf + "H";
-			else												return "" + C.xSelf + "#";
+			if (players > 0)
+				return "" + C.xSelf + players;
+			else if (Clans.getClanUtility().isChunkHome(owner, chunk))
+				return "" + C.xSelf + "H";
+			else
+				return "" + C.xSelf + "#";
 		}
-
+		
 		if (relation == ClanRelation.ALLY)
 		{
-			if (players > 0)									return "" + C.xAlly + players;
-			else if (Clans.getClanUtility().isChunkHome(owner, chunk))	return "" + C.xAlly + "H";
-			else												return "" + C.xAlly + "#";
+			if (players > 0)
+				return "" + C.xAlly + players;
+			else if (Clans.getClanUtility().isChunkHome(owner, chunk))
+				return "" + C.xAlly + "H";
+			else
+				return "" + C.xAlly + "#";
 		}
-
+		
 		if (relation == ClanRelation.ALLY_TRUST)
 		{
-			if (players > 0)									return "" + C.xdAlly + players;
-			else if (Clans.getClanUtility().isChunkHome(owner, chunk))	return "" + C.xdAlly + "H";
-			else												return "" + C.xdAlly + "#";
+			if (players > 0)
+				return "" + C.xdAlly + players;
+			else if (Clans.getClanUtility().isChunkHome(owner, chunk))
+				return "" + C.xdAlly + "H";
+			else
+				return "" + C.xdAlly + "#";
 		}
-
-		if (players > 0)										return "" + C.xEnemy + players;
-		else if (Clans.getClanUtility().isChunkHome(owner, chunk))		return "" + C.xEnemy + "H";
-		else													return "" + C.xEnemy + "#";
-	}
-
-	public void handleInteract(PlayerInteractEvent event) 
-	{
-		if (event.getPlayer().getItemInHand().getType() != Material.MAP)
-			return;
-
-		if (!Recharge.Instance.use(event.getPlayer(), "Clan Map", 500, false, false))
-			return;
 		
-		displayOwner(event.getPlayer());
-		displayMap(event.getPlayer());	
+		if (players > 0)
+			return "" + C.xEnemy + players;
+		else if (Clans.getClanUtility().isChunkHome(owner, chunk))
+			return "" + C.xEnemy + "H";
+		else
+			return "" + C.xEnemy + "#";
 	}
-
-
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
index 6b1f8d233..9db1f9d2e 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
@@ -2,6 +2,7 @@ package mineplex.game.clans.clans;
 
 import java.sql.Timestamp;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Effect;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -17,12 +18,19 @@ import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockBurnEvent;
 import org.bukkit.event.block.BlockIgniteEvent;
 import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
+import org.bukkit.event.block.BlockPhysicsEvent;
 import org.bukkit.event.block.BlockPistonExtendEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerBucketEmptyEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import mineplex.core.MiniPlugin;
@@ -33,91 +41,41 @@ import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEvent;
 import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilGear;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilItem;
+import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilTime;
-import mineplex.core.common.util.UtilTime.TimeUnit;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.game.clans.clans.ClansUtility.ClanRelation;
-import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
-import mineplex.minecraft.game.core.condition.Condition.ConditionType;
+import mineplex.game.clans.core.repository.ClanTerritory;
+import mineplex.game.clans.spawn.Spawn;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+import net.minecraft.server.v1_8_R3.EnumDirection;
 
 public class ClansGame extends MiniPlugin
 {
-	private ClansManager Clans;
+	private ClansManager _clans;
 	
 	public ClansGame(JavaPlugin plugin, ClansManager clans)
 	{
 		super("Clans Game", plugin);
 		
-		Clans = clans;
-	}	
-
-	@EventHandler
-	public void Update(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.FAST)
-			return;
-		
-		for (Player cur : UtilServer.getPlayers())
-			if (Clans.getClanUtility().isSafe(cur.getLocation()))
-			{
-				long lastDamager = Clans.getCombatManager().Get(cur).GetLastCombat();
-
-				if (!UtilTime.elapsed(lastDamager, 15000))
-				{
-					UtilPlayer.message(cur, F.main("Safe Zone", "You are not safe for " + 
-							F.time(UtilTime.convertString(15000 - (System.currentTimeMillis() - lastDamager), 1, TimeUnit.FIT))));
-
-					Clans.getCondition().Factory().Custom("Unsafe", cur, cur, ConditionType.CUSTOM, 1, 0, false, Material.FIRE, (byte)0, true);
-				}
-			}
+		_clans = clans;
 	}
 	
-	@EventHandler
-	public void preventHorseSpawn(CreatureSpawnEvent event)
-	{
-		if (event.getEntityType() == EntityType.HORSE)
-			event.setCancelled(true);
-	}
-	
-	@EventHandler
-	public void deductEnergy(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.SEC)
-			return;
-		
-		for (ClanInfo clan : Clans.getClanMap().values())
-		{
-			
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW)
-	public void SkillTrigger(SkillTriggerEvent event)
-	{
-		if (!Clans.getClanUtility().isSafe(event.GetPlayer()))
-			return;
-
-		UtilPlayer.message(event.GetPlayer(), F.main("Safe Zone", "You cannot use " + F.skill(event.GetSkillName() + " in " + F.elem("Safe Zone") + ".")));
-
-		event.SetCancelled(true);
-	}
-
-	@EventHandler
+	@EventHandler(ignoreCancelled = true)
 	public void openClanShop(PlayerInteractEvent event)
 	{
-		if (event.isCancelled())
-			return;
+		boolean hasItem = event.getPlayer().getItemInHand().getType() != Material.AIR;
 		
-		if (UtilEvent.isAction(event, ActionType.R_BLOCK))
+		if (UtilEvent.isAction(event, ActionType.R_BLOCK) && event.getClickedBlock().getType() == Material.ENCHANTMENT_TABLE)
 		{
-			if (event.getClickedBlock().getType() == Material.ENCHANTMENT_TABLE)
+			if (!event.getPlayer().isSneaking() || !hasItem)
 			{
-				Clans.getClanShop().attemptShopOpen(event.getPlayer());
+				_clans.getClassShop().attemptShopOpen(event.getPlayer());
 				event.setCancelled(true);
 			}
 		}
@@ -126,198 +84,237 @@ public class ClansGame extends MiniPlugin
 	@EventHandler(priority = EventPriority.LOW)
 	public void BlockBurn(BlockBurnEvent event)
 	{
-		if (Clans.getClanUtility().isBorderlands(event.getBlock().getLocation()))
-			event.setCancelled(true);
+		if (_clans.getClanUtility().isBorderlands(event.getBlock().getLocation())) event.setCancelled(true);
 	}
-
+	
 	@EventHandler(priority = EventPriority.LOW)
 	public void BlockSpread(BlockIgniteEvent event)
 	{
-		if (event.getCause() == IgniteCause.SPREAD)
-			if (Clans.getClanUtility().isBorderlands(event.getBlock().getLocation()))
-				event.setCancelled(true);
+		if (event.getCause() == IgniteCause.SPREAD) if (_clans.getClanUtility().isBorderlands(event.getBlock().getLocation())) event.setCancelled(true);
 	}
-
-	@EventHandler(priority = EventPriority.LOW) 
+	
+	@EventHandler(priority = EventPriority.LOW)
 	public void BlockPlace(BlockPlaceEvent event)
 	{
-		if (event.isCancelled())
-			return;
+		if (event.isCancelled()) return;
 		
-		if (event.getBlock().getType() != Material.LADDER)
-			return;
+		if (event.getBlock().getType() != Material.LADDER) return;
 		
-		if (Clans.getClanUtility().getAccess(event.getPlayer(), event.getBlock().getLocation()) == ClanRelation.SELF)
-			return;
+		if (_clans.getClanUtility().getAccess(event.getPlayer(), event.getBlock().getLocation()) == ClanRelation.SELF) return;
 		
 		final Block block = event.getBlock();
 		
-		UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(Clans.getPlugin(), new Runnable()
+		UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(_clans.getPlugin(), new Runnable()
 		{
 			public void run()
 			{
-				Clans.getBlockRestore().Add(block, 65, block.getData(), 30000);
+				_clans.getBlockRestore().add(block, 65, block.getData(), 30000);
 				
-				BlockRestoreData data = Clans.getBlockRestore().GetData(block);
+				BlockRestoreData data = _clans.getBlockRestore().getData(block);
 				if (data != null)
 				{
 					data.setFromId(0);
-					data.setFromData((byte)0);
+					data.setFromData((byte) 0);
 				}
 			}
 		}, 0);
 		
 	}
-
-	@EventHandler(priority = EventPriority.LOW) 
+	
+	@EventHandler
+	public void onFishHookEvent(PlayerFishEvent event)
+	{
+		if (event.getCaught() instanceof Player)
+		{
+			Player defender = (Player) event.getCaught();
+			Player attacker = event.getPlayer();
+			
+			if (!_clans.getClanUtility().canHurt(defender, attacker))
+			{
+				event.setCancelled(true);
+				ClanRelation rel = _clans.getRelation(defender, attacker);
+				UtilPlayer.message(attacker, F.main("Clans", "You cannot harm " + _clans.getClanUtility().mRel(rel, defender.getName(), false) + "."));
+			}
+		}
+	}
+	
+	@EventHandler
+	public void onPlayerFillBucket(PlayerInteractEvent event)
+	{
+		ItemStack itemInHand = event.getPlayer().getItemInHand();
+		
+		if (UtilItem.matchesMaterial(itemInHand, Material.BUCKET) && UtilEvent.isAction(event, ActionType.R))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	@EventHandler
+	public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event)
+	{
+		Material bucket = event.getBucket();
+		
+		if (bucket == Material.LAVA_BUCKET || bucket == Material.WATER_BUCKET)
+		{
+			event.setCancelled(true);
+			UtilPlayer.message(event.getPlayer(), F.main("Clans", "You cannot empty buckets!"));
+		}
+	}
+	
+	@EventHandler
+	public final void onFoodLevelChangeEvent(FoodLevelChangeEvent event)
+	{
+		((Player) event.getEntity()).setSaturation(3.8F); // While not entirely
+															// accurate, this is
+															// a pretty good
+															// guess at original
+															// food level
+															// changes
+	}
+	
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void BlockBreak(BlockBreakEvent event)
 	{
-		if (event.isCancelled() || event.getPlayer().getWorld().getEnvironment() != Environment.NORMAL || event.getPlayer().getGameMode() == GameMode.CREATIVE)
-			return;
+		if (event.getPlayer().getWorld().getEnvironment() != Environment.NORMAL || event.getPlayer().getGameMode() == GameMode.CREATIVE) return;
 		
-		String mimic = Clans.Get(event.getPlayer()).getMimic();
+		String mimic = _clans.Get(event.getPlayer()).getMimic();
 		
 		if (mimic.length() != 0)
 		{
-			if (Clans.getClanUtility().searchClanPlayer(event.getPlayer(), mimic, false) != null)
+			if (_clans.getClanUtility().searchClanPlayer(event.getPlayer(), mimic, false) != null)
 				mimic = C.cGray + " You are currently mimicing " + C.cGold + mimic;
 			else
 				mimic = "";
 		}
 		
-		//Borderlands
-		if (Clans.getClanUtility().isBorderlands(event.getBlock().getLocation()) && event.getPlayer().getGameMode() != GameMode.CREATIVE)
+		// Borderlands
+		if (_clans.getClanUtility().isBorderlands(event.getBlock().getLocation()) && event.getPlayer().getGameMode() != GameMode.CREATIVE)
 		{
-			//Disallow
+			// Disallow
 			event.setCancelled(true);
-
-			//Inform
-			UtilPlayer.message(event.getPlayer(), F.main("Clans", "You can not break " +
-					F.elem(ItemStackFactory.Instance.GetName(event.getBlock(), true)) +
-					" in " + 
-					F.elem("Borderlands") +
-					"."));
+			
+			// Inform
+			UtilPlayer.message(event.getPlayer(), F.main("Clans", "You can not break blocks in " + F.elem("Borderlands") + "."));
 			return;
 		}
-
-		if (Clans.getClanBlocks().canBreak(event.getBlock().getTypeId()))
-			return;
-
-		if (Clans.getClanUtility().getAccess(event.getPlayer(), event.getBlock().getLocation()) == ClanRelation.SELF)
+		
+		if (_clans.getClanBlocks().canBreak(event.getBlock().getTypeId())) return;
+		
+		if (_clans.getClanUtility().getAccess(event.getPlayer(), event.getBlock().getLocation()) == ClanRelation.SELF)
 		{
-			//Disallow Shops
-			if (event.getBlock().getType() == Material.ENDER_CHEST || event.getBlock().getType() == Material.ENCHANTMENT_TABLE)
-				if (Clans.getClanUtility().isSafe(event.getBlock().getLocation()))
+			// Disallow Shops
+			if (event.getBlock().getType() == Material.ENDER_CHEST || event.getBlock().getType() == Material.ENCHANTMENT_TABLE) if (_clans.getClanUtility().isSafe(event.getBlock().getLocation()))
+			{
+				// Disallow
+				event.setCancelled(true);
+				
+				// Inform
+				UtilPlayer.message(event.getPlayer(), F.main("Clans", "You can not break blocks in " + _clans.getClanUtility().getOwnerStringRel(event.getBlock().getLocation(), event.getPlayer()) + C.mBody + "'s Territory."));
+			}
+			
+			// Disallow Recruit Chest
+			if (_clans.getClanUtility().isClaimed(event.getBlock().getLocation())) if (event.getBlock().getTypeId() == 54)
+			{
+				if (_clans.getClanUtility().getRole(event.getPlayer()) == ClanRole.RECRUIT)
 				{
-					//Disallow
+					// Disallow
 					event.setCancelled(true);
-
-					//Inform
-					UtilPlayer.message(event.getPlayer(), F.main("Clans", "You can not break " +
-							F.elem(ItemStackFactory.Instance.GetName(event.getBlock(), true)) +
-							" in " + 
-							Clans.getClanUtility().getOwnerStringRel(event.getBlock().getLocation(), event.getPlayer().getName()) +
-							"."));
+					
+					// Inform
+					UtilPlayer.message(event.getPlayer(), F.main("Clans", "Clan Recruits cannot break " + F.elem(ItemStackFactory.Instance.GetName(event.getBlock(), true)) + "."));
 				}
-
-			//Disallow Recruit Chest
-			if (Clans.getClanUtility().isClaimed(event.getBlock().getLocation()))
-				if (event.getBlock().getTypeId() == 54)
-				{
-					if (Clans.getClanUtility().getRole(event.getPlayer()) == ClanRole.RECRUIT)
-					{
-						//Disallow
-						event.setCancelled(true);
-
-						//Inform
-						UtilPlayer.message(event.getPlayer(), F.main("Clans", "Clan Recruits cannot break " +
-								F.elem(ItemStackFactory.Instance.GetName(event.getBlock(), true)) + "."));
-					}
-				}
-
-			//Allow
+			}
+			
+			// Allow
 			return;
 		}
-
-		//Disallow
+		
+		if (_clans.getWarManager().allowFromInvade(event.getBlock().getLocation(), event.getPlayer()))
+		{
+			// Allow because of invasion
+			return;
+		}
+		
+		// Disallow
 		event.setCancelled(true);
-
-		//Inform
-		UtilPlayer.message(event.getPlayer(), F.main("Clans", "You can not break " +
-				F.elem(ItemStackFactory.Instance.GetName(event.getBlock(), true)) +
-				" in " + 
-				Clans.getClanUtility().getOwnerStringRel(event.getBlock().getLocation(), event.getPlayer().getName()) +
-				"." + 
-				mimic));
+		
+		// Inform
+		UtilPlayer.message(event.getPlayer(), F.main("Clans", "You can not break blocks in " + _clans.getClanUtility().getOwnerStringRel(event.getBlock().getLocation(), event.getPlayer()) + C.mBody + "'s Territory." + mimic));
 	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
+	
+	@EventHandler
+	public void respawn(PlayerRespawnEvent event)
+	{
+		_clans.getItemMapManager().setMap(event.getPlayer());
+	}
+	
+	@EventHandler(priority = EventPriority.LOW)
 	public void Damage(CustomDamageEvent event)
 	{
-		if (event.IsCancelled())
-			return;
+		if (event.IsCancelled()) return;
+		
+		Player damagee = event.GetDamageePlayer();
+		if (damagee == null) return;
 		
-		Player damagee = event.GetDamageePlayer();	
-		if (damagee == null)	return;
-
-		if (Clans.getClanUtility().isSafe(damagee))
-			event.SetCancelled("Safe Zone");	
-
 		Player damager = event.GetDamagerPlayer(true);
-		if (damager == null)	return;
-
-		if (!Clans.getClanUtility().canHurt(damagee, damager))
+		if (damager == null) return;
+		
+		if (!_clans.getClanUtility().canHurt(damagee, damager))
 		{
-			//Cancel
+			// Cancel
 			event.SetCancelled("Clans Ally");
-
-			//Inform
+			
+			// Inform
 			if (damager != null)
 			{
-				ClanRelation rel = Clans.getRelation(damagee.getName(), damager.getName());
-				UtilPlayer.message(damager, F.main("Clans", 
-						"You cannot harm " + Clans.getClanUtility().mRel(rel, damagee.getName(), false) + "."));
-			}		
+				ClanRelation rel = _clans.getRelation(damagee, damager);
+				UtilPlayer.message(damager, F.main("Clans", "You cannot harm " + _clans.getClanUtility().mRel(rel, damagee.getName(), false) + "."));
+			}
 		}
 	}
-
-	//Block Interact and Placement
+	
+	// Block Interact and Placement
 	public void Interact(PlayerInteractEvent event)
 	{
 		Player player = event.getPlayer();
-
-		if (player.getWorld().getEnvironment() != Environment.NORMAL)
-			return;
-
-		if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.LEFT_CLICK_BLOCK)
-			return;
-
-		//Block Interaction
-		Location loc = event.getClickedBlock().getRelative(event.getBlockFace()).getLocation();
-		if (UtilBlock.usable(event.getClickedBlock()))		loc = event.getClickedBlock().getLocation();
 		
-		//Borderlands
-		if (	player.getGameMode() != GameMode.CREATIVE &&
-				player.getItemInHand() != null && 
-				Clans.getClanBlocks().denyUsePlace(player.getItemInHand().getTypeId()) &&
-				Clans.getClanUtility().isBorderlands(event.getClickedBlock().getLocation()))
+		if (player.getWorld().getEnvironment() != Environment.NORMAL) return;
+		
+		if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.LEFT_CLICK_BLOCK) return;
+		
+		// Block Interaction
+		Location loc = event.getClickedBlock().getRelative(event.getBlockFace()).getLocation();
+		if (UtilBlock.usable(event.getClickedBlock())) loc = event.getClickedBlock().getLocation();
+		
+		if (_clans.getWarManager().allowFromInvade(loc, event.getPlayer()))
 		{
-			//Disallow
-			event.setCancelled(true);
-
-			//Inform
-			UtilPlayer.message(player, F.main("Clans", "You cannot use/place " +
-					F.elem(ItemStackFactory.Instance.GetName(event.getClickedBlock(), true)) +
-					" in " + 
-					F.elem("Borderlands") +
-					"."));
-
+			// Allow because of invasion
 			return;
 		}
-
-		ClanRelation access = Clans.getClanUtility().getAccess(player, loc);
 		
-		//Hoe Return
+		// Borderlands
+		if (player.getGameMode() != GameMode.CREATIVE && player.getItemInHand() != null && _clans.getClanBlocks().denyUsePlace(player.getItemInHand().getTypeId()) && _clans.getClanUtility().isBorderlands(event.getClickedBlock().getLocation()))
+		{
+			// Disallow
+			event.setCancelled(true);
+			
+			// Inform
+			UtilPlayer.message(player, F.main("Clans", "You cannot place blocks in " + F.elem("Borderlands") + "."));
+			return;
+		}
+		
+		ClanRelation access = _clans.getClanUtility().getAccess(player, loc);
+		ClanInfo clan = _clans.getClan(player);
+		ClanInfo blockClan = _clans.getClanUtility().getClaim(loc) == null ? null : _clans.getClan(_clans.getClanUtility().getClaim(loc).Owner);
+		
+		// Doors, chests, & furnaces
+		if (blockClan != null && !blockClan.equals(clan) && (event.getAction() == Action.RIGHT_CLICK_BLOCK && (loc.getBlock().getType().name().contains("DOOR") || UtilItem.doesHaveGUI(loc.getBlock().getType()))))
+		{
+			UtilPlayer.message(player, F.main("Clans", "You are not allowed to use that here."));
+			event.setCancelled(true);
+		}
+		
+		// Hoe Return
 		if (access != ClanRelation.SELF && !UtilBlock.usable(event.getClickedBlock()))
 		{
 			if (UtilGear.isHoe(player.getItemInHand()))
@@ -326,220 +323,429 @@ public class ClansGame extends MiniPlugin
 				return;
 			}
 		}
-
-		//Full Access
+		
+		// Full Access
 		if (access == ClanRelation.SELF)
 		{
-			//Recruits cannot open Chests  // IN OWN CLAIMED LAND
-			if (event.getClickedBlock().getTypeId() == 54 && Clans.getClanUtility().getOwner(loc) != null)
+			// Recruits cannot open Chests // IN OWN CLAIMED LAND
+			if (event.getClickedBlock().getTypeId() == 54 && _clans.getClanUtility().getOwner(loc) != null)
 			{
-				if (Clans.getClanUtility().getRole(player) == ClanRole.RECRUIT)
+				if (_clans.getClanUtility().getRole(player) == ClanRole.RECRUIT)
 				{
-					//Disallow
+					// Disallow
 					event.setCancelled(true);
-
-					//Inform
-					UtilPlayer.message(player, F.main("Clans", "Clan Recruits cannot access " +
-							F.elem(ItemStackFactory.Instance.GetName(event.getClickedBlock(), true)) +
-							"."));
+					
+					// Inform
+					UtilPlayer.message(player, F.main("Clans", "Clan Recruits cannot access " + F.elem(ItemStackFactory.Instance.GetName(event.getClickedBlock(), true)) + "."));
 				}
 			}
-
-			//Wilderness Adjacent
-			if (	event.getAction() == Action.RIGHT_CLICK_BLOCK && 
-					!UtilBlock.usable(event.getClickedBlock()) &&
-					player.getItemInHand() != null && 
-					Clans.getClanBlocks().denyUsePlace(player.getItemInHand().getTypeId()) &&
-					!Clans.getClanUtility().isClaimed(loc))
+			
+			// Wilderness Adjacent
+			if (event.getAction() == Action.RIGHT_CLICK_BLOCK && !UtilBlock.usable(event.getClickedBlock()) && player.getItemInHand() != null && _clans.getClanBlocks().denyUsePlace(player.getItemInHand().getTypeId()) && !_clans.getClanUtility().isClaimed(loc))
 			{
-
+				
 				String enemy = null;
 				boolean self = false;
-
-				for (int x=-1 ; x<=1 ; x++)
-					for (int z=-1 ; z<=1 ; z++)
+				
+				for (int x = -1; x <= 1; x++)
+					for (int z = -1; z <= 1; z++)
 					{
-						if (self)
-							continue;
-
-						if (x != 0 && z != 0 || x == 0 && z == 0)
-							continue;
-
-						Location sideLoc = new Location(loc.getWorld(), loc.getX()+x, loc.getY(), loc.getZ()+z);
-
-						if (Clans.getClanUtility().isSelf(player.getName(), sideLoc))
-							self = true;
-
-						if (enemy != null)
-							continue;
-
-						if (Clans.getClanUtility().getAccess(player, sideLoc) != ClanRelation.SELF)
-							enemy = Clans.getClanUtility().getOwnerStringRel(
-									new Location(loc.getWorld(), loc.getX()+x, loc.getY(), loc.getZ()+z), 
-									player.getName());
+						if (self) continue;
+						
+						if (x != 0 && z != 0 || x == 0 && z == 0) continue;
+						
+						Location sideLoc = new Location(loc.getWorld(), loc.getX() + x, loc.getY(), loc.getZ() + z);
+						
+						if (_clans.getClanUtility().isSelf(player, sideLoc)) self = true;
+						
+						if (enemy != null) continue;
+						
+						if (_clans.getClanUtility().getAccess(player, sideLoc) != ClanRelation.SELF) enemy = _clans.getClanUtility().getOwnerStringRel(new Location(loc.getWorld(), loc.getX() + x, loc.getY(), loc.getZ() + z), player);
 					}
-
+					
 				if (enemy != null && !self)
 				{
-					//Disallow
+					// Disallow
 					event.setCancelled(true);
-
-					//Inform
-					UtilPlayer.message(player, F.main("Clans", "You cannot use/place " +
-							F.elem(ItemStackFactory.Instance.GetName(player.getItemInHand(), true)) +
-							" next to " + 
-							enemy +
-							"."));
-
+					
+					// Inform
+					UtilPlayer.message(player, F.main("Clans", "You cannot place blocks next to " + enemy + "."));
+					
 					return;
 				}
 			}
-
+			
 			return;
 		}
-
-		String mimic = Clans.Get(player).getMimic();
+		
+		String mimic = _clans.Get(player).getMimic();
 		
 		if (mimic.length() != 0)
 		{
-			if (Clans.getClanUtility().searchClanPlayer(player, mimic, false) != null)
+			if (_clans.getClanUtility().searchClanPlayer(player, mimic, false) != null)
 				mimic = C.cGray + " You are currently mimicing " + C.cGold + mimic;
 			else
 				mimic = "";
 		}
 		
-		//Deny Interaction
-		if (Clans.getClanBlocks().denyInteract(event.getClickedBlock().getTypeId()))
+		// Deny Interaction
+		if (_clans.getClanBlocks().denyInteract(event.getClickedBlock().getTypeId()))
 		{
-			//Block Action
+			// Block Action
 			if (access == ClanRelation.NEUTRAL)
 			{
-				//Allow Field Chest
+				Location home = event.getClickedBlock() == null ? null : _clans.getClanUtility().getClanByClanName(_clans.getClanUtility().getClaim(event.getClickedBlock().getLocation()).Owner).getHome();
+				
+				// Allow Field Chest
 				if (event.getClickedBlock().getTypeId() == 54)
-					if (Clans.getClanUtility().isSpecial(event.getClickedBlock().getLocation(), "Fields"))
+				{
+					if (_clans.getClanUtility().isSpecial(event.getClickedBlock().getLocation(), "Fields"))
+					{
 						return;
-
-				//Disallow
+					}
+				}
+				
+				// Allow Clan's Home
+				if (home != null && event.getClickedBlock().getLocation().distance(home) <= 2 && event.getClickedBlock().getType().equals(Material.BED_BLOCK))
+				{
+					return;
+				}
+				
+				// Disallow
 				event.setCancelled(true);
 				
-				//Inform
-				UtilPlayer.message(player, F.main("Clans", "You cannot use " +
-						F.elem(ItemStackFactory.Instance.GetName(event.getClickedBlock(), true)) +
-						" in " + 
-						Clans.getClanUtility().getOwnerStringRel(event.getClickedBlock().getLocation(), 
-								player.getName()) +
-						"." + 
-						mimic));
+				// Inform
+				UtilPlayer.message(player, F.main("Clans", "You cannot use items in " + _clans.getClanUtility().getOwnerStringRel(event.getClickedBlock().getLocation(), player)  + C.mBody + "'s Territory." + mimic));
 				
 				return;
 			}
-			//Block is not Trust Allowed
-			else if (!Clans.getClanBlocks().allowInteract(event.getClickedBlock().getTypeId()) || access != ClanRelation.ALLY_TRUST)
+			// Block is not Trust Allowed
+			else if (!_clans.getClanBlocks().allowInteract(event.getClickedBlock().getTypeId()) || access != ClanRelation.ALLY_TRUST)
 			{
-				//Disallow
-				event.setCancelled(true);
-
-				//Inform
-				UtilPlayer.message(player, F.main("Clans", "You cannot use " +
-						F.elem(ItemStackFactory.Instance.GetName(event.getClickedBlock(), true)) +
-						" in " + 
-						Clans.getClanUtility().getOwnerStringRel(event.getClickedBlock().getLocation(), 
-								player.getName()) +
-						"." + 
-						mimic));
-
-				return;
-			}	
-		}
-
-		//Block Placement
-		if (event.getAction() == Action.RIGHT_CLICK_BLOCK)
-			if (player.getItemInHand().getType() != Material.AIR)
-				if (Clans.getClanBlocks().denyUsePlace(player.getItemInHand().getTypeId()))
+				Location home = event.getClickedBlock() == null ? null : _clans.getClanUtility().getClanByClanName(_clans.getClanUtility().getClaim(event.getClickedBlock().getLocation()).Owner).getHome();
+				
+				// Allow Clan's Home
+				if (home != null && event.getClickedBlock().getLocation().distance(home) <= 2 && event.getClickedBlock().getType().equals(Material.BED_BLOCK))
 				{
-					//Disallow
-					event.setCancelled(true);
-
-					//Inform
-					UtilPlayer.message(player, F.main("Clans", "You cannot use/place " +
-							F.elem(ItemStackFactory.Instance.GetName(player.getItemInHand(), true)) +
-							" in " + 
-							Clans.getClanUtility().getOwnerStringRel(event.getClickedBlock().getRelative(event.getBlockFace()).getLocation(), 
-									player.getName()) +
-							"." + 
-							mimic));
-
 					return;
 				}
+				
+				// Disallow
+				event.setCancelled(true);
+				
+				// Inform
+				UtilPlayer.message(player, F.main("Clans", "You cannot use items in " + _clans.getClanUtility().getOwnerStringRel(event.getClickedBlock().getLocation(), player)  + C.mBody +  "'s Territory." + mimic));
+				
+				return;
+			}
+		}
+		
+		// Block Placement
+		if (event.getAction() == Action.RIGHT_CLICK_BLOCK)
+		{
+			if (player.getItemInHand().getType() != Material.AIR)
+			{
+				if (player.getGameMode() != GameMode.CREATIVE && _clans.getClanBlocks().denyUsePlace(player.getItemInHand().getTypeId()))
+				{
+					// Disallow
+					event.setCancelled(true);
+					
+					// Inform
+					UtilPlayer.message(player, F.main("Clans", "You cannot place blocks in " + _clans.getClanUtility().getOwnerStringRel(event.getClickedBlock().getRelative(event.getBlockFace()).getLocation(), player)  + C.mBody +  "'s Territory." + mimic));
+					
+					return;
+				}
+			}
+		}
 	}
-
+	
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void doorPlaced(BlockPlaceEvent event)
+	{
+		if (event.getBlockPlaced().getType().equals(Material.ACACIA_DOOR)
+	     || event.getBlockPlaced().getType().equals(Material.WOODEN_DOOR)
+	     || event.getBlockPlaced().getType().equals(Material.BIRCH_DOOR)
+	     || event.getBlockPlaced().getType().equals(Material.DARK_OAK_DOOR)
+	     || event.getBlockPlaced().getType().equals(Material.JUNGLE_DOOR)
+	     || event.getBlockPlaced().getType().equals(Material.SPRUCE_DOOR)
+	     || event.getBlockPlaced().getType().equals(Material.WOOD_DOOR)
+	     || event.getBlockPlaced().getType().equals(Material.IRON_DOOR_BLOCK))
+		{
+			ClanTerritory claim = _clans.getClanUtility().getClaim(event.getBlockPlaced().getLocation());
+			
+			if (claim != null && (claim.Owner.equals("Spawn") || claim.Owner.equals("Shops")))
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+	
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void Piston(BlockPistonExtendEvent event)
 	{
-		ClanInfo pistonClan = Clans.getClanUtility().getOwner(event.getBlock().getLocation());
-
+		ClanInfo pistonClan = _clans.getClanUtility().getOwner(event.getBlock().getLocation());
+		
 		Block push = event.getBlock();
-		for (int i=0 ; i<13 ; i++)
+		for (int i = 0; i < 13; i++)
 		{
 			push = push.getRelative(event.getDirection());
-
+			
 			Block front = push.getRelative(event.getDirection()).getRelative(event.getDirection());
-
-			if (push.getType() == Material.AIR)
-				return;
-
-			ClanInfo pushClan = Clans.getClanUtility().getOwner(front.getLocation());
-
-			if (pushClan == null)
-				continue;
-
-			if (pushClan.isAdmin())
-				continue;
-
+			
+			if (push.getType() == Material.AIR) return;
+			
+			ClanInfo pushClan = _clans.getClanUtility().getOwner(front.getLocation());
+			
+			if (pushClan == null) continue;
+			
+			if (pushClan.isAdmin()) continue;
+			
 			if (pistonClan == null)
 			{
 				push.getWorld().playEffect(push.getLocation(), Effect.STEP_SOUND, push.getTypeId());
 				event.setCancelled(true);
 				return;
 			}
-
-			if (pistonClan.equals(pushClan))
-				continue;
-
+			
+			if (pistonClan.equals(pushClan)) continue;
+			
 			push.getWorld().playEffect(push.getLocation(), Effect.STEP_SOUND, push.getTypeId());
 			event.setCancelled(true);
 			return;
-		}			
+		}
 	}
-
+	
 	@EventHandler
 	public void Quit(PlayerQuitEvent event)
 	{
-		ClanInfo clan = Clans.getClanUtility().getClanByPlayer(event.getPlayer());
-		if (clan == null)		return;
-
+		ClanInfo clan = _clans.getClanUtility().getClanByPlayer(event.getPlayer());
+		if (clan == null) return;
+		
 		clan.setLastOnline(new Timestamp(System.currentTimeMillis()));
 	}
-
+	
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void Explosion(EntityExplodeEvent event)
 	{
 		try
 		{
-			if (event.getEntityType() != EntityType.PRIMED_TNT && event.getEntityType() != EntityType.MINECART_TNT)
-				return;
+			if (event.getEntityType() != EntityType.PRIMED_TNT && event.getEntityType() != EntityType.MINECART_TNT) return;
 		}
 		catch (Exception e)
 		{
 			return;
 		}
-
-		ClanInfo clan = Clans.getClanUtility().getOwner(event.getEntity().getLocation());
-		if (clan == null)		return;
-
+		
+		ClanInfo clan = _clans.getClanUtility().getOwner(event.getEntity().getLocation());
+		if (clan == null) return;
+		
+		if (_clans.getWarManager().isBeingInvaded(clan))
+		{
+			// Allow because of invasion
+			return;
+		}
+		
 		if (!clan.isOnline())
 			event.setCancelled(true);
 		else
 			clan.inform(C.cRed + "Your Territory is under attack!", null);
 	}
+	
+	@EventHandler
+	public void onClanHomeInteract(PlayerInteractEvent event)
+	{
+		if (!UtilEvent.isAction(event, ActionType.L_BLOCK) && !UtilEvent.isAction(event, ActionType.R_BLOCK))
+		{
+			return;
+		}
+		
+		ClanInfo clan = _clans.getClan(event.getPlayer());
+		
+		Block block = event.getClickedBlock();
+		Player player = event.getPlayer();
+		
+		if (clan == null)
+		{
+			for (String otherClanName : _clans.getClanNameSet())
+			{
+				boolean done = false;
+				ClanInfo otherClan = _clans.getClan(otherClanName);
+				
+				if (otherClan.getHome() == null)
+				{
+					return;
+				}
+				
+				if (!(UtilMath.offset(block.getLocation(), otherClan.getHome()) < 3))
+				{
+					return;
+				}
+				
+				for (int x = -2; x < 2; x++)
+				{
+					for (int z = -2; z < 2; z++)
+					{
+						Block otherBlock = event.getClickedBlock().getLocation().add(x, 0, z).getBlock();
+						if (otherBlock.getType().equals(Material.BED_BLOCK))
+						{
+							if (UtilEvent.isAction(event, ActionType.R_BLOCK))
+							{
+								event.setCancelled(true);
+								done = true;
+								break;
+							}
+						}
+					}
+					
+					if (done)
+					{
+						break;
+					}
+				}
+				
+				if (done)
+				{
+					break;
+				}
+			}
+			
+			return;
+		}
+		
+		if (clan.getHome() == null)
+		{
+			return;
+		}
+		
+		if (!(UtilMath.offset(block.getLocation(), clan.getHome()) < 3))
+		{
+			return;
+		}
+		
+		for (int x = -2; x < 2; x++)
+		{
+			for (int z = -2; z < 2; z++)
+			{
+				Block otherBlock = event.getClickedBlock().getLocation().clone().add(x, 0, z).getBlock();
+				if (otherBlock.getType().equals(Material.BED_BLOCK))
+				{
+					if (UtilEvent.isAction(event, ActionType.R_BLOCK))
+					{
+						event.setCancelled(true);
+						break;
+					}
+					
+					if (clan.getMembers().get(player.getUniqueId()).getRole() == ClanRole.LEADER || clan.getMembers().get(player.getUniqueId()).getRole() == ClanRole.ADMIN)
+					{
+						break;
+					}
+					else
+					{
+						UtilPlayer.message(player, F.main("Clans", "Only the Clan Leader and Admins can manage the Clan Home."));
+						break;
+					}
+				}
+			}
+		}
+	}
+	
+	@EventHandler
+	public void onPlaceBed(BlockPlaceEvent event)
+	{
+		if (event.getItemInHand().getType().equals(Material.BED) || event.getItemInHand().getType().equals(Material.BED_BLOCK))
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Clans", "You cannot manually place beds, to set your clan home, type " + F.elem("/c sethome") + "."));
+			event.setCancelled(true);
+		}
+	}
+	
+	@EventHandler
+	public void onClanHomeDestroyed(BlockBreakEvent event)
+	{
+		ClanInfo userClan = _clans.getClan(event.getPlayer());
+		
+		Block block = event.getBlock();
+		Player player = event.getPlayer();
+		
+		ClanInfo blockClan = null;
+		ClanTerritory claim = _clans.getClanUtility().getClaim(block.getLocation());
+		
+		if (claim != null)
+		{
+			if (ClansBlacklist.isValidClanName(claim.Owner))
+			{
+				blockClan = _clans.getClan(claim.Owner);
+			}
+		}
+		
+		if (blockClan == null)
+		{
+			return;
+		}
+		
+		if (blockClan.getHome() == null)
+		{
+			return;
+		}
+		
+		if (UtilMath.offset(block.getLocation(), blockClan.getHome()) > 2)
+		{
+			return;
+		}
+		
+		if (!block.getType().equals(Material.BED_BLOCK))
+		{
+			return;
+		}
+		
+		if (!blockClan.equals(userClan))
+		{
+			if (userClan != null && blockClan.isAlly(userClan))
+			{
+				UtilPlayer.message(player, F.main("Clans", "You cannot remove an Ally's Clan Home."));
+			}
+			else
+			{
+				UtilPlayer.message(player, F.main("Clans", "You have destroyed " + F.elem(blockClan.getName()) + "'s Clan Home!"));
+				
+				UtilBlock.deleteBed(blockClan.getHome());
+				
+				blockClan.setHome(null);
+			}
+			
+			return;
+		}
+		
+		if (userClan.getMembers().get(player.getUniqueId()).getRole() == ClanRole.LEADER || userClan.getMembers().get(player.getUniqueId()).getRole() == ClanRole.ADMIN)
+		{
+			event.setCancelled(true);
+			
+			UtilBlock.deleteBed(blockClan.getHome());
+			
+			blockClan.setHome(null);
+			UtilPlayer.message(player, F.main("Clans", "You have removed your Clan Home."));
+		}
+		else
+		{
+			event.setCancelled(true);
+			UtilPlayer.message(player, F.main("Clans", "Only the Clan Leader and Admins can remove the Clan Home."));
+		}
+	}
+	
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() == UpdateType.FAST)
+		{
+			for (Player player : Bukkit.getOnlinePlayers())
+			{
+				if (player.getGameMode() == GameMode.CREATIVE)
+				{
+					return;
+				}
+				
+				UtilInv.removeAll(player, Material.BED, (byte) 0);
+			}
+		}
+	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
index 05b6bb0e9..aa8efa0bb 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
@@ -1,49 +1,112 @@
 package mineplex.game.clans.clans;
 
+import java.io.File;
+import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 import java.util.TimeZone;
+import java.util.UUID;
 
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+import org.bukkit.event.entity.EntityShootBowEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerKickEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.Recipe;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import mineplex.core.CustomTagFix;
 import mineplex.core.MiniClientPlugin;
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.achievement.AchievementManager;
 import mineplex.core.blockrestore.BlockRestore;
+import mineplex.core.chat.Chat;
+import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
 import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
 import mineplex.core.creature.Creature;
 import mineplex.core.creature.event.CreatureSpawnCustomEvent;
 import mineplex.core.disguise.DisguiseManager;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.energy.Energy;
+import mineplex.core.explosion.Explosion;
+import mineplex.core.hologram.Hologram;
+import mineplex.core.hologram.HologramManager;
 import mineplex.core.movement.Movement;
 import mineplex.core.npc.NpcManager;
 import mineplex.core.packethandler.PacketHandler;
+import mineplex.core.portal.Portal;
+import mineplex.core.preferences.PreferencesManager;
 import mineplex.core.projectile.ProjectileManager;
 import mineplex.core.stats.StatsManager;
+import mineplex.core.task.TaskManager;
 import mineplex.core.teleport.Teleport;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClanTips.TipType;
 import mineplex.game.clans.clans.ClansUtility.ClanRelation;
+import mineplex.game.clans.clans.commands.ClanManagementCommand;
 import mineplex.game.clans.clans.commands.ClansAllyChatCommand;
 import mineplex.game.clans.clans.commands.ClansChatCommand;
 import mineplex.game.clans.clans.commands.ClansCommand;
-import mineplex.game.clans.clans.commands.ServerTimeCommand;
-import mineplex.game.clans.clans.repository.ClanTerritory;
-import mineplex.game.clans.clans.repository.tokens.ClanMemberToken;
-import mineplex.game.clans.clans.repository.tokens.ClanTerritoryToken;
-import mineplex.game.clans.clans.repository.tokens.ClanToken;
+import mineplex.game.clans.clans.commands.ClansLoginManager;
+import mineplex.game.clans.clans.commands.KillCommand;
+import mineplex.game.clans.clans.commands.MapCommand;
+import mineplex.game.clans.clans.commands.RegionsCommand;
+import mineplex.game.clans.clans.data.PlayerClan;
+import mineplex.game.clans.clans.event.ClansPlayerDeathEvent;
+import mineplex.game.clans.clans.gui.ClanShop;
+import mineplex.game.clans.clans.loot.LootManager;
+import mineplex.game.clans.clans.map.ItemMapManager;
+import mineplex.game.clans.clans.observer.ObserverManager;
+import mineplex.game.clans.clans.potato.PotatoManager;
+import mineplex.game.clans.clans.redis.ClanDeleteCommandHandler;
+import mineplex.game.clans.clans.redis.ClanLoadCommandHandler;
+import mineplex.game.clans.clans.regions.ClansRegions;
+import mineplex.game.clans.clans.scoreboard.ClansScoreboardManager;
+import mineplex.game.clans.clans.stuck.StuckManager;
+import mineplex.game.clans.clans.supplyDrop.SupplyDropManager;
+import mineplex.game.clans.clans.tntGenerator.TntGeneratorManager;
 import mineplex.game.clans.clans.war.WarManager;
+import mineplex.game.clans.clans.worldevent.WorldEventManager;
+import mineplex.game.clans.core.ClanDeleteCommand;
+import mineplex.game.clans.core.ClanLoadCommand;
+import mineplex.game.clans.core.repository.ClanTerritory;
+import mineplex.game.clans.core.repository.tokens.ClanMemberToken;
+import mineplex.game.clans.core.repository.tokens.ClanTerritoryToken;
+import mineplex.game.clans.core.repository.tokens.ClanToken;
+import mineplex.game.clans.economy.GoldManager;
 import mineplex.game.clans.fields.Field;
 import mineplex.game.clans.gameplay.Gameplay;
+import mineplex.game.clans.gameplay.safelog.SafeLog;
+import mineplex.game.clans.gameplay.safelog.npc.NPCManager;
+import mineplex.game.clans.items.GearManager;
+import mineplex.game.clans.spawn.Spawn;
+import mineplex.game.clans.tutorials.TutorialManager;
 import mineplex.minecraft.game.classcombat.Class.ClassManager;
+import mineplex.minecraft.game.classcombat.Class.ClientClass;
+import mineplex.minecraft.game.classcombat.Class.IPvpClass;
 import mineplex.minecraft.game.classcombat.Class.repository.token.CustomBuildToken;
 import mineplex.minecraft.game.classcombat.Condition.SkillConditionManager;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
@@ -56,154 +119,388 @@ import mineplex.minecraft.game.core.condition.ConditionManager;
 import mineplex.minecraft.game.core.damage.DamageManager;
 import mineplex.minecraft.game.core.fire.Fire;
 import mineplex.minecraft.game.core.mechanics.Weapon;
+import mineplex.serverdata.commands.ServerCommandManager;
 
-public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelation
+public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelation
 {
+	public static final int CLAIMABLE_RADIUS = 800;
+	public static final int WORLD_RADIUS = 1200;
 	private static final TimeZone TIME_ZONE = TimeZone.getDefault();
-
+	private static ClansManager _instance;
+	
+	public static ClansManager getInstance()
+	{
+		return _instance;
+	}
+	
 	private String _serverName;
 	
 	private CoreClientManager _clientManager;
 	private CombatManager _combatManager;
 	private ClansUtility _clanUtility;
+	private ClansScoreboardManager _scoreboard;
 	private ClansDataAccessLayer _clanDataAccess;
 	private ClansDisplay _clanDisplay;
 	private ClansAdmin _clanAdmin;
 	private ClansGame _clanGame;
 	private ClansBlocks _clanBlocks;
+	private ClansRegions _clanRegions;
 	private BlockRestore _blockRestore;
 	private Teleport _teleport;
 	private ConditionManager _condition;
 	private ClassCombatShop _classShop;
+	private HologramManager _hologramManager;
+	private GearManager _gearManager;
+	private LootManager _lootManager;
+	private DonationManager _donationManager;
+	
+	private TutorialManager _tutorialManager;
+	
 	private ClassManager _classManager;
+	
+	public ClassManager getClassManager()
+	{
+		return _classManager;
+	}
+	
 	private WarManager _warManager;
+	private ProjectileManager _projectileManager;
+	private WorldEventManager _worldEvent;
+	private Chat _chat;
+	private ItemMapManager _itemMapManager;
+	private DisguiseManager _disguiseManager;
+	private NpcManager _npcManager;
+	private Explosion _explosion;
+	private GoldManager _goldManager;
 	
 	private int _inviteExpire = 2;
 	private int _nameMin = 3;
 	private int _nameMax = 10;
 	private long _reclaimTime = 1800000;
 	private long _onlineTime = 1200000;
-
-	//Clans
+	
+	// Command Shop
+	private ClanShop _clanShop;
+	
+	// Clans
 	private NautHashMap<String, ClanInfo> _clanMap = new NautHashMap<String, ClanInfo>();
-	private NautHashMap<String, ClanInfo> _clanMemberMap = new NautHashMap<String, ClanInfo>();
+	// private NautHashMap<String, ClanInfo> _clanMemberNameMap = new
+	// NautHashMap<String, ClanInfo>();
+	private NautHashMap<UUID, ClanInfo> _clanMemberUuidMap = new NautHashMap<UUID, ClanInfo>();
 	private NautHashMap<String, ClanTerritory> _claimMap = new NautHashMap<String, ClanTerritory>();
 	private NautHashMap<String, Long> _unclaimMap = new NautHashMap<String, Long>();
 	
-	public String[] denyClan = new String[] {
-			"neut", "neutral", "sethome", "promote", "demote", "admin", "help", "create", "disband", "delete", "invite", "join", "kick", "ally", "trust", "claim", "unclaim", "territory", "home"};
+	public String UserDataDir = UtilServer.getServer().getWorlds().get(0).getWorldFolder().getPath() + File.separator + ".." + File.separator + "CLANS_USER_DATA" + File.separator;
 	
-	public ClansManager(JavaPlugin plugin, String serverName, CoreClientManager clientManager, DonationManager donationManager, BlockRestore blockRestore, Teleport teleport, String webServerAddress)
+	public ClanTips ClanTips;
+	
+	// Spawn area
+	
+	public ClansManager(JavaPlugin plugin, String serverName, PacketHandler packetHandler, CoreClientManager clientManager, DonationManager donationManager, PreferencesManager preferencesManager, BlockRestore blockRestore, Teleport teleport, Chat chat, GearManager gearManager, HologramManager hologramManager, String webServerAddress)
 	{
 		super("Clans Manager", plugin);
 		
+		_instance = this;
+		
 		_serverName = serverName;
 		_clientManager = clientManager;
 		_combatManager = new CombatManager(plugin);
+		_hologramManager = hologramManager;
 		
+		_chat = chat;
 		_blockRestore = blockRestore;
 		_teleport = teleport;
-				
+		_warManager = new WarManager(plugin, this);
+		
+		_donationManager = donationManager;
+		
+		_goldManager = new GoldManager(this, _clientManager, donationManager);
+		_gearManager = gearManager;
+		_lootManager = new LootManager(gearManager, _goldManager);
+		_disguiseManager = new DisguiseManager(plugin, packetHandler);
+		Creature creature = new Creature(plugin);
+		_npcManager = new NpcManager(plugin, creature);
+		_condition = new SkillConditionManager(plugin);
+		DamageManager damageManager = new DamageManager(plugin, _combatManager, _npcManager, _disguiseManager, _condition);
+		damageManager.addCommand(new KillCommand(damageManager));
+		_worldEvent = new WorldEventManager(plugin, this, damageManager, _lootManager, blockRestore, _clanRegions, null);
+		
+		TaskManager taskManager = new TaskManager(plugin, _clientManager, webServerAddress);
+		
+		_tutorialManager = new TutorialManager(plugin, _goldManager, taskManager, donationManager, preferencesManager, this, packetHandler);
+		
+		ClanTips = new ClanTips(plugin, this, preferencesManager);
+		
+		new StuckManager(this);
+		
+		_scoreboard = new ClansScoreboardManager(plugin, _tutorialManager, this, _warManager, _worldEvent, clientManager, donationManager);
+		// new MurderManager(plugin, this);
+		
 		_clanAdmin = new ClansAdmin(this);
 		_clanBlocks = new ClansBlocks();
-		_clanDataAccess = new ClansDataAccessLayer(this);
+		_clanDataAccess = new ClansDataAccessLayer(this, _scoreboard);
 		_clanDisplay = new ClansDisplay(plugin, this);
 		_clanGame = new ClansGame(plugin, this);
 		_clanUtility = new ClansUtility(this);
+		_itemMapManager = new ItemMapManager(this, _worldEvent);
+		new TntGeneratorManager(plugin, this);
+		new SupplyDropManager(plugin, this);
+		
+		_explosion = new Explosion(plugin, blockRestore);
+		
+		 new ClansLoginManager(getPlugin(), clientManager, _serverName);
+		
+		_clanShop = new ClanShop(this, clientManager, donationManager);
 		
 		Energy energy = new Energy(plugin);
-		PacketHandler packetHandler = new PacketHandler(plugin);
-		new CustomTagFix(plugin, packetHandler);
-		DisguiseManager disguiseManager = new DisguiseManager(plugin, packetHandler);
-		_condition = new SkillConditionManager(plugin);
-		Creature creature = new Creature(plugin);	
+		// TODO: Re-enable customtagfix with NCP update?
+		// new CustomTagFix(plugin, packetHandler);
 		
-		new Field(plugin, creature, _condition, energy, serverName);
+		new Field(plugin, creature, _condition, this, energy, serverName);
 		
-		DamageManager damageManager = new DamageManager(plugin, _combatManager, new NpcManager(plugin, creature), disguiseManager, _condition);
+		// Required managers to be initialized
+		new Spawn(plugin, this);
+		new NPCManager(this, _hologramManager);
+		new SafeLog(plugin, this);
+		new ObserverManager(plugin, _condition, this);
 		
+		new ClanEnergyTracker(plugin, this);
+		
+		new ClansAlphaManager(this, taskManager);
+
+		new PotatoManager(plugin, this);
+
 		new Weapon(plugin, energy);
 		new Gameplay(plugin, this, blockRestore, damageManager);
-		ProjectileManager throwManager = new ProjectileManager(plugin);
+		_projectileManager = new ProjectileManager(plugin);
 		Fire fire = new Fire(plugin, _condition, damageManager);
 		
 		HashSet<String> itemIgnore = new HashSet<String>();
 		itemIgnore.add("Proximity Explosive");
 		itemIgnore.add("Proximity Zapper");
 		
-		ItemFactory itemFactory = new ItemFactory(plugin, blockRestore, _condition, damageManager, energy, fire, throwManager, webServerAddress, itemIgnore);
-		SkillFactory skillManager = new SkillFactory(plugin, damageManager, this, _combatManager, _condition, throwManager, disguiseManager, blockRestore, fire, new Movement(plugin), teleport, energy, webServerAddress);
+		ItemFactory itemFactory = new ItemFactory(plugin, blockRestore, _condition, damageManager, energy, fire, _projectileManager, webServerAddress, itemIgnore);
+		SkillFactory skillManager = new SkillFactory(plugin, damageManager, this, _combatManager, _condition, _projectileManager, _disguiseManager, blockRestore, fire, new Movement(plugin), teleport, energy, webServerAddress);
 		skillManager.RemoveSkill("Dwarf Toss", "Block Toss");
+		skillManager.removeSkill("Whirlwind Axe");
+		skillManager.removeSkill("Shield Smash");
+		
+		_worldEvent.setFactory(skillManager);
 		_classManager = new ClassManager(plugin, _clientManager, donationManager, skillManager, itemFactory, webServerAddress);
 		
+		// Register redis based server commands
+		ServerCommandManager.getInstance().registerCommandType(ClanDeleteCommand.class, new ClanDeleteCommandHandler());
+		ServerCommandManager.getInstance().registerCommandType(ClanLoadCommand.class, new ClanLoadCommandHandler());
+		
 		StatsManager statsManager = new StatsManager(plugin, _clientManager);
 		AchievementManager achievementManager = new AchievementManager(statsManager, _clientManager, donationManager);
-        ClassShopManager shopManager = new ClassShopManager(plugin, _classManager, skillManager, itemFactory, achievementManager, _clientManager, false);
-        _classShop = new ClassCombatShop(shopManager, _clientManager, donationManager, true, "Class Shop");
-
-		_warManager = new WarManager(plugin, this);
-
+		ClassShopManager shopManager = new ClassShopManager(plugin, _classManager, skillManager, itemFactory, achievementManager, _clientManager);
+		_classShop = new ClassCombatShop(shopManager, _clientManager, donationManager, true, "Class Shop");
+		
 		ClanEnergyManager clanEnergyManager = new ClanEnergyManager(plugin, this, clientManager, donationManager);
 		
 		for (ClanToken token : _clanDataAccess.getRepository().retrieveClans())
 		{
-			ClanInfo clan = new ClanInfo(this, token);
-			_clanMap.put(token.Name, clan);
-			
-			for (ClanMemberToken memberToken : token.Members)
-				_clanMemberMap.put(memberToken.Name, clan);
-			
-			for (ClanTerritoryToken territoryToken : token.Territories)
-				_claimMap.put(territoryToken.Chunk, new ClanTerritory(territoryToken));
+			loadClan(token);
+		}
+		
+		// RedisDataRepository(ConnectionData writeConn, ConnectionData
+		// readConn, Region region, Class<T> elementType, String elementLabel)
+		// Initialize default region factions and territory
+		// (spawn/fields/borderlands)
+		_clanRegions = new ClansRegions(plugin, this);
+		_clanRegions.initializeRegions();
+		
+		List<Location> jumpOffHolograms = Arrays.asList(
+				// West Spawn
+				new Location(Spawn.getSpawnWorld(), -295.5, 204, 36.5),
+				new Location(Spawn.getSpawnWorld(), -295.5, 204, -26.5),
+				new Location(Spawn.getSpawnWorld(), -331.5, 204, 6.5),
+				new Location(Spawn.getSpawnWorld(), -266.5, 204, 6.5),
+				
+				// East Spawn
+				new Location(Spawn.getSpawnWorld(), 304.5, 207, -26.5),
+				new Location(Spawn.getSpawnWorld(), 332.5, 207, 6.5),
+				new Location(Spawn.getSpawnWorld(), 304.5, 207, 36.5),
+				new Location(Spawn.getSpawnWorld(), 268.5, 207, 6.5)
+		);
+		
+		List<Location> welcomeHolograms = Arrays.asList(
+				// West Spawn
+				new Location(Spawn.getSpawnWorld(), -304.5, 204, 6.5),
+				new Location(Spawn.getSpawnWorld(), -295.5, 204, 15.5),
+				new Location(Spawn.getSpawnWorld(), -286.5, 204, 6.5),
+				new Location(Spawn.getSpawnWorld(), -295.5, 204, -2.5),
+				
+				// East Spawn
+				new Location(Spawn.getSpawnWorld(), 295.5, 207, 6.5),
+				new Location(Spawn.getSpawnWorld(), 304.5, 207, -2.5),
+				new Location(Spawn.getSpawnWorld(), 313.5, 207, 6.5),
+				new Location(Spawn.getSpawnWorld(), 304.5, 207, 15.5)
+		);
+		
+		for (Location location : jumpOffHolograms)
+		{
+			Hologram hologram = new Hologram(hologramManager, location, 
+					C.cGreen + "Jump Off",
+					C.cGreen + "to begin your Clans adventure!");
+			hologram.start();
+		}
+		
+		for (Location location : welcomeHolograms)
+		{
+			Hologram hologram = new Hologram(hologramManager, location, 
+					C.cGreenB + "Welcome to Clans Alpha", 
+					C.cWhite + "Please be aware there may be bugs",
+					C.cWhite + "Map may reset at any time during Alpha!",
+					C.cWhite + "Type " + C.cYellow + "/clan" + C.cWhite + " to get started!"
+			);
+			hologram.start();
+		}
+		
+		// Disables beds from being crafted
+		Iterator<Recipe> it = _plugin.getServer().recipeIterator();
+		Recipe recipe;
+		while (it.hasNext())
+		{
+			recipe = it.next();
+			if (recipe != null && recipe.getResult().getType() == Material.BED)
+			{
+				it.remove();
+			}
 		}
 	}
 	
 	@Override
 	public void addCommands()
 	{
-		addCommand(new ClansCommand(this));
+		addCommand(new ClansCommand(this, _tutorialManager));
+		addCommand(new RegionsCommand(this));
 		addCommand(new ClansChatCommand(this));
 		addCommand(new ClansAllyChatCommand(this));
-		addCommand(new ServerTimeCommand(this));
+		addCommand(new ClanManagementCommand(this));
+		addCommand(new MapCommand(this));
 	}
-
+	
+	public void loadClan(ClanToken clanToken)
+	{
+		ClanInfo clan = new ClanInfo(this, clanToken);
+		_clanMap.put(clanToken.Name, clan);
+		
+		for (ClanMemberToken memberToken : clanToken.Members)
+		{
+			_clanMemberUuidMap.put(memberToken.PlayerUUID, clan);
+			// _clanMemberMap.put(memberToken.Name, clan);
+		}
+		
+		for (ClanTerritoryToken territoryToken : clanToken.Territories)
+			_claimMap.put(territoryToken.Chunk, new ClanTerritory(territoryToken));
+	}
+	
+	public DisguiseManager getDisguiseManager()
+	{
+		return _disguiseManager;
+	}
+	
+	public TutorialManager getTutorials()
+	{
+		return _tutorialManager;
+	}
+	
+	public NpcManager getNPCManager()
+	{
+		return _npcManager;
+	}
+	
+	public ClansRegions getClanRegions()
+	{
+		return _clanRegions;
+	}
+	
+	public DonationManager getDonationManager()
+	{
+		return _donationManager;
+	}
+	
+	public ItemMapManager getItemMapManager()
+	{
+		return _itemMapManager;
+	}
+	
+	public Explosion getExplosion()
+	{
+		return _explosion;
+	}
+	
 	public int getInviteExpire()
 	{
 		return _inviteExpire;
 	}
-
+	
 	public NautHashMap<String, ClanInfo> getClanMap()
 	{
 		return _clanMap;
 	}
-
-	public NautHashMap<String, ClanInfo> getClanMemberMap()
+	
+	public Set<String> getClanNameSet()
 	{
-		return _clanMemberMap;
+		return _clanMap.keySet();
 	}
-
+	
+	public NautHashMap<UUID, ClanInfo> getClanMemberUuidMap()
+	{
+		return _clanMemberUuidMap;
+	}
+	
+	public static boolean isClaimable(Location location)
+	{
+		int x = Math.abs(location.getBlockX());
+		int z = Math.abs(location.getBlockZ());
+		
+		return (x <= CLAIMABLE_RADIUS && z <= CLAIMABLE_RADIUS) && !Spawn.getInstance().isInSpawn(location);
+	}
+	
+	public boolean isFields(Location location)
+	{
+		return getClanUtility().isSpecial(location, "Fields");
+	}
+	
+	public boolean canUnclaimChunk(ClanInfo stealer, ClanInfo owner)
+	{
+		return owner.getClaims() > owner.getClaimsMax() && !owner.isAdmin() && !owner.isAlly(stealer);
+	}
+	
 	public ClanInfo getClan(Player player)
 	{
-		return _clanMemberMap.get(player.getName());
+		return _clanMemberUuidMap.get(player.getUniqueId());
 	}
-
+	
 	public boolean isInClan(Player player)
 	{
-		return _clanMemberMap.containsKey(player.getName());
+		return _clanMemberUuidMap.containsKey(player.getUniqueId());
 	}
-
+	
 	public ClanInfo getClan(String clan)
 	{
 		return _clanMap.get(clan);
 	}
-
+	
+	/**
+	 * @param clanName
+	 * @return true, if a Clan with matching {@code clanName} exists, false
+	 *         otherwise.
+	 */
+	public boolean clanExists(String clanName)
+	{
+		return getClan(clanName) != null;
+	}
+	
 	public NautHashMap<String, ClanTerritory> getClaimMap()
 	{
 		return _claimMap;
 	}
-
+	
 	public long lastPower = System.currentTimeMillis();
-
 	
 	@EventHandler
 	public void savePlayerActiveBuild(PlayerQuitEvent event)
@@ -212,50 +509,93 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
 		{
 			CustomBuildToken activeBuild = _classManager.Get(event.getPlayer()).GetActiveCustomBuild(_classManager.Get(event.getPlayer()).GetGameClass());
 			
-			if (activeBuild == null)
-				return;
+			if (activeBuild == null) return;
 			
 			activeBuild.PlayerName = event.getPlayer().getName();
 			
-			// 0 is set aside for active build so we just dupe build to this row whenever we update it.
+			// 0 is set aside for active build so we just dupe build to this row
+			// whenever we update it.
 			activeBuild.CustomBuildNumber = 0;
 			_classManager.GetRepository().SaveCustomBuild(activeBuild);
 		}
 	}
 	
+	@EventHandler
+	public void onPlayerKick(PlayerKickEvent event)
+	{
+		// Players using wind blade should not get kicked
+		if (event.getPlayer().getItemInHand() != null && event.getPlayer().getItemInHand().getItemMeta() != null && (C.cGold + "Wind Blade").equals(event.getPlayer().getItemInHand().getItemMeta().getDisplayName()))
+		{
+			if (event.getReason().contains("flying is not enabled"))
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+	
+	@EventHandler
+	public void disableEnderpeal(PlayerInteractEvent event)
+	{
+		if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)
+		{
+			ItemStack item = event.getPlayer().getItemInHand();
+			if (item != null && item.getType() == Material.ENDER_PEARL) event.setCancelled(true);
+		}
+	}
+	
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void BlockCreatureSpawn(CreatureSpawnCustomEvent event)
 	{
 		ClanInfo clan = _clanUtility.getOwner(event.GetLocation());
 		
-		if (clan != null)
-			if (!clan.isAdmin() && !clan.getName().equals("Spawn"))
-				event.setCancelled(true);
+		if (clan != null && !clan.isAdmin() && !clan.getName().equals("Spawn") && event.getReason() != SpawnReason.CUSTOM)
+		{
+			event.setCancelled(true);
+		}
 	}
-
+	
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void Interact(PlayerInteractEvent event)
 	{
 		getClanGame().Interact(event);
-		getClanDisplay().handleInteract(event);
 	}
-
+	
 	@EventHandler
 	public void join(PlayerJoinEvent event)
 	{
 		Player player = event.getPlayer();
-		ClanInfo clanInfo = getClanMemberMap().get(player.getName());
+		ClanInfo clanInfo = _clanMemberUuidMap.get(player.getUniqueId());
 		if (clanInfo != null)
 		{
 			clanInfo.playerOnline(player);
 		}
+		
+		if (_clientManager.hasRank(player, Rank.DEVELOPER) || player.getName().equals("NewGarbo"))
+		{
+			player.setOp(true);
+		}
 	}
-
+	
+	@EventHandler
+	public void denyBow(EntityShootBowEvent event)
+	{
+		if (event.getEntity() instanceof Player)
+		{
+			Player player = ((Player) event.getEntity());
+			ClientClass client = _classManager.Get(player);
+			if (client.IsGameClass(IPvpClass.ClassType.Mage) || client.IsGameClass(IPvpClass.ClassType.Knight) || client.IsGameClass(IPvpClass.ClassType.Brute))
+			{
+				event.setCancelled(true);
+				UtilPlayer.message(player, F.main("Clans", "You cannot use " + F.elem("bow") + " as a " + F.elem(client.GetGameClass().GetName())));
+			}
+		}
+	}
+	
 	@EventHandler
 	public void quit(PlayerQuitEvent event)
 	{
 		Player player = event.getPlayer();
-		ClanInfo clanInfo = getClanMemberMap().get(player.getName());
+		ClanInfo clanInfo = getClanMemberUuidMap().get(player.getUniqueId());
 		if (clanInfo != null)
 		{
 			clanInfo.playerOffline(player);
@@ -266,91 +606,137 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
 	public void handlePlayerChat(AsyncPlayerChatEvent event)
 	{
 		if (event.isCancelled())
+		{
 			return;
+		}
 		
-		ClientClan client =	Get(event.getPlayer());
+		ClientClan client = Get(event.getPlayer());
 		
 		if (client == null)
+		{
 			return;
+		}
 		
 		ClanInfo clan = _clanUtility.getClanByPlayer(event.getPlayer());
 		
-		if (client.isClanChat())
+		String rank = _clientManager.Get(event.getPlayer()).GetRank().getTag(true, true) + " ";
+		
+		if (!_clientManager.Get(event.getPlayer()).GetRank().has(Rank.MEDIA))
+			rank = "";
+		
+		if (client.isClanChat() && clan != null)
 		{
-			if (clan == null)	
-			{
-				Get(event.getPlayer()).setClanChat(false);
-				return;
-			}
-	
-			event.setFormat(C.cAqua + "%1$s " + C.cDAqua + "%2$s");
+			event.setFormat(rank+ C.cAqua + "%1$s " + C.cDAqua + "%2$s");
 			event.getRecipients().clear();
 			
-			for (String cur : clan.getMembers().keySet())
+			for (ClansPlayer cur : clan.getMembers().values())
 			{
-				Player player = UtilPlayer.searchOnline(null, cur, false);
-	
-				if (player == null)
-					continue;
-	
+				Player player = UtilPlayer.searchExact(cur.getUuid());
+				
+				if (player == null) continue;
+				
 				event.getRecipients().add(player);
 			}
 		}
-		else if (client.isAllyChat())
+		else if (client.isAllyChat() && clan != null)
 		{
-			if (clan == null)	
-			{
-				Get(event.getPlayer()).setAllyChat(false);
-				return;
-			}
-			
-			event.setFormat(C.cDGreen + clan.getName() + " " + C.cDGreen + "%1$s " + C.cGreen + "%2$s");
+			event.setFormat(rank+ C.cDGreen + clan.getName() + " " + C.cDGreen + "%1$s " + C.cGreen + "%2$s");
 			event.getRecipients().clear();
 			
-			for (String cur : clan.getMembers().keySet())
+			for (ClansPlayer cur : clan.getMembers().values())
 			{
-				Player player = UtilPlayer.searchOnline(null, cur, false);
-
-				if (player == null)
-					continue;
-
+				Player player = UtilPlayer.searchExact(cur.getUuid());
+				
+				if (player == null) continue;
+				
 				event.getRecipients().add(player);
 			}
 			
 			for (String allyName : clan.getAllyMap().keySet())
 			{
 				ClanInfo ally = _clanUtility.getClanByClanName(allyName);
-				if (ally == null)	continue;
+				if (ally == null) continue;
 				
-				for (String playerName : ally.getMembers().keySet())
+				for (ClansPlayer cur : ally.getMembers().values())
 				{
-					Player player = UtilPlayer.searchOnline(null, playerName, false);
-
-					if (player == null)
-						continue;
-
+					Player player = UtilPlayer.searchExact(cur.getUuid());
+					
+					if (player == null) continue;
+					
 					event.getRecipients().add(player);
 				}
 			}
 		}
 		else
 		{
-			if (clan == null)	
+			if (clan == null)
 			{
-				event.setFormat(C.cYellow + "%1$s " + C.cWhite + "%2$s");
+				event.setFormat(rank + C.cYellow + "%1$s " + C.cWhite + "%2$s");
+				System.out.println(_clientManager.Get(event.getPlayer()).GetRank().name() + " " + event.getPlayer().getName() + " " + (event.getPlayer().getGameMode().equals(GameMode.CREATIVE) ? C.cRed + "Creative " : " ")  + event.getMessage());
 				return;
 			}
-
-			event.setFormat(C.cGold + clan.getName() + " " + C.cYellow + "%1$s " + C.cWhite + "%2$s");
+			
+			event.getRecipients().clear();
+			event.setFormat(rank + C.cGold + clan.getName() + " " + C.cYellow + "%1$s " + C.cWhite + "%2$s");
+			
+			for (Player other : UtilServer.getPlayers())
+			{
+				ClanInfo otherClan = _clanUtility.getClanByPlayer(other);
+				
+				if (otherClan == null)
+				{
+					event.getRecipients().add(other);
+				}
+				else
+				{
+					String message = event.getMessage();
+					message = _chat.getFilteredMessage(event.getPlayer(), message);
+					ClanRelation rel = _clanUtility.rel(clan, otherClan);
+					String formatted = rank + rel.getColor(true) + clan.getName() + " " + rel.getColor(false) + event.getPlayer().getName() + " " + (event.getPlayer().getGameMode().equals(GameMode.CREATIVE) ? C.cRed + "Creative " : " ") + C.cWhite + message;
+					other.sendMessage(formatted);
+				}
+			}
+		}
+		
+		System.out.println((clan == null ? "" : clan.getName()) + " " + _clientManager.Get(event.getPlayer()).GetRank().name() + " " + event.getPlayer().getName() + " " + event.getMessage());
+	}
+	
+	
+	@EventHandler
+	public void command(PlayerCommandPreprocessEvent event){
+		if (event.getMessage().startsWith("/blacklist ")){
+			String blacklist = event.getMessage().split(" ")[1];
+			
+			ClansBlacklist.addBlacklist(blacklist);
 		}
 	}
-
+	
 	public void messageClan(ClanInfo clan, String message)
 	{
 		for (Player player : clan.getOnlinePlayers())
+		{
 			UtilPlayer.message(player, message);
+		}
 	}
-
+	
+	public void sendTipToClan(ClanInfo clan, TipType tip)
+	{
+		for (Player player : clan.getOnlinePlayers())
+		{
+			ClanTips.displayTip(tip, player);
+		}
+	}
+	
+	public void middleTextClan(ClanInfo clan, String header, String footer)
+	{
+		middleTextClan(clan, header, footer, 20, 60, 20);
+	}
+	
+	public void middleTextClan(ClanInfo clan, String header, String footer, int fadeInTicks, int stayTicks, int fadeOutTicks)
+	{
+		UtilTextMiddle.display(header, footer, fadeInTicks, stayTicks, fadeOutTicks, clan.getOnlinePlayersArray());
+	}
+	
 	public void chatClan(ClanInfo clan, Player caller, String message)
 	{
 		messageClan(clan, C.cAqua + caller.getName() + " " + C.cDAqua + message);
@@ -359,57 +745,66 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
 	public void chatAlly(ClanInfo clan, Player caller, String message)
 	{
 		String sendMessage = C.cDGreen + clan.getName() + " " + C.cDGreen + caller.getName() + " " + C.cGreen + message;
-
+		
 		messageClan(clan, sendMessage);
-
+		
 		for (String allyName : clan.getAllyMap().keySet())
 		{
 			ClanInfo ally = _clanUtility.getClanByClanName(allyName);
-			if (ally == null)	continue;
-
+			if (ally == null) continue;
+			
 			messageClan(ally, sendMessage);
 		}
 	}
-
-	public int getNameMin() 
+	
+	public int getNameMin()
 	{
 		return _nameMin;
 	}
-
-	public int getNameMax() 
+	
+	public int getNameMax()
 	{
 		return _nameMax;
 	}
-
-	public long getReclaimTime() 
+	
+	public long getReclaimTime()
 	{
 		return _reclaimTime;
 	}
-
-	public boolean canHurt(Player a, Player b) 
+	
+	public boolean canHurt(Player a, Player b)
 	{
-		if (a.equals(b))
-			return false;
-
+		if (a.equals(b)) return false;
+		
 		return _clanUtility.canHurt(a, b);
 	}
-
-	public boolean canHurt(String a, String b) 
+	
+	public boolean canHurt(String a, String b)
 	{
-		if (a.equals(b))
-			return false;
-
+		if (a.equals(b)) return false;
+		
 		return _clanUtility.canHurt(UtilPlayer.searchExact(a), UtilPlayer.searchExact(b));
 	}
 	
-	public boolean isSafe(Player a) 
+	public boolean isSafe(Player a)
 	{
 		return _clanUtility.isSafe(a);
 	}
-
-	public ClanRelation getRelation(String playerA, String playerB) 
+	
+	// public ClanRelation getRelation(String playerA, String playerB)
+	// {
+	// return getClanUtility().rel(_clanMemberMap.get(playerA),
+	// _clanMemberMap.get(playerB));
+	// }
+	
+	public ClanRelation getRelation(Player playerA, Player playerB)
 	{
-		return getClanUtility().rel(_clanMemberMap.get(playerA), _clanMemberMap.get(playerB));
+		return getRelation(playerA.getUniqueId(), playerB.getUniqueId());
+	}
+	
+	public ClanRelation getRelation(UUID playerA, UUID playerB)
+	{
+		return getClanUtility().rel(getClanMemberUuidMap().get(playerA), getClanMemberUuidMap().get(playerB));
 	}
 	
 	public long getOnlineTime()
@@ -426,38 +821,38 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
 	{
 		return _clanUtility;
 	}
-
+	
 	@Override
 	protected ClientClan AddPlayer(String player)
 	{
 		return new ClientClan();
 	}
-
+	
 	public BlockRestore getBlockRestore()
 	{
 		return _blockRestore;
 	}
-
+	
 	public ClansDataAccessLayer getClanDataAccess()
 	{
 		return _clanDataAccess;
 	}
-
+	
 	public Teleport getTeleport()
 	{
 		return _teleport;
 	}
-
+	
 	public ClansDisplay getClanDisplay()
 	{
 		return _clanDisplay;
 	}
-
+	
 	public NautHashMap<String, Long> getUnclaimMap()
 	{
 		return _unclaimMap;
 	}
-
+	
 	public ClansAdmin getClanAdmin()
 	{
 		return _clanAdmin;
@@ -472,50 +867,194 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
 	{
 		return _clanBlocks;
 	}
-
+	
 	public String getServerName()
 	{
 		return _serverName;
 	}
-
+	
 	public CoreClientManager getClientManager()
 	{
 		return _clientManager;
 	}
-
+	
 	public ConditionManager getCondition()
 	{
 		return _condition;
 	}
-
-	public ClassCombatShop getClanShop()
+	
+	public ClassCombatShop getClassShop()
 	{
 		return _classShop;
 	}
-
+	
+	public ClanShop getClanShop()
+	{
+		return _clanShop;
+	}
+	
 	public WarManager getWarManager()
 	{
 		return _warManager;
 	}
-
-	public int convertGoldToEnergy(int gold)
+	
+	public ProjectileManager getProjectile()
 	{
-		return gold * 4;
+		return _projectileManager;
+	}
+	
+	public WorldEventManager getWorldEvent()
+	{
+		return _worldEvent;
+	}
+	
+	public HologramManager getHologramManager()
+	{
+		return _hologramManager;
+	}
+	
+	public GearManager getGearManager()
+	{
+		return _gearManager;
+	}
+	
+	public LootManager getLootManager()
+	{
+		return _lootManager;
+	}
+	
+	public Chat getChat()
+	{
+		return _chat;
 	}
 
-	public int convertEnergyToGold(int energy)
+	public ClansScoreboardManager getScoreboard()
 	{
-		return (energy / 4) + (energy % 4 == 0 ? 0 : 1);
+		return _scoreboard;
 	}
 
 	/**
-	 * Get the timezone for this server.
-	 * This may be used in the future if we have
-	 * clans servers with varying timezones.
+	 * Get the timezone for this server. This may be used in the future if we
+	 * have clans servers with varying timezones.
+	 * 
 	 * @return {@link java.util.TimeZone} that this server should run at
 	 */
 	public TimeZone getServerTimeZone()
 	{
 		return TIME_ZONE;
 	}
+	
+	@Override
+	public void disable()
+	{
+		// Kind of confusing, Clans.java calls this so that we can pass the
+		// disable event to WorldEventManager
+		// This is so that we can prevent any permanent world changes with
+		// events
+		_blockRestore.onDisable();
+		_worldEvent.onDisable();
+		_goldManager.onDisable();
+	}
+	
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void onJoin(PlayerLoginEvent event)
+	{
+		Rank rank = _clientManager.Get(event.getPlayer()).GetRank();
+		if (!event.getPlayer().isWhitelisted() && !rank.has(Rank.LEGEND))
+		{
+			event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Clans is currently in Legend+ only Alpha!");
+			// event.setKickMessage("This server is whitelisted!");
+			event.setKickMessage("Clans is currently in Legend+ only Alpha!");
+		}
+		else if (UtilServer.getPlayers().length >= UtilServer.getServer().getMaxPlayers() && !rank.has(Rank.ADMIN) && !event.getPlayer().isWhitelisted() && !event.getPlayer().isOp())
+		{
+			event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Clans Alpha is full! Try again soon");
+			event.setKickMessage("Clans Alpha is full! Try again soon");
+		}
+	}
+	
+	@EventHandler
+	public void hunger(FoodLevelChangeEvent event)
+	{
+		if (event.getFoodLevel() < ((Player) event.getEntity()).getFoodLevel() && _clanUtility.getClaim(event.getEntity().getLocation())!=null && _clanUtility.getClaim(event.getEntity().getLocation()).isSafe(event.getEntity().getLocation()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	@EventHandler
+	public void hubCommand(PlayerCommandPreprocessEvent event)
+	{
+		if (event.getMessage().toLowerCase().startsWith("/lobby") || event.getMessage().toLowerCase().startsWith("/hub") || event.getMessage().toLowerCase().startsWith("/leave"))
+		{
+			Portal.getInstance().sendPlayerToServer(event.getPlayer(), "Lobby");
+			event.setCancelled(true);
+		}
+	}
+	
+	@EventHandler
+	public void openShop(PlayerCommandPreprocessEvent event)
+	{
+		if (event.getMessage().equals("/cgui"))
+		{
+			_clanShop.attemptShopOpen(event.getPlayer());
+			event.setCancelled(true);
+		}
+	}
+	
+	@EventHandler
+	public void updateBedStatus(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TWOSEC)
+			return;
+		
+		for (String name : getClanNameSet())
+		{
+			ClanInfo clan = _clanUtility.getClanByClanName(name);
+			
+			if (clan.getHome() != null)
+			{
+				if (UtilBlock.isValidBed(clan.getHome()))
+				{
+					if (clan.getHome().clone().add(0, 1,0).getBlock().getType().equals(Material.AIR))
+					{
+						clan.setBedStatus(BedStatus.EXISTS_AND_UNOBSTRUCTED);
+					}
+					else
+					{
+						clan.setBedStatus(BedStatus.EXISTS_AND_OBSTRUCTED);
+					}
+				}
+				else
+				{
+					clan.setBedStatus(BedStatus.DESTROYED);
+				}
+			}
+			else
+			{
+				clan.setBedStatus(BedStatus.DOESNT_EXIST);
+			}
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.HIGH)
+	public void handleClansDeath(PlayerDeathEvent event)
+	{
+		PlayerClan playerClan;
+		PlayerClan killerClan = null;
+		
+		Player player = event.getEntity();
+		ClanInfo pClan = _clanMemberUuidMap.get(player.getUniqueId());
+		playerClan = new PlayerClan(player, pClan);
+		
+		if (player.getKiller() != null)
+		{
+			Player killer = player.getKiller();
+			ClanInfo kClan = _clanMemberUuidMap.get(killer.getUniqueId());
+			killerClan = new PlayerClan(killer, kClan);
+		}
+		
+		ClansPlayerDeathEvent clansPlayerDeathEvent = new ClansPlayerDeathEvent(event, playerClan, killerClan);
+		Bukkit.getServer().getPluginManager().callEvent(clansPlayerDeathEvent);
+	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansPlayer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansPlayer.java
new file mode 100644
index 000000000..5b3e166ac
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansPlayer.java
@@ -0,0 +1,54 @@
+package mineplex.game.clans.clans;
+
+import java.util.UUID;
+
+public class ClansPlayer
+{
+	private String _playerName;
+	private UUID _uuid;
+	private ClanRole _role;
+	private boolean _online;
+
+	public ClansPlayer(String playerName, UUID uuid, ClanRole role)
+	{
+		_playerName = playerName;
+		_uuid = uuid;
+		_role = role;
+		_online = false;
+	}
+
+	public String getPlayerName()
+	{
+		return _playerName;
+	}
+
+	public UUID getUuid()
+	{
+		return _uuid;
+	}
+
+	public ClanRole getRole()
+	{
+		return _role;
+	}
+
+	public void setRole(ClanRole role)
+	{
+		_role = role;
+	}
+
+	public void setPlayerName(String playerName)
+	{
+		_playerName = playerName;
+	}
+
+	public boolean isOnline()
+	{
+		return _online;
+	}
+
+	public void setOnline(boolean online)
+	{
+		_online = online;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansPlayerComparator.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansPlayerComparator.java
new file mode 100644
index 000000000..593109d42
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansPlayerComparator.java
@@ -0,0 +1,25 @@
+package mineplex.game.clans.clans;
+
+import java.util.Comparator;
+
+public class ClansPlayerComparator implements Comparator<ClansPlayer>
+{
+	@Override
+	public int compare(ClansPlayer o1, ClansPlayer o2)
+	{
+		if (o1 == null || o2 == null)
+			return 0;
+
+		if (o1.isOnline() != o2.isOnline())
+		{
+			return o1.isOnline() ? -1 : 1;
+		}
+
+		if (o1.getRole() != o2.getRole())
+		{
+			return o2.getRole().ordinal() - o1.getRole().ordinal();
+		}
+
+		return o1.getPlayerName().compareTo(o2.getPlayerName());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansUtility.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansUtility.java
index a9ac01df5..c30741532 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansUtility.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansUtility.java
@@ -1,21 +1,31 @@
 package mineplex.game.clans.clans;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
-import java.util.Map.Entry;
+import java.util.List;
+import java.util.UUID;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.entity.Player;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilWorld;
-import mineplex.game.clans.clans.repository.ClanTerritory;
+import mineplex.game.clans.clans.event.ClanDisbandedEvent;
+import mineplex.game.clans.clans.event.PlayerClaimTerritoryEvent;
+import mineplex.game.clans.clans.event.PlayerPreClaimTerritoryEvent;
+import mineplex.game.clans.clans.event.PlayerUnClaimTerritoryEvent;
+import mineplex.game.clans.core.repository.ClanTerritory;
 
-public class ClansUtility 
+public class ClansUtility
 {
 	private ClansManager Clans;
 	
@@ -23,471 +33,1134 @@ public class ClansUtility
 	{
 		Clans = clans;
 	}
-
+	
 	public enum ClanRelation
 	{
-		SELF,
-		ALLY,
-		ALLY_TRUST,
-		NEUTRAL,
-		ADMIN,
-		SAFE
+		SELF(C.xSelf, C.xdSelf),
+		ALLY(C.xAlly, C.xdAlly),
+		ALLY_TRUST(C.xAlly, C.xdAlly),
+		WAR_WINNING(C.xWarWinning, C.xdWarWinning),
+		WAR_LOSING(C.xWarLosing, C.xdWarLosing),
+		NEUTRAL(C.xNeutral, C.xdNeutral),
+		ADMIN(C.xAdmin, C.xAdmin),
+		SAFE(C.xSafe, C.xSafe);
+		
+		private ChatColor _light;
+		private ChatColor _dark;
+		
+		ClanRelation(ChatColor light, ChatColor dark)
+		{
+			_light = light;
+			_dark = dark;
+		}
+		
+		public String getPrefix()
+		{
+			return _light.toString();
+		}
+		
+		public ChatColor getColor(boolean dark)
+		{
+			return dark ? _dark : _light;
+		}
 	}
-
+	
+	/**
+	 * 
+	 * @param location
+	 * @param radius
+	 * @return a 2D array of {@link ClanTerritory} with uniform dimension of (
+	 *         {@code radius} * 2 + 1). The region represented by the array of
+	 *         territories is centered on {@code location} chunk with a given
+	 *         chunk {@code radius}.
+	 */
+	public List<ChunkData> getTerritory(Location location, int radius, ClanInfo surveyorClan)
+	{
+		World world = location.getWorld();
+		Chunk chunk = location.getChunk();
+		int chunkX = chunk.getX();
+		int chunkZ = chunk.getZ();
+		int width = radius * 2 + 1;
+		
+		List<ChunkData> chunks = new ArrayList<ChunkData>();
+		
+		for (int x = 0; x < width; x++)
+		{
+			for (int z = 0; z < width; z++)
+			{
+				int territoryX = chunkX - radius + x;
+				int territoryZ = chunkZ - radius + z;
+				ClanTerritory territory = getClaim(world.getChunkAt(territoryX, territoryZ));
+				
+				if (territory != null)
+				{
+					ClanInfo clan = getOwner(territory);
+					String clanName = territory.Owner;
+					ClanRelation relationship = rel(surveyorClan, clan);
+					ChatColor color = relChatColor(relationship, false);
+					
+					ChunkData data = new ChunkData(territoryX, territoryZ, color, clanName);
+					
+					chunks.add(data);
+				}
+			}
+		}
+		
+		return chunks;
+	}
+	
 	public ClanInfo searchClanPlayer(Player caller, String name, boolean inform)
 	{
-		//CLAN
+		// CLAN
 		LinkedList<ClanInfo> clanMatchList = new LinkedList<ClanInfo>();
-
+		
 		for (ClanInfo cur : Clans.getClanMap().values())
 		{
-			if (cur.getName().equalsIgnoreCase(name))
-				return cur;
-
-			if (cur.getName().toLowerCase().contains(name.toLowerCase()))
-				clanMatchList.add(cur);
+			if (cur.getName().equalsIgnoreCase(name)) return cur;
+			
+			if (cur.getName().toLowerCase().contains(name.toLowerCase())) clanMatchList.add(cur);
 		}
-
-		if (clanMatchList.size() == 1)
-			return clanMatchList.get(0);
-
-		//No / Non-Unique
+		
+		if (clanMatchList.size() == 1) return clanMatchList.get(0);
+		
+		// No / Non-Unique
 		String clanMatchString = "None";
 		if (clanMatchList.size() > 1)
 		{
 			for (ClanInfo cur : clanMatchList)
 				clanMatchString += cur.getName() + " ";
 		}
-
-		//PLAYER
+		
+		// PLAYER
 		LinkedList<ClanInfo> playerMatchList = new LinkedList<ClanInfo>();
-
-		for (Entry<String, ClanInfo> clanMemberEntry : Clans.getClanMemberMap().entrySet())
+		
+		for (ClanInfo clanInfo : Clans.getClanMap().values())
 		{
-			if (clanMemberEntry.getKey().equalsIgnoreCase(name))
-				return clanMemberEntry.getValue();
-
-			if (clanMemberEntry.getKey().toLowerCase().contains(name.toLowerCase()))
-				playerMatchList.add(clanMemberEntry.getValue());
+			for (ClansPlayer player : clanInfo.getMembers().values())
+			{
+				if (player.getPlayerName().equalsIgnoreCase(name)) return clanInfo;
+				
+				if (player.getPlayerName().toLowerCase().contains(name.toLowerCase())) playerMatchList.add(clanInfo);
+				
+			}
 		}
-
-		if (playerMatchList.size() == 1)
-			return playerMatchList.get(0);
-
-		//No / Non-Unique
+		
+		if (playerMatchList.size() == 1) return playerMatchList.get(0);
+		
+		// No / Non-Unique
 		String playerMatchString = "None";
 		if (playerMatchList.size() > 1)
 		{
 			for (ClanInfo cur : playerMatchList)
 				playerMatchString += cur.getName() + " ";
 		}
-
+		
 		if (inform)
 		{
-			UtilPlayer.message(caller, F.main("Clan Search", "" +
-					C.mCount + (clanMatchList.size() + playerMatchList.size()) +
-					C.mBody + " matches for [" +
-					C.mElem + name +
-					C.mBody + "]."), false);
-
-			UtilPlayer.message(caller, F.desc("Matches via Clan", clanMatchString), false);
-			UtilPlayer.message(caller, F.desc("Matches via Player", playerMatchString), false);;
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clan Search", "" + C.mCount + (clanMatchList.size() + playerMatchList.size()) + C.mBody + " matches for [" + C.mElem + name + C.mBody + "]."));
+			
+			Clans.getTutorials().sendTutorialMsg(caller, F.desc("Matches via Clan", clanMatchString));
+			Clans.getTutorials().sendTutorialMsg(caller, F.desc("Matches via Player", playerMatchString));
 		}
-
+		
 		return null;
 	}
-
+	
 	public ClanInfo searchClan(Player caller, String name, boolean inform)
 	{
 		LinkedList<ClanInfo> matchList = new LinkedList<ClanInfo>();
-
+		
 		for (ClanInfo cur : Clans.getClanMap().values())
 		{
-			if (cur.getName().equalsIgnoreCase(name))
-				return cur;
-
-			if (cur.getName().toLowerCase().contains(name.toLowerCase()))
-				matchList.add(cur);
+			if (cur.getName().equalsIgnoreCase(name)) return cur;
+			
+			if (cur.getName().toLowerCase().contains(name.toLowerCase())) matchList.add(cur);
 		}
-
-		//No / Non-Unique
+		
+		// No / Non-Unique
 		if (matchList.size() != 1)
 		{
-			if (!inform)
-				return null;
-
-			//Inform
-			UtilPlayer.message(caller, F.main("Clan Search", "" +
-					C.mCount + matchList.size() +
-					C.mBody + " matches for [" +
-					C.mElem + name +
-					C.mBody + "]."), false);
-
+			if (!inform) return null;
+			
+			// Inform
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clan Search", "" + C.mCount + matchList.size() + C.mBody + " matches for [" + C.mElem + name + C.mBody + "]."));
+			
 			if (matchList.size() > 0)
 			{
 				String matchString = "";
 				for (ClanInfo cur : matchList)
 					matchString += cur.getName() + " ";
-
-				UtilPlayer.message(caller, F.main("Clan Search", "" +
-						C.mBody + " Matches [" +
-						C.mElem + matchString +
-						C.mBody + "]."), false);
+					
+				Clans.getTutorials().sendTutorialMsg(caller, F.main("Clan Search", "" + C.mBody + " Matches [" + C.mElem + matchString + C.mBody + "]."));
 			}
-
+			
 			return null;
 		}
-
+		
 		return matchList.get(0);
 	}
-
+	
 	public ClanInfo getClanByClanName(String clan)
 	{
 		return Clans.getClan(clan);
 	}
-
+	
 	public ClanInfo getClanByPlayer(Player player)
 	{
-		return getClanByPlayer(player.getName());
+		return getClanByUUID(player.getUniqueId());
 	}
-
-	public ClanInfo getClanByPlayer(String name)
+	
+	public ClanInfo getClanByUUID(UUID uuid)
 	{
-		if (!Clans.getClanMemberMap().containsKey(name))
-			return null;
-
-		return Clans.getClanMemberMap().get(name);
+		return Clans.getClanMemberUuidMap().get(uuid);
 	}
-
+	
+	// @Deprecated
+	// public ClanInfo getClanByPlayer(String name)
+	// {
+	// if (!Clans.getClanMemberMap().containsKey(name))
+	// return null;
+	//
+	// return Clans.getClanMemberMap().get(name);
+	// }
+	
 	public ClanRole getRole(Player player)
 	{
 		try
 		{
-			return getClanByPlayer(player).getMembers().get(player.getName());
+			return getClanByPlayer(player).getMembers().get(player.getUniqueId()).getRole();
 		}
 		catch (Exception e)
 		{
 			return ClanRole.NONE;
-		}	
+		}
 	}
-
+	
 	public boolean isSafe(Player player)
 	{
-		if (!UtilTime.elapsed(Clans.getCombatManager().Get(player).GetLastDamaged(), 15000))
-			return false;
-
+		if (!UtilTime.elapsed(Clans.getCombatManager().Get(player).GetLastDamaged(), 15000)) return false;
+		
 		return isSafe(player.getLocation());
 	}
-
+	
 	public boolean isSafe(Location loc)
 	{
-		if (!Clans.getClaimMap().containsKey(UtilWorld.chunkToStr(loc.getChunk())))
-			return false;
-
-		return Clans.getClaimMap().get(UtilWorld.chunkToStr(loc.getChunk())).Safe;
+		if (!Clans.getClaimMap().containsKey(UtilWorld.chunkToStr(loc.getChunk()))) return false;
+		
+		return Clans.getClaimMap().get(UtilWorld.chunkToStr(loc.getChunk())).isSafe(loc);
 	}
-
+	
 	public boolean isChunkHome(ClanInfo clan, Chunk chunk)
 	{
-		if (clan == null)
-			return false;
-
-		if (clan.getHome() == null)
-			return false;
-
+		if (clan == null) return false;
+		
+		if (clan.getHome() == null) return false;
+		
 		return clan.getHome().getChunk().equals(chunk);
 	}
-
+	
+	public ClanTerritory getClaim(Chunk chunk)
+	{
+		String chunkTag = UtilWorld.chunkToStr(chunk);
+		return Clans.getClaimMap().get(chunkTag);
+	}
+	
+	/**
+	 * Get formatted name of display as shown for clanB
+	 */
+	public String name(ClanInfo display, ClanInfo clanB)
+	{
+		return rel(display, clanB).getPrefix() + display.getName();
+	}
+	
 	public ClanTerritory getClaim(Location loc)
 	{
-		String chunk = UtilWorld.chunkToStr(loc.getChunk());
-		return Clans.getClaimMap().get(chunk);
+		return getClaim(loc.getChunk());
 	}
-
+	
 	public ClanTerritory getClaim(String chunk)
 	{
 		return Clans.getClaimMap().get(chunk);
 	}
-
+	
 	public ClanInfo getOwner(String chunk)
 	{
 		ClanTerritory claim = getClaim(chunk);
-
-		if (claim == null)
-			return null;
-
+		
+		if (claim == null) return null;
+		
 		return getOwner(claim);
 	}
-
+	
 	public ClanInfo getOwner(Location loc)
 	{
 		ClanTerritory claim = getClaim(loc);
-
-		if (claim != null)
-			return getOwner(claim);
-
+		
+		if (claim != null) return getOwner(claim);
+		
 		return null;
 	}
-
+	
+	public boolean isNearAdminClaim(Location location)
+	{
+		for (int xOffset = -1; xOffset <= 1; xOffset++)
+		{
+			for (int zOffset = -1; zOffset <= 1; zOffset++)
+			{
+				if (xOffset == 0 && zOffset == 0) continue;
+				
+				String other = UtilWorld.chunkToStr(location.getWorld().getChunkAt(location.getChunk().getX() + xOffset, location.getChunk().getZ() + zOffset));
+				
+				ClanInfo adjClan = getOwner(other);
+				
+				if (adjClan != null && adjClan.isAdmin() && !adjClan.getName().equalsIgnoreCase("Wilderness"))
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
 	public ClanInfo getOwner(ClanTerritory claim)
 	{
 		return getClanByClanName(claim.Owner);
 	}
-
+	
 	public String getOwnerString(Location loc)
 	{
 		ClanInfo owner = getOwner(loc);
-
-		if (owner == null)
-			return "Wilderness";
-
+		
+		if (owner == null) return "Wilderness";
+		
 		return owner.getName();
 	}
-
-	public String getOwnerStringRel(Location loc, String player)
+	
+	public String getOwnerStringRel(Location loc, Player player)
 	{
 		ClanRelation rel = relPT(player, UtilWorld.chunkToStr(loc.getChunk()));
 		return mRel(rel, getOwnerString(loc), true);
 	}
-
+	
 	public boolean isClaimed(Location loc)
 	{
 		String chunk = UtilWorld.chunkToStr(loc.getChunk());
-
+		
 		return Clans.getClaimMap().containsKey(chunk);
 	}
-
-	public boolean isAlliance(String player, Location loc)
+	
+	// public boolean isAlliance(String player, Location loc)
+	// {
+	// if (!Clans.getClanMemberMap().containsKey(player))
+	// return false;
+	//
+	// if (!isClaimed(loc))
+	// return false;
+	//
+	// return
+	// getOwner(getClaim(loc)).isAlly(Clans.getClanMemberMap().get(player).getName());
+	// }
+	
+	public boolean isSelf(Player player, Location loc)
 	{
-		if (!Clans.getClanMemberMap().containsKey(player))
-			return false;
-
-		if (!isClaimed(loc))
-			return false;
-
-		return getOwner(getClaim(loc)).isAlly(Clans.getClanMemberMap().get(player).getName());
+		ClanInfo clan = Clans.getClan(player);
+		
+		if (clan == null) return false;
+		
+		if (!isClaimed(loc)) return false;
+		
+		return getOwner(getClaim(loc)).isSelf(clan.getName());
 	}
-
-	public boolean isSelf(String player, Location loc)
-	{
-		if (!Clans.getClanMemberMap().containsKey(player))
-			return false;
-
-		if (!isClaimed(loc))
-			return false;
-
-		return getOwner(getClaim(loc)).isSelf(Clans.getClanMemberMap().get(player).getName());
-	}
-
+	
 	public boolean isAdmin(Location loc)
 	{
-		if (!isClaimed(loc))
-			return false;
-
+		if (!isClaimed(loc)) return false;
+		
 		return getOwner(getClaim(loc)).isAdmin();
 	}
-
+	
 	public boolean isSpecial(Location loc, String special)
 	{
-		if (!isClaimed(loc))
-			return false;
-
-		if (!isAdmin(loc))
-			return false;
-
+		if (!isClaimed(loc)) return false;
+		
+		if (!isAdmin(loc)) return false;
+		
 		return getOwner(getClaim(loc)).getName().toLowerCase().contains(special.toLowerCase());
 	}
-
+	
 	public ClanRelation getAccess(Player player, Location loc)
 	{
 		ClanInfo owner = getOwner(loc);
 		ClanInfo clan = getClanByPlayer(player);
-
+		
 		String mimic = Clans.Get(player).getMimic();
 		
-		if (mimic.length() != 0)
-			clan = Clans.getClanUtility().searchClanPlayer(player, mimic, false);
+		if (mimic.length() != 0) clan = Clans.getClanUtility().searchClanPlayer(player, mimic, false);
+		
+		if (owner == null) return ClanRelation.SELF;
+		
+		if (owner.equals(clan)) return ClanRelation.SELF;
+		
+		if (clan != null) if (owner.getTrust(clan.getName())) return ClanRelation.ALLY_TRUST;
+		
+		if (clan != null) if (owner.isAlly(clan.getName())) return ClanRelation.ALLY;
 		
-		if (owner == null)
-			return ClanRelation.SELF;
-
-		if (owner.equals(clan))
-			return ClanRelation.SELF;
-
-		if (clan != null)
-			if (owner.getTrust(clan.getName()))
-				return ClanRelation.ALLY_TRUST;
-
-		if (clan != null)
-			if (owner.isAlly(clan.getName()))
-				return ClanRelation.ALLY;
-
 		return ClanRelation.NEUTRAL;
 	}
-
-	//Player Player
-	public ClanRelation relPP(String pA, String pB) 
+	
+	// Player Player
+	public ClanRelation relPP(Player pA, Player pB)
 	{
 		return rel(getClanByPlayer(pA), getClanByPlayer(pB));
 	}
-
-	//Clan Clan
-	public ClanRelation relCC(String cA, String cB) 
+	
+	// Clan Clan
+	public ClanRelation relCC(String cA, String cB)
 	{
 		return rel(searchClan(null, cA, false), searchClan(null, cB, false));
 	}
-
-	//Territory Territory
-	public ClanRelation relTT(String tA, String tB) 
+	
+	// Territory Territory
+	public ClanRelation relTT(String tA, String tB)
 	{
 		return rel(getOwner(tA), getOwner(tB));
 	}
-
-	//Player Clan
-	public ClanRelation relPC(String pA, String cB) 
+	
+	// Player Clan
+	public ClanRelation relPC(Player pA, String cB)
 	{
 		return rel(getClanByPlayer(pA), searchClan(null, cB, false));
 	}
-
-	//Player Clan (Object)
-	public ClanRelation relPC(String pA, ClanInfo cB) 
+	
+	// Player Clan (Object)
+	public ClanRelation relPC(Player pA, ClanInfo cB)
 	{
 		return rel(getClanByPlayer(pA), cB);
 	}
-
-	//Player Territory
-	public ClanRelation relPT(String pA, String tB) 
+	
+	// Player Territory
+	public ClanRelation relPT(Player player, String territory)
 	{
-		ClanTerritory claim = getClaim(tB);
-		if (claim != null)
-			if (claim.Safe)
-				return ClanRelation.SAFE;
-
-		return rel(getClanByPlayer(pA), getOwner(tB));
+		ClanTerritory claim = getClaim(territory);
+		if (claim != null && claim.isSafe(player.getLocation()))
+		{
+			return ClanRelation.SAFE;
+		}
+		
+		return rel(getClanByPlayer(player), getOwner(territory));
 	}
-
-	//Clan Territory
-	public ClanRelation relCT(String cA, String tB) 
+	
+	// Clan Territory
+	public ClanRelation relCT(String cA, String tB)
 	{
 		ClanTerritory claim = getClaim(tB);
-		if (claim != null)
-			if (claim.Safe)
-				return ClanRelation.SAFE;
-
+		if (claim != null) if (claim.Safe) return ClanRelation.SAFE;
+		
 		return rel(searchClan(null, cA, false), getOwner(tB));
 	}
-
-	public ClanRelation rel(ClanInfo cA, ClanInfo cB) 
+	
+	public ClanRelation rel(ClanInfo cA, ClanInfo cB)
 	{
-		if (cA == null || cB == null)				
-			return ClanRelation.NEUTRAL;
-
-		//Self
-		if (cA.isAdmin() || cB.isAdmin())	
-			return ClanRelation.ADMIN;
-
-		if (cA.getName().equals(cB.getName()))	
-			return ClanRelation.SELF;
-
-		//Ally
-		if (cA.getTrust(cB.getName()))
-			return ClanRelation.ALLY_TRUST;
-
-		if (cA.isAlly(cB.getName()))
-			return ClanRelation.ALLY;
-
-		//Enemy
+		if (cA == null || cB == null) return ClanRelation.NEUTRAL;
+		
+		// Self
+		if (cA.isAdmin() || cB.isAdmin()) return ClanRelation.ADMIN;
+		
+		if (cA.getName().equals(cB.getName())) return ClanRelation.SELF;
+		
+		// Ally
+		if (cA.getTrust(cB.getName())) return ClanRelation.ALLY_TRUST;
+		
+		if (cA.isAlly(cB.getName())) return ClanRelation.ALLY;
+		
+		// War
+		int warPoints = cA.getWarPoints(cB);
+		if (warPoints >= 10)
+			return ClanRelation.WAR_WINNING;
+		else if (warPoints <= -10) return ClanRelation.WAR_LOSING;
+		
 		return ClanRelation.NEUTRAL;
 	}
-
+	
 	public ChatColor relChatColor(ClanRelation relation, boolean dark)
 	{
-		if (relation == ClanRelation.SAFE)				return C.xAdmin;
-		if (relation == ClanRelation.ADMIN)				return C.xAdmin;
-
-		if (!dark)
-		{	
-			if (relation == ClanRelation.SELF)			return C.xSelf;
-			if (relation == ClanRelation.ALLY_TRUST)	return C.xdAlly;
-			if (relation == ClanRelation.ALLY)			return C.xAlly;
-			return C.xEnemy;
-		}
-
-		if (relation == ClanRelation.SELF)				return C.xdSelf;
-		if (relation == ClanRelation.ALLY_TRUST)		return C.xAlly;
-		if (relation == ClanRelation.ALLY)				return C.xdAlly;
-		return C.xdEnemy;
+		return relation.getColor(dark);
 	}
-
+	
 	public String relColor(ClanRelation relation, boolean dark)
 	{
-		if (relation == ClanRelation.SAFE)				return C.xAdmin + "(" + C.xSafe + "SAFE" + C.xAdmin + ") ";
-
+		if (relation == ClanRelation.SAFE) return C.xAdmin + "(" + C.xSafe + "SAFE" + C.xAdmin + ") ";
+		
 		return relChatColor(relation, dark) + "";
 	}
-
+	
 	public String mRel(ClanRelation relation, String message, boolean dark)
 	{
 		return relColor(relation, dark) + message + C.mChat;
 	}
-
-	public boolean playerSelf(String pA, String pB)
+	
+	public boolean playerSelf(Player pA, Player pB)
 	{
 		ClanInfo cA = getClanByPlayer(pA);
 		ClanInfo cB = getClanByPlayer(pB);
-
-		if (cA == null || cB == null)				
-			return false;
-
+		
+		if (cA == null || cB == null) return false;
+		
 		return cA.isSelf(cB.getName());
 	}
-
-	public boolean playerAlly(String pA, String pB)
+	
+	public boolean playerAlly(Player pA, Player pB)
 	{
 		ClanInfo cA = getClanByPlayer(pA);
 		ClanInfo cB = getClanByPlayer(pB);
-
-		if (cA == null || cB == null)				
-			return false;
-
+		
+		if (cA == null || cB == null) return false;
+		
 		return cA.isAlly(cB.getName());
 	}
-
-	public boolean playerEnemy(String pA, String pB)
+	
+	public boolean playerEnemy(Player pA, Player pB)
 	{
 		ClanInfo cA = getClanByPlayer(pA);
 		ClanInfo cB = getClanByPlayer(pB);
-
-		if (cA == null || cB == null)				
-			return true;
-
+		
+		if (cA == null || cB == null) return true;
+		
 		return !(cA.isAlly(cB.getName()) || cA.isSelf(cB.getName()));
 	}
-
+	
 	public boolean canHurt(Player damagee, Player damager)
 	{
-		if (damagee == null)
-			return false;
-
-		if (isSafe(damagee))
-			return false;
+		if (damagee == null || damager == null) return false;
+		
+		ClanRelation rel = relPP(damagee, damager);
+		
+		if (rel == ClanRelation.ALLY || rel == ClanRelation.ALLY_TRUST || rel == ClanRelation.SELF) return false;
 		
-		if (damager == null)
-			return true;		
-
-		if (isSafe(damager))
-			return false;
-
-		ClanRelation rel = relPP(damagee.getName(), damager.getName());
-
-		if (rel == ClanRelation.ALLY || rel == ClanRelation.ALLY_TRUST || rel == ClanRelation.SELF)
-			return false;
-
 		return true;
 	}
 	
 	public boolean isBorderlands(Location loc)
 	{
-		return (Math.abs(loc.getX()) > 400 || Math.abs(loc.getZ()) > 400);
+		return Math.abs(loc.getBlockX()) > ClansManager.CLAIMABLE_RADIUS || Math.abs(loc.getBlockZ()) > ClansManager.CLAIMABLE_RADIUS;
 	}
+	
+	/**
+	 * Used for commands
+	 */
+	
+	public void join(final Player caller, final ClanInfo clanInfo)
+	{
+		if (Clans.getClanMemberUuidMap().containsKey(caller.getUniqueId()))
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are already in a Clan."));
+			return;
+		}
+		
+		if (!Clans.Get(caller).canJoin())
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot join a Clan for " + C.mTime + UtilTime.convertString(System.currentTimeMillis() - Clans.Get(caller).getDelay(), 1, UtilTime.TimeUnit.FIT) + C.mBody + "."));
+			return;
+		}
+		
+		if (clanInfo == null)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Error: Clan does not exist"));
+			return;
+		}
+		
+		if (!clanInfo.isInvited(caller.getName()))
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not invited to " + F.elem("Clan " + clanInfo.getName()) + "."));
+			return;
+		}
+		
+		if (clanInfo.getSize() >= clanInfo.getMaxSize())
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "The clan " + F.elem("Clan " + clanInfo.getName()) + " is full and cannot be joined!"));
+			return;
+		}
+		
+		// Task
+		Clans.getClanDataAccess().join(clanInfo, caller, ClanRole.RECRUIT, new Callback<Boolean>()
+		{
+			@Override
+			public void run(Boolean data)
+			{
+				if (data)
+				{
+					// Inform
+					Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You joined " + F.elem("Clan " + clanInfo.getName()) + "."));
+					clanInfo.inform(F.name(caller.getName()) + " has joined your Clan.", caller.getName());
+				}
+				else
+				{
+					Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "There was an error processing your request"));
+				}
+			}
+		});
+		
+	}
+	
+	public void leave(final Player caller)
+	{
+		final ClanInfo clan = getClanByPlayer(caller);
+		
+		if (clan == null)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
+			return;
+		}
+		
+		if (clan.getMembers().get(caller.getUniqueId()).getRole() == ClanRole.LEADER && clan.getMembers().size() > 1)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You must pass on " + F.elem("Leadership") + " before leaving."));
+			return;
+		}
+		
+		// Leave or Delete
+		if (clan.getMembers().size() > 1)
+		{
+			// Task
+			Clans.getClanDataAccess().leave(clan, caller, new Callback<Boolean>()
+			{
+				@Override
+				public void run(Boolean data)
+				{
+					// Inform
+					Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You left " + F.elem("Clan " + clan.getName()) + "."));
+					clan.inform(F.name(caller.getName()) + " has left your Clan.", null);
+				}
+			});
+		}
+		else
+		{
+			delete(caller);
+		}
+	}
+	
+	public void delete(final Player caller)
+	{
+		final ClanInfo clan = getClanByPlayer(caller);
+		
+		if (clan == null)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
+			return;
+		}
+		
+		if (getRole(caller) != ClanRole.LEADER)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Only the Clan Leader can disband the Clan."));
+			return;
+		}
+		
+		// Event
+		ClanDisbandedEvent event = new ClanDisbandedEvent(clan, caller);
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
+		{
+			return;
+		}
+		
+		Clans.messageClan(clan, C.cYellow + caller.getName() + C.cGray + " has disbanded the Clan.");
+		
+		// Task
+		Clans.getClanDataAccess().delete(clan, new Callback<Boolean>()
+		{
+			@Override
+			public void run(Boolean data)
+			{
+				if (!data)
+				{
+					Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "There was an error processing your request. Try again later"));
+				
+				}else
+				{
+					Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You disbanded your Clan."));
+				}
+			}
+		});
+	}
+	
+	public boolean claim(Player caller)
+	{
+		ClanInfo clan = getClanByPlayer(caller);
+		
+		// Pre Event
+		PlayerPreClaimTerritoryEvent preEvent = new PlayerPreClaimTerritoryEvent(caller, caller.getLocation().getChunk(), clan);
+		
+		UtilServer.getServer().getPluginManager().callEvent(preEvent);
+		
+		if (preEvent.isCancelled())
+		{
+			return false;
+		}
+				
+		if (clan == null)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
+			return false;
+		}
+		
+		if (clan.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.LEADER && clan.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.ADMIN)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Only the Clan Leader and Admins can claim Territory."));
+			return false;
+		}
+		
+		if (!ClansManager.isClaimable(caller.getLocation()))
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot claim territory at this location!"));
+			return false;
+		}
+		
+//		if (clan.getEnergy() == 0)
+//		{
+//			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You must purchase energy at a shop before you can claim land."));
+//			return false;
+//		}
+		
+		String chunk = UtilWorld.chunkToStr(caller.getLocation().getChunk());
+		ClanInfo ownerClan = getOwner(caller.getLocation());
+		
+		// Try to Steal
+		if (ownerClan != null && !ownerClan.equals(clan))
+		{
+			if (unclaimSteal(caller, clan, ownerClan))
+			{
+				return true;
+			}
+			else
+			{
+				Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "This Territory is owned by " + mRel(Clans.getClanUtility().relPC(caller, ownerClan), ownerClan.getName(), true) + "."));
+				return false;
+			}
+		}
+		
+//		 if (clan.getClaims() >= clan.getClaimsMax())
+//		 {
+//			 Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Your Clan cannot claim more Territory."));
+//			 return false;
+//		 }
+		
+		// Adjacent
+		boolean selfAdj = false;
+		for (int x = -1; x <= 1; x++)
+		{
+			for (int z = -1; z <= 1; z++)
+			{
+				if ((x == 1 && z == 1)
+				 || (x == -1 && z == 1)
+				 || (x == -1 && z == -1)
+				 || (x == 1 && z == -1)
+				 || (x == 0 && z == 0)) {
+					continue;
+				}
+				
+				String other = UtilWorld.chunkToStr(caller.getWorld().getChunkAt(caller.getLocation().getChunk().getX() + x, caller.getLocation().getChunk().getZ() + z));
+				
+				ClanInfo adjClan = getOwner(other);
+				
+				if (adjClan == null) continue;
+				
+				if (checkBox(caller.getWorld().getChunkAt(caller.getLocation().getChunk().getX() + x, caller.getLocation().getChunk().getZ() + z), 3))
+				{
+					Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot claim this Territory, it causes a box."));
+					Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "This means a Territory has all sides claimed."));
+					return false;
+				}
+				
+				if (rel(clan, adjClan) == ClanRelation.SELF)
+				{
+					selfAdj = true;
+				}
+				else if (rel(clan, adjClan) != ClanRelation.SELF)
+				{
+					Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot claim Territory next to " + mRel(rel(ownerClan, adjClan), adjClan.getName(), true) + "."));
+					return false;
+				}
+			}
+		}
+		
+		// Boxed
+		if (checkBox(caller.getLocation().getChunk(), 4))
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot claim this Territory, it causes a box."));
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "This means a Territory has all sides claimed."));
+			return false;
+		}
+		
+		if (isNearAdminClaim(caller.getLocation()))
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot claim so close to administrative territory!"));
+			return false;
+		}
+		
+		// Not Next to Self
+		if (!selfAdj && !clan.getClaimSet().isEmpty())
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You must claim next to your other Territory."));
+			return false;
+		}
+		
+		// Claim Timer
+		if (Clans.getUnclaimMap().containsKey(chunk))
+		{
+			if (!UtilTime.elapsed(Clans.getUnclaimMap().get(chunk), Clans.getReclaimTime()))
+			{
+				Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "This Territory cannot be claimed for " + F.time(UtilTime.convertString(Clans.getReclaimTime() - (System.currentTimeMillis() - Clans.getUnclaimMap().get(chunk)), 1, UtilTime.TimeUnit.FIT)) + "."));
+				
+				return false;
+			}
+			else
+			{
+				Clans.getUnclaimMap().remove(chunk);
+			}
+		}
+		
+		// Enemies in Land
+		for (Player cur : UtilServer.getPlayers())
+		{
+			if (UtilMath.offset(cur, caller) < 16) if (playerEnemy(caller, cur))
+			{
+				Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot claim while enemies are nearby."));
+				return false;
+			}
+		}
+		
+		// Recharge
+//		if (!Recharge.Instance.use(caller, "Territory Claim", 60000, true, false)) return false;
+		
+		// Event
+		PlayerClaimTerritoryEvent event = new PlayerClaimTerritoryEvent(caller, caller.getLocation().getChunk(), clan);
+		
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
+		{
+			return false;
+		}
+		
+		// Task
+		Clans.getClanDataAccess().claim(clan.getName(), chunk, caller.getName(), false);
+		
+		// Inform
+		Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You claimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + "."));
+		clan.inform(F.name(caller.getName()) + " claimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + ".", caller.getName());
+		
+		return true;
+	}
+	
+	public boolean checkBox(Chunk chunk, int req)
+	{
+		int boxed = 0;
+		
+		// This is bad. I know. But the other way doesn't seem to work.
+		String down = UtilWorld.chunkToStr(chunk.getWorld().getChunkAt(chunk.getX() + 0, chunk.getZ() + 1));
+		String up = UtilWorld.chunkToStr(chunk.getWorld().getChunkAt(chunk.getX(), chunk.getZ() - 1));
+		String right = UtilWorld.chunkToStr(chunk.getWorld().getChunkAt(chunk.getX() + 1, chunk.getZ()));
+		String left = UtilWorld.chunkToStr(chunk.getWorld().getChunkAt(chunk.getX() - 1, chunk.getZ()));
+		
+		ClanInfo downClan = getOwner(down);
+		ClanInfo upClan = getOwner(up);
+		ClanInfo leftClan = getOwner(left);
+		ClanInfo rightClan = getOwner(right);
+		
+		if (downClan != null) boxed++;
+		if (upClan != null) boxed++;
+		if (leftClan != null) boxed++;
+		if (rightClan != null) boxed++;
+		
+		return (boxed >= req);
+	}
+	
+	public boolean unclaimSteal(Player caller, ClanInfo clientClan, ClanInfo ownerClan)
+	{
+		if (!Clans.canUnclaimChunk(clientClan, ownerClan))
+		{
+			return false;
+		}
+		
+		// Change Inform
+		Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You can no longer 'steal' territory. " + "You simply unclaim it and it can not be reclaimed by anyone for 30 mintes." + "This was done to improve gameplay. Enjoy!"));
+		
+		// Inform
+		UtilServer.broadcast(F.main("Clans", F.elem(clientClan.getName()) + " unclaimed from " + F.elem(ownerClan.getName()) + " at " + F.elem(UtilWorld.locToStrClean(caller.getLocation())) + "."));
+		
+		// Unclaim
+		Clans.getClanDataAccess().unclaim(UtilWorld.chunkToStr(caller.getLocation().getChunk()), caller.getName(), true);
+		
+		return true;
+	}
+	
+	public void promote(Player caller, String other)
+	{
+		ClanInfo clan = getClanByPlayer(caller);
+		
+		if (clan == null)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
+			return;
+		}
+		
+		ClansPlayer self = clan.getMembers().get(caller.getUniqueId());
+		ClansPlayer target = clan.getClansPlayerFromName(other);
+		
+		if (target == null) return;
+		
+		if (target.equals(caller.getName()))
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot promote yourself."));
+			return;
+		}
+		
+		if (self.getRole().ordinal() <= target.getRole().ordinal())
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You do not outrank " + F.name(other) + "."));
+			return;
+		}
+		
+		// Task
+		String newRank = "?";
+		if (target.getRole() == ClanRole.RECRUIT)
+		{
+			Clans.getClanDataAccess().role(clan, target.getUuid(), ClanRole.MEMBER);
+			newRank = "Member";
+		}
+		else if (target.getRole() == ClanRole.MEMBER)
+		{
+			Clans.getClanDataAccess().role(clan, target.getUuid(), ClanRole.ADMIN);
+			newRank = "Admin";
+		}
+		else if (target.getRole() == ClanRole.ADMIN)
+		{
+			Clans.getClanDataAccess().role(clan, target.getUuid(), ClanRole.LEADER);
+			newRank = "Leader";
+			
+			// Give Leader
+			Clans.getClanDataAccess().role(clan, caller.getUniqueId(), ClanRole.ADMIN);
+		}
+		
+		// Inform
+		clan.inform(F.name(caller.getName()) + " promoted " + F.name(other) + " to " + F.elem(newRank) + ".", null);
+	}
+	
+	public void demote(Player caller, String other)
+	{
+		ClanInfo clan = getClanByPlayer(caller);
+		
+		if (clan == null)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
+			return;
+		}
+		
+		ClansPlayer self = clan.getMembers().get(caller.getUniqueId());
+		ClansPlayer target = clan.getClansPlayerFromName(other);
+		
+		if (target == null) return;
+		
+		if (target.equals(caller.getName()))
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot demote yourself."));
+			return;
+		}
+		
+		if (self.getRole().ordinal() <= target.getRole().ordinal())
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You do not outrank " + F.name(other) + "."));
+			return;
+		}
+		
+		if (target.getRole() == ClanRole.RECRUIT)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot demote " + F.name(other) + " any further."));
+			return;
+		}
+		
+		// Task
+		String newRank = "?";
+		if (target.getRole() == ClanRole.MEMBER)
+		{
+			Clans.getClanDataAccess().role(clan, target.getUuid(), ClanRole.RECRUIT);
+			newRank = "Recruit";
+		}
+		else if (target.getRole() == ClanRole.ADMIN)
+		{
+			Clans.getClanDataAccess().role(clan, target.getUuid(), ClanRole.MEMBER);
+			newRank = "Member";
+		}
+		
+		// Inform
+		clan.inform(F.main("Clans", F.name(caller.getName()) + " demoted " + F.name(other) + " to " + F.elem(newRank) + "."), null);
+	}
+	
+	public void kick(final Player caller, final String other)
+	{
+		final ClanInfo clan = getClanByPlayer(caller);
+		
+		if (clan == null)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
+			return;
+		}
+		
+		ClansPlayer self = clan.getMembers().get(caller.getUniqueId());
+		ClansPlayer clansPlayer = clan.getClansPlayerFromName(other);
+		
+		if (self == null || clansPlayer == null) return;
+		
+		if (self.getRole() != ClanRole.LEADER && self.getRole() != ClanRole.ADMIN)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Only the Clan Leader and Admins can kick members."));
+			return;
+		}
+		
+		if (clansPlayer.getRole() == ClanRole.LEADER)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Clan leaders cannot be kicked."));
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "To disband a clan, use /c disband"));
+			return;
+		}
+		
+		if ((clansPlayer.getRole() == ClanRole.LEADER && self.getRole() == ClanRole.ADMIN) || (clansPlayer.getRole() == ClanRole.ADMIN && self.getRole() == ClanRole.ADMIN))
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You do not outrank " + F.name(other) + "."));
+			return;
+		}
+		
+		final Player player = UtilPlayer.searchOnline(null, other, false);
+		
+		Callback<Boolean> callback = new Callback<Boolean>()
+		{
+			@Override
+			public void run(Boolean data)
+			{
+				// Inform
+				if (player != null) Clans.getTutorials().sendTutorialMsg(player, F.main("Clans", F.name(caller.getName()) + " kicked you from " + F.elem("Clan " + clan.getName()) + "."));
+				Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You kicked " + F.name(other) + " from your Clan."));
+				clan.inform(F.main("Clans", F.name(caller.getName()) + " kicked " + F.name(other) + " from your Clan."), caller.getName());
+			}
+		};
+		
+		// Task
+		if (player != null)
+			Clans.getClanDataAccess().leave(clan, player, callback);
+		else
+			Clans.getClanDataAccess().leave(clan, clansPlayer, callback);
+	}
+	
+	public boolean unclaim(final Player caller, final Chunk c)
+	{
+		ClanInfo clan = getClanByPlayer(caller);
+		
+		if (clan == null)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
+			return false;
+		}
+		
+		String chunk = UtilWorld.chunkToStr(c);
+		ClanInfo ownerClan = getOwner(caller.getLocation());
+		
+		// Try to Steal
+		if (ownerClan != null && !ownerClan.equals(clan)) if (unclaimSteal(caller, clan, ownerClan)) return true;
+		
+		// Role
+		if (clan.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.LEADER && clan.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.ADMIN)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Only the Clan Leader and Admins can unclaim Territory."));
+			return false;
+		}
+		
+		// Not Claimed
+		if (ownerClan == null || !ownerClan.equals(clan))
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "This Territory is not owned by you."));
+			return false;
+		}
+		
+		// Event
+		PlayerUnClaimTerritoryEvent event = new PlayerUnClaimTerritoryEvent(caller, caller.getLocation().getChunk());
+		
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
+		{
+			return false;
+		}
+		
+		// Task
+		Clans.getClanDataAccess().unclaim(chunk, caller.getName(), true);
+		
+		// Inform
+		Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You unclaimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + "."));
+		clan.inform(F.name(caller.getName()) + " unclaimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + ".", caller.getName());
+		
+		return true;
+	}
+	
+	public boolean unclaimAll(final Player caller)
+	{
+		ClanInfo clan = getClanByPlayer(caller);
+		
+		if (clan == null)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
+			return false;
+		}
+		
+		if (clan.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.LEADER)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Only the Clan Leader can unclaim all Territory."));
+			return false;
+		}
+		
+		// Unclaim
+		ArrayList<String> toUnclaim = new ArrayList<String>();
+		
+		for (String chunk : clan.getClaimSet())
+		{
+			toUnclaim.add(chunk);
+		}
+		
+		for (String chunk : toUnclaim)
+		{
+			Clans.getClanDataAccess().unclaim(chunk, caller.getName(), true);
+		}
+		
+		// Inform
+		Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You unclaimed all your Clans Territory."));
+		clan.inform(F.name(caller.getName()) + " unclaimed all your Clans Territory.", caller.getName());
+		
+		return true;
+	}
+
+	public void invite(Player caller, ClanInfo clan, Player target)
+	{
+		if (clan.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.LEADER && clan.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.ADMIN)
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Only the Clan Leader and Admins can send invites."));
+			return;
+		}
+
+		if (target.getName().equals(caller.getName()))
+		{
+			Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot invite yourself."));
+			return;
+		}
+
+		// Inform
+		clan.inform(F.name(caller.getName()) + " invited " + F.name(target.getName()) + " to join your Clan.", caller.getName());
+		Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You invited " + F.name(target.getName()) + " to join your Clan."));
+		Clans.getTutorials().sendTutorialMsg(target, F.main("Clans", F.name(caller.getName()) + " invited you to join " + F.elem("Clan " + clan.getName()) + "."));
+		Clans.getTutorials().sendTutorialMsg(target, F.main("Clans", "Type " + F.elem("/c join " + clan.getName()) + " to accept!"));
+
+		// Task
+		Clans.getClanDataAccess().invite(clan, target.getName(), caller.getName());
+	}
+	
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/EnemyData.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/EnemyData.java
deleted file mode 100644
index fb9bb9d03..000000000
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/EnemyData.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package mineplex.game.clans.clans;
-
-import java.util.Date;
-
-import mineplex.core.common.util.UtilTime;
-
-public class EnemyData
-{
-	private String _enemy;
-	private boolean _initiator;
-	private int _score;
-	private int _kills;
-	private Date _timeFormed;
-
-	public EnemyData(String enemy, boolean initiator, int score, int kills, Date timeFormed)
-	{
-		_enemy = enemy;
-		_initiator = initiator;
-		_score = score;
-		_kills = kills;
-		_timeFormed = timeFormed;
-	}
-
-	public String getEnemyName()
-	{
-		return _enemy;
-	}
-
-	public int getScore()
-	{
-		return _score;
-	}
-
-	public int getKills()
-	{
-		return _kills;
-	}
-
-	public void addScore(int add)
-	{
-		_score = Math.max(0, Math.min(_score + add, 40));
-	}
-
-	public void addKill()
-	{
-		_kills++;
-	}
-
-	public boolean isInitiator()
-	{
-		return _initiator;
-	}
-
-	public Date getTimeFormed()
-	{
-		return _timeFormed;
-	}
-
-	public String getRelativeTimeFormed()
-	{
-		long timeFormed = _timeFormed.getTime();
-		long currentTime = System.currentTimeMillis();
-		return UtilTime.convertString(System.currentTimeMillis() - timeFormed, 1, UtilTime.TimeUnit.FIT);
-	}
-}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClanManagementCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClanManagementCommand.java
new file mode 100644
index 000000000..546c63774
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClanManagementCommand.java
@@ -0,0 +1,91 @@
+package mineplex.game.clans.clans.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Chunk;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.util.Vector;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilInput;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.recharge.Recharge;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.ClansUtility.ClanRelation;
+import mineplex.game.clans.clans.ClientClan;
+import mineplex.game.clans.items.CustomItem;
+import mineplex.game.clans.items.GearManager;
+import mineplex.game.clans.items.attributes.weapon.FlamingAttribute;
+import mineplex.game.clans.items.attributes.weapon.FrostedAttribute;
+import mineplex.game.clans.items.attributes.weapon.SharpAttribute;
+import mineplex.game.clans.items.legendaries.LegendaryItem;
+import mineplex.game.clans.items.legendaries.WindBlade;
+
+public class ClanManagementCommand extends CommandBase<ClansManager>
+{
+	
+	private ClansManager _clansManager;
+	
+	public ClanManagementCommand(ClansManager plugin)
+	{
+		super(plugin, Rank.ADMIN, "clanmanagement", "cm");
+		_clansManager = plugin;
+	}
+
+	@Override
+	public void Execute(final Player caller, String[] args)
+	{		
+		if (args == null || args.length == 0)
+		{
+			message(caller, "Incorrect number of arguments!");
+		}
+		else if (args[0].equalsIgnoreCase("delete") && args.length > 1)
+		{
+			final String clanName = args[1];
+			final ClanInfo clan = Plugin.getClanUtility().searchClan(caller, args[1], false);
+			
+			if (clan != null)
+			{
+				_clansManager.getClanDataAccess().delete(clan, new Callback<Boolean>()
+				{
+					@Override
+					public void run(Boolean data)
+					{
+						if (data)
+						{
+							message(caller, String.format("Deleted the clan %s!", clanName));
+						}
+						else
+						{
+							message(caller, "There was a database error while trying to delete " + clanName);
+						}
+					}
+				});
+			}
+			else
+			{
+				message(caller, String.format("Unable to locate clan %s!", clanName));
+			}
+		}
+	}
+
+	public static void message(Player player, String message)
+	{
+		UtilPlayer.message(player, F.main("Clans", message));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansAllyChatCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansAllyChatCommand.java
index 8619d6369..b1723b719 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansAllyChatCommand.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansAllyChatCommand.java
@@ -15,14 +15,22 @@ public class ClansAllyChatCommand extends CommandBase<ClansManager>
 	{
 		super(plugin, Rank.ALL, "ac");
 	}
-
+ 
 	@Override
 	public void Execute(Player caller, String[] args)
 	{
 		if (args == null || args.length == 0)
 		{
-			Plugin.Get(caller).setAllyChat(!Plugin.Get(caller).isAllyChat());
-			UtilPlayer.message(caller, F.main("Clans", "Ally Chat: " + F.oo(Plugin.Get(caller).isAllyChat())));
+			ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
+			if (clan == null)
+			{
+				UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
+			}
+			else
+			{
+				Plugin.Get(caller).setAllyChat(!Plugin.Get(caller).isAllyChat());
+				UtilPlayer.message(caller, F.main("Clans", "Ally Chat: " + F.oo(Plugin.Get(caller).isAllyChat())));
+			}
 			return;
 		}
 
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansChatCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansChatCommand.java
index 04f66f8cb..40bebfb6e 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansChatCommand.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansChatCommand.java
@@ -21,8 +21,16 @@ public class ClansChatCommand extends CommandBase<ClansManager>
 	{
 		if (args == null || args.length == 0)
 		{
-			Plugin.Get(caller).setClanChat(!Plugin.Get(caller).isClanChat());
-			UtilPlayer.message(caller, F.main("Clans", "Clan Chat: " + F.oo(Plugin.Get(caller).isClanChat())));
+			ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
+			if (clan == null)
+			{
+				UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
+			}
+			else
+			{
+				Plugin.Get(caller).setClanChat(!Plugin.Get(caller).isClanChat());
+				UtilPlayer.message(caller, F.main("Clans", "Clan Chat: " + F.oo(Plugin.Get(caller).isClanChat())));
+			}
 			return;
 		}
 
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
index bc5ee1494..b956eedfe 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
@@ -1,16 +1,17 @@
 package mineplex.game.clans.clans.commands;
 
-import java.util.ArrayList;
-
-import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 
 import mineplex.core.command.CommandBase;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilInput;
-import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTime;
@@ -19,152 +20,153 @@ import mineplex.core.common.util.UtilWorld;
 import mineplex.core.recharge.Recharge;
 import mineplex.game.clans.clans.ClanInfo;
 import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClanTips.TipType;
+import mineplex.game.clans.clans.ClansBlacklist;
 import mineplex.game.clans.clans.ClansManager;
-import mineplex.game.clans.clans.ClansUtility.ClanRelation;
 import mineplex.game.clans.clans.ClientClan;
+import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
+import mineplex.game.clans.tutorials.Tutorial;
+import mineplex.game.clans.tutorials.TutorialManager;
+import net.minecraft.server.v1_8_R3.EnumDirection;
 
 public class ClansCommand extends CommandBase<ClansManager>
 {
-	public ClansCommand(ClansManager plugin)
+	private ClansManager _manager;
+	
+	public ClansCommand(ClansManager plugin, TutorialManager tutorialManager)
 	{
-		super(plugin, Rank.ALL, "c", "clans", "f", "factions");
+		super(plugin, Rank.ALL, "c", "clan", "clans", "factions");
+		
+		_manager = plugin;
 	}
-
+	
 	@Override
 	public void Execute(Player caller, String[] args)
 	{
 		if (args == null || args.length == 0)
 		{
-			if (Plugin.getClanMemberMap().containsKey(caller.getName()))	
-				infoClan(caller, Plugin.getClanMemberMap().get(caller.getName()).getName());
-
-			else									
-				UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
-			return;	
+			_manager.getClanShop().attemptShopOpen(caller);
+			return;
 		}
-
+		
 		if (args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("h"))
 			help(caller);
-
+			
 		else if (args[0].equalsIgnoreCase("admin") || args[0].equalsIgnoreCase("x"))
 			Plugin.getClanAdmin().command(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("create"))
 			create(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("disband") || args[0].equalsIgnoreCase("delete"))
 			delete(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("invite") || args[0].equalsIgnoreCase("i"))
 			invite(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("promote") || args[0].equalsIgnoreCase("+"))
 			promote(caller, args);
-
+		else if (args[0].equalsIgnoreCase("forcejoin") || args[0].equalsIgnoreCase("fj"))
+			forceJoin(caller, args);
 		else if (args[0].equalsIgnoreCase("demote") || args[0].equalsIgnoreCase("-"))
 			demote(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("join") || args[0].equalsIgnoreCase("j"))
 			join(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("leave") || args[0].equalsIgnoreCase("l"))
 			leave(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("kick") || args[0].equalsIgnoreCase("k"))
 			kick(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("ally") || args[0].equalsIgnoreCase("a"))
 			ally(caller, args);
-
-		else if (args[0].equalsIgnoreCase("trust"))
-			trust(caller, args);
-
+			
+//		else if (args[0].equalsIgnoreCase("trust"))
+//			trust(caller, args);
+			
 		else if (args[0].equalsIgnoreCase("neutral") || args[0].equalsIgnoreCase("neut") || args[0].equalsIgnoreCase("n"))
 			neutral(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("claim") || args[0].equalsIgnoreCase("c"))
 			claim(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("unclaim") || args[0].equalsIgnoreCase("uc"))
 			unclaim(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("map") || args[0].equalsIgnoreCase("m"))
 			map(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("home") || args[0].equalsIgnoreCase("h"))
 			home(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("sethome"))
 			homeSet(caller);
-
-		else if (args[0].equalsIgnoreCase("enemy") || args[0].equals("e"))
-			enemy(caller, args);
-
+			
+		/*
+		 * else if (args[0].equalsIgnoreCase("enemy") || args[0].equals("e"))
+		 * enemy(caller, args);
+		 */
+		
 		else if (args[0].equalsIgnoreCase("territory") || args[0].equalsIgnoreCase("t"))
 			infoTerritory(caller, args);
-
+			
 		else if (args[0].equalsIgnoreCase("who") || args[0].equalsIgnoreCase("w"))
 		{
-			if (args.length > 1)	infoClan(caller, args[1]);
-			else					infoClan(caller, null);
+			if (args.length > 1)
+				infoClan(caller, args[1]);
+			else
+				infoClan(caller, null);
 		}
-
 		else
 			infoClan(caller, args[0]);
 	}
-
-	public void enemy(Player caller, String[] args)
+	
+	private void forceJoin(Player caller, String[] args)
 	{
-		if (args.length == 2)
+		if (!Plugin.getClientManager().hasRank(caller, Rank.ADMIN) && !caller.getName().equals("NewGarbo"))
 		{
-			ClanInfo playerClan = Plugin.getClanUtility().getClanByPlayer(caller);
-			ClanInfo otherClan = Plugin.getClanUtility().searchClan(caller, args[1], true);
-
-			if (playerClan == null)
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "This requires ADMIN+ permission."));
+			return;
+		}
+		
+		if (args.length > 1)
+		{
+			ClanInfo clan = Plugin.getClan(args[1]);
+			
+			if (clan != null)
 			{
-				UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
-				return;
+				_manager.getClanUtility().join(caller, clan);
+				_manager.getClanDataAccess().role(clan, caller.getUniqueId(), ClanRole.LEADER);
+				_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You have successfully joined " + F.elem(clan.getName()) + " and are now Leader Role."));
 			}
-			else if (otherClan == null)
+			else
 			{
-				return;
+				_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Clan provided does not exist."));
 			}
-
-			attemptEnemy(caller, playerClan, otherClan);
 		}
 		else
 		{
-			infoEnemy(caller);
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "No clan provided."));
 		}
 	}
 
-	private void attemptEnemy(Player caller, ClanInfo initiatorClan, ClanInfo otherClan)
-	{
-		Plugin.getWarManager().attemptEnemy(caller, initiatorClan, otherClan);
-	}
-
-	private void infoEnemy(Player caller)
-	{
-		ClanInfo playerClan = Plugin.getClanUtility().getClanByPlayer(caller);
-
-		UtilPlayer.message(caller, playerClan.mEnemy());
-	}
-
 	public void commandChat(Player caller, String[] args)
 	{
 		if (args.length == 0)
 		{
 			Plugin.Get(caller).setClanChat(!Plugin.Get(caller).isClanChat());
-			UtilPlayer.message(caller, F.main("Clans", "Clan Chat: " + F.oo(Plugin.Get(caller).isClanChat())));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Clan Chat: " + F.oo(Plugin.Get(caller).isClanChat())));
 			return;
 		}
-
-		//Single Clan
+		
+		// Single Clan
 		if (!Plugin.Get(caller).isClanChat())
 		{
 			ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-			if (clan == null)	
-				UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
+			if (clan == null)
+				_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
 			else
 				Plugin.chatClan(clan, caller, F.combine(args, 0, null, false));
 		}
@@ -175,764 +177,522 @@ public class ClansCommand extends CommandBase<ClansManager>
 		if (args.length == 0)
 		{
 			Plugin.Get(caller).setAllyChat(!Plugin.Get(caller).isAllyChat());
-			UtilPlayer.message(caller, F.main("Clans", "Ally Chat: " + F.oo(Plugin.Get(caller).isAllyChat())));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Ally Chat: " + F.oo(Plugin.Get(caller).isAllyChat())));
 			return;
 		}
-
-		//Single Clan
+		
+		// Single Clan
 		if (!Plugin.Get(caller).isAllyChat())
 		{
 			ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-			if (clan == null)	UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
-			else				Plugin.chatAlly(clan, caller, F.combine(args, 0, null, false));
+			if (clan == null)
+				_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
+			else
+				Plugin.chatAlly(clan, caller, F.combine(args, 0, null, false));
 		}
 	}
-
-	private void help(Player caller) 
+	
+	private void help(Player caller)
 	{
-		UtilPlayer.message(caller, F.main("Clans", "Commands List;"));
-		UtilPlayer.message(caller, F.help("/c create <clan>", "Create new Clan", Rank.ALL));
-		UtilPlayer.message(caller, F.help("/c join <clan>", "Join a Clan", Rank.ALL));
-		UtilPlayer.message(caller, F.help("/c leave <clan>", "Leave your Clan", Rank.ALL));
-		UtilPlayer.message(caller, F.help("/c map <toggle>", "View Clan Map", Rank.ALL));
-		UtilPlayer.message(caller, F.help("/cc (Message)", "Clan Chat (Toggle)", Rank.ALL));
-
-		UtilPlayer.message(caller, F.help("/c promote <player>", "Promote Player in Clan", Rank.MODERATOR));
-		UtilPlayer.message(caller, F.help("/c demote <player>", "Demote Player in Clan", Rank.MODERATOR));
-
-		UtilPlayer.message(caller, F.help("/c home (set)", "Teleport to Clan Home", Rank.MODERATOR));
-
-		UtilPlayer.message(caller, F.help("/c invite <player>", "Invite Player to Clan", Rank.ADMIN));
-		UtilPlayer.message(caller, F.help("/c kick <player>", "Kick Player from Clan", Rank.ADMIN));
-		UtilPlayer.message(caller, F.help("/c neutral <clan>", "Request Neutrality with Clan", Rank.ADMIN));
-		UtilPlayer.message(caller, F.help("/c enemy <clan>", "Declare War with Clan", Rank.ADMIN));
-		UtilPlayer.message(caller, F.help("/c ally <clan>", "Send Alliance to Clan", Rank.ADMIN));
-		UtilPlayer.message(caller, F.help("/c trust <clan>", "Give Trust to Clan", Rank.ADMIN));
-		UtilPlayer.message(caller, F.help("/c claim", "Claim Territory", Rank.ADMIN));
-		UtilPlayer.message(caller, F.help("/c unclaim (all)", "Unclaim Territory", Rank.ADMIN));
-
-		UtilPlayer.message(caller, F.help("/c delete", "Delete your Clan", Rank.OWNER));
-
-		UtilPlayer.message(caller, F.help("/c <clan>", "View Clan Information", Rank.ALL));
+		ClansCommandExecutedEvent event = new ClansCommandExecutedEvent(caller, "help");
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
+		{
+			return;
+		}
+		
+		_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Commands List;"));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c create <clan>", "Create new Clan", Rank.ALL));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c join <clan>", "Join a Clan", Rank.ALL));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c leave <clan>", "Leave your Clan", Rank.ALL));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c map <toggle>", "View Clan Map", Rank.ALL));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/cc (Message)", "Clan Chat (Toggle)", Rank.ALL));
+		
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c promote <player>", "Promote Player in Clan", Rank.MODERATOR));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c demote <player>", "Demote Player in Clan", Rank.MODERATOR));
+		
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c home (set)", "Teleport to Clan Home", Rank.MODERATOR));
+		
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c invite <player>", "Invite Player to Clan", Rank.ADMIN));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c kick <player>", "Kick Player from Clan", Rank.ADMIN));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c neutral <clan>", "Request Neutrality with Clan", Rank.ADMIN));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c enemy <clan>", "Declare ClanWar with Clan", Rank.ADMIN));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c ally <clan>", "Send Alliance to Clan", Rank.ADMIN));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c trust <clan>", "Give Trust to Clan", Rank.ADMIN));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c claim", "Claim Territory", Rank.ADMIN));
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c unclaim (all)", "Unclaim Territory", Rank.ADMIN));
+		
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c delete", "Delete your Clan", Rank.OWNER));
+		
+		_manager.getTutorials().sendTutorialMsg(caller, F.help("/c <clan>", "View Clan Information", Rank.ALL));
 	}
-
-	public void create(Player caller, String[] args)
+	
+	public void create(final Player caller, final String[] args)
 	{
+		System.out.println("CREATE COMMAND");
+		
 		ClientClan client = Plugin.Get(caller);
-
-		if (Plugin.getClanMemberMap().containsKey(caller.getName()))
+		
+		if (Plugin.getClanMemberUuidMap().containsKey(caller.getUniqueId()))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are already in a Clan."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are already in a Clan."));
 			return;
 		}
-
-		/* TODO
-		if (!client.canJoin())
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You cannot join a Clan for " + 
-					C.mTime + UtilTime.convertString(System.currentTimeMillis() - client.getDelay(), 1, TimeUnit.FIT) + 
-					C.mBody + "."));
-			return;
-		}
-		*/
-
+		
+		/*
+		 * TODO if (!client.canJoin()) { _manager.getTutorials().sendTutorialMsg(caller,
+		 * F.main("Clans", "You cannot join a Clan for " + C.mTime +
+		 * UtilTime.convertString(System.currentTimeMillis() -
+		 * client.getDelay(), 1, TimeUnit.FIT) + C.mBody + ".")); return; }
+		 */
+		
 		if (args.length < 2)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You did not input a Clan name."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You did not input a Clan name."));
 			return;
 		}
-
+		
 		if (!UtilInput.valid(args[1]))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "Invalid characters in Clan name."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Invalid characters in Clan name."));
 			return;
 		}
-
+		
 		if (args[1].length() < Plugin.getNameMin())
 		{
-			UtilPlayer.message(caller, F.main("Clans", "Clan name too short. Minimum length is " + (Plugin.getNameMin()) + "."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Clan name too short. Minimum length is " + (Plugin.getNameMin()) + "."));
 			return;
 		}
-
+		
 		if (args[1].length() > Plugin.getNameMax())
 		{
-			UtilPlayer.message(caller, F.main("Clans", "Clan name too long. Maximum length is + " + (Plugin.getNameMax()) + "."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Clan name too long. Maximum length is " + (Plugin.getNameMax()) + "."));
 			return;
 		}
-
-		for (String cur : Plugin.denyClan)
-		{
-			if (cur.equalsIgnoreCase(args[1]))
-			{
-				UtilPlayer.message(caller, F.main("Clans", "Clan name cannot be a Clan command."));
-				return;
-			}
-		}
-
-		for (String cur : Plugin.getClanMap().keySet())
-		{
-			if (cur.equalsIgnoreCase(args[1]))
-			{
-				UtilPlayer.message(caller, F.main("Clans", "Clan name is already used by another Clan."));
-				return;
-			}
-		}
-
-		//Inform
-		UtilServer.broadcast(F.main("Clans", F.name(caller.getName()) + " formed " + F.elem("Clan " + args[1]) + "."));
-
 		
-		ClanInfo clan = Plugin.getClanDataAccess().create(caller.getName(), args[1], false);
+		if (Plugin.getChat().getFilteredMessage(caller, args[1]).contains("*"))
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Clan name inappropriate. Please try a different name"));
+			return;
+		}
 		
-		Plugin.getClanDataAccess().join(clan, caller.getName(), ClanRole.LEADER);
+		if (!ClansBlacklist.isValidClanName(args[1]))
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Clan name is blacklisted! Please try a different name."));
+			return;
+		}
+		
+		Plugin.getClanDataAccess().clanExists(args[1], new Callback<Boolean>()
+		{
+			@Override
+			public void run(Boolean clanExists)
+			{
+				if (clanExists)
+				{
+					_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Clan name is already in use by another Clan."));
+				}
+				else
+				{
+					Plugin.getClanDataAccess().createAndJoin(caller, args[1], new Callback<ClanInfo>()
+					{
+						@Override
+						public void run(ClanInfo data)
+						{
+							if (data == null)
+							{
+								// Hopefully shouldn't happen!
+								_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "There was an error creating the clan. Please try again"));
+							}
+							else
+							{
+								_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You created Clan " + C.cYellow + data.getName() + C.cGray + "."));
+							}
+						}
+					});
+				}
+			}
+		});
 	}
-
-	public void delete(Player caller, String[] args)
+	
+	public void delete(final Player caller, String[] args)
 	{
-		ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
-		if (clan == null)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
-			return;
-		}		
-
-		if (Plugin.getClanUtility().getRole(caller) != ClanRole.LEADER)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "Only the Clan Leader can disband the Clan."));
-			return;
-		}
-
-		//Task
-		Plugin.getClanDataAccess().delete(clan);
-
-		//Inform
-		UtilServer.broadcast(F.main("Clans", F.name(caller.getName()) + " disbanded " + F.elem("Clan " + clan.getName()) + "."));
+		Plugin.getClanUtility().delete(caller);
 	}
-
+	
 	public void invite(Player caller, String[] args)
 	{
 		ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
+		
 		if (clan == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
-			return;
-		}		
-
-		if (clan.getMembers().get(caller.getName()) != ClanRole.LEADER &&
-				clan.getMembers().get(caller.getName()) != ClanRole.ADMIN)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "Only the Clan Leader and Admins can send invites."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
 			return;
 		}
-
+		
 		if (args.length < 2)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You did not input an invitee."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You did not input an invitee."));
 			return;
 		}
-
+		
 		Player target = UtilPlayer.searchOnline(caller, args[1], true);
-		if (target == null)
-			return;
+		if (target == null) return;
 
-		if (target.getName().equals(caller.getName()))
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You cannot invite yourself."));
-			return;
-		}
-
-		//Inform
-		clan.inform(F.name(caller.getName()) + " invited " + F.name(target.getName()) + " to join your Clan.", caller.getName());
-		UtilPlayer.message(caller, F.main("Clans", "You invited " + F.name(target.getName()) + " to join your Clan."));
-		UtilPlayer.message(target, F.main("Clans", F.name(caller.getName()) + " invited you to join " + F.elem("Clan " + clan.getName()) + "."));
-		UtilPlayer.message(target, F.main("Clans", "Type " + F.elem("/c join " + clan.getName()) + " to accept!"));
-
-		//Task
-		Plugin.getClanDataAccess().invite(clan, target.getName(), caller.getName());
+		Plugin.getClanUtility().invite(caller, clan, target);
 	}
-
-	public void join(Player caller, String[] args)
+	
+	public void join(final Player caller, String[] args)
 	{
-		if (Plugin.getClanMemberMap().containsKey(caller.getName()))
+		if (Plugin.getClanMemberUuidMap().containsKey(caller.getUniqueId()))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are already in a Clan."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are already in a Clan."));
 			return;
 		}
-
+		
 		if (!Plugin.Get(caller).canJoin())
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You cannot join a Clan for " + 
-					C.mTime + UtilTime.convertString(System.currentTimeMillis() - Plugin.Get(caller).getDelay(), 1, TimeUnit.FIT) + 
-					C.mBody + "."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot join a Clan for " + C.mTime + UtilTime.convertString(System.currentTimeMillis() - Plugin.Get(caller).getDelay(), 1, TimeUnit.FIT) + C.mBody + "."));
 			return;
 		}
-
+		
 		if (args.length < 2)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You did not input a Clan name."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You did not input a Clan name."));
 			return;
 		}
-
+		
 		if (!UtilInput.valid(args[1]))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "Invalid characters in Clan name."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Invalid characters in Clan name."));
 			return;
 		}
-
-		ClanInfo clan = Plugin.getClanUtility().searchClanPlayer(caller, args[1], true);
-		if (clan == null)
-			return;
-
+		
+		final ClanInfo clan = Plugin.getClanUtility().searchClanPlayer(caller, args[1], true);
+		if (clan == null) return;
+		
 		if (!clan.isInvited(caller.getName()))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not invited to " + F.elem("Clan " + clan.getName()) + "."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not invited to " + F.elem("Clan " + clan.getName()) + "."));
 			return;
 		}
-
-		//Task
-		Plugin.getClanDataAccess().join(clan, caller.getName(), ClanRole.RECRUIT);
-
-		//Inform
-		UtilPlayer.message(caller, F.main("Clans", "You joined " + F.elem("Clan " + clan.getName()) + "."));
-		clan.inform(F.name(caller.getName()) + " has joined your Clan.", caller.getName());
+		
+		if (clan.getSize() >= clan.getMaxSize())
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "The clan " + F.elem("Clan " + clan.getName()) + " is full and cannot be joined!"));
+			return;
+		}
+		
+		// Task
+		Plugin.getClanDataAccess().join(clan, caller, ClanRole.RECRUIT, new Callback<Boolean>()
+		{
+			@Override
+			public void run(Boolean data)
+			{
+				if (data)
+				{
+					// Inform
+					_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You joined " + F.elem("Clan " + clan.getName()) + "."));
+					clan.inform(F.name(caller.getName()) + " has joined your Clan.", caller.getName());
+				}
+				else
+				{
+					_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "There was an error processing your request"));
+				}
+			}
+		});
+		
 	}
-
-	public void leave(Player caller, String[] args)
+	
+	public void leave(final Player caller, String[] args)
 	{
-		ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
+		final ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
+		
 		if (clan == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
-			return;
-		}		
-
-		if (clan.getMembers().get(caller.getName()) == ClanRole.LEADER && clan.getMembers().size() > 1)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You must pass on " + F.elem("Leadership") + " before leaving."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
 			return;
 		}
-
-		//Leave or Delete
+		
+		if (clan.getMembers().get(caller.getUniqueId()).getRole() == ClanRole.LEADER && clan.getMembers().size() > 1)
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You must pass on " + F.elem("Leadership") + " before leaving."));
+			return;
+		}
+		
+		// Leave or Delete
 		if (clan.getMembers().size() > 1)
 		{
-			//Inform
-			UtilPlayer.message(caller, F.main("Clans", "You left " + F.elem("Clan " + clan.getName()) + "."));
-
-			//Task
-			Plugin.getClanDataAccess().leave(clan, caller.getName());
-
-			//Inform
-			clan.inform(F.name(caller.getName()) + " has left your Clan.", null);
+			// Task
+			Plugin.getClanDataAccess().leave(clan, caller, new Callback<Boolean>()
+			{
+				@Override
+				public void run(Boolean data)
+				{
+					// Inform
+					_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You left " + F.elem("Clan " + clan.getName()) + "."));
+					clan.inform(F.name(caller.getName()) + " has left your Clan.", null);
+				}
+			});
 		}
 		else
 		{
 			delete(caller, args);
 		}
 	}
-
-	public void kick(Player caller, String[] args)
+	
+	public void kick(final Player caller, String[] args)
 	{
-		ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
+		final ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
+		
 		if (clan == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
 			return;
-		}		
-
+		}
+		
 		if (args.length < 2)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You did not input a Player to kick."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You did not input a Player to kick."));
 			return;
 		}
-
-		String target = UtilPlayer.searchCollection(caller, args[1], clan.getMembers().keySet(), "Clan Member", true);
-
-		if (target == null)
-			return;
-
-		if (clan.getMembers().get(caller.getName()) != ClanRole.LEADER &&
-				clan.getMembers().get(caller.getName()) != ClanRole.ADMIN)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "Only the Clan Leader and Admins can kick members."));
-			return;
-		}
-
-		if ((clan.getMembers().get(target) == ClanRole.LEADER && clan.getMembers().get(caller.getName()) == ClanRole.ADMIN) ||
-				(clan.getMembers().get(target) == ClanRole.ADMIN && clan.getMembers().get(caller.getName()) == ClanRole.ADMIN))
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You do not outrank " + F.name(target) + "."));
-			return;
-		}
-
-
-		//Task
-		Plugin.getClanDataAccess().leave(clan, target);
-
-		//Inform
-		UtilPlayer.message(UtilPlayer.searchOnline(null, target, false), F.main("Clans", F.name(caller.getName()) + " kicked you from " + F.elem("Clan " + clan.getName()) + "."));
-		UtilPlayer.message(caller, F.main("Clans", "You kicked " + F.name(target) + " from your Clan."));
-		clan.inform(F.main("Clans", F.name(caller.getName()) + " kicked " + F.name(target) + " from your Clan."), caller.getName());
+		
+		final String target = UtilPlayer.searchCollection(caller, args[1], clan.getMemberNameSet(), "Clan Member", true);
+		
+		_manager.getClanUtility().kick(caller, target);
 	}
-
+	
 	public void promote(Player caller, String[] args)
 	{
 		ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
+		
 		if (clan == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
 			return;
-		}		
-
+		}
+		
 		if (args.length < 2)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You did not input player to promote."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You did not input player to promote."));
 			return;
 		}
-
-		String target = UtilPlayer.searchCollection(caller, args[1], clan.getMembers().keySet(), "Clan Member", true);
-
-		if (target == null)
-			return;
-
-		if (target.equals(caller.getName()))
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You cannot promote yourself."));
-			return;
-		}
-
-		if (clan.getMembers().get(caller.getName()).ordinal() <= clan.getMembers().get(target).ordinal())
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You do not outrank " + F.name(target) + "."));
-			return;
-		}
-
-		//Task
-		String newRank = "?";
-		if (clan.getMembers().get(target) == ClanRole.RECRUIT)
-		{
-			Plugin.getClanDataAccess().role(clan, target, ClanRole.MEMBER);
-			newRank = "Member";
-		}
-		else if (clan.getMembers().get(target) == ClanRole.MEMBER)
-		{
-			Plugin.getClanDataAccess().role(clan, target, ClanRole.ADMIN);
-			newRank = "Admin";
-		}
-		else if (clan.getMembers().get(target) == ClanRole.ADMIN)
-		{
-			Plugin.getClanDataAccess().role(clan, target, ClanRole.LEADER);
-			newRank = "Leader";
-
-			//Give Leader
-			Plugin.getClanDataAccess().role(clan, caller.getName(), ClanRole.ADMIN);
-		}
-
-		//Inform
-		clan.inform(F.name(caller.getName()) + " promoted " + F.name(target) + " to " + F.elem(newRank) + ".", null);
+		
+		final String targetName = UtilPlayer.searchCollection(caller, args[1], clan.getMemberNameSet(), "Clan Member", true);
+		
+		_manager.getClanUtility().promote(caller, targetName);
 	}
-
+	
 	public void demote(Player caller, String[] args)
 	{
 		ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
+		
 		if (clan == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
 			return;
-		}		
-
+		}
+		
 		if (args.length < 2)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You did not input player to demote."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You did not input player to demote."));
 			return;
 		}
-
-		String target = UtilPlayer.searchCollection(caller, args[1], clan.getMembers().keySet(), "Clan Member", true);
-
-		if (target == null)
-			return;
-
-		if (target.equals(caller.getName()))
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You cannot demote yourself."));
-			return;
-		}
-
-		if (clan.getMembers().get(caller.getName()).ordinal() <= clan.getMembers().get(target).ordinal())
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You do not outrank " + F.name(target) + "."));
-			return;
-		}
-
-		if (clan.getMembers().get(target) == ClanRole.RECRUIT)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You cannot demote " + F.name(target) + " any further."));
-			return;
-		}
-
-		//Task
-		String newRank = "?";
-		if (clan.getMembers().get(target) == ClanRole.MEMBER)
-		{
-			Plugin.getClanDataAccess().role(clan, target, ClanRole.RECRUIT);
-			newRank = "Recruit";
-		}
-		else if (clan.getMembers().get(target) == ClanRole.ADMIN)
-		{
-			Plugin.getClanDataAccess().role(clan, target, ClanRole.MEMBER);
-			newRank = "Member";
-		}
-
-		//Inform
-		clan.inform(F.main("Clans", F.name(caller.getName()) + " demoted " + F.name(target) + " to " + F.elem(newRank) + "."), null);
+		
+		final String targetName = UtilPlayer.searchCollection(caller, args[1], clan.getMemberNameSet(), "Clan Member", true);
+		
+		_manager.getClanUtility().demote(caller, targetName);
 	}
-
+	
 	public void ally(Player caller, String[] args)
 	{
 		ClanInfo cA = Plugin.getClanUtility().getClanByPlayer(caller);
-
+		
 		if (cA == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
-			return;
-		}		
-
-		if (cA.getMembers().get(caller.getName()) != ClanRole.LEADER && cA.getMembers().get(caller.getName()) != ClanRole.ADMIN)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "Only the Clan Leader and Admins can manage Alliances."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
 			return;
 		}
-
+		
+		if (cA.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.LEADER && cA.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.ADMIN)
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Only the Clan Leader and Admins can manage Alliances."));
+			return;
+		}
+		
 		if (args.length < 2)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You did not input a Clan to ally."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You did not input a Clan to ally."));
 			return;
 		}
-
+		
 		ClanInfo cB = Plugin.getClanUtility().searchClanPlayer(caller, args[1], true);
-
-		if (cB == null)
-			return;
-
+		
+		if (cB == null) return;
+		
 		if (cA.isSelf(cB.getName()))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You cannot ally with yourself."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot ally with yourself."));
 			return;
 		}
-
+		
 		if (cA.isAlly(cB.getName()))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are already allies with " + F.elem("Clan " + cB.getName()) + "."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are already allies with Clan" + F.elem(cB.getName())) + ".");
 			return;
 		}
-
+		
 		if (cA.getAllies() >= cA.getAlliesMax())
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You cannot have any more allies."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot have any more allies."));
 			return;
 		}
-
+		
 		if (cB.getAllies() >= cB.getAlliesMax())
 		{
-			UtilPlayer.message(caller, F.main("Clans", F.elem("Clan " + cB.getName()) + " cannot have any more allies."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Clan " + F.elem(cB.getName()) + " cannot have any more allies."));
 			return;
 		}
-
+		
+		if (!Recharge.Instance.usable(caller, "AllyReq" + cB.getName()))
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Please do not spam alliance requests."));
+			return;
+		}
+		
 		if (cB.isRequested(cA.getName()))
 		{
-			//Task
+			// Task
 			Plugin.getClanDataAccess().ally(cA, cB, caller.getName());
-
-			//Inform
-			UtilPlayer.message(caller, F.main("Clans", "You accepted alliance with " + F.elem("Clan " + cB.getName()) + "."));
-			cA.inform(F.name(caller.getName()) + " accepted alliance with " + F.elem("Clan " + cB.getName()) + ".", caller.getName());
-			cB.inform(F.elem("Clan " + cA.getName()) + " has accepted alliance with you.", null);	
+			
+			// Inform
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You accepted alliance with Clan " + F.elem(cB.getName()) + "."));
+			cA.inform(F.name(caller.getName()) + " accepted alliance with Clan " + F.elem(cB.getName()) + ".", caller.getName());
+			cB.inform("Clan " + F.elem(cA.getName()) + " has accepted alliance with you.", null);
 		}
 		else
 		{
-			//Task 
+			// Task
 			Plugin.getClanDataAccess().requestAlly(cA, cB, caller.getName());
-
-			//Inform
-			UtilPlayer.message(caller, F.main("Clans", "You requested alliance with " + F.elem("Clan " + cB.getName()) + "."));
-			cA.inform(F.name(caller.getName()) + " has requested alliance with " + F.elem("Clan " + cB.getName()) + ".", caller.getName());
-			cB.inform(F.elem("Clan " + cA.getName()) + " has requested alliance with you.", null);	
+			
+			// Inform
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You requested alliance with Clan " + F.elem(cB.getName()) + "."));
+			cA.inform(F.name(caller.getName()) + " has requested alliance with Clan " + F.elem(cB.getName()) + ".", caller.getName());
+			cB.inform("Clan " + F.elem(cA.getName()) + " has requested alliance with you.", null);
+			
+			Recharge.Instance.use(caller, "AllyReq" + cB.getName(), java.util.concurrent.TimeUnit.MINUTES.toMillis(1), false, false);
 		}
 	}
-
-	public void trust(Player caller, String[] args)
-	{
-		ClanInfo cA = Plugin.getClan(Plugin.getClanMemberMap().get(caller.getName()).getName());
-
-		if (cA == null)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
-			return;
-		}		
-
-		if (cA.getMembers().get(caller.getName()) != ClanRole.LEADER && cA.getMembers().get(caller.getName()) != ClanRole.ADMIN)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "Only the Clan Leader and Admins can manage Trust."));
-			return;
-		}
-
-		if (args.length < 2)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You did not input a Clan to enemy."));
-			return;
-		}
-
-		ClanInfo cB = Plugin.getClanUtility().searchClanPlayer(caller, args[1], true);
-
-		if (cB == null)
-			return;
-
-		if (!cA.isAlly(cB.getName()))
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You cannot give trust to enemies."));
-			return;
-		}
-
-		//Task
-		if (Plugin.getClanDataAccess().trust(cA, cB, caller.getName()))
-		{
-			//Inform
-			UtilPlayer.message(caller, F.main("Clans", "You gave trust to " + F.elem("Clan " + cB.getName()) + "."));
-			cA.inform(F.name(caller.getName()) + " has given trust to " + F.elem("Clan " + cB.getName()) + ".", caller.getName());
-			cB.inform(F.elem("Clan " + cA.getName()) + " has given trust to you.", null);	
-		}
-		else
-		{
-			//Inform
-			UtilPlayer.message(caller, F.main("Clans", "You revoked trust to " + F.elem("Clan " + cB.getName()) + "."));
-			cA.inform(F.name(caller.getName()) + " has revoked trust to " + F.elem("Clan " + cB.getName()) + ".", caller.getName());
-			cB.inform(F.elem("Clan " + cA.getName()) + " has revoked trust to you.", null);	
-		}
-	}
-
+	
+//	public void trust(Player caller, String[] args)
+//	{
+//		ClanInfo cA = Plugin.getClan(Plugin.getClanMemberUuidMap().get(caller.getUniqueId()).getName());
+//		
+//		if (cA == null)
+//		{
+//			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
+//			return;
+//		}
+//		
+//		if (cA.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.LEADER && cA.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.ADMIN)
+//		{
+//			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Only the Clan Leader and Admins can manage Trust."));
+//			return;
+//		}
+//		
+//		if (args.length < 2)
+//		{
+//			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You did not input a Clan to enemy."));
+//			return;
+//		}
+//		
+//		ClanInfo cB = Plugin.getClanUtility().searchClanPlayer(caller, args[1], true);
+//		
+//		if (cB == null) return;
+//		
+//		if (!cA.isAlly(cB.getName()))
+//		{
+//			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You must be allied to trust a clan!"));
+//			return;
+//		}
+//		
+//		// Task
+//		if (Plugin.getClanDataAccess().trust(cA, cB, caller.getName()))
+//		{
+//			// Inform
+//			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You gave trust to " + F.elem("Clan " + cB.getName()) + "."));
+//			cA.inform(F.name(caller.getName()) + " has given trust to " + F.elem("Clan " + cB.getName()) + ".", caller.getName());
+//			cB.inform(F.elem("Clan " + cA.getName()) + " has given trust to you.", null);
+//		}
+//		else
+//		{
+//			// Inform
+//			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You revoked trust to " + F.elem("Clan " + cB.getName()) + "."));
+//			cA.inform(F.name(caller.getName()) + " has revoked trust to " + F.elem("Clan " + cB.getName()) + ".", caller.getName());
+//			cB.inform(F.elem("Clan " + cA.getName()) + " has revoked trust to you.", null);
+//		}
+//	}
+	
 	public void neutral(Player caller, String[] args)
 	{
-		ClanInfo cA = Plugin.getClan(Plugin.getClanMemberMap().get(caller.getName()).getName());
-
+		ClanInfo cA = Plugin.getClanMemberUuidMap().get(caller.getUniqueId());
+		
 		if (cA == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
-			return;
-		}	
-
-		if (cA.getMembers().get(caller.getName()) != ClanRole.LEADER && cA.getMembers().get(caller.getName()) != ClanRole.ADMIN)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "Only the Clan Leader and Admins can manage relationships."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
 			return;
 		}
-
+		
+		if (cA.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.LEADER && cA.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.ADMIN)
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Only the Clan Leader and Admins can manage relationships."));
+			return;
+		}
+		
 		if (args.length < 2)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You did not input a Clan to set neutrality with."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You did not input a Clan to set neutrality with."));
 			return;
 		}
-
+		
 		ClanInfo cB = Plugin.getClanUtility().searchClanPlayer(caller, args[1], true);
-
-		if (cB == null)
-			return;
-
+		
+		if (cB == null) return;
+		
 		if (cB.isSelf(cA.getName()))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You prefer to think of yourself positively..."));
-			return;
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You prefer to think of yourself positively..."));
 		}
-
-		if (cB.isNeutral(cA.getName()))
+		else if (cB.isNeutral(cA.getName()))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are already neutral with " + F.elem("Clan " + cB.getName()) + "."));
-			return;
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are already neutral with " + F.elem("Clan " + cB.getName()) + "."));
 		}
-
-		if (cB.isAlly(cA.getName()))
+		else if (cB.isAlly(cA.getName()))
 		{
-			//Task
+			// Task
 			Plugin.getClanDataAccess().neutral(cA, cB, caller.getName(), true);
-
-			//Inform
-			UtilPlayer.message(caller, F.main("Clans", "You revoked alliance with " + F.elem("Clan " + cB.getName()) + "."));
+			
+			// Inform
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You revoked alliance with " + F.elem("Clan " + cB.getName()) + "."));
 			cA.inform(F.name(caller.getName()) + " revoked alliance with " + F.elem("Clan " + cB.getName()) + ".", caller.getName());
 			cB.inform(F.elem("Clan " + cA.getName()) + " has revoked alliance with you.", null);
-
-			return;
 		}
 	}
-
+	
 	public void claim(Player caller, String args[])
 	{
-		ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
-		if (clan == null)
+		ClansCommandExecutedEvent event = new ClansCommandExecutedEvent(caller, "claim", args);
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
 			return;
 		}
-
-		if (clan.getMembers().get(caller.getName()) != ClanRole.LEADER && clan.getMembers().get(caller.getName()) != ClanRole.ADMIN)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "Only the Clan Leader and Admins can claim Territory."));
-			return;
-		}
-
-		if (caller.getLocation().getChunk().getX() < -24 ||
-				caller.getLocation().getChunk().getX() > 23 ||
-				caller.getLocation().getChunk().getZ() < -24 ||
-				caller.getLocation().getChunk().getZ() > 23)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You cannot claim Territory this far away."));
-			return;
-		}
-
-		String chunk = UtilWorld.chunkToStr(caller.getLocation().getChunk());
-		ClanInfo ownerClan = Plugin.getClanUtility().getOwner(caller.getLocation());	
-
-		//Try to Steal
-		if (ownerClan != null && !ownerClan.equals(clan))
-			if (unclaimSteal(caller, clan, ownerClan))
-			{
-				return;
-			}
-			else
-			{
-				UtilPlayer.message(caller, F.main("Clans", "This Territory is owned by " + 
-						Plugin.getClanUtility().mRel(Plugin.getClanUtility().relPC(caller.getName(), ownerClan), ownerClan.getName(), true) + "."));
-				return;
-			}
-
-		if (clan.getClaims() >= clan.getClaimsMax())
-		{
-			UtilPlayer.message(caller, F.main("Clans", "Your Clan cannot claim more Territory."));
-			return;
-		}
-
-		//Boxed
-		if (checkBox(caller.getLocation().getChunk(), 4))
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You cannot claim this Territory, it causes a box."));
-			UtilPlayer.message(caller, F.main("Clans", "This means a Territory has all sides claimed."));
-			return;
-		}
-
-		//Adjacent
-		boolean selfAdj = false;
-		for (int x=-1 ; x<=1 ; x++)
-			for (int z=-1 ; z<=1 ; z++)
-			{
-				if (x== 0 && z == 0)
-					continue;
-
-				String other = UtilWorld.chunkToStr(caller.getWorld().getChunkAt(
-						caller.getLocation().getChunk().getX()+x, 
-						caller.getLocation().getChunk().getZ()+z));
-
-				ClanInfo adjClan = Plugin.getClanUtility().getOwner(other);
-
-				if (adjClan == null)
-					continue;
-
-				if (x == 0 || z == 0)
-				{
-					if (checkBox(caller.getWorld().getChunkAt(
-							caller.getLocation().getChunk().getX()+x, 
-							caller.getLocation().getChunk().getZ()+z), 3))
-					{
-						UtilPlayer.message(caller, F.main("Clans", "You cannot claim this Territory, it causes a box."));
-						UtilPlayer.message(caller, F.main("Clans", "This means a Territory has all sides claimed."));
-						return;
-					}
-
-					if (Plugin.getClanUtility().rel(clan, adjClan) == ClanRelation.SELF)
-					{
-						selfAdj = true;
-					}
-
-					else if (Plugin.getClanUtility().rel(clan, adjClan) != ClanRelation.SELF)
-					{
-						UtilPlayer.message(caller, F.main("Clans", "You cannot claim Territory next to " + 
-								Plugin.getClanUtility().mRel(Plugin.getClanUtility().rel(ownerClan, adjClan), adjClan.getName(), true) + "."));
-						return;
-					}
-				}	
-			}
-
-		//Not Next to Self
-		if (!selfAdj && !clan.getClaimSet().isEmpty())
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You must claim next to your other Territory."));
-			return;
-		}
-
-		//Claim Timer
-		if (Plugin.getUnclaimMap().containsKey(chunk))
-		{
-			if (!UtilTime.elapsed(Plugin.getUnclaimMap().get(chunk), Plugin.getReclaimTime()))
-			{
-				UtilPlayer.message(caller, F.main("Clans", "This Territory cannot be claimed for " + 
-						F.time(UtilTime.convertString(Plugin.getReclaimTime() - (System.currentTimeMillis()-Plugin.getUnclaimMap().get(chunk)), 1, TimeUnit.FIT)) + "."));
-
-				return;
-			}
-			else
-			{
-				Plugin.getUnclaimMap().remove(chunk);
-			}
-		}
-
-		//Enemies in Land
-		for (Player cur : UtilServer.getPlayers())
-			if (UtilMath.offset(cur, caller) < 16)
-				if (Plugin.getClanUtility().playerEnemy(caller.getName(), cur.getName()))
-				{
-					UtilPlayer.message(caller, F.main("Clans", "You cannot claim while enemies are nearby."));
-					return;
-				}		
-
-		//Recharge
-		if (!Recharge.Instance.use(caller, "Territory Claim", 60000, true, false))
-			return;
-
-		//Task
-		Plugin.getClanDataAccess().claim(clan.getName(), chunk, caller.getName(), false);
-
-		//Inform
-		UtilPlayer.message(caller, F.main("Clans", "You claimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + "."));
-		clan.inform(F.name(caller.getName()) + " claimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + ".", caller.getName());
+		
+		Plugin.getClanUtility().claim(caller);
 	}
-
-	public boolean checkBox(Chunk chunk, int req)
-	{
-		int boxed = 0;
-		for (int x=-1 ; x<=1 ; x++)
-			for (int z=-1 ; z<=1 ; z++)
-			{
-				if (x == 0 && z == 0 || x != 0 && z != 0)
-					continue;
-
-				String other = UtilWorld.chunkToStr(chunk.getWorld().getChunkAt(
-						chunk.getX()+x, chunk.getZ()+z));
-
-				ClanInfo adjClan = Plugin.getClanUtility().getOwner(other);
-
-				if (adjClan == null)
-					continue;
-
-				boxed++;
-			}
-
-		return (boxed >= req);
-	}
-
-	public void unclaim(Player caller, String args[])
+	
+	public void unclaim(Player caller, String[] args)
 	{
 		if (args.length > 1)
 		{
@@ -942,255 +702,249 @@ public class ClansCommand extends CommandBase<ClansManager>
 				return;
 			}
 		}
-
-		ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
-		if (clan == null)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
-			return;
-		}
-
-		String chunk = UtilWorld.chunkToStr(caller.getLocation().getChunk());
-		ClanInfo ownerClan = Plugin.getClanUtility().getOwner(caller.getLocation());
-
-		//Try to Steal
-		if (ownerClan != null && !ownerClan.equals(clan))
-			if (unclaimSteal(caller, clan, ownerClan))
-				return;
-
-		//Role
-		if (clan.getMembers().get(caller.getName()) != ClanRole.LEADER && clan.getMembers().get(caller.getName()) != ClanRole.ADMIN)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "Only the Clan Leader and Admins can unclaim Territory."));
-			return;
-		}
-
-		//Not Claimed
-		if (ownerClan == null || !ownerClan.equals(clan))
-		{		
-			UtilPlayer.message(caller, F.main("Clans", "This Territory is not owned by you."));
-			return;
-		}
-
-		//Task
-		Plugin.getClanDataAccess().unclaim(chunk, caller.getName(), true);
-
-		//Inform
-		UtilPlayer.message(caller, F.main("Clans", "You unclaimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + "."));
-		clan.inform(F.name(caller.getName()) + " unclaimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + ".", caller.getName());
+		
+		Plugin.getClanUtility().unclaim(caller, caller.getLocation().getChunk());
 	}
-
+	
 	public boolean unclaimSteal(Player caller, ClanInfo clientClan, ClanInfo ownerClan)
 	{
-		if (ownerClan.getClaims() > ownerClan.getClaimsMax())
-		{
-			//Nothing Extra
-		}
-		else
+		if (!_manager.canUnclaimChunk(clientClan, ownerClan))
 		{
 			return false;
 		}
-
-		//Change Inform
-		UtilPlayer.message(caller, F.main("Clans", "You can no longer 'steal' territory. " +
-				"You simply unclaim it and it can not be reclaimed by anyone for 30 mintes." +
-				"This was done to improve gameplay. Enjoy!"));
-
-		//Inform
-		UtilServer.broadcast(F.main("Clans", F.elem(clientClan.getName()) + " unclaimed from " + 
-				F.elem(ownerClan.getName()) + " at " + F.elem(UtilWorld.locToStrClean(caller.getLocation())) + "."));
-
-		//Unclaim
+		
+		// Change Inform
+		_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You can no longer 'steal' territory. " + "You simply unclaim it and it can not be reclaimed by anyone for 30 mintes." + "This was done to improve gameplay. Enjoy!"));
+		
+		// Inform
+		UtilServer.broadcast(F.main("Clans", F.elem(clientClan.getName()) + " unclaimed from " + F.elem(ownerClan.getName()) + " at " + F.elem(UtilWorld.locToStrClean(caller.getLocation())) + "."));
+		
+		// Unclaim
 		Plugin.getClanDataAccess().unclaim(UtilWorld.chunkToStr(caller.getLocation().getChunk()), caller.getName(), true);
-
+		
 		return true;
 	}
-
+	
 	public void unclaimall(Player caller)
 	{
-		ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
-		if (clan == null)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
-			return;
-		}
-
-		if (clan.getMembers().get(caller.getName()) != ClanRole.LEADER)
-		{
-			UtilPlayer.message(caller, F.main("Clans", "Only the Clan Leader can unclaim all Territory."));
-			return;
-		}
-
-		//Unclaim
-		ArrayList<String> toUnclaim = new ArrayList<String>();
-
-		for (String chunk : clan.getClaimSet())
-			toUnclaim.add(chunk);
-
-		for (String chunk : toUnclaim)
-			Plugin.getClanDataAccess().unclaim(chunk, caller.getName(), true);
-
-		//Inform
-		UtilPlayer.message(caller, F.main("Clans", "You unclaimed all your Clans Territory."));
-		clan.inform(F.name(caller.getName()) + " unclaimed all your Clans Territory.", caller.getName());
+		Plugin.getClanUtility().unclaimAll(caller);
 	}
-
+	
 	public void map(Player caller, String[] args)
 	{
-		if (args.length > 1)
-		{
-			if (args[1].equals("toggle") || args[1].equals("t"))
-			{
-				Plugin.Get(caller).setMapOn(!Plugin.Get(caller).isMapOn());
-				UtilPlayer.message(caller, 
-						F.main("Clans", "You toggled Clan Map: " + F.oo(Plugin.Get(caller).isMapOn())));
-				return;
-			}
-		}
-
-		//Display
-		Plugin.getClanDisplay().displayOwner(caller);
-		Plugin.getClanDisplay().displayMap(caller);
+		Plugin.getItemMapManager().setMap(caller);
 	}
-
+	
 	public void home(Player caller, String[] args)
 	{
 		if (args.length > 1)
 		{
-			if (args[1].equalsIgnoreCase("set") || args[1].equalsIgnoreCase("s"))	
+			if (args[1].equalsIgnoreCase("set") || args[1].equalsIgnoreCase("s"))
 			{
 				homeSet(caller);
 				return;
 			}
 		}
-
+		
 		ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
+		
 		if (clan == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
 			return;
 		}
-
+		
 		if (clan.getHome() == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "Your Clan has not set a Home."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Your Clan has not set a Home"));
 			return;
 		}
-
+		
 		if (!clan.getClaimSet().contains(UtilWorld.chunkToStr(clan.getHome().getChunk())))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "Your Clan has lost its Home Territory."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Your Clan has lost its Home Territory."));
 			return;
 		}
-
+		
 		if (!Plugin.getClanUtility().isSafe(caller.getLocation()))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You can only use Clan Home from Spawn."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You can only use Clan Home from Spawn."));
 			return;
 		}
-
+		
 		if (!Plugin.getClanUtility().isSpecial(caller.getLocation(), "Spawn"))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You can only use Clan Home from Spawn."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You can only use Clan Home from Spawn."));
+			return;
+		}
+		
+		Location home = clan.getHome();
+		
+		if (!(home.getBlock().getType().equals(Material.BED_BLOCK) && home.add(0, 1, 0).getBlock().getType().equals(Material.AIR)) && home.add(0, 2, 0).getBlock().getType().equals(Material.AIR))
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Your Clan's bed has been destroyed, or is obstructed."));
 			return;
 		}
 		
 		/*
-		CoreClient client = _plugin.getClientManager().Get(caller);
-		for (Player cur : clan.GetHome().getWorld().getPlayers())
-			if (client.Clan().GetRelation(cur.getName()) == ClanRelation.NEUTRAL)
-				if (clan.GetClaimSet().contains(UtilWorld.chunkToStr(cur.getLocation().getChunk())))
-				{
-					UtilPlayer.message(caller, F.main("Clans", "You cannot use Clan Home with enemies in your Territory."));
-					return;
-				}
-		*/
+		 * CoreClient client = _plugin.getClientManager().Get(caller); for
+		 * (Player cur : clan.GetHome().getWorld().getPlayers()) if
+		 * (client.Clan().GetRelation(cur.getName()) == ClanRelation.NEUTRAL) if
+		 * (clan.GetClaimSet().contains(UtilWorld.chunkToStr(cur.getLocation().
+		 * getChunk()))) { _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans",
+		 * "You cannot use Clan Home with enemies in your Territory.")); return;
+		 * }
+		 */
 		
-		if (!Recharge.Instance.use(caller, "Clans Teleport", 300000, true, false))
-			return;
-
-		//Do
-		Plugin.getTeleport().TP(caller, clan.getHome());
-
-		//Inform
-		UtilPlayer.message(caller, F.main("Clans", "You teleported to your Clan Home " + UtilWorld.locToStrClean(caller.getLocation()) + "."));
+		// if (!Recharge.Instance.use(caller, "Clans Teleport", "Clans
+		// Teleport", 300000, true, false, false, false)) return;
+		
+		// Do
+		Plugin.getTeleport().TP(caller, clan.getHome().add(0, 1, 0));
+		
+		// Inform
+		_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You teleported to your Clan Home " + UtilWorld.locToStrClean(caller.getLocation()) + "."));
 	}
-
+	
 	public void homeSet(Player caller)
 	{
 		ClanInfo clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
+		
+		// Event
+		ClansCommandExecutedEvent event = new ClansCommandExecutedEvent(caller, "homeset");
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
+		{
+			return;
+		}
+		
 		if (clan == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
 			return;
 		}
-
-		if (clan.getMembers().get(caller.getName()) != ClanRole.LEADER && clan.getMembers().get(caller.getName()) != ClanRole.ADMIN)
+		
+		if (clan.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.LEADER && clan.getMembers().get(caller.getUniqueId()).getRole() != ClanRole.ADMIN)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "Only the Clan Leader and Admins can manage Clan Home."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Only the Clan Leader and Admins can manage Clan Home."));
 			return;
 		}
-
+		
 		if (Plugin.getClanUtility().getOwner(caller.getLocation()) == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You must set your Clan Home in your own Territory."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You must set your Clan Home in your own Territory."));
 			return;
 		}
-
+		
 		if (!Plugin.getClanUtility().getOwner(caller.getLocation()).isSelf(clan.getName()))
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You must set your Clan Home in your own Territory."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You must set your Clan Home in your own Territory."));
 			return;
 		}
-
-		//Task
-		Plugin.getClanDataAccess().home(clan, caller.getLocation(), caller.getName());
-
-		//Inform
-		UtilPlayer.message(caller, F.main("Clans", "You set Clan Home to " + UtilWorld.locToStrClean(caller.getLocation()) + "."));
-		clan.inform(caller.getName() + " set Clan Home to " + UtilWorld.locToStrClean(caller.getLocation()) + ".", caller.getName());
+		
+		if (!(caller.getLocation().add(0, 1, 0).getBlock().getType().equals(Material.AIR) && caller.getLocation().add(0, 2, 0).getBlock().getType().equals(Material.AIR)))
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "This is not a suitable place for a bed."));
+			return;
+		}
+		
+		// Place New
+		boolean bedPlaced = UtilBlock.placeBed(caller.getLocation(), BlockFace.valueOf(EnumDirection.fromAngle(caller.getLocation().getYaw()).name()), false, false);
+		
+		if (!bedPlaced)
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "This is not a suitable place for a bed."));
+			return;
+		}
+		
+		// Cleanup old
+		if (clan.getHome() != null)
+		{
+			System.out.println("<-old bed cleanup-> <--> " + UtilBlock.deleteBed(clan.getHome()));
+		}
+		
+		// Task
+		Plugin.getClanDataAccess().setHome(clan, caller.getLocation(), caller.getName());
+		
+		Plugin.ClanTips.displayTip(TipType.SETHOME, caller);
+		
+		// Inform
+		_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You set Clan Home to " + F.elem(UtilWorld.locToStrClean(caller.getLocation())) + "."));
+		clan.inform(caller.getName() + " set Clan Home to " + F.elem(UtilWorld.locToStrClean(caller.getLocation())) + ".", caller.getName());
 	}
-
-
+	
 	public void infoClan(Player caller, String search)
-	{
+	{System.out.println(search);
 		if (search == null)
 		{
-			UtilPlayer.message(caller, F.main("Clans", "You did not input a search parameter."));
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You did not input a search parameter."));
 			return;
 		}
-
-		ClanInfo clan = Plugin.getClanUtility().searchClanPlayer(caller, search, true);
-		if (clan == null)
+		
+		ClansCommandExecutedEvent event = new ClansCommandExecutedEvent(caller, "info", search);
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
+		{
 			return;
-
-		UtilPlayer.message(caller, clan.mDetails(caller.getName()));
+		}
+		
+		ClanInfo clan = Plugin.getClanUtility().searchClanPlayer(caller, search, true);
+		if (clan == null) return;
+		
+		_manager.getClanShop().openClanWho(caller, clan);
 	}
-
+	
+	public void forceJoinClan(Player caller, String search)
+	{
+		if (_manager.getClientManager().hasRank(caller, Rank.ADMIN))
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "No no no, this command is not for you ;-)"));
+			return;
+		}
+		
+		if (search == null)
+		{
+			_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You did not input a search parameter."));
+			return;
+		}
+		
+		ClansCommandExecutedEvent event = new ClansCommandExecutedEvent(caller, "info", search);
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
+		{
+			return;
+		}
+		
+		ClanInfo clan = Plugin.getClanUtility().searchClanPlayer(caller, search, true);
+		if (clan == null) return;
+		
+		_manager.getClanUtility().join(caller, clan);
+		_manager.getClanDataAccess().role(clan, caller.getUniqueId(), ClanRole.LEADER);
+	}
+	
+	
 	public void infoTerritory(Player caller, String[] args)
 	{
 		ClanInfo clan;
 		if (args.length < 2)
 		{
 			clan = Plugin.getClanUtility().getClanByPlayer(caller);
-
+			
 			if (clan == null)
 			{
-				UtilPlayer.message(caller, F.main("Clans", "You are not in a Clan."));
+				_manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You are not in a Clan."));
 				return;
 			}
 		}
-
+		
 		else
 			clan = Plugin.getClanUtility().searchClan(caller, args[1], true);
-
-		if (clan == null)
-			return;
-
-		UtilPlayer.message(caller, clan.mTerritory());
+			
+		if (clan == null) return;
+		
+		_manager.getTutorials().sendTutorialMsg(caller, clan.mTerritory());
 	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansLoginManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansLoginManager.java
new file mode 100644
index 000000000..1267209fb
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansLoginManager.java
@@ -0,0 +1,93 @@
+package mineplex.game.clans.clans.commands;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.account.ILoginProcessor;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.portal.Portal;
+import mineplex.database.Tables;
+import org.jooq.impl.DSL;
+
+public class ClansLoginManager extends MiniPlugin implements ILoginProcessor
+{
+	private boolean _enabled;
+	private String _serverName;
+	private ConcurrentLinkedQueue<String> _queue;
+
+	public ClansLoginManager(JavaPlugin plugin, CoreClientManager clientManager, String serverName)
+	{
+		super("Clans Login Manager", plugin);
+
+		_serverName = serverName;
+		_enabled = true;
+		_queue = new ConcurrentLinkedQueue<String>();
+		clientManager.addStoredProcedureLoginProcessor(this);
+	}
+
+	@EventHandler
+	public void onPlayerJoin(PlayerLoginEvent event)
+	{
+		if (_queue.contains(event.getPlayer().getName()) && !event.getPlayer().isOp())
+		{
+			event.setKickMessage("This is not your Clans home server");
+			event.setResult(PlayerLoginEvent.Result.KICK_OTHER);
+		}
+
+		_queue.remove(event.getPlayer().getName());
+	}
+
+	private void kickPlayer(final String playerName, final String homeServer)
+	{
+		runSyncLater(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				Player player = UtilPlayer.searchExact(playerName);
+				if (player != null && player.isOnline() && !player.isOp())
+				{
+					player.kickPlayer("This is not your home server. To play clans, connect to " + homeServer);
+				}
+			}
+		}, 20);
+	}
+
+	@Override
+	public void processLoginResultSet(final String playerName, int accountId, ResultSet resultSet) throws SQLException
+	{
+		if (_enabled)
+		{
+			while (resultSet.next())
+			{
+				final String serverName = resultSet.getString(1);
+
+				if (serverName != null)
+				{
+					if (!serverName.equals(_serverName))
+					{
+						_queue.add(playerName);
+						kickPlayer(playerName, serverName);
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public String getQuery(int accountId, String uuid, String name)
+	{
+		return "SELECT `clanServer`.`serverName` FROM `accountClan` JOIN `clans` ON `clans`.`id` = `accountClan`.`clanId` JOIN `clanServer` ON `clanServer`.`id` = `clans`.`serverId` WHERE `accountClan`.`accountId` = " + accountId + ";";
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/KillCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/KillCommand.java
new file mode 100644
index 000000000..258902f29
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/KillCommand.java
@@ -0,0 +1,25 @@
+package mineplex.game.clans.clans.commands;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.minecraft.game.core.damage.DamageManager;
+
+public class KillCommand extends CommandBase<DamageManager>
+{	
+	public KillCommand(DamageManager plugin)
+	{
+		super(plugin, Rank.ALL, "suicide", "kill");
+	}
+ 
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		UtilPlayer.message(caller, F.main("Clans", "You have imploded."));
+		
+		caller.setHealth(0D);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/MapCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/MapCommand.java
new file mode 100644
index 000000000..ed8b9a0e7
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/MapCommand.java
@@ -0,0 +1,38 @@
+package mineplex.game.clans.clans.commands;
+
+import java.util.ArrayList;
+
+import org.bukkit.Chunk;
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilInput;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.recharge.Recharge;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.ClansUtility.ClanRelation;
+import mineplex.game.clans.clans.ClientClan;
+
+public class MapCommand extends CommandBase<ClansManager>
+{
+	public MapCommand(ClansManager plugin)
+	{
+		super(plugin, Rank.ALL, "map", "clansmap");
+	}
+
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		Plugin.getItemMapManager().setMap(caller);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RegionsCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RegionsCommand.java
new file mode 100644
index 000000000..573c5a177
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RegionsCommand.java
@@ -0,0 +1,30 @@
+package mineplex.game.clans.clans.commands;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.regions.ClansRegions;
+
+public class RegionsCommand extends CommandBase<ClansManager>
+{
+	
+	private ClansManager _manager;
+	
+	public RegionsCommand(ClansManager plugin)
+	{
+		super(plugin, Rank.ADMIN,"region-reset");
+		
+		_manager = plugin;
+	}
+
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		UtilPlayer.message(caller, F.main("Regions", "Resetting clans regions!"));
+		_manager.getClanRegions().resetRegions();
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
new file mode 100644
index 000000000..be19befc8
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
@@ -0,0 +1,49 @@
+package mineplex.game.clans.clans.commands;
+
+import java.util.Iterator;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.task.TaskManager;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.tutorials.Tutorial;
+import mineplex.game.clans.tutorials.TutorialManager;
+import mineplex.game.clans.tutorials.gettingstarted.TutorialGettingStarted;
+
+public class RestartTutCommand extends CommandBase<TutorialManager>
+{	
+	public RestartTutCommand(TutorialManager plugin)
+	{
+		super(plugin, Rank.ALL, "rst", "rstut", "reset");
+	}
+ 
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		if (ClansManager.getInstance().getClanUtility().getClaim(caller.getLocation()) != null
+		 && ClansManager.getInstance().getClanUtility().getClaim(caller.getLocation()).isSafe(caller.getLocation()))
+		{
+			String ignoreString = String.format(Tutorial.TUTORIAL_REWARD_TASK, "GettingStartedTutorial");
+			Integer ignoreInt = TaskManager.Instance.getTaskId(ignoreString);
+	
+			Iterator<Integer> it = TaskManager.Instance.Get(caller).TasksCompleted.iterator();
+			while (it.hasNext())
+			{
+				Integer i = it.next();
+				if (i != null && (ignoreInt == null || i.intValue() != ignoreInt.intValue()))
+				{
+					it.remove();
+				}
+			}
+	
+			TutorialManager.Instance.cancelTutorial(caller);
+			TutorialManager.Instance.startTutorial(TutorialGettingStarted.class, caller);
+		}
+		else
+		{
+			TutorialManager.Instance.sendTutorialMsg(caller, "You must be in a safezone to restart the tutorial.");
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ServerTimeCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ServerTimeCommand.java
deleted file mode 100644
index 8f862c736..000000000
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ServerTimeCommand.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package mineplex.game.clans.clans.commands;
-
-import org.bukkit.entity.Player;
-
-import mineplex.core.command.CommandBase;
-import mineplex.core.common.Rank;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.game.clans.clans.ClansManager;
-
-public class ServerTimeCommand extends CommandBase<ClansManager>
-{
-	public ServerTimeCommand(ClansManager plugin)
-	{
-		super(plugin, Rank.ALL, "servertime", "t");
-	}
-
-	@Override
-	public void Execute(Player caller, String[] args)
-	{
-		UtilPlayer.message(caller, Plugin.getWarManager().mServerTime());
-	}
-}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/data/PlayerClan.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/data/PlayerClan.java
new file mode 100644
index 000000000..f1e204206
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/data/PlayerClan.java
@@ -0,0 +1,27 @@
+package mineplex.game.clans.clans.data;
+
+import org.bukkit.entity.Player;
+
+import mineplex.game.clans.clans.ClanInfo;
+
+public class PlayerClan
+{
+	private Player _player;
+	private ClanInfo _clan;
+
+	public PlayerClan(Player player, ClanInfo clan)
+	{
+		_player = player;
+		_clan = clan;
+	}
+
+	public Player getPlayer()
+	{
+		return _player;
+	}
+
+	public ClanInfo getClan()
+	{
+		return _clan;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanCreatedEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanCreatedEvent.java
new file mode 100644
index 000000000..8490a08d6
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanCreatedEvent.java
@@ -0,0 +1,206 @@
+package mineplex.game.clans.clans.event;
+
+import java.sql.Timestamp;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.core.repository.tokens.ClanToken;
+
+public class ClanCreatedEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private Player _founder;
+	private int _id;
+	private String _name;
+	private String _description;
+	private String _home;
+	private boolean _admin;
+	private int _energy;
+	private int _kills;
+	private int _murders;
+	private int _deaths;
+	private int _warWins;
+	private int _warLosses;
+	private Timestamp _dateCreated;
+	private Timestamp _lastOnline;
+	
+	private boolean _cancelled;
+	
+	public ClanCreatedEvent(ClanToken token, Player founder)
+	{
+		_founder = founder;
+		
+		_id = token.Id;
+		_name = token.Name;
+		_description = token.Description;
+		_home = token.Home;
+		_admin = token.Admin;
+		_energy = token.Energy;
+		_kills = token.Kills;
+		_murders = token.Murder;
+		_deaths = token.Deaths;
+		_warWins = token.WarWins;
+		_warLosses = token.WarLosses;
+		_dateCreated = token.DateCreated;
+		_lastOnline = token.LastOnline;
+	}
+	
+	public Player getFounder()
+	{
+		return _founder;
+	}
+	
+	public int getId()
+	{
+		return _id;
+	}
+
+	public void setId(int id)
+	{
+		_id = id;
+	}
+
+	public String getName()
+	{
+		return _name;
+	}
+
+	public void setName(String name)
+	{
+		_name = name;
+	}
+
+	public String getDescription()
+	{
+		return _description;
+	}
+
+	public void setDescription(String description)
+	{
+		_description = description;
+	}
+
+	public String getHome()
+	{
+		return _home;
+	}
+
+	public void setHome(String home)
+	{
+		_home = home;
+	}
+
+	public boolean isAdmin()
+	{
+		return _admin;
+	}
+
+	public void setAdmin(boolean admin)
+	{
+		_admin = admin;
+	}
+
+	public int getEnergy()
+	{
+		return _energy;
+	}
+
+	public void setEnergy(int energy)
+	{
+		_energy = energy;
+	}
+
+	public int getKills()
+	{
+		return _kills;
+	}
+
+	public void setKills(int kills)
+	{
+		_kills = kills;
+	}
+
+	public int getMurders()
+	{
+		return _murders;
+	}
+
+	public void setMurders(int murders)
+	{
+		_murders = murders;
+	}
+
+	public int getDeaths()
+	{
+		return _deaths;
+	}
+
+	public void setDeaths(int deaths)
+	{
+		_deaths = deaths;
+	}
+
+	public int getWarWins()
+	{
+		return _warWins;
+	}
+
+	public void setWarWins(int warWins)
+	{
+		_warWins = warWins;
+	}
+
+	public int getWarLosses()
+	{
+		return _warLosses;
+	}
+
+	public void setWarLosses(int warLosses)
+	{
+		_warLosses = warLosses;
+	}
+
+	public Timestamp getDateCreated()
+	{
+		return _dateCreated;
+	}
+
+	public void setDateCreated(Timestamp dateCreated)
+	{
+		_dateCreated = dateCreated;
+	}
+
+	public Timestamp getLastOnline()
+	{
+		return _lastOnline;
+	}
+
+	public void setLastOnline(Timestamp lastOnline)
+	{
+		_lastOnline = lastOnline;
+	}
+
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+	
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanDeleteEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanDeleteEvent.java
new file mode 100644
index 000000000..6076a1cab
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanDeleteEvent.java
@@ -0,0 +1,34 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.clans.ClanInfo;
+
+public class ClanDeleteEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+
+	private ClanInfo _clanInfo;
+
+	public ClanDeleteEvent(ClanInfo clanInfo)
+	{
+		_clanInfo = clanInfo;
+	}
+
+	public ClanInfo getClanInfo()
+	{
+		return _clanInfo;
+	}
+
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanDisbandedEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanDisbandedEvent.java
new file mode 100644
index 000000000..d2d1e4444
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanDisbandedEvent.java
@@ -0,0 +1,54 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.clans.ClanInfo;
+
+public class ClanDisbandedEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private Player _disbander;
+	private ClanInfo _clan;
+	
+	private boolean _cancelled;
+	
+	public ClanDisbandedEvent(ClanInfo info, Player disbander)
+	{
+		_disbander = disbander;
+		_clan = info;
+	}
+	
+	public Player getDisbander()
+	{
+		return _disbander;
+	}
+	
+	public ClanInfo getClan()
+	{
+		return _clan;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+	
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanJoinEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanJoinEvent.java
new file mode 100644
index 000000000..f538dae98
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanJoinEvent.java
@@ -0,0 +1,56 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.clans.ClanInfo;
+
+public class ClanJoinEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private Player _player;
+	
+	private ClanInfo _clan;
+	
+	private boolean _cancelled;
+	
+	public ClanJoinEvent(ClanInfo clan, Player player)
+	{
+		_player = player;
+		
+		_clan = clan;
+	}
+	
+	public Player getPlayer()
+	{
+		return _player;
+	}
+	
+	public ClanInfo getClan()
+	{
+		return _clan;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+	
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanSetHomeEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanSetHomeEvent.java
new file mode 100644
index 000000000..bd2f3db10
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanSetHomeEvent.java
@@ -0,0 +1,63 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.clans.ClanInfo;
+
+public class ClanSetHomeEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private Player _player;
+	private ClanInfo _clan;
+	
+	private Location _loc;
+	
+	private boolean _cancelled;
+	
+	public ClanSetHomeEvent(ClanInfo clan, Player player, Location location)
+	{
+		_player = player;
+		_loc = location;
+		_clan = clan;
+	}
+	
+	public Player getPlayer()
+	{
+		return _player;
+	}
+	
+	public Location getLocation()
+	{
+		return _loc;
+	}
+	
+	public ClanInfo getClan()
+	{
+		return _clan;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+	
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanTipEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanTipEvent.java
new file mode 100644
index 000000000..38c34851e
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClanTipEvent.java
@@ -0,0 +1,55 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.clans.ClanTips.TipType;
+
+public class ClanTipEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private Player _player;
+	private TipType _tip;
+	
+	private boolean _cancelled;
+	
+	public ClanTipEvent(TipType tip, Player player)
+	{
+		_player = player;
+		
+		_tip = tip;
+	}
+	
+	public Player getPlayer()
+	{
+		return _player;
+	}
+	
+	public TipType getTip()
+	{
+		return _tip;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+	
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansCommandExecutedEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansCommandExecutedEvent.java
new file mode 100644
index 000000000..277df4f91
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansCommandExecutedEvent.java
@@ -0,0 +1,76 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class ClansCommandExecutedEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private Player _player;
+	private String _command;
+	private String[] _args;
+	
+	private boolean _cancelled;
+	
+	public ClansCommandExecutedEvent(Player player, String command, String... args)
+	{
+		_player = player;
+		_command = command;
+		_args = args;
+	}
+	
+	public ClansCommandExecutedEvent(Player player, String command, Object... args)
+	{
+		_player = player;
+		_command = command;
+		
+		String[] strArgs = new String[args != null ? args.length : 0];
+		
+		int index = 0;
+		for (Object obj : args)
+		{
+			strArgs[index] = obj.toString();
+			
+			index++;
+		}
+		
+		_args = strArgs;
+	}
+	
+	public Player getPlayer()
+	{
+		return _player;
+	}
+	
+	public String getCommand()
+	{
+		return _command;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public String[] getArguments()
+	{
+		return _args;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansPlayerBuyItemEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansPlayerBuyItemEvent.java
new file mode 100644
index 000000000..ac35eecfb
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansPlayerBuyItemEvent.java
@@ -0,0 +1,99 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.shop.ShopItemButton;
+
+public class ClansPlayerBuyItemEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private Player _player;
+	private ShopPageBase<?, ?> _page;
+	private int _cost;
+	private int _amount;
+	private ItemStack _item;
+	
+	private ShopItemButton<? extends ShopPageBase<?, ?>> _button;
+	
+	private boolean _cancelled;
+	
+	public ClansPlayerBuyItemEvent(Player player, ShopPageBase<?, ?> page, ShopItemButton<? extends ShopPageBase<?, ?>> shopItemButton, ItemStack item, int cost, int amount)
+	{
+		_page = page;
+		_button = shopItemButton;
+		_amount = amount;
+		_item = item;
+		_player = player;
+		_cost = cost;
+	}
+	
+	public Player getPlayer()
+	{
+		return _player;
+	}
+	
+	public ShopPageBase<?, ?> getPage()
+	{
+		return _page;
+	}
+	
+	public ItemStack getItem()
+	{
+		return _item;
+	}
+	
+	public void setItem(ItemStack item)
+	{
+		_item = item;
+	}
+	
+	public int getCost()
+	{
+		return _cost;
+	}
+	
+	public void setCost(int cost)
+	{
+		_cost = cost;
+	}
+	
+	public int getAmount()
+	{
+		return _amount;
+	}
+	
+	public void setAmount(int amount)
+	{
+		_amount = amount;
+	}
+	
+	public ShopItemButton<? extends ShopPageBase<?, ?>> getButton()
+	{
+		return _button;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansPlayerDeathEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansPlayerDeathEvent.java
new file mode 100644
index 000000000..a59064aca
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansPlayerDeathEvent.java
@@ -0,0 +1,51 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.PlayerDeathEvent;
+
+import mineplex.game.clans.clans.data.PlayerClan;
+
+public class ClansPlayerDeathEvent extends Event
+{
+	private PlayerDeathEvent _event;
+	private PlayerClan _player;
+	private PlayerClan _killer;
+
+	public ClansPlayerDeathEvent(PlayerDeathEvent event, PlayerClan player, PlayerClan killer)
+	{
+		_event = event;
+		_player = player;
+		_killer = killer;
+	}
+
+	public PlayerDeathEvent getEvent()
+	{
+		return _event;
+	}
+
+	public PlayerClan getPlayer()
+	{
+		return _player;
+	}
+
+	public PlayerClan getKiller()
+	{
+		return _killer;
+	}
+
+	public void setPlayer(PlayerClan player)
+	{
+		_player = player;
+	}
+
+	public void setKiller(PlayerClan killer)
+	{
+		_killer = killer;
+	}
+
+	// Bukkit event stuff
+	private static final HandlerList handlers = new HandlerList();
+	public static HandlerList getHandlerList() { return handlers; }
+	public HandlerList getHandlers() { return handlers; }
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansPlayerSellItemEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansPlayerSellItemEvent.java
new file mode 100644
index 000000000..f957356f7
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansPlayerSellItemEvent.java
@@ -0,0 +1,99 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.shop.ShopItemButton;
+
+public class ClansPlayerSellItemEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private Player _player;
+	private ShopPageBase<?, ?> _page;
+	private int _cost;
+	private int _amount;
+	private ItemStack _item;
+	
+	private ShopItemButton<? extends ShopPageBase<?, ?>> _button;
+	
+	private boolean _cancelled;
+	
+	public ClansPlayerSellItemEvent(Player player, ShopPageBase<?, ?> page, ShopItemButton<? extends ShopPageBase<?, ?>> shopItemButton, ItemStack item, int cost, int amount)
+	{
+		_page = page;
+		_button = shopItemButton;
+		_amount = amount;
+		_item = item;
+		_player = player;
+		_cost = cost;
+	}
+	
+	public Player getPlayer()
+	{
+		return _player;
+	}
+	
+	public ShopPageBase<?, ?> getPage()
+	{
+		return _page;
+	}
+	
+	public ItemStack getItem()
+	{
+		return _item;
+	}
+	
+	public void setItem(ItemStack item)
+	{
+		_item = item;
+	}
+	
+	public int getCost()
+	{
+		return _cost;
+	}
+	
+	public void setCost(int cost)
+	{
+		_cost = cost;
+	}
+	
+	public int getAmount()
+	{
+		return _amount;
+	}
+	
+	public void setAmount(int amount)
+	{
+		_amount = amount;
+	}
+	
+	public ShopItemButton<? extends ShopPageBase<?, ?>> getButton()
+	{
+		return _button;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansShopAddButtonEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansShopAddButtonEvent.java
new file mode 100644
index 000000000..535fb68b2
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/ClansShopAddButtonEvent.java
@@ -0,0 +1,138 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.core.shop.ShopBase;
+
+public class ClansShopAddButtonEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private final Player _player;
+	private final ShopBase<?> _shop;
+	private Material _material;
+	private int _buyPrice;
+	private int _sellPrice;
+	private byte _data;
+	private String _displayName;
+	private int _amount;
+	private int _slot;
+	
+	private boolean _cancelled;
+	
+	public ClansShopAddButtonEvent(Player player, ShopBase<?> shop, int slot, Material material, int buyPrice, int sellPrice, byte data, String displayName, int amount)
+	{
+		_player = player;
+		_shop = shop;
+		_slot = slot;
+		_material = material;
+		_buyPrice = buyPrice;
+		_sellPrice = sellPrice;
+		_data = data;
+		_displayName = displayName;
+		_amount = amount;
+	}
+	
+	public Player getPlayer()
+	{
+		return _player;
+	}
+	
+	public ShopBase<?> getShop()
+	{
+		return _shop;
+	}
+	
+	public Material getMaterial()
+	{
+		return _material;
+	}
+	
+	public int getBuyPrice()
+	{
+		return _buyPrice;
+	}
+	
+	public void setBuyPrice(int buyPrice)
+	{
+		_buyPrice = buyPrice;
+	}
+	
+	public int getSellPrice()
+	{
+		return _sellPrice;
+	}
+	
+	public void setSellPrice(int sellPrice)
+	{
+		_sellPrice = sellPrice;
+	}
+	
+	public int getSlot()
+	{
+		return _slot;
+	}
+	
+	public void setSlot(int slot)
+	{
+		_slot = slot;
+	}
+	
+	public byte getData()
+	{
+		return _data;
+	}
+	
+	public void setData(byte data)
+	{
+		_data = data;
+	}
+	
+	public void setMaterial(Material material)
+	{
+		_material = material;
+	}
+	
+	public void setDisplayName(String displayName)
+	{
+		_displayName = displayName;
+	}
+	
+	public void setAmount(int amount)
+	{
+		_amount = amount;
+	}
+	
+	public String getDisplayName()
+	{
+		return _displayName;
+	}
+	
+	public int getAmount()
+	{
+		return _amount;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/EnergyPageBuildEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/EnergyPageBuildEvent.java
new file mode 100644
index 000000000..4212010be
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/EnergyPageBuildEvent.java
@@ -0,0 +1,58 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.core.shop.ShopBase;
+
+public class EnergyPageBuildEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private boolean _free;
+	private boolean _cancelled;
+	
+	private Player _player;
+	
+	public EnergyPageBuildEvent(Player player)
+	{
+		_player = player;
+	}
+	
+	public Player getPlayer()
+	{
+		return _player;
+	}
+	
+	public boolean free()
+	{
+		return _free;
+	}
+	
+	public void setFree(boolean free)
+	{
+		_free = free;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerClaimTerritoryEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerClaimTerritoryEvent.java
new file mode 100644
index 000000000..35fc5eaf5
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerClaimTerritoryEvent.java
@@ -0,0 +1,63 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.Chunk;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.clans.ClanInfo;
+
+public class PlayerClaimTerritoryEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private Player _claimer;
+	private Chunk _claimedChunk;
+	
+	private boolean _cancelled;
+
+	private ClanInfo _clan;
+	
+	public PlayerClaimTerritoryEvent(Player claimer, Chunk claimedChunk, ClanInfo clan)
+	{
+		_claimer = claimer;
+		_claimedChunk = claimedChunk;
+		_clan = clan;
+	}
+	
+	public Player getClaimer()
+	{
+		return _claimer;
+	}
+	
+	public ClanInfo getClan()
+	{
+		return _clan;
+	}
+	
+	public Chunk getClaimedChunk()
+	{
+		return _claimedChunk;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerEnterTerritoryEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerEnterTerritoryEvent.java
new file mode 100644
index 000000000..7a8d6aa41
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerEnterTerritoryEvent.java
@@ -0,0 +1,54 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class PlayerEnterTerritoryEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private String _newTerritory;
+	private String _lastTerritory;
+	private Player _player;
+	
+	private boolean _safe;
+	
+	public PlayerEnterTerritoryEvent(Player player, String lastTerritory, String newTerritory, boolean safe)
+	{
+		_player = player;
+		_lastTerritory = lastTerritory;
+		_newTerritory = newTerritory;
+		_safe = safe;
+	}
+	
+	public Player getPlayer()
+	{
+		return _player;
+	}
+	
+	public String getLastTerritory()
+	{
+		return _lastTerritory;
+	}
+	
+	public String getNewTerritory()
+	{
+		return _newTerritory;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+
+	public boolean isSafe()
+	{
+		return _safe;
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerPreClaimTerritoryEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerPreClaimTerritoryEvent.java
new file mode 100644
index 000000000..e74cd8d96
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerPreClaimTerritoryEvent.java
@@ -0,0 +1,63 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.Chunk;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.clans.ClanInfo;
+
+public class PlayerPreClaimTerritoryEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private Player _claimer;
+	private Chunk _claimedChunk;
+	
+	private boolean _cancelled;
+
+	private ClanInfo _clan;
+	
+	public PlayerPreClaimTerritoryEvent(Player claimer, Chunk claimedChunk, ClanInfo clan)
+	{
+		_claimer = claimer;
+		_claimedChunk = claimedChunk;
+		_clan = clan;
+	}
+	
+	public Player getClaimer()
+	{
+		return _claimer;
+	}
+	
+	public ClanInfo getClan()
+	{
+		return _clan;
+	}
+	
+	public Chunk getClaimedChunk()
+	{
+		return _claimedChunk;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerUnClaimTerritoryEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerUnClaimTerritoryEvent.java
new file mode 100644
index 000000000..41ef2e8b1
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/event/PlayerUnClaimTerritoryEvent.java
@@ -0,0 +1,53 @@
+package mineplex.game.clans.clans.event;
+
+import org.bukkit.Chunk;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class PlayerUnClaimTerritoryEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private Player _unClaimer;
+	private Chunk _unClaimedChunk;
+	
+	private boolean _cancelled;
+	
+	public PlayerUnClaimTerritoryEvent(Player unClaimer, Chunk unClaimedChunk)
+	{
+		_unClaimer = unClaimer;
+		_unClaimedChunk = unClaimedChunk;
+	}
+	
+	public Player getUnClaimer()
+	{
+		return _unClaimer;
+	}
+	
+	public Chunk getUnClaimedChunk()
+	{
+		return _unClaimedChunk;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+	
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/ClanIcon.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/ClanIcon.java
new file mode 100644
index 000000000..078b469f7
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/ClanIcon.java
@@ -0,0 +1,35 @@
+package mineplex.game.clans.clans.gui;
+
+import org.bukkit.Material;
+
+public enum ClanIcon
+{
+	JOIN(Material.PRISMARINE, (byte) 1),
+	LEAVE(Material.PRISMARINE, (byte) 2),
+	TERRITORY(Material.PRISMARINE, (byte) 0),
+	MEMBER(Material.SAND, (byte) 1),
+	COMMANDS(Material.RED_SANDSTONE, (byte) 0),
+	ENERGY(Material.SEA_LANTERN, (byte) 0),
+	CASTLE(Material.RECORD_9, (byte) 0),
+	WAR(Material.RECORD_11, (byte) 0),
+	ALLIANCE(Material.RECORD_10, (byte) 0);
+
+	private Material _material;
+	private byte _data;
+
+	ClanIcon(Material material, byte data)
+	{
+		_material = material;
+		_data = data;
+	}
+
+	public Material getMaterial()
+	{
+		return _material;
+	}
+
+	public byte getData()
+	{
+		return _data;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/ClanShop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/ClanShop.java
new file mode 100644
index 000000000..7b0285d83
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/ClanShop.java
@@ -0,0 +1,31 @@
+package mineplex.game.clans.clans.gui;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.page.ClanMainPage;
+import mineplex.game.clans.clans.gui.page.ClanWhoPage;
+
+public class ClanShop extends ShopBase<ClansManager>
+{
+	public ClanShop(ClansManager plugin, CoreClientManager clientManager, DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager, "ClansShop");
+	}
+
+	@Override
+	protected ShopPageBase<ClansManager, ? extends ShopBase<ClansManager>> buildPagesFor(Player player)
+	{
+		return new ClanMainPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
+	}
+
+	public void openClanWho(Player player, ClanInfo clan)
+	{
+		openPageForPlayer(player, new ClanWhoPage(getPlugin(), this, getClientManager(), getDonationManager(), player, clan, false));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanAddAllyButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanAddAllyButton.java
new file mode 100644
index 000000000..58b7d88c3
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanAddAllyButton.java
@@ -0,0 +1,21 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.common.jsonchat.ClickEvent;
+import mineplex.core.common.jsonchat.JsonMessage;
+import mineplex.core.common.util.C;
+import mineplex.core.shop.item.IButton;
+
+public class ClanAddAllyButton implements IButton
+{
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		player.closeInventory();
+
+		JsonMessage message = new JsonMessage(C.cRed + C.Bold + "Click here to add an Ally").click(ClickEvent.SUGGEST_COMMAND, "/c ally ");
+		message.sendToPlayer(player);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanAddTrustedButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanAddTrustedButton.java
new file mode 100644
index 000000000..505eb674b
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanAddTrustedButton.java
@@ -0,0 +1,21 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.common.jsonchat.ClickEvent;
+import mineplex.core.common.jsonchat.JsonMessage;
+import mineplex.core.common.util.C;
+import mineplex.core.shop.item.IButton;
+
+public class ClanAddTrustedButton implements IButton
+{
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		player.closeInventory();
+
+		JsonMessage message = new JsonMessage(C.cRed + C.Bold + "Click here to trust a clan").click(ClickEvent.SUGGEST_COMMAND, "/c trust ");
+		message.sendToPlayer(player);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanAddWarButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanAddWarButton.java
new file mode 100644
index 000000000..22e4ce7ef
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanAddWarButton.java
@@ -0,0 +1,21 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.common.jsonchat.ClickEvent;
+import mineplex.core.common.jsonchat.JsonMessage;
+import mineplex.core.common.util.C;
+import mineplex.core.shop.item.IButton;
+
+public class ClanAddWarButton implements IButton
+{
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		player.closeInventory();
+
+		JsonMessage message = new JsonMessage(C.cRed + C.Bold + "Click here to war a clan").click(ClickEvent.SUGGEST_COMMAND, "/war ");
+		message.sendToPlayer(player);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanButton.java
new file mode 100644
index 000000000..1abdda431
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanButton.java
@@ -0,0 +1,69 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.shop.item.IButton;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.ClanShop;
+
+public abstract class ClanButton implements IButton
+{
+	private ClanShop _shop;
+	private ClansManager _clansManager;
+	private Player _player;
+	private ClanInfo _clanInfo;
+	private ClanRole _clanRole;
+
+	public ClanButton(ClanShop shop, ClansManager clansManager, Player player, ClanInfo clanInfo, ClanRole clanRole)
+	{
+		_shop = shop;
+		_clansManager = clansManager;
+		_player = player;
+		_clanInfo = clanInfo;
+		_clanRole = clanRole;
+	}
+
+	public ClansManager getClansManager()
+	{
+		return _clansManager;
+	}
+
+	public Player getPlayer()
+	{
+		return _player;
+	}
+
+	public ClanInfo getClanInfo()
+	{
+		return _clanInfo;
+	}
+
+	public ClanRole getClanRole()
+	{
+		return _clanRole;
+	}
+
+	public ClanShop getShop()
+	{
+		return _shop;
+	}
+
+	protected void displayText(String header, String message)
+	{
+		UtilTextMiddle.display(header, message, _player);
+	}
+
+	protected void displayClan(String header, String message, boolean displayForClicker)
+	{
+		for (Player player : _clanInfo.getOnlinePlayers())
+		{
+			if (displayForClicker || !player.equals(getPlayer()))
+				UtilTextMiddle.display(header, message, player);
+		}
+
+//		_clansManager.messageClan(_clanInfo, message);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanCreateButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanCreateButton.java
new file mode 100644
index 000000000..5776f58b0
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanCreateButton.java
@@ -0,0 +1,26 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.common.jsonchat.ClickEvent;
+import mineplex.core.common.jsonchat.JsonMessage;
+import mineplex.core.common.util.C;
+import mineplex.core.shop.item.IButton;
+
+public class ClanCreateButton implements IButton
+{
+	public ClanCreateButton()
+	{
+
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		player.closeInventory();
+
+		JsonMessage message = new JsonMessage(C.cRed + C.Bold + "Click here to create a clan").click(ClickEvent.SUGGEST_COMMAND, "/c create ");
+		message.sendToPlayer(player);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanDisbandButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanDisbandButton.java
new file mode 100644
index 000000000..5450e21a8
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanDisbandButton.java
@@ -0,0 +1,24 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.ClanShop;
+
+public class ClanDisbandButton extends ClanButton
+{
+	public ClanDisbandButton(ClanShop shop, ClansManager clansManager, Player player, ClanInfo clanInfo, ClanRole clanRole)
+	{
+		super(shop, clansManager, player, clanInfo, clanRole);
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		getPlayer().closeInventory();
+		getClansManager().getClanUtility().delete(getPlayer());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanEnergyButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanEnergyButton.java
new file mode 100644
index 000000000..ae2d56236
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanEnergyButton.java
@@ -0,0 +1,23 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.ClanShop;
+
+public class ClanEnergyButton extends ClanButton
+{
+	public ClanEnergyButton(ClanShop shop, ClansManager clansManager, Player player, ClanInfo clanInfo, ClanRole clanRole)
+	{
+		super(shop, clansManager, player, clanInfo, clanRole);
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanInviteButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanInviteButton.java
new file mode 100644
index 000000000..afd3eff2b
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanInviteButton.java
@@ -0,0 +1,28 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.donation.DonationManager;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.ClanShop;
+import mineplex.game.clans.clans.gui.page.ClanInvitePage;
+
+public class ClanInviteButton extends ClanButton
+{
+	private DonationManager _donationManager;
+
+	public ClanInviteButton(ClanShop shop, ClansManager clansManager, DonationManager donationManager, Player player, ClanInfo clanInfo, ClanRole clanRole)
+	{
+		super(shop, clansManager, player, clanInfo, clanRole);
+		_donationManager = donationManager;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		getShop().openPageForPlayer(getPlayer(), new ClanInvitePage(getClansManager(), getShop(), getClansManager().getClientManager(), _donationManager, player));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanJoinButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanJoinButton.java
new file mode 100644
index 000000000..f3e451d0a
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanJoinButton.java
@@ -0,0 +1,27 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.shop.item.IButton;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+
+public class ClanJoinButton implements IButton
+{
+	private ClansManager _clansManager;
+	private ClanInfo _clanInfo;
+
+	public ClanJoinButton(ClansManager clansManager, ClanInfo clanInfo)
+	{
+		_clansManager = clansManager;
+		_clanInfo = clanInfo;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		player.closeInventory();
+		_clansManager.getClanUtility().join(player, _clanInfo);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanLeaveButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanLeaveButton.java
new file mode 100644
index 000000000..114f3eb79
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanLeaveButton.java
@@ -0,0 +1,24 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.ClanShop;
+
+public class ClanLeaveButton extends ClanButton
+{
+	public ClanLeaveButton(ClanShop shop, ClansManager clansManager, Player player, ClanInfo clanInfo, ClanRole clanRole)
+	{
+		super(shop, clansManager, player, clanInfo, clanRole);
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		getPlayer().closeInventory();
+		getClansManager().getClanUtility().leave(getPlayer());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanMemeberButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanMemeberButton.java
new file mode 100644
index 000000000..da1194fe2
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanMemeberButton.java
@@ -0,0 +1,46 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.ClanShop;
+import mineplex.game.clans.clans.gui.page.ClanMainPage;
+
+public class ClanMemeberButton extends ClanButton
+{
+	private ClanMainPage _page;
+	private String _other;
+
+	public ClanMemeberButton(ClanShop shop, ClansManager clansManager, Player player, ClanInfo clanInfo, ClanRole clanRole, ClanMainPage page, String other)
+	{
+		super(shop, clansManager, player, clanInfo, clanRole);
+		_other = other;
+		_page = page;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		if (clickType == ClickType.LEFT)
+		{
+			// Promote
+			getClansManager().getClanUtility().promote(getPlayer(), _other);
+			_page.refresh();
+		}
+		else if (clickType == ClickType.RIGHT)
+		{
+			// Demote
+			getClansManager().getClanUtility().demote(getPlayer(), _other);
+			_page.refresh();
+		}
+		else if (clickType == ClickType.SHIFT_RIGHT)
+		{
+			// Kick
+			getClansManager().getClanUtility().kick(getPlayer(), _other);
+			_page.refresh();
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanRelationsButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanRelationsButton.java
new file mode 100644
index 000000000..134973507
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanRelationsButton.java
@@ -0,0 +1,8 @@
+package mineplex.game.clans.clans.gui.button;
+
+/**
+ * Created by phina on 10/31/2015.
+ */
+public class ClanRelationsButton
+{
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanTerritoryButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanTerritoryButton.java
new file mode 100644
index 000000000..b718a5132
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanTerritoryButton.java
@@ -0,0 +1,60 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Chunk;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.ClanShop;
+
+public class ClanTerritoryButton extends ClanButton
+{
+	public ClanTerritoryButton(ClanShop shop, ClansManager clansManager, Player player, ClanInfo clanInfo, ClanRole clanRole)
+	{
+		super(shop, clansManager, player, clanInfo, clanRole);
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		if (clickType == ClickType.LEFT)
+		{
+			player.closeInventory();
+
+			Chunk chunk = player.getLocation().getChunk();
+			String chunkName = UtilWorld.chunkToStrClean(chunk);
+			if (getClansManager().getClanUtility().claim(player))
+			{
+				displayText(C.cGreen + "Territory", "You claimed the chunk " + chunkName);
+				displayClan(C.cGreen + "Territory", C.cYellow + getPlayer().getName() + ChatColor.RESET + " claimed the chunk " + chunkName, false);
+			}
+		}
+		else if (clickType == ClickType.SHIFT_LEFT)
+		{
+			player.closeInventory();
+
+			Chunk chunk = player.getLocation().getChunk();
+			String chunkName = UtilWorld.chunkToStrClean(chunk);
+			if (getClansManager().getClanUtility().unclaim(player, player.getLocation().getChunk()))
+			{
+				displayText(C.cGreen + "Territory", "You unclaimed the chunk " + chunkName);
+				displayClan(C.cGreen + "Territory", C.cYellow + getPlayer().getName() + ChatColor.RESET + " unclaimed the chunk " + chunkName, false);
+			}
+		}
+		else if (clickType == ClickType.SHIFT_RIGHT && getClanRole() == ClanRole.LEADER)
+		{
+			player.closeInventory();
+
+			if (getClansManager().getClanUtility().unclaimAll(player))
+			{
+				displayText(C.cGreen + "Territory", "You unclaimed all chunks");
+				displayClan(C.cGreen + "Territory", C.cYellow + getPlayer().getName() + ChatColor.RESET + " unclaimed all chunks", false);
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanWhoButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanWhoButton.java
new file mode 100644
index 000000000..20385402b
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanWhoButton.java
@@ -0,0 +1,21 @@
+package mineplex.game.clans.clans.gui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.common.jsonchat.ClickEvent;
+import mineplex.core.common.jsonchat.JsonMessage;
+import mineplex.core.common.util.C;
+import mineplex.core.shop.item.IButton;
+
+public class ClanWhoButton implements IButton
+{
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		player.closeInventory();
+
+		JsonMessage message = new JsonMessage(C.cRed + C.Bold + "Click here to lookup a clan").click(ClickEvent.SUGGEST_COMMAND, "/c who ");
+		message.sendToPlayer(player);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/MemberManagementButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/MemberManagementButton.java
new file mode 100644
index 000000000..b9c261a1f
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/MemberManagementButton.java
@@ -0,0 +1,8 @@
+package mineplex.game.clans.clans.gui.button;
+
+/**
+ * Created by phina on 10/31/2015.
+ */
+public class MemberManagementButton
+{
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanInvitePage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanInvitePage.java
new file mode 100644
index 000000000..0ee4c4a41
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanInvitePage.java
@@ -0,0 +1,81 @@
+package mineplex.game.clans.clans.gui.page;
+
+import java.util.ArrayList;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilSkull;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.ClanShop;
+
+public class ClanInvitePage extends ClanPageBase
+{
+	public ClanInvitePage(ClansManager plugin, ClanShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
+	{
+		super(plugin, shop, clientManager, donationManager, "Invite Players", player, 54);
+
+		buildPage();
+	}
+
+	@Override
+	public void buildNoClan()
+	{
+
+	}
+
+	@Override
+	public void buildClan(ClanInfo clanInfo, ClanRole clanRole)
+	{
+		int index = 9;
+		for (Player player : UtilServer.getSortedPlayers())
+		{
+			if (index <= 54 && getPlugin().getClan(player) == null)
+			{
+				addPlayerButton(index, player, clanInfo);
+				index++;
+			}
+		}
+
+		if (index == 9)
+		{
+			// No players online to join!
+			String[] lore = new String[] { C.Reset + "There are no players online who", C.Reset + "are not in a clan already!" };
+			ShopItem shopItem = new ShopItem(Material.BARRIER, "No Players!", lore,1, true, false);
+			addItem(22, shopItem);
+		}
+
+		addBackButton();
+	}
+
+	private void addPlayerButton(int slot, final Player target, final ClanInfo clan)
+	{
+		String itemName = C.cGreenB + target.getName();
+		ArrayList<String> lore = new ArrayList<String>(5);
+		lore.add(" ");
+		lore.add(" ");
+		lore.add(ChatColor.RESET + C.cGray + "Left Click " + C.cWhite + "Invite Player");
+
+		ItemStack item = UtilSkull.getPlayerHead(target.getName(), itemName, lore);
+
+		addButton(slot, item, new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				getPlugin().getClanUtility().invite(getPlayer(), clan, target);
+			}
+		});
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanJoinPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanJoinPage.java
new file mode 100644
index 000000000..7134328f0
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanJoinPage.java
@@ -0,0 +1,59 @@
+package mineplex.game.clans.clans.gui.page;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.ClanShop;
+import mineplex.game.clans.clans.gui.button.ClanJoinButton;
+
+public class ClanJoinPage extends ClanPageBase
+{
+	public ClanJoinPage(ClansManager plugin, ClanShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
+	{
+		super(plugin, shop, clientManager, donationManager, "Join Clan", player, 54);
+
+		buildPage();
+	}
+
+	@Override
+	public void buildNoClan()
+	{
+		int currentIndex = 9;
+
+		for (ClanInfo clanInfo : getPlugin().getClanMap().values())
+		{
+			if (clanInfo.isInvited(getPlayer().getName()))
+			{
+				addInvitation(currentIndex, clanInfo);
+				currentIndex++;
+			}
+		}
+
+		if (currentIndex == 9)
+		{
+			// No invitations :(
+			ShopItem shopItem = new ShopItem(Material.BOOK, "You have no Clan Invitations!", new String[] {}, 1, true, false);
+			setItem(22, shopItem);
+		}
+
+		addBackButton();
+	}
+
+	private void addInvitation(int index, ClanInfo clanInfo)
+	{
+		ShopItem shopItem = new ShopItem(Material.BOOK_AND_QUILL, clanInfo.getName(), new String[] {}, 1, false, false);
+		addButton(index, shopItem, new ClanJoinButton(getPlugin(), clanInfo));
+	}
+
+	@Override
+	public void buildClan(ClanInfo clanInfo, ClanRole clanRole)
+	{
+		// Nothing
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanMainPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanMainPage.java
new file mode 100644
index 000000000..e9738de3f
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanMainPage.java
@@ -0,0 +1,357 @@
+package mineplex.game.clans.clans.gui.page;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.TreeSet;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilSkull;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.ClansPlayer;
+import mineplex.game.clans.clans.ClansPlayerComparator;
+import mineplex.game.clans.clans.gui.ClanIcon;
+import mineplex.game.clans.clans.gui.ClanShop;
+import mineplex.game.clans.clans.gui.button.ClanCreateButton;
+import mineplex.game.clans.clans.gui.button.ClanEnergyButton;
+import mineplex.game.clans.clans.gui.button.ClanInviteButton;
+import mineplex.game.clans.clans.gui.button.ClanLeaveButton;
+import mineplex.game.clans.clans.gui.button.ClanMemeberButton;
+import mineplex.game.clans.clans.gui.button.ClanTerritoryButton;
+import mineplex.game.clans.clans.gui.button.ClanWhoButton;
+import mineplex.game.clans.core.war.ClanWarData;
+
+public class ClanMainPage extends ClanPageBase
+{
+	private static boolean USE_RESOURCE_ICONS = true;
+
+	public ClanMainPage(ClansManager plugin, ClanShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
+	{
+		super(plugin, shop, clientManager, donationManager, "Manage Clan", player, 54);
+
+		buildPage();
+	}
+
+	@Override
+	public void buildNoClan()
+	{
+		// Clan Create
+		ShopItem clanCreate = new ShopItem(Material.BOOK_AND_QUILL, "Create Clan", new String[] {}, 1, false, false);
+		addButton(21, clanCreate, new ClanCreateButton());
+
+		// Clan Join
+		ShopItem clanJoin = new ShopItem(ClanIcon.JOIN.getMaterial(), ClanIcon.JOIN.getData(), "Join Clan", new String[] {}, 1, false, false);
+		addButton(23, clanJoin, new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				getShop().openPageForPlayer(getPlayer(), new ClanJoinPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), getPlayer()));
+			}
+		});
+	}
+
+	@Override
+	public void buildClan(final ClanInfo clanInfo, ClanRole clanRole)
+	{
+		// Invites
+		{
+			String inviteName = "Invites";
+			Material inviteMaterial = USE_RESOURCE_ICONS ? ClanIcon.JOIN.getMaterial() : Material.RED_ROSE;
+			byte inviteDate = USE_RESOURCE_ICONS ? ClanIcon.JOIN.getData() : 0;
+			int size = clanInfo.getSize();
+			int maxSize = clanInfo.getMaxSize();
+			ArrayList<String> inviteLore = new ArrayList<String>();
+			inviteLore.add(" ");
+			inviteLore.add(C.Reset + C.cGray + "Clans can have a max size of " + C.cYellow + maxSize + C.cGray + " members");
+			inviteLore.add(C.Reset + C.cGray + "You currently have " + C.cYellow + size + C.cGray + " members");
+			inviteLore.add(C.Reset + C.cGray + "More members in your clan will allow you to");
+			inviteLore.add(C.Reset + C.cGray + "claim more land, but it will also increase");
+			inviteLore.add(C.Reset + C.cGray + "your Energy drain per minute.");
+			if (clanRole.has(ClanRole.ADMIN))
+			{
+				inviteLore.add(" ");
+				inviteLore.add(C.Reset + C.cYellow + "Left Click " + C.cWhite + "Invite Player");
+			}
+
+			ShopItem inviteItem = new ShopItem(inviteMaterial, inviteDate, inviteName, inviteLore.toArray(new String[0]), 1, false, false);
+			ClanInviteButton inviteButton = new ClanInviteButton(getShop(), getPlugin(), getDonationManager(), getPlayer(), clanInfo, clanRole);
+			addButton(0, inviteItem, inviteButton);
+		}
+
+		// Territory
+		{
+			String territoryName = "Territory";
+			Material territoryMaterial = USE_RESOURCE_ICONS ? ClanIcon.TERRITORY.getMaterial() : Material.GRASS;
+			byte territoryData = USE_RESOURCE_ICONS ? (byte) ClanIcon.TERRITORY.getData() : 0;
+			ArrayList<String> territoryLore = new ArrayList<String>();
+			int claims = clanInfo.getClaims();
+			int maxClaims = clanInfo.getClaimsMax();
+			territoryLore.add(" ");
+			territoryLore.add(C.Reset + C.cGray + "Every land claim represents a 16x16 chunk");
+			territoryLore.add(C.Reset + C.cGray + "Your clan can claim a maximum of " + C.cYellow + maxClaims + C.cGray + " chunks");
+			territoryLore.add(C.Reset + C.cGray + "You currently have " + C.cYellow + claims + C.cGray + " chunk(s) claimed");
+			territoryLore.add(C.Reset + C.cGray + "Increase max claims with more clan members");
+			territoryLore.add(C.Reset + C.cGray + "Energy cost will increase with more land claimed");
+			if (clanRole.has(ClanRole.ADMIN))
+			{
+				territoryLore.add(" ");
+				territoryLore.add(ChatColor.RESET + C.cYellow + "Left Click " + C.cWhite + "Claim Land");
+				territoryLore.add(ChatColor.RESET + C.cYellow + "Shift-Left Click " + C.cWhite + "Unclaim Land");
+				if (clanRole.has(ClanRole.LEADER))
+				{
+					territoryLore.add(ChatColor.RESET + C.cYellow + "Shift-Right Click " + C.cWhite + "Unclaim All Land");
+				}
+			}
+
+			ShopItem territoryItem = new ShopItem(territoryMaterial, territoryData, territoryName, territoryLore.toArray(new String[0]), 1, false, false);
+			ClanTerritoryButton territoryButton = new ClanTerritoryButton(getShop(), getPlugin(), getPlayer(), clanInfo, clanRole);
+			addButton(2, territoryItem, territoryButton);
+		}
+
+		// Energy
+		{
+			String energyName = "Energy";
+			Material energyMaterial = USE_RESOURCE_ICONS ? ClanIcon.ENERGY.getMaterial() : Material.GOLD_BLOCK;
+			byte energyData = USE_RESOURCE_ICONS ? ClanIcon.ENERGY.getData() : 0;
+			ArrayList<String> energyLore = new ArrayList<String>();
+			energyLore.add(" ");
+			energyLore.add(C.Reset + C.cGray + "Energy is the currency used to upkeep");
+			energyLore.add(C.Reset + C.cGray + "your clan. Energy drains over time and");
+			energyLore.add(C.Reset + C.cGray + "you will need to refill it at the NPC in");
+			energyLore.add(C.Reset + C.cGray + "the shops. More clan members and more land");
+			energyLore.add(C.Reset + C.cGray + "increases the rate energy drains at.");
+			energyLore.add(" ");
+			energyLore.add(C.Reset + C.cYellow + "Energy " + C.cWhite + clanInfo.getEnergy() + "/" + clanInfo.getEnergyMax());
+			if (clanInfo.getEnergyCostPerMinute() > 0)
+				energyLore.add(C.Reset + C.cYellow + "Energy Depletes " + C.cWhite + clanInfo.getEnergyLeftString());
+
+			ShopItem energyItem = new ShopItem(energyMaterial, energyData, energyName, energyLore.toArray(new String[0]), 1, false, false);
+			ClanEnergyButton energyButton = new ClanEnergyButton(getShop(), getPlugin(), getPlayer(), clanInfo, clanRole);
+			addButton(4, energyItem, energyButton);
+		}
+
+
+		// Leave
+		{
+			String leaveName = "Leave";
+			Material leaveMaterial = USE_RESOURCE_ICONS ? ClanIcon.LEAVE.getMaterial() : Material.TNT;
+			byte leaveData = USE_RESOURCE_ICONS ? ClanIcon.LEAVE.getData() : 0;
+			ArrayList<String> leaveLore = new ArrayList<String>();
+			leaveLore.add(" ");
+			if (clanRole.has(ClanRole.MEMBER))
+			{
+				leaveLore.add(ChatColor.RESET + C.cYellow + "Shift-Left Click " + C.cWhite + "Leave Clan");
+			}
+			if (clanRole.has(ClanRole.LEADER))
+			{
+				leaveLore.add(ChatColor.RESET + C.cYellow + "Shift-Right Click " + C.cWhite + "Disband Clan");
+			}
+
+			ShopItem leaveItem = new ShopItem(leaveMaterial, leaveData, leaveName, leaveLore.toArray(new String[0]), 1, false, false);
+			ClanLeaveButton leaveButton = new ClanLeaveButton(getShop(), getPlugin(), getPlayer(), clanInfo, clanRole);
+			addButton(6, leaveItem, leaveButton);
+		}
+
+		// Commands
+		{
+			String commandsName = "Commands";
+			Material commandsMaterial = USE_RESOURCE_ICONS ? ClanIcon.COMMANDS.getMaterial() : Material.PAPER;
+			byte commandsData = USE_RESOURCE_ICONS ? ClanIcon.COMMANDS.getData() : 0;
+			ArrayList<String> commandsLore = new ArrayList<String>();
+			commandsLore.add(" ");
+			commandsLore.add(ChatColor.RESET + C.cYellow + "/c help " + C.cWhite + "Lists Clans Commands");
+			commandsLore.add(ChatColor.RESET + C.cYellow + "/c ally <clan> " + C.cWhite + "Request Ally");
+			commandsLore.add(ChatColor.RESET + C.cYellow + "/c neutral <clan> " + C.cWhite + "Revoke Ally");
+			commandsLore.add(ChatColor.RESET + C.cYellow + "/c sethome " + C.cWhite + "Set Home Bed");
+			commandsLore.add(ChatColor.RESET + C.cYellow + "/c home " + C.cWhite + "Teleport to Home Bed");
+			commandsLore.add(ChatColor.RESET + C.cYellow + "/map " + C.cWhite + "Give yourself a World Map");
+			
+			ShopItem commandsItem = new ShopItem(commandsMaterial, commandsData, commandsName, commandsLore.toArray(new String[0]), 1, false, false);
+			setItem(8, commandsItem);
+		}
+
+		// Players
+		{
+			int slot = 18;
+			for (ClansPlayer clansPlayer : UtilAlg.sortSet(clanInfo.getMembers().values(), new ClansPlayerComparator()))
+			{
+				addPlayerButton(slot, clansPlayer, clanInfo, clanRole);
+				slot++;
+			}
+		}
+
+		// Allies
+		{
+			// We need to sort the ally set in the order of players online!
+			TreeSet<ClanInfo> allySet = new TreeSet<ClanInfo>(new Comparator<ClanInfo>()
+			{
+				@Override
+				public int compare(ClanInfo o1, ClanInfo o2)
+				{
+					return o1.getOnlinePlayers().size() - o2.getOnlinePlayers().size();
+				}
+			});
+
+			for (String allyName : clanInfo.getAllyMap().keySet())
+			{
+				ClanInfo ally = getPlugin().getClan(allyName);
+				if (ally != null)
+				{
+					allySet.add(ally);
+				}
+			}
+
+			int slot = 36;
+			for (ClanInfo ally : allySet)
+			{
+				addAllyButton(slot, ally);
+				slot++;
+			}
+		}
+
+		// Wars
+		{
+			TreeSet<ClanWarData> warSet = new TreeSet<ClanWarData>(new Comparator<ClanWarData>()
+			{
+				@Override
+				public int compare(ClanWarData o1, ClanWarData o2)
+				{
+					return o1.getPoints(clanInfo.getName()) - o2.getPoints(clanInfo.getName());
+				}
+			});
+
+			warSet.addAll(clanInfo.getWars());
+
+			Iterator<ClanWarData> descIterator = warSet.descendingIterator();
+			Iterator<ClanWarData> ascIterator = warSet.iterator();
+
+			for (int i = 0; i < 4 && descIterator.hasNext(); i++)
+			{
+				ClanWarData data = descIterator.next();
+				if (data.getPoints(clanInfo.getName()) <= 0)
+					break;
+
+				int slot = 45 + i;
+				addWarButton(slot, clanInfo, data);
+			}
+
+			for (int i = 0; i < 4 && ascIterator.hasNext(); i++)
+			{
+				ClanWarData data = ascIterator.next();
+				if (data.getPoints(clanInfo.getName()) >= 0)
+					break;
+
+				int slot = 53 - i;
+				addWarButton(slot, clanInfo, data);
+			}
+
+		}
+	}
+
+	private void addWarButton(int slot, ClanInfo clan, final ClanWarData clanWar)
+	{
+		String enemyName = clanWar.getClanA().equals(clan.getName()) ? clanWar.getClanB() : clanWar.getClanA();
+		final ClanInfo enemy = getPlugin().getClan(enemyName);
+		String itemName = enemyName;
+		Material material = USE_RESOURCE_ICONS ? ClanIcon.WAR.getMaterial() : Material.DIAMOND_SWORD;
+		byte data = USE_RESOURCE_ICONS ? ClanIcon.WAR.getData() : 0;
+		int warPoints = clanWar.getPoints(clan.getName());
+
+		ArrayList<String> lore = new ArrayList<String>(5);
+		lore.add(" ");
+		lore.add(C.Reset + C.cYellow + "War Points " + clan.getFormattedWarPoints(enemy));
+		lore.add(" ");
+		lore.add(ChatColor.RESET + C.cGray + "Left Click " + C.cWhite + "Clan Info");
+
+		ShopItem shopItem = new ShopItem(material, data, itemName, lore.toArray(new String[0]), 0, false, false);
+		addButtonFakeCount(slot, shopItem, new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				getShop().openPageForPlayer(player, new ClanWhoPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), player, enemy, true));
+			}
+		}, warPoints);
+	}
+
+	private void addAllyButton(int slot, final ClanInfo ally)
+	{
+		String itemName = ally.getName();
+		Material material = USE_RESOURCE_ICONS ? ClanIcon.ALLIANCE.getMaterial() : Material.EMERALD_BLOCK;
+		byte data = USE_RESOURCE_ICONS ? ClanIcon.ALLIANCE.getData() : 0;
+		ArrayList<String> lore = new ArrayList<String>(5);
+		lore.add(" ");
+		lore.add(ChatColor.RESET + C.cGray + "Left Click " + C.cWhite + "Clan Info");
+
+		ShopItem shopItem = new ShopItem(material, data, itemName, lore.toArray(new String[0]), 1, false, false);
+		addButtonFakeCount(slot, shopItem, new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				getShop().openPageForPlayer(player, new ClanWhoPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), player, ally, true));
+			}
+		}, ally.getOnlinePlayers().size());
+	}
+
+	private void addPlayerButton(int slot, ClansPlayer clansPlayer, ClanInfo guiInfo, ClanRole guiRole)
+	{
+		ClanRole playerRole = clansPlayer.getRole();
+		String itemName = (clansPlayer.isOnline() ? C.cGreenB : C.cRedB) + clansPlayer.getPlayerName();
+		ArrayList<String> lore = new ArrayList<String>(5);
+		lore.add(" ");
+		lore.add(C.Reset + C.cYellow + "Role " + C.cWhite + clansPlayer.getRole().getFriendlyName());
+		if (clansPlayer.isOnline())
+		{
+			Player player = UtilPlayer.searchExact(clansPlayer.getUuid());
+			if (player != null)
+			{
+				String loc = UtilWorld.locToStrClean(player.getLocation());
+				lore.add(C.Reset + C.cYellow + "Location " + C.cWhite + loc);
+				// TODO Save join date?
+			}
+		}
+		// TODO Save last join date
+
+		if (guiRole.has(ClanRole.ADMIN))
+		{
+			lore.add(" ");
+			
+			if (!playerRole.has(ClanRole.LEADER) && guiRole.has(playerRole))
+			{
+				lore.add(ChatColor.RESET + C.cYellow + "Left Click " + C.cWhite + "Promote");
+			}
+			
+			if (!playerRole.has(ClanRole.LEADER) && guiRole.has(playerRole))
+			{
+				lore.add(ChatColor.RESET + C.cYellow + "Right Click " + C.cWhite + "Demote");
+			}
+			
+			if (!playerRole.has(ClanRole.LEADER))
+			{
+				lore.add(ChatColor.RESET + C.cYellow + "Shift-Right Click " + C.cWhite + "Kick");
+			}
+		}
+
+		ItemStack item = UtilSkull.getPlayerHead(clansPlayer.isOnline() ? clansPlayer.getPlayerName() : "", itemName, lore);
+
+		addButton(slot, item, new ClanMemeberButton(getShop(), getPlugin(), getPlayer(), guiInfo, guiRole, this, clansPlayer.getPlayerName()));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanPageBase.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanPageBase.java
new file mode 100644
index 000000000..f4e781d51
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanPageBase.java
@@ -0,0 +1,64 @@
+package mineplex.game.clans.clans.gui.page;
+
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.ClanShop;
+
+public abstract class ClanPageBase extends ShopPageBase<ClansManager, ClanShop>
+{
+	public ClanPageBase(ClansManager plugin, ClanShop shop, CoreClientManager clientManager, DonationManager donationManager, String name, Player player, int size)
+	{
+		super(plugin, shop, clientManager, donationManager, name, player, size);
+	}
+
+	@Override
+	protected final void buildPage()
+	{
+		ClanInfo clanInfo = getPlugin().getClan(getPlayer());
+
+		if (clanInfo == null)
+		{
+			buildNoClan();
+		}
+		else
+		{
+			ClanRole role = getPlugin().getClanUtility().getRole(getPlayer());
+			buildClan(clanInfo, role);
+		}
+	}
+
+	public abstract void buildNoClan();
+
+	public abstract void buildClan(ClanInfo clanInfo, ClanRole clanRole);
+
+	protected void addBackButton()
+	{
+		addBackButton(4);
+	}
+
+	protected void addBackButton(int slot)
+	{
+		addButton(slot, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
+		{
+			public void onClick(Player player, ClickType clickType)
+			{
+				ShopPageBase<ClansManager, ClanShop> mainPage = new ClanMainPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), getPlayer());
+
+				getShop().openPageForPlayer(getPlayer(), mainPage);
+				player.playSound(player.getLocation(), Sound.CLICK, 1, 1);
+			}
+		});
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanWhoPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanWhoPage.java
new file mode 100644
index 000000000..bc6240df7
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/page/ClanWhoPage.java
@@ -0,0 +1,148 @@
+package mineplex.game.clans.clans.gui.page;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilSkull;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.ClansPlayer;
+import mineplex.game.clans.clans.ClansPlayerComparator;
+import mineplex.game.clans.clans.ClansUtility;
+import mineplex.game.clans.clans.gui.ClanShop;
+import mineplex.game.clans.clans.gui.ClanIcon;
+
+public class ClanWhoPage extends ClanPageBase
+{
+	private ClanInfo _lookupClan;
+	private boolean _showBackButton;
+
+	public ClanWhoPage(ClansManager plugin, ClanShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player, ClanInfo lookupClan, boolean showBackButton)
+	{
+		super(plugin, shop, clientManager, donationManager, lookupClan.getName(), player, 36);
+		_lookupClan = lookupClan;
+		_showBackButton = showBackButton;
+
+		buildPage();
+	}
+
+	@Override
+	public void buildNoClan()
+	{
+		build(null);
+	}
+
+	@Override
+	public void buildClan(ClanInfo clanInfo, ClanRole clanRole)
+	{
+		build(clanInfo);
+	}
+
+	private void build(ClanInfo clanInfo)
+	{
+		ClansUtility.ClanRelation relation = getPlugin().getClanUtility().rel(clanInfo, _lookupClan);
+
+		// Main Clan Info
+		{
+			int slot = 4;
+			ArrayList<String> lore = new ArrayList<String>();
+			lore.add(" ");
+
+			// Basic Clan Info
+			lore.add(C.Reset + C.cYellow + "Founder " + C.cWhite + _lookupClan.getDesc());
+			lore.add(C.Reset + C.cYellow + "Formed " + C.cWhite + UtilTime.convertString(System.currentTimeMillis() - _lookupClan.getDateCreated().getTime(), 1, UtilTime.TimeUnit.FIT));
+			lore.add(C.Reset + C.cYellow + "Members " + C.cWhite + _lookupClan.getOnlinePlayerCount() + "/" + _lookupClan.getMembers().size());
+			lore.add(C.Reset + C.cYellow + "Territory " + C.cWhite + _lookupClan.getClaims() + "/" + _lookupClan.getClaimsMax());
+			lore.add(C.Reset + C.cYellow + "TNT Protection " + C.cWhite + _lookupClan.getProtected());
+			if (clanInfo != null)
+			{
+				lore.add(C.Reset + C.cYellow + "Your War Points " + C.cWhite + clanInfo.getFormattedWarPoints(_lookupClan));
+			}
+			lore.add(" ");
+
+			// Energy
+			lore.add(C.Reset + C.cYellow + "Energy " + C.cWhite + _lookupClan.getEnergy() + "/" + _lookupClan.getEnergyMax());
+			if (_lookupClan.getEnergyCostPerMinute() > 0)
+				lore.add(C.Reset + C.cYellow + "Energy Depletes " + C.cWhite + _lookupClan.getEnergyLeftString());
+
+			lore.add(" ");
+
+			// Allies
+			if (_lookupClan.getAllyMap().size() > 0)
+			{
+				String allySorted = "";
+				HashSet<String> allyUnsorted = new HashSet<String>();
+
+				for (String allyName : _lookupClan.getAllyMap().keySet())
+					allyUnsorted.add(allyName);
+
+				for (String cur : UtilAlg.sortKey(allyUnsorted))
+					allySorted += C.cGreen + cur + C.cWhite + ", ";
+				
+				lore.add(C.Reset + C.cYellow + "Allies");
+				lore.add(" " + allySorted);
+			}
+
+			// Self Clan Info
+			if (_lookupClan.equals(clanInfo))
+			{
+				String clanHome = _lookupClan.getHome() == null ? "None" : UtilWorld.locToStrClean(_lookupClan.getHome());
+				String generator = _lookupClan.getGenerator() == null ? "None" : UtilWorld.blockToStrClean(_lookupClan.getGenerator().getBlock());
+
+				lore.add(C.Reset + C.cYellow + "Clan Home " + C.cWhite + clanHome);
+				lore.add(C.Reset + C.cYellow + "TNT Generator " + C.cWhite + generator);
+			}
+
+			ShopItem shopItem = new ShopItem(ClanIcon.CASTLE.getMaterial(), ClanIcon.CASTLE.getData(), _lookupClan.getName(), lore.toArray(new String[0]), 1, false, false);
+			setItem(slot, shopItem);
+		}
+
+
+		// Players
+		{
+			int slot = 18;
+			for (ClansPlayer player : UtilAlg.sortSet(_lookupClan.getMembers().values(), new ClansPlayerComparator()))
+			{
+				addPlayer(slot, player, relation == ClansUtility.ClanRelation.ALLY || relation == ClansUtility.ClanRelation.ALLY_TRUST || relation == ClansUtility.ClanRelation.SELF);
+				slot++;
+			}
+		}
+
+		if (_showBackButton)
+		{
+			addBackButton(0);
+		}
+	}
+
+	private void addPlayer(int slot, ClansPlayer clansPlayer, boolean showLocation)
+	{
+		String itemName = (clansPlayer.isOnline() ? C.cGreenB : C.cRedB) + clansPlayer.getPlayerName();
+		ArrayList<String> lore = new ArrayList<String>(5);
+		lore.add(" ");
+		lore.add(C.Reset + C.cYellow + "Role " + C.cWhite + clansPlayer.getRole().getFriendlyName());
+		if (showLocation && clansPlayer.isOnline())
+		{
+			Player player = UtilPlayer.searchExact(clansPlayer.getUuid());
+			if (player != null)
+			{
+				String loc = UtilWorld.locToStrClean(player.getLocation());
+				lore.add(C.Reset + C.cYellow + "Location " + C.cWhite + loc);
+			}
+		}
+
+		ItemStack item = UtilSkull.getPlayerHead(clansPlayer.isOnline() ? clansPlayer.getPlayerName() : "", itemName, lore);
+		setItem(slot, item);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/CustomItemLoot.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/CustomItemLoot.java
new file mode 100644
index 000000000..af4160255
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/CustomItemLoot.java
@@ -0,0 +1,84 @@
+package mineplex.game.clans.clans.loot;
+
+import java.util.Arrays;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilMath;
+
+public class CustomItemLoot implements ILoot
+{
+	private Material _material;
+	private byte _data;
+	private int _min;
+	private int _max;
+	private String _displayName;
+	private String[] _lore;
+	
+	public CustomItemLoot(Material material)
+	{
+		this(material, 1, 1);
+	}
+	
+	public CustomItemLoot(Material material, int min, int max)
+	{
+		this(material, (byte) 0, min, max, null, new String[] {});
+	}
+	
+	public CustomItemLoot(Material material, int min, int max, String displayName, String... lore)
+	{
+		this(material, (byte) 0, min, max, displayName, lore);
+	}
+	
+	public CustomItemLoot(Material material, byte data, int min, int max, String displayName, String... lore)
+	{
+		_material = material;
+		_data = data;
+		_min = min;
+		_max = max;
+		_displayName = C.Reset + displayName;
+		_lore = lore;
+	}
+	
+	@Override
+	public void dropLoot(Location location)
+	{
+		location.getWorld().dropItemNaturally(location, getItemStack());
+	}
+	
+	@Override
+	public ItemStack getItemStack()
+	{
+		ItemStack stack = new ItemStack(_material, UtilMath.rRange(_min, _max), _data);
+		
+		ItemMeta meta = stack.getItemMeta();
+		
+		if (meta == null)
+		{
+			meta = Bukkit.getItemFactory().getItemMeta(_material);
+		}
+		
+		if (meta != null && _displayName != null)
+		{
+			meta.setDisplayName(_displayName);
+		}
+		
+		if (meta != null && _lore != null && _lore.length > 0)
+		{
+			meta.setLore(Arrays.asList(_lore));
+		}
+		
+		if (meta != null)
+		{
+			stack.setItemMeta(meta);
+		}
+		
+		return stack;
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/GearLoot.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/GearLoot.java
new file mode 100644
index 000000000..c65d2cd33
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/GearLoot.java
@@ -0,0 +1,28 @@
+package mineplex.game.clans.clans.loot;
+
+import org.bukkit.Location;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.game.clans.items.GearManager;
+
+public class GearLoot implements ILoot
+{
+	private GearManager _gearManager;
+	
+	public GearLoot(GearManager gearManager)
+	{
+		_gearManager = gearManager;
+	}
+	
+	@Override
+	public void dropLoot(Location location)
+	{
+		_gearManager.spawnItem(location);
+	}
+	
+	@Override
+	public ItemStack getItemStack()
+	{
+		return _gearManager.generateItem().toItemStack();
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/GoldLoot.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/GoldLoot.java
new file mode 100644
index 000000000..cf9634736
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/GoldLoot.java
@@ -0,0 +1,34 @@
+package mineplex.game.clans.clans.loot;
+
+import org.bukkit.Location;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.UtilMath;
+import mineplex.game.clans.economy.GoldManager;
+
+public class GoldLoot implements ILoot
+{
+	private GoldManager _goldManager;
+	private int _min;
+	private int _max;
+
+	public GoldLoot(GoldManager goldManager, int min, int max)
+	{
+		_goldManager = goldManager;
+		_min = min;
+		_max = max;
+	}
+
+	@Override
+	public void dropLoot(Location location)
+	{
+		int count = _min + UtilMath.r(_max - _min);
+		_goldManager.dropGold(location, count);
+	}
+
+	@Override
+	public ItemStack getItemStack()
+	{
+		return null;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/GoldTokenLoot.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/GoldTokenLoot.java
new file mode 100644
index 000000000..03707ad93
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/GoldTokenLoot.java
@@ -0,0 +1,36 @@
+package mineplex.game.clans.clans.loot;
+
+import org.bukkit.Location;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.UtilMath;
+import mineplex.game.clans.items.economy.GoldToken;
+
+public class GoldTokenLoot implements ILoot
+{
+	private int _minGold;
+	private int _maxGold;
+
+	public GoldTokenLoot(int minGold, int maxGold)
+	{
+		_minGold = minGold;
+		_maxGold = maxGold;
+	}
+
+	@Override
+	public void dropLoot(Location location)
+	{
+		int gold = _minGold + UtilMath.r(_maxGold - _minGold);
+
+		GoldToken token = new GoldToken(gold);
+		location.getWorld().dropItemNaturally(location, token.toItemStack());
+	}
+
+	@Override
+	public ItemStack getItemStack()
+	{
+		int gold = _minGold + UtilMath.r(_maxGold - _minGold);
+		GoldToken token = new GoldToken(gold);
+		return token.toItemStack();
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/ILoot.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/ILoot.java
new file mode 100644
index 000000000..dafd8e0ed
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/ILoot.java
@@ -0,0 +1,12 @@
+package mineplex.game.clans.clans.loot;
+
+import org.bukkit.Location;
+import org.bukkit.inventory.ItemStack;
+
+public interface ILoot
+{
+	public void dropLoot(Location location);
+
+	public ItemStack getItemStack();
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/ItemLoot.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/ItemLoot.java
new file mode 100644
index 000000000..e7e6bb848
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/ItemLoot.java
@@ -0,0 +1,48 @@
+package mineplex.game.clans.clans.loot;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.UtilMath;
+
+public class ItemLoot implements ILoot
+{
+	private Material _material;
+	private byte _data;
+	private int _min;
+	private int _max;
+
+	public ItemLoot(Material material)
+	{
+		this(material, 1, 1);
+	}
+
+	public ItemLoot(Material material, int min, int max)
+	{
+		this(material, (byte) 0, min, max);
+	}
+
+	public ItemLoot(Material material, byte data, int min, int max)
+	{
+		_material = material;
+		_data = data;
+		_min = min;
+		_max = max;
+	}
+
+	@Override
+	public void dropLoot(Location location)
+	{
+		int count = UtilMath.rRange(_min, _max);
+		ItemStack item = new ItemStack(_material, count, (short) 0, _data);
+		location.getWorld().dropItemNaturally(location, item);
+	}
+
+	@Override
+	public ItemStack getItemStack()
+	{
+		int count = UtilMath.rRange(_min, _max);
+		return new ItemStack(_material, count, (short) 0, _data);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java
new file mode 100644
index 000000000..73832f6ec
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java
@@ -0,0 +1,109 @@
+package mineplex.game.clans.clans.loot;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.game.clans.economy.GoldManager;
+import mineplex.game.clans.items.GearManager;
+import mineplex.game.clans.items.generation.WeightSet;
+
+public class LootManager
+{
+	private GearManager _gearManager;
+	private GoldManager _goldManager;
+	
+	private WeightSet<ILoot> _commonSet;
+	private WeightSet<ILoot> _rareSet;
+	
+	public LootManager(GearManager gearManager, GoldManager goldManager)
+	{
+		_gearManager = gearManager;
+		_goldManager = goldManager;
+		
+		_commonSet = new WeightSet<ILoot>();
+		_rareSet = new WeightSet<ILoot>();
+		
+		populateCommon();
+		populateRare();
+	}
+	
+	private void populateCommon()
+	{
+		// Food
+		_commonSet.add(5, new ItemLoot(Material.CARROT, 1, 5));
+		_commonSet.add(5, new ItemLoot(Material.APPLE, 1, 3));
+		_commonSet.add(5, new ItemLoot(Material.COOKED_BEEF, 1, 3));
+		_commonSet.add(5, new ItemLoot(Material.RAW_BEEF, 1, 4));
+		_commonSet.add(5, new ItemLoot(Material.POTATO_ITEM, 1, 5));
+		
+		// Armor
+		_commonSet.add(2, new ItemLoot(Material.IRON_HELMET, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.IRON_CHESTPLATE, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.IRON_LEGGINGS, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.IRON_BOOTS, 1, 1));
+		
+		_commonSet.add(2, new ItemLoot(Material.GOLD_HELMET, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.GOLD_CHESTPLATE, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.GOLD_LEGGINGS, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.GOLD_BOOTS, 1, 1));
+		
+		_commonSet.add(2, new ItemLoot(Material.LEATHER_HELMET, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.LEATHER_CHESTPLATE, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.LEATHER_LEGGINGS, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.LEATHER_BOOTS, 1, 1));
+		
+		_commonSet.add(2, new ItemLoot(Material.DIAMOND_HELMET, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.DIAMOND_CHESTPLATE, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.DIAMOND_LEGGINGS, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.DIAMOND_BOOTS, 1, 1));
+		
+		_commonSet.add(2, new ItemLoot(Material.CHAINMAIL_HELMET, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.CHAINMAIL_CHESTPLATE, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.CHAINMAIL_LEGGINGS, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.CHAINMAIL_BOOTS, 1, 1));
+		
+		_commonSet.add(2, new ItemLoot(Material.IRON_AXE, 1, 1));
+		_commonSet.add(2, new ItemLoot(Material.IRON_SWORD, 1, 1));
+		
+		_commonSet.add(2, new CustomItemLoot(Material.STONE_SWORD, 1, 1, "Standard Sword"));
+		_commonSet.add(2, new CustomItemLoot(Material.STONE_AXE, 1, 1, "Standard Axe"));
+		_commonSet.add(2, new CustomItemLoot(Material.GOLD_SWORD, 1, 1, "Booster Sword"));
+		_commonSet.add(2, new CustomItemLoot(Material.GOLD_AXE, 1, 1, "Booster Axe"));
+		_commonSet.add(2, new CustomItemLoot(Material.DIAMOND_SWORD, 1, 1, "Power Sword"));
+		_commonSet.add(2, new CustomItemLoot(Material.DIAMOND_AXE, 1, 1, "Power Axe"));
+		
+		_commonSet.add(1, new ItemLoot(Material.WOOD_SWORD, 1, 1));
+		_commonSet.add(1, new ItemLoot(Material.WOOD_AXE, 1, 1));
+		
+		// Gear
+		_commonSet.add(1, new GearLoot(_gearManager));
+		
+		// Gold
+		// _commonSet.add(5, new GoldLoot(_goldManager, 100, 1000));
+		_commonSet.add(1, new GoldTokenLoot(5000, 10000));
+	}
+	
+	private void populateRare()
+	{
+		// Gear
+		_rareSet.add(100, new GearLoot(_gearManager));
+		_rareSet.add(10, new GoldTokenLoot(50000, 100000));
+	}
+	
+	public void dropCommon(Location location)
+	{
+		_commonSet.generateRandom().dropLoot(location);
+	}
+	
+	public void dropRare(Location location)
+	{
+		_rareSet.generateRandom().dropLoot(location);
+	}
+	
+	public ItemStack getRareItemStack()
+	{
+		return _rareSet.generateRandom().getItemStack();
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapManager.java
new file mode 100644
index 000000000..1a6268a76
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapManager.java
@@ -0,0 +1,924 @@
+package mineplex.game.clans.clans.map;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.PrintWriter;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.commons.io.FileUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_8_R3.CraftChunk;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.entity.ItemSpawnEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.map.MapRenderer;
+import org.bukkit.map.MapView;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.HashMultiset;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Multisets;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextBottom;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.itemstack.ItemBuilder;
+import mineplex.core.portal.ServerTransferEvent;
+import mineplex.core.timing.TimingManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.ClansUtility;
+import mineplex.game.clans.clans.worldevent.WorldEventManager;
+import net.minecraft.server.v1_8_R3.Block;
+import net.minecraft.server.v1_8_R3.BlockPosition;
+import net.minecraft.server.v1_8_R3.Blocks;
+import net.minecraft.server.v1_8_R3.IBlockData;
+import net.minecraft.server.v1_8_R3.MaterialMapColor;
+import net.minecraft.server.v1_8_R3.PersistentCollection;
+
+public class ItemMapManager extends MiniPlugin
+{
+	private int _blocksScan = 16 * 3;
+	private ClansUtility _clansUtility;
+	private Comparator<Entry<Integer, Integer>> _comparator;
+	private int _halfMapSize = 1536 / 2;
+	private int[][] _heightMap = new int[(_halfMapSize * 2) + 16][];
+	private boolean _loadWorld = true;
+	private HashMap<Integer, Byte[][]> _map = new HashMap<Integer, Byte[][]>();
+	private short _mapId = -1;
+	private HashMap<String, MapInfo> _mapInfo = new HashMap<String, MapInfo>();
+	private HashMap<Integer, Integer> _scale = new HashMap<Integer, Integer>();
+	private ArrayList<Entry<Integer, Integer>> _scanList = new ArrayList<Entry<Integer, Integer>>();
+	private World _world;
+	private WorldEventManager _eventManager;
+
+	public ItemMapManager(ClansManager clansManager, WorldEventManager eventManager)
+	{
+		super("ItemMapManager", clansManager.getPlugin());
+ 
+		_clansUtility = clansManager.getClanUtility();
+		_eventManager = eventManager;
+
+		_comparator = new Comparator<Entry<Integer, Integer>>()
+		{
+
+			@Override
+			public int compare(Entry<Integer, Integer> o1, Entry<Integer, Integer> o2)
+			{
+				// Render the places outside the map first to speed up visual errors fixing
+				int outsideMap = Boolean.compare(o1.getValue() < -_halfMapSize, o2.getValue() < -_halfMapSize);
+
+				if (outsideMap != 0)
+				{
+					return -outsideMap;
+				}
+
+				double dist1 = 0;
+				double dist2 = 0;
+
+				for (Player player : UtilServer.getPlayers())
+				{
+					dist1 += getDistance(o1, player.getLocation().getX(), player.getLocation().getZ());
+					dist2 += getDistance(o2, player.getLocation().getX(), player.getLocation().getZ());
+				}
+
+				if (dist1 != dist2)
+				{
+					return Double.compare(dist1, dist2);
+				}
+
+				dist1 = getDistance(o1, 0, 0);
+				dist2 = getDistance(o2, 0, 0);
+
+				return Double.compare(dist1, dist2);
+
+			}
+		};
+
+		for (int x = -_halfMapSize; x < _halfMapSize; x += _blocksScan)
+		{
+			for (int z = -_halfMapSize - 16; z < _halfMapSize; z += (z < -_halfMapSize ? 16 : _blocksScan))
+			{
+				_scanList.add(new HashMap.SimpleEntry(x, z));
+			}
+		}
+
+		_scale.put(0, 1);
+		// _scale.put(1, 2);
+		_scale.put(1, 4);
+		_scale.put(2, 8);
+		_scale.put(3, 13);
+		// _scale.put(5, 16);
+
+		for (Entry<Integer, Integer> entry : _scale.entrySet())
+		{
+			int size = (_halfMapSize * 2) / entry.getValue();
+			Byte[][] bytes = new Byte[size][];
+
+			for (int i = 0; i < size; i++)
+			{
+				bytes[i] = new Byte[size];
+			}
+
+			_map.put(entry.getKey(), bytes);
+		}
+
+		for (int i = 0; i < _heightMap.length; i++)
+		{
+			_heightMap[i] = new int[_heightMap.length];
+		}
+
+		_world = Bukkit.getWorld("world");
+
+		try
+		{
+			File file = new File("world/clans_map_id");
+			File foundFile = null;
+
+			for (File f : new File("world/data").listFiles())
+			{
+				if (f.getName().startsWith("map_"))
+				{
+					foundFile = f;
+					break;
+				}
+			}
+
+			if (foundFile == null)
+			{
+				PersistentCollection collection = ((CraftWorld) _world).getHandle().worldMaps;
+				Field f = collection.getClass().getDeclaredField("d");
+				f.setAccessible(true);
+				((HashMap) f.get(collection)).put("map", (short) 0);
+			}
+
+			if (file.exists())
+			{
+				BufferedReader br = new BufferedReader(new FileReader(file));
+				_mapId = Short.parseShort(br.readLine());
+				br.close();
+
+				if (foundFile == null)
+				{
+					_mapId = -1;
+					file.delete();
+				}
+				else
+				{
+					for (int i = _mapId; i <= _mapId + 100; i++)
+					{
+						File file1 = new File("world/data/map_" + i + ".dat");
+
+						if (!file1.exists())
+						{
+							FileUtils.copyFile(foundFile, file1);
+						}
+
+						setupRenderer(Bukkit.getMap((short) i));
+					}
+				}
+			}
+
+			if (_mapId < 0)
+			{
+				MapView view = Bukkit.createMap(_world);
+				_mapId = view.getId();
+				setupRenderer(view);
+
+				for (int i = 0; i < 100; i++)
+				{
+					setupRenderer(Bukkit.createMap(_world));// Ensures the following 100 maps are unused
+				}
+
+				file.createNewFile();
+
+				PrintWriter writer = new PrintWriter(file, "UTF-8");
+				writer.print(_mapId);
+				writer.close();
+			}
+		}
+		catch (Exception ex)
+		{
+			ex.printStackTrace();
+		}
+
+		rebuildScan();
+	}
+
+	private void setupRenderer(MapView view)
+	{
+		for (MapRenderer renderer : view.getRenderers())
+		{
+			view.removeRenderer(renderer);
+		}
+
+		view.addRenderer(new ItemMapRenderer(this, _eventManager));
+	}
+
+	@EventHandler
+	public void preventMapInItemFrame(PlayerInteractEntityEvent event)
+	{
+		if (!(event.getRightClicked() instanceof ItemFrame))
+			return;
+
+		ItemStack item = event.getPlayer().getItemInHand();
+
+		if (item == null || item.getType() != Material.MAP || item.getDurability() < _mapId
+				|| item.getDurability() > _mapId + 100)
+			return;
+
+		event.setCancelled(true);
+	}
+
+	/**
+	 * Get the center of the map.
+	 */
+	public int calcMapCenter(int zoom, int cord)
+	{
+		int mapSize = _halfMapSize / zoom; // This is how large the map is in pixels
+
+		int mapCord = cord / zoom; // This is pixels from true center of map, not held map
+
+		int fDiff = mapSize - -mapCord;
+		int sDiff = mapSize - mapCord;
+
+		double chunkBlock = cord & 0xF;
+		cord -= chunkBlock;
+		chunkBlock /= zoom;
+
+		/*if ((fDiff < 64 || sDiff < 64) && (Math.abs(fDiff - sDiff) > 1))
+		{
+			cord += (fDiff > sDiff ? Math.floor(chunkBlock) : Math.ceil(chunkBlock));
+		}
+		else*/
+		{
+			cord += (int) Math.floor(chunkBlock) * zoom;
+		}
+
+		while ((fDiff < 64 || sDiff < 64) && (Math.abs(fDiff - sDiff) > 1))
+		{
+			int change = (fDiff > sDiff ? -zoom : zoom);
+			cord += change;
+
+			mapCord = cord / zoom;
+
+			fDiff = mapSize - -mapCord;
+			sDiff = mapSize - mapCord;
+		}
+
+		return cord;
+	}
+
+	private void colorWorldHeight(int scale, int startingX, int startingZ)
+	{
+		Byte[][] map = _map.get(scale);
+		int zoom = getZoom(scale);
+
+		for (int x = startingX; x < startingX + _blocksScan; x += zoom)
+		{
+			double d0 = 0;
+
+			// Prevents ugly lines for the first line of Z
+
+			for (int addX = 0; addX < zoom; addX++)
+			{
+				for (int addZ = 0; addZ < zoom; addZ++)
+				{
+					int hX = x + addX + _halfMapSize;
+					int hZ = (startingZ - zoom) + addZ + _halfMapSize;
+
+					if (hX >= _halfMapSize * 2 || hZ >= _halfMapSize * 2)
+					{
+						continue;
+					}
+
+					d0 += _heightMap[hX + 16][hZ + 16] / (zoom * zoom);
+				}
+			}
+
+			for (int z = startingZ; z < startingZ + _blocksScan; z += zoom)
+			{
+				// Water depth colors not included
+				double d1 = 0;
+
+				for (int addX = 0; addX < zoom; addX++)
+				{
+					for (int addZ = 0; addZ < zoom; addZ++)
+					{
+						int hX = x + addX + _halfMapSize;
+						int hZ = z + addZ + _halfMapSize;
+
+						if (hX >= _halfMapSize * 2 || hZ >= _halfMapSize * 2)
+						{
+							continue;
+						}
+
+						d1 += _heightMap[hX + 16][hZ + 16] / (zoom * zoom);
+					}
+				}
+
+				double d2 = (d1 - d0) * 4.0D / (zoom + 4) + ((x + z & 0x1) - 0.5D) * 0.4D;
+				byte b0 = 1;
+
+				d0 = d1;
+
+				if (d2 > 0.6D)
+				{
+					b0 = 2;
+				}
+				else if (d2 > 1.2D)
+				{
+					b0 = 3;
+				}
+				else if (d2 < -0.6D)
+				{
+					b0 = 0;
+				}
+
+				int origColor = map[(x + _halfMapSize) / zoom][(z + _halfMapSize) / zoom] - 1;
+
+				/*if (color < 4)
+				{
+					d2 = waterDepth * 0.1D + (k1 + j2 & 0x1) * 0.2D;
+					b0 = 1;
+					if (d2 < 0.5D)
+					{
+						b0 = 2;
+					}
+
+					if (d2 > 0.9D)
+					{
+						b0 = 0;
+					}
+				}*/
+
+				byte color = (byte) (origColor + b0);
+				map[(x + _halfMapSize) / zoom][(z + _halfMapSize) / zoom] = color;
+			}
+		}
+	}
+
+	private void drawWorldScale(int scale, int startingX, int startingZ)
+	{
+		Byte[][] first = _map.get(0);
+		Byte[][] second = _map.get(scale);
+		int zoom = getZoom(scale);
+
+		for (int x = startingX; x < startingX + _blocksScan; x += zoom)
+		{
+			for (int z = startingZ; z < startingZ + _blocksScan; z += zoom)
+			{
+				HashMultiset<Byte> hashmultiset = HashMultiset.create();
+
+				for (int addX = 0; addX < zoom; addX++)
+				{
+					for (int addZ = 0; addZ < zoom; addZ++)
+					{
+						int pX = x + addX + _halfMapSize;
+						int pZ = z + addZ + _halfMapSize;
+
+						if (pX >= first.length || pZ >= first.length)
+						{
+							continue;
+						}
+
+						Byte b = first[pX][pZ];
+
+						hashmultiset.add(b);
+					}
+				}
+
+				Byte color = Iterables.getFirst(Multisets.copyHighestCountFirst(hashmultiset), (byte) 0);
+
+				second[(x + _halfMapSize) / zoom][(z + _halfMapSize) / zoom] = color;
+			}
+		}
+	}
+
+	@EventHandler
+	public void dropItem(ItemSpawnEvent event)
+	{
+		ItemStack item = event.getEntity().getItemStack();
+
+		if (item != null && item.getType() == Material.MAP && item.getDurability() >= _mapId
+				&& item.getDurability() <= _mapId + 100)
+		{
+			event.getEntity().remove();
+		}
+	}
+
+	public ClansUtility getClansUtility()
+	{
+		return _clansUtility;
+	}
+
+	private double getDistance(double x1, double z1, double x2, double z2)
+	{
+		x1 = (x1 - x2);
+		z1 = (z1 - z2);
+
+		return (x1 * x1) + (z1 * z1);
+	}
+
+	private double getDistance(Entry<Integer, Integer> entry, double x1, double z1)
+	{
+		return getDistance(x1, z1, entry.getKey() + (_blocksScan / 2), entry.getValue() + (_blocksScan / 2));
+	}
+
+	public Byte[][] getMap(int scale)
+	{
+		return _map.get(scale);
+	}
+
+	public MapInfo getMap(Player player)
+	{
+		return _mapInfo.get(player.getName());
+	}
+
+	public int getMapSize()
+	{
+		return _halfMapSize;
+	}
+
+	public int getZoom(int scale)
+	{
+		return _scale.get(scale);
+	}
+
+	@EventHandler
+	public void preventMapMoveInventories(InventoryClickEvent event)
+	{
+		Inventory inv = event.getClickedInventory();
+
+		if (inv == null)
+			return;
+
+		// Yeah, the loop looks a little weird..
+		for (ItemStack item : new ItemStack[]
+			{
+					event.getCurrentItem(), event.getCursor()
+			})
+		{
+			if (item == null || item.getType() != Material.MAP || item.getDurability() < _mapId
+					|| item.getDurability() > _mapId + 100)
+				continue;
+
+			if (inv.getHolder() instanceof Player ? !event.isShiftClick() : Objects.equal(event.getCurrentItem(), item))
+				continue;
+
+			event.setCancelled(true);
+
+			UtilPlayer.message(event.getWhoClicked(),
+					F.main("Inventory", "You cannot move " + F.item("Clans Map") + " between inventories."));
+			return;
+		}
+	}
+
+	@EventHandler
+	public void onDeath(PlayerDeathEvent event)
+	{
+		MapInfo info = getMap(event.getEntity());
+
+		info.setMap(Math.min(_mapId + 100, info.getMap() + 1));
+	}
+
+	@EventHandler
+	public void onHotbarMove(PlayerItemHeldEvent event)
+	{
+		Player player = event.getPlayer();
+
+		ItemStack item = player.getInventory().getItem(event.getNewSlot());
+
+		if (item == null || item.getType() != Material.MAP || item.getDurability() < _mapId
+				|| item.getDurability() > _mapId + 100)
+			return;
+
+		showZoom(player, getMap(player));
+
+	}
+
+	@EventHandler
+	public void onInteract(PlayerInteractEvent event)
+	{
+		if (event.getAction() == Action.PHYSICAL)
+			return;
+
+		ItemStack item = event.getItem();
+
+		if (item == null || item.getType() != Material.MAP || item.getDurability() < _mapId
+				|| item.getDurability() > _mapId + 100)
+			return;
+
+		event.setCancelled(true);
+
+		Player player = event.getPlayer();
+
+		MapInfo info = getMap(player);
+
+		boolean zoomIn = event.getAction().name().contains("LEFT");
+
+		if (!_scale.containsKey(info.getScale() + (zoomIn ? -1 : 1)))
+		{
+			return;
+		}
+
+		if (!info.canZoom())
+		{
+			long remainingTime = (info.getZoomCooldown() + 2500) - System.currentTimeMillis();
+
+			UtilPlayer.message(
+					player,
+					F.main("Recharge",
+							"You cannot use " + F.skill("Map Zoom") + " for "
+									+ F.time(UtilTime.convertString((remainingTime), 1, TimeUnit.FIT)) + "."));
+			return;
+		}
+
+		info.addZoom();
+
+		if (zoomIn)
+		{
+			int newScale = info.getScale() - 1;
+			Location loc = player.getLocation();
+
+			int zoom = getZoom(newScale);
+
+			info.setInfo(newScale, calcMapCenter(zoom, loc.getBlockX()), calcMapCenter(zoom, loc.getBlockZ()));
+		}
+		else
+		{
+			int newScale = info.getScale() + 1;
+			Location loc = player.getLocation();
+
+			int zoom = getZoom(newScale);
+
+			info.setInfo(newScale, calcMapCenter(zoom, loc.getBlockX()), calcMapCenter(zoom, loc.getBlockZ()));
+		}
+
+		showZoom(player, info);
+	}
+
+	@EventHandler
+	public void onJoin(PlayerJoinEvent event)
+	{
+		MapInfo info = new MapInfo(_mapId);
+
+		Player player = event.getPlayer();
+		Location loc = player.getLocation();
+
+		int zoom = getZoom(1);
+
+		info.setInfo(1, calcMapCenter(zoom, loc.getBlockX()), calcMapCenter(zoom, loc.getBlockZ()));
+		_mapInfo.put(player.getName(), info);
+
+		if (UtilInv.getItems(player).isEmpty())
+		{
+			setMap(player);
+		}
+	}
+
+	@EventHandler
+	public void onQuit(PlayerQuitEvent event)
+	{
+		_mapInfo.remove(event.getPlayer().getName());
+	}
+
+	@EventHandler
+	public void onServerTransfer(ServerTransferEvent event)
+	{
+		Player p = event.getPlayer();
+
+		p.sendMessage(C.cDRed + C.Bold + "WARNING!");
+		p.sendMessage(C.cYellow + "There's a bug where switching servers will freeze the Clans Map!");
+		p.sendMessage(C.cYellow + "If you want to play on Clans again, rejoin the Mineplex server!");
+	}
+
+	private void rebuildScan()
+	{
+		for (int x = -_halfMapSize; x < _halfMapSize; x += _blocksScan)
+		{
+			for (int z = -_halfMapSize - 16; z < _halfMapSize; z += (z < -_halfMapSize ? 16 : _blocksScan))
+			{
+				_scanList.add(new HashMap.SimpleEntry(x, z));
+			}
+		}
+
+		if (!_loadWorld)
+		{
+			Iterator<Entry<Integer, Integer>> itel = _scanList.iterator();
+
+			while (itel.hasNext())
+			{
+				Entry<Integer, Integer> entry = itel.next();
+				boolean removeEntry = true;
+
+				for (Player player : UtilServer.getPlayers())
+				{
+					if (Math.sqrt(getDistance(entry, player.getLocation().getX(), player.getLocation().getZ())) < 200)
+					{
+						removeEntry = false;
+						break;
+					}
+				}
+
+				if (removeEntry)
+				{
+					itel.remove();
+				}
+			}
+		}
+
+		Collections.sort(_scanList, _comparator);
+	}
+
+	@EventHandler
+	public void recenterMap(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+		{
+			return;
+		}
+
+		for (Player player : Bukkit.getOnlinePlayers())
+		{
+			MapInfo info = getMap(player);
+
+			if (info.getScale() >= 3)
+			{
+				continue;
+			}
+
+			Location l = player.getLocation();
+			int zoom = getZoom(info.getScale());
+
+			double mapX = (l.getX() - info.getX()) / zoom;
+			double mapZ = (l.getZ() - info.getZ()) / zoom;
+
+			if (Math.abs(mapX) > 22 || Math.abs(mapZ) > 22)
+			{
+				int newX = calcMapCenter(zoom, l.getBlockX());
+				int newZ = calcMapCenter(zoom, l.getBlockZ());
+
+				if (Math.abs(mapX) > 22 ? newX != info.getX() : newZ != info.getZ())
+				{
+					info.setInfo(newX, newZ);
+				}
+			}
+		}
+	}
+
+	@EventHandler
+	public void renderMap(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		if (_scanList.isEmpty())
+		{
+			if (_loadWorld)
+			{
+				for (int x = -_halfMapSize; x < _halfMapSize; x += _blocksScan)
+				{
+					for (int z = -_halfMapSize; z < _halfMapSize; z += _blocksScan)
+					{
+						drawWorldScale(3, x, z);
+						colorWorldHeight(3, x, z);
+					}
+				}
+
+				System.out.print("Finished first map scan and render");
+			}
+
+			_loadWorld = false;
+
+			if (UtilServer.getPlayers().length == 0)
+				return;
+
+			rebuildScan();
+		}
+		else if (_scanList.size() % 20 == 0)
+		{
+			Collections.sort(_scanList, _comparator);
+		}
+
+		Entry<Integer, Integer> entry = _scanList.remove(0);
+
+		int startingX = entry.getKey();
+		int startingZ = entry.getValue();
+
+		boolean outsideMap = startingZ < -_halfMapSize;
+
+		scanWorldMap(startingX, startingZ, !outsideMap);
+		
+		if (outsideMap)
+		{
+			return;
+		}
+
+		for (int scale = 1; scale < _scale.size(); scale++)
+		{
+			if (scale == 3 && _loadWorld)
+				continue;
+
+			if (!outsideMap)
+			{
+				drawWorldScale(scale, startingX, startingZ);
+			}
+
+			colorWorldHeight(scale, startingX, startingZ);
+		}
+		
+		colorWorldHeight(0, startingX, startingZ);
+	}
+
+	public void scanWorldMap(int startingX, int startingZ, boolean setColors)
+	{
+		Byte[][] map = _map.get(0);
+
+		for (int beginX = startingX; beginX < startingX + _blocksScan; beginX += 16)
+		{
+			for (int beginZ = startingZ - (startingZ > -_halfMapSize ? 16 : 0); beginZ < startingZ
+					+ (setColors ? _blocksScan : 16); beginZ += 16)
+			{
+				Chunk chunk = _world.getChunkAt(beginX / 16, beginZ / 16);
+				boolean loaded = false;
+
+				if (!chunk.isLoaded())
+				{
+					if (_loadWorld)
+					{
+						loaded = chunk.load();
+					}
+					else
+					{
+						continue;
+					}
+				}
+
+				net.minecraft.server.v1_8_R3.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
+
+				for (int x = beginX; x < beginX + 16; x++)
+				{
+					for (int z = beginZ; z < beginZ + 16; z++)
+					{
+						int color = 0;
+
+						if (!nmsChunk.isEmpty())
+						{
+							int k3 = x & 0xF;
+							int l3 = z & 0xF;
+
+							int l4 = nmsChunk.b(k3, l3) + 1;
+							IBlockData iblockdata = Blocks.AIR.getBlockData();
+
+							if (l4 > 1)
+							{
+								do
+								{
+									l4--;
+									iblockdata= nmsChunk.getBlockData(new BlockPosition(k3, l4, l3));
+								}
+								while (iblockdata.getBlock().g(iblockdata) == MaterialMapColor.b && (l4 > 0));
+
+								if ((l4 > 0) && (iblockdata.getBlock().getMaterial().isLiquid()))
+								{
+									int j5 = l4 - 1;
+									Block block1;
+									do
+									{
+										block1 = nmsChunk.getType(new BlockPosition(k3, j5--, l3));
+									}
+									while ((j5 > 0) && (block1.getMaterial().isLiquid()));
+								}
+							}
+
+							_heightMap[x + _halfMapSize + 16][z + _halfMapSize + 16] = l4;
+
+							if (setColors)
+							{
+								//color = block.f(i5).M;
+								IBlockData data = nmsChunk.getBlockData(new BlockPosition(k3, l4, l3));
+								color = data.getBlock().g(data).M;
+
+								color = (byte) ((color * 4) + 1);
+							}
+						}
+
+						if (setColors && beginZ >= startingZ)
+						{
+							map[x + _halfMapSize][z + _halfMapSize] = (byte) color;
+						}
+					}
+
+					if (loaded)
+					{
+						chunk.unload();
+					}
+				}
+			}
+		}
+	}
+
+	public void setMap(Player player)
+	{
+		for (ItemStack item : UtilInv.getItems(player))
+		{
+			if (item.getType() == Material.MAP && (item.getDurability() >= _mapId && item.getDurability() <= _mapId + 100))
+			{
+				return;
+			}
+		}
+
+		ItemStack item = new ItemBuilder(Material.MAP, 1, (short) getMap(player).getMap()).setTitle("Clans Map").build();
+
+		int slot = player.getInventory().firstEmpty();
+
+		if (slot >= 0)
+		{
+			ItemStack mapSlot = player.getInventory().getItem(8);
+
+			if (mapSlot == null || mapSlot.getType() == Material.AIR)
+			{
+				slot = 8;
+			}
+
+			player.getInventory().setItem(slot, item);
+		}
+	}
+
+	private void showZoom(Player player, MapInfo info)
+	{
+		String progressBar = C.cBlue + "";
+
+		boolean colorChange = false;
+
+		for (int i = 2; i >= 0; i--)
+		{
+			if (!colorChange && i < info.getScale())
+			{
+				progressBar += C.cGray;
+				colorChange = true;
+			}
+
+			char c;
+
+			switch (i)
+			{
+			case 0:
+				c = '█';
+				break;
+			case 1:
+				c = '▆';
+				break;
+			default:
+				c = '▄';
+				break;
+			}
+
+			for (int a = 0; a < 4; a++)
+			{
+				progressBar += c;
+			}
+
+			if (i > 0)
+			{
+				progressBar += " ";
+			}
+		}
+
+		UtilTextBottom.display(progressBar, player);
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapRenderer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapRenderer.java
new file mode 100644
index 000000000..bf85c900d
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapRenderer.java
@@ -0,0 +1,320 @@
+package mineplex.game.clans.clans.map;
+
+import java.awt.Color;
+
+import mineplex.core.common.util.UtilTime;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansUtility;
+import mineplex.game.clans.clans.worldevent.WorldEventManager;
+import mineplex.minecraft.game.core.boss.EventState;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.map.MapCanvas;
+import org.bukkit.map.MapCursor;
+import org.bukkit.map.MapCursorCollection;
+import org.bukkit.map.MapPalette;
+import org.bukkit.map.MapRenderer;
+import org.bukkit.map.MapView;
+
+public class ItemMapRenderer extends MapRenderer
+{
+	private ItemMapManager _manager;
+	private WorldEventManager _eventManager;
+
+	public ItemMapRenderer(ItemMapManager itemMapManager, WorldEventManager eventManager)
+	{
+		super(true);
+
+		_manager = itemMapManager;
+		_eventManager = eventManager;
+	}
+
+	@Override
+	public void render(MapView mapView, MapCanvas canvas, Player player)
+	{
+		MapInfo info = _manager.getMap(player);
+
+		if (info == null)
+		{
+			return;
+		}
+
+		int scale = info.getScale();
+		int zoom = _manager.getZoom(scale);
+
+		ClanInfo clan = _manager.getClansUtility().getClanByPlayer(player);
+
+		Byte[][] map = _manager.getMap(scale);
+
+		int centerX = info.getX() / zoom;
+		int centerZ = info.getZ() / zoom;
+
+		// We have this cooldown to squeeze out every single bit of performance from the server.
+		if (UtilTime.elapsed(info.getLastRendered(), 4000))
+		{
+			info.setLastRendered();
+
+			for (int mapX = 0; mapX < 128; mapX++)
+			{
+				for (int mapZ = 0; mapZ < 128; mapZ++)
+				{
+					int blockX = centerX + (mapX - 64);
+					int blockZ = centerZ + (mapZ - 64);
+
+					int pixelX = blockX + (map.length / 2);
+					int pixelZ = blockZ + (map.length / 2);
+
+					Byte color;
+
+					if (!(pixelX < 0 || pixelZ < 0 || pixelX >= map.length || pixelZ >= map.length)
+							&& map[pixelX][pixelZ] != null)
+					{
+
+						color = map[pixelX][pixelZ];
+
+						blockX *= zoom;
+						blockZ *= zoom;
+
+						String chunk = "world," + (int) Math.floor(blockX / 16D) + "," + (int) Math.floor(blockZ / 16D);
+
+						ClanInfo owningClan = _manager.getClansUtility().getOwner(chunk);
+
+						if (owningClan != null)
+						{
+							boolean colorAll = scale > 0;
+							Color clanColor = null;
+							Color clanColor2 = null;
+							
+							if (owningClan == clan)
+							{
+								clanColor = Color.CYAN;
+							}
+							else
+							{
+								ClansUtility.ClanRelation relation = _manager.getClansUtility().rel(clan, owningClan);
+								
+								if (owningClan.isAdmin())
+								{
+									colorAll = false;
+									
+									if (owningClan.getName().equals("Shops"))
+									{
+										clanColor = Color.WHITE;
+										clanColor2 = new Color(50, 150, 255);
+										
+										if (_manager.getClansUtility().relPT(player, chunk) == ClansUtility.ClanRelation.SAFE)
+											clanColor2 = new Color(50, 150, 255);
+									}
+									else if  (owningClan.getName().equals("Spawn"))
+									{
+										clanColor = Color.WHITE;
+										clanColor2 = new Color(0, 255, 100);
+									}
+									else if (owningClan.getName().equals("Fields"))
+									{
+										clanColor = Color.WHITE;
+										clanColor2 = new Color(255, 120, 0);
+									}
+									else
+									{
+										clanColor = Color.WHITE;
+										clanColor2 = Color.GRAY;
+									}
+								}
+								else if (relation == ClansUtility.ClanRelation.WAR_LOSING)
+								{
+									clanColor = Color.RED;
+								}
+								else if (relation == ClansUtility.ClanRelation.WAR_WINNING)
+								{
+									clanColor = Color.MAGENTA;
+								}
+								else if (relation == ClansUtility.ClanRelation.ALLY || relation == ClansUtility.ClanRelation.ALLY_TRUST)
+								{
+									clanColor = Color.GREEN;
+								}
+								else if (relation == ClansUtility.ClanRelation.SELF)
+								{
+									clanColor = Color.CYAN;
+								}
+								else
+								{
+									// Neutral
+									clanColor = Color.YELLOW;
+								}
+							}
+
+							if (clanColor != null)
+							{
+								int chunkBX = blockX & 0xF;
+								int chunkBZ = blockZ & 0xF;
+								int chunkX1 = (int) Math.floor(blockX / 16D);
+								int chunkZ1 = (int) Math.floor(blockZ / 16D);
+
+								//Border
+								if (colorAll ||
+
+									((chunkBX == 0 || zoom == 13) &&
+	
+									owningClan != _manager.getClansUtility().getOwner("world," + (chunkX1 - 1) + "," + chunkZ1))
+	
+									|| ((chunkBZ == 0 || zoom == 13) &&
+	
+									owningClan != _manager.getClansUtility().getOwner("world," + chunkX1 + "," + (chunkZ1 - 1)))
+	
+									|| ((chunkBX + zoom > 15 || zoom == 13) &&
+	
+									owningClan != _manager.getClansUtility().getOwner("world," + (chunkX1 + 1) + "," + chunkZ1))
+	
+									|| ((chunkBZ + zoom > 15 || zoom == 13) &&
+	
+									owningClan != _manager.getClansUtility().getOwner("world," + chunkX1 + "," + (chunkZ1 + 1))))
+								{
+									Color cColor = MapPalette.getColor(color);
+									double clans = colorAll ? 1 : 0.8;// 0.65;
+								
+									//Use clanColor2 no matter what for admins
+									Color drawColor = clanColor;
+									if (owningClan.isAdmin() && clanColor2 != null)
+									{
+										drawColor = clanColor2;
+										clans = 1;
+									}
+									
+									double base = 1 - clans;
+									
+									int r = (int) ((cColor.getRed() * base) + (drawColor.getRed() * clans));
+									int b = (int) ((cColor.getBlue() * base) + (drawColor.getBlue() * clans));
+									int g = (int) ((cColor.getGreen() * base) + (drawColor.getGreen() * clans));
+
+									color = MapPalette.matchColor(r, g, b);
+								}
+								
+
+
+								//Inside
+								else
+								{
+									Color cColor = MapPalette.getColor(color);
+
+									double clans = 0.065;
+									
+									//Stripes
+									boolean checker = (mapX + (mapZ % 4)) % 4 == 0;
+									Color drawColor = clanColor;
+									if (checker && owningClan.isAdmin() && clanColor2 != null)
+									{
+										drawColor = clanColor2;
+										clans = 1;
+									}
+									
+									double base = 1 - clans;
+
+									int r = (int) ((cColor.getRed() * base) + (drawColor.getRed() * clans));
+									int b = (int) ((cColor.getBlue() * base) + (drawColor.getBlue() * clans));
+									int g = (int) ((cColor.getGreen() * base) + (drawColor.getGreen() * clans));
+
+									color = MapPalette.matchColor(r, g, b);
+								}
+							}
+						}
+					}
+					else
+					{
+						color = (byte) 0;
+					}
+
+					canvas.setPixel(mapX, mapZ, color);
+				}
+			}
+		}
+
+		if (info.isSendMap())
+		{
+			player.sendMap(mapView);
+		}
+
+		MapCursorCollection cursors = canvas.getCursors();
+
+		while (cursors.size() > 0)
+		{
+			cursors.removeCursor(cursors.getCursor(0));
+		}
+
+		for (WorldEvent event : _eventManager.getEvents())
+		{
+			if (event.getState() != EventState.LIVE)
+				continue;
+
+			Location point = event.getCenterLocation();
+			double mapX = (point.getX() - info.getX()) / zoom;
+			double mapZ = (point.getZ() - info.getZ()) / zoom;
+
+			// To make these appear at the edges of the map, just change it from 64 to something like 128 for double the map size
+			if (mapX > -64 && mapX < 64 && mapZ > -64 && mapZ < 64)
+			{
+				byte b0 = (byte) (int) Math.min(127, (double) (mapX * 2.0F) + 0.5D);
+				byte b1 = (byte) (int) Math.max(-127, (double) (mapZ * 2.0F) + 0.5D);
+
+				byte cursorType = 4; // http://i.imgur.com/wpH6PT8.png
+				// Those are byte 5 and 6
+				byte rotation = (byte) ((int) Math.floor(System.currentTimeMillis() / 1000D) % 16);
+
+				MapCursor cursor = new MapCursor(b0, b1, rotation, cursorType, true);
+
+				cursors.addCursor(cursor);
+			}
+		}
+
+		for (Player other : Bukkit.getOnlinePlayers())
+		{
+			if (player.canSee(other) && other.isValid())
+			{
+				Location l = other.getLocation();
+
+				double mapX = (l.getX() - info.getX()) / zoom;
+				double mapZ = (l.getZ() - info.getZ()) / zoom;
+
+				if (mapX > -64 && mapX < 64 && mapZ > -64 && mapZ < 64)
+				{
+					ClanInfo otherClan = _manager.getClansUtility().getClanByPlayer(other);
+
+					MapCursor.Type cursorDisplay;
+
+					if (player == other)
+					{
+						cursorDisplay = MapCursor.Type.WHITE_POINTER;
+					}
+					else if (otherClan == null || clan == null)
+					{
+						continue;
+					}
+					else if (otherClan == clan)
+					{
+						cursorDisplay = MapCursor.Type.BLUE_POINTER;
+					}
+					else if (otherClan.isAlly(clan.getName()))
+					{
+						cursorDisplay = MapCursor.Type.GREEN_POINTER;
+					}
+					else
+					{
+						continue;
+					}
+
+					byte b0 = (byte) (int) Math.min(127, (double) (mapX * 2.0F) + 0.5D);
+					byte b1 = (byte) (int) Math.max(-127, (double) (mapZ * 2.0F) + 0.5D);
+
+					byte rotation = (byte) (int) ((l.getYaw() * 16D) / 360D);
+
+					MapCursor cursor = new MapCursor(b0, b1, (byte) (rotation & 0xF), cursorDisplay.getValue(), true);
+
+					cursors.addCursor(cursor);
+				}
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/MapInfo.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/MapInfo.java
new file mode 100644
index 000000000..ef79024fb
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/MapInfo.java
@@ -0,0 +1,124 @@
+package mineplex.game.clans.clans.map;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import mineplex.core.common.util.UtilTime;
+
+public class MapInfo
+{
+	private int _scale;
+	private int _centerX;
+	private int _centerZ;
+	private long _lastRendered;
+	private boolean _sendMap;
+	private List<Long> _lastZooms = new ArrayList<Long>();
+	private int _mapId;
+
+	public MapInfo(int newId)
+	{
+		_mapId = newId;
+	}
+
+	public int getMap()
+	{
+		return _mapId;
+	}
+
+	public void setMap(int newId)
+	{
+		_mapId = newId;
+	}
+
+	public boolean canZoom()
+	{
+		Iterator<Long> itel = _lastZooms.iterator();
+
+		while (itel.hasNext())
+		{
+			long lastZoomed = itel.next();
+
+			if (UtilTime.elapsed(lastZoomed, 2500))
+			{
+				itel.remove();
+			}
+		}
+
+		return _lastZooms.size() < 3;
+	}
+
+	public void addZoom()
+	{
+		_lastZooms.add(System.currentTimeMillis());
+	}
+
+	public long getZoomCooldown()
+	{
+		long cooldown = 0;
+
+		for (long zoomCooldown : _lastZooms)
+		{
+			if (cooldown == 0 || zoomCooldown < cooldown)
+			{
+				cooldown = zoomCooldown;
+			}
+		}
+
+		return cooldown;
+	}
+
+	public long getLastRendered()
+	{
+		return _lastRendered;
+	}
+
+	public void setLastRendered()
+	{
+		_lastRendered = System.currentTimeMillis();
+	}
+
+	public void setInfo(int scale, int x, int z)
+	{
+		_lastRendered = 0;
+		_scale = scale;
+		_centerX = x;
+		_centerZ = z;
+		_sendMap = true;
+	}
+
+	public void setInfo(int x, int z)
+	{
+		_lastRendered = 0;
+		_centerX = x;
+		_centerZ = z;
+		_sendMap = true;
+	}
+
+	public boolean isSendMap()
+	{
+		if (_sendMap)
+		{
+			_sendMap = false;
+			return true;
+		}
+
+		return false;
+	}
+
+	public int getX()
+	{
+		return _centerX;
+	}
+
+	public int getZ()
+	{
+		return _centerZ;
+	}
+
+	public int getScale()
+	{
+		return _scale;
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/ClientMurder.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/ClientMurder.java
new file mode 100644
index 000000000..3377a54be
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/ClientMurder.java
@@ -0,0 +1,52 @@
+package mineplex.game.clans.clans.murder;
+
+public class ClientMurder
+{
+	private boolean _isWeakling;
+	private long _lastWeaklingUpdate;
+	private long _ignoreWeaklingTime;
+	private int _inventoryValue;
+	
+	public ClientMurder()
+	{
+	}
+	
+	public boolean isWeakling()
+	{
+		return _isWeakling && _ignoreWeaklingTime < System.currentTimeMillis();
+	}
+	
+	public void setIsWeakling(boolean isWeakling)
+	{
+		_isWeakling = isWeakling;
+		_lastWeaklingUpdate = System.currentTimeMillis();
+	}
+	
+	public void setInventoryValue(int inventoryValue)
+	{
+		_inventoryValue = inventoryValue;
+	}
+	
+	/**
+	 * Disable weakling status for x milliseconds
+	 * 
+	 * @param milliseconds
+	 */
+	public void disableWeakling(long milliseconds)
+	{
+		if (_ignoreWeaklingTime > System.currentTimeMillis())
+			_ignoreWeaklingTime += milliseconds;
+		else
+			_ignoreWeaklingTime = System.currentTimeMillis() + milliseconds;
+	}
+	
+	public long getLastWeaklingUpdate()
+	{
+		return _lastWeaklingUpdate;
+	}
+	
+	public int getInventoryValue()
+	{
+		return _inventoryValue;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java
new file mode 100644
index 000000000..2f5fcaf30
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java
@@ -0,0 +1,211 @@
+package mineplex.game.clans.clans.murder;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.inventory.InventoryMoveItemEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniClientPlugin;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.shop.ClansShopItem;
+import mineplex.minecraft.game.core.combat.CombatComponent;
+import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
+
+public class MurderManager extends MiniClientPlugin<ClientMurder>
+{
+	private final List<Material> weapons = Arrays.asList(Material.WOOD_SWORD, Material.STONE_SWORD, Material.IRON_SWORD, Material.DIAMOND_SWORD, Material.WOOD_AXE, Material.STONE_AXE, Material.IRON_AXE, Material.DIAMOND_AXE, Material.BOW);
+	
+	private final List<Material> armor = Arrays.asList(Material.LEATHER_HELMET, Material.LEATHER_CHESTPLATE, Material.LEATHER_LEGGINGS, Material.LEATHER_BOOTS, Material.IRON_HELMET, Material.IRON_CHESTPLATE, Material.IRON_LEGGINGS, Material.IRON_BOOTS, Material.GOLD_HELMET, Material.GOLD_CHESTPLATE, Material.GOLD_LEGGINGS, Material.GOLD_BOOTS, Material.CHAINMAIL_HELMET, Material.CHAINMAIL_CHESTPLATE, Material.CHAINMAIL_LEGGINGS, Material.CHAINMAIL_BOOTS, Material.DIAMOND_HELMET, Material.DIAMOND_CHESTPLATE, Material.DIAMOND_LEGGINGS, Material.DIAMOND_BOOTS);
+	
+	private ClansManager _clansManager;
+	
+	public MurderManager(JavaPlugin plugin, ClansManager clansManager)
+	{
+		super("Murder", plugin);
+		
+		_clansManager = clansManager;
+	}
+	
+	@EventHandler
+	public void onCombatDeath(CombatDeathEvent event)
+	{
+		if (event.GetEvent().getEntity() instanceof Player)
+		{
+			Player deadPlayer = ((Player) event.GetEvent().getEntity());
+			refreshClient(deadPlayer);
+			Location location = deadPlayer.getLocation();
+			
+			CombatComponent combatKiller = event.GetLog().GetKiller();
+			if (combatKiller != null && combatKiller.IsPlayer())
+			{
+				Player killer = UtilPlayer.searchExact(combatKiller.GetName());
+				if (killer != null)
+				{
+					refreshClient(deadPlayer);
+					refreshClient(killer);
+					if (canMurderOccur(killer, deadPlayer, location) && isWeakling(deadPlayer) && !isWeakling(killer))
+					{
+						// Was a murder
+						event.setKilledWord("murdered");
+						ClanInfo killerClan = _clansManager.getClan(killer);
+						
+						if (killerClan != null) killerClan.addMurder(1);
+					}
+				}
+			}
+		}
+	}
+	
+	@EventHandler
+	public void onPickup(PlayerPickupItemEvent event)
+	{
+		refreshClient(event.getPlayer());
+	}
+	
+	@EventHandler
+	public void onDrop(PlayerDropItemEvent event)
+	{
+		refreshClient(event.getPlayer());
+	}
+	
+	@EventHandler
+	public void onInventoryEvent(InventoryMoveItemEvent event)
+	{
+		Inventory source = event.getSource();
+		if (source.getHolder() instanceof Player)
+		{
+			refreshClient(((Player) source.getHolder()));
+		}
+		
+		Inventory dest = event.getDestination();
+		if (dest.getHolder() instanceof Player)
+		{
+			refreshClient(((Player) dest.getHolder()));
+		}
+	}
+	
+	@EventHandler
+	public void onRespawn(PlayerRespawnEvent event)
+	{
+		refreshClient(event.getPlayer());
+	}
+	
+	@EventHandler
+	public void particle(UpdateEvent event)
+	{
+		if (event.getType() == UpdateType.SLOW)
+		{
+			for (Player player : UtilServer.getPlayers())
+			{
+				refreshClient(player);
+			}
+		}
+		
+		if (event.getType() == UpdateType.SEC)
+		{
+			for (Player player : UtilServer.getPlayers())
+			{
+				int inventoryValue = getInventoryValue(player);
+				
+				if (isWeakling(player))
+				{
+					for (Player other : UtilServer.getPlayers())
+					{
+						if (canMurderOccur(other, player, other.getLocation()) && inventoryValue <= 2000)
+						{
+							UtilParticle.PlayParticle(UtilParticle.ParticleType.ANGRY_VILLAGER, player.getEyeLocation().add(0, 0.25, 0), 0, 0, 0, 0, 1, UtilParticle.ViewDist.NORMAL, other);
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	public boolean isWeakling(Player player)
+	{
+		return Get(player).isWeakling();
+	}
+	
+	public int getInventoryValue(Player player)
+	{
+		return Get(player).getInventoryValue();
+	}
+	
+	private int calculateInventoryValue(Player player)
+	{
+		int value = 0;
+		
+		// +4 for armor contents
+		for (int i = 0; i < player.getInventory().getSize() + 4; i++)
+		{
+			ItemStack stack = player.getInventory().getItem(i);
+			
+			if (stack == null)
+			{
+				continue;
+			}
+			
+			ClansShopItem item = ClansShopItem.getByItem(stack.getType(), stack.getDurability());
+			
+			if (item != null)
+			{
+				value += item.getSellPrice(stack.getAmount());
+			}
+		}
+		
+		return value;
+	}
+	
+	private boolean canMurderOccur(Player killer, Player victim, Location location)
+	{
+		if (killer.equals(victim)) return false;
+		if (isWeakling(killer)) return false;
+		if (victim.isDead()) return false;
+		if (_clansManager.getClanUtility().getClaim(location) != null) return false;
+		
+		return true;
+	}
+	
+	private void refreshClient(Player player)
+	{
+		boolean weakling = true;
+		PlayerInventory inventory = player.getInventory();
+		
+		// Add 4 for armor contents
+		int inventorySize = inventory.getSize() + 4;
+		for (int i = 0; i < inventorySize; i++)
+		{
+			Material type = inventory.getItem(i) != null ? inventory.getItem(i).getType() : null;
+			
+			weakling = !(weapons.contains(type) || armor.contains(type));
+			
+			if (!weakling) break;
+		}
+		
+		Get(player).setIsWeakling(weakling);
+		Get(player).setInventoryValue(calculateInventoryValue(player));
+	}
+	
+	@Override
+	protected ClientMurder AddPlayer(String player)
+	{
+		return new ClientMurder();
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverData.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverData.java
new file mode 100644
index 000000000..8e9e14fe0
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverData.java
@@ -0,0 +1,29 @@
+package mineplex.game.clans.clans.observer;
+
+import java.util.EnumSet;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.common.player.PlayerSnapshot;
+
+public class ObserverData
+{
+	private PlayerSnapshot _snapshot;
+	private EnumSet<ObserverSettings> _settings;
+
+	public ObserverData(Player player)
+	{
+		_snapshot = PlayerSnapshot.getSnapshot(player);
+		_settings = EnumSet.noneOf(ObserverSettings.class);
+	}
+
+	public PlayerSnapshot getSnapshot()
+	{
+		return _snapshot;
+	}
+
+	public EnumSet<ObserverSettings> getSettings()
+	{
+		return _settings;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java
new file mode 100644
index 000000000..59055ea02
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java
@@ -0,0 +1,179 @@
+package mineplex.game.clans.clans.observer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bukkit.GameMode;
+import org.bukkit.block.Chest;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.observer.command.ObserverCommand;
+import mineplex.game.clans.core.repository.ClanTerritory;
+import mineplex.minecraft.game.core.condition.ConditionManager;
+
+public class ObserverManager extends MiniPlugin
+{
+	// Used to Cloak Players
+	private ConditionManager _conditionManager;
+	private ClansManager _clansManager;
+	private Map<Player, ObserverData> _observerMap;
+
+	public ObserverManager(JavaPlugin plugin, ConditionManager conditionManager, ClansManager clansManager)
+	{
+		super("Observer", plugin);
+
+		_conditionManager = conditionManager;
+		_clansManager = clansManager;
+		_observerMap = new HashMap<Player, ObserverData>();
+	}
+
+	public void setObserver(Player player)
+	{
+		ObserverData data = new ObserverData(player);
+		((CraftPlayer) player).getHandle().spectating = true;
+		_conditionManager.Clean(player);
+		_conditionManager.Factory().Cloak("Observer", player, null, 999999999, true, true);
+		UtilPlayer.clearInventory(player);
+		UtilPlayer.clearPotionEffects(player);
+		player.setGameMode(GameMode.CREATIVE);
+		_observerMap.put(player, data);
+	}
+
+	public void removeObserver(Player player)
+	{
+		ObserverData data = _observerMap.get(player);
+		restore(player, data);
+		_observerMap.remove(player);
+	}
+
+	public boolean isObserver(Player player)
+	{
+		return _observerMap.containsKey(player);
+	}
+
+	private void restore(Player player, ObserverData data)
+	{
+		data.getSnapshot().applySnapshot(player);
+		_conditionManager.Clean(player);
+		player.setGameMode(GameMode.SURVIVAL);
+		((CraftPlayer) player).getHandle().spectating = false;
+	}
+
+	@EventHandler
+	public void onDamage(EntityDamageByEntityEvent event)
+	{
+		if (_observerMap.containsKey(event.getDamager()) || _observerMap.containsKey(event.getEntity()))
+			event.setCancelled(true);
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onInteract(PlayerInteractEvent event)
+	{
+		ObserverData data = _observerMap.get(event.getPlayer());
+
+		if (data != null)
+		{
+			if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getState() instanceof Chest)
+			{
+				if (!data.getSettings().contains(ObserverSettings.CAN_OPEN_CHESTS))
+				{
+					notify(event.getPlayer(), "You cannot open chests as an observer");
+					event.setCancelled(true);
+				}
+			}
+			else
+			{
+				if (!data.getSettings().contains(ObserverSettings.CAN_INTERACT))
+				{
+					notify(event.getPlayer(), "You cannot interact as an observer");
+					event.setCancelled(true);
+				}
+			}
+		}
+	}
+
+	@EventHandler
+	public void onInventoryClick(InventoryClickEvent event)
+	{
+		ObserverData data = _observerMap.get(event.getWhoClicked());
+
+		if (data != null)
+		{
+			if (!data.getSettings().contains(ObserverSettings.CAN_CLICK_INVENTORY))
+				event.setCancelled(true);
+		}
+	}
+
+	@EventHandler
+	public void onPickup(PlayerPickupItemEvent event)
+	{
+		ObserverData data = _observerMap.get(event.getPlayer());
+
+		if (data != null)
+		{
+			if (!data.getSettings().contains(ObserverSettings.CAN_PICKUP_ITEMS))
+				event.setCancelled(true);
+		}
+	}
+
+	@EventHandler
+	public void onQuit(PlayerQuitEvent event)
+	{
+		if (_observerMap.containsKey(event.getPlayer()))
+		{
+			restore(event.getPlayer(), _observerMap.get(event.getPlayer()));
+			_observerMap.remove(_plugin);
+		}
+	}
+
+	@Override
+	public void disable()
+	{
+		super.disable();
+
+		for (Map.Entry<Player, ObserverData> entry : _observerMap.entrySet())
+		{
+			restore(entry.getKey(), entry.getValue());
+		}
+	}
+
+	public boolean canEnterObserverMode(Player player, boolean notify)
+	{
+		ClanTerritory territory = _clansManager.getClanUtility().getClaim(player.getLocation());
+
+		if (territory == null || !territory.isSafe(player.getLocation()))
+		{
+			if (notify)
+				UtilPlayer.message(player, F.main("Observer", "You must be in a Safe Zone to use observer mode!"));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	private void notify(Player player, String message)
+	{
+		UtilPlayer.message(player, F.main("Observer", message));
+	}
+
+	@Override
+	public void addCommands()
+	{
+		addCommand(new ObserverCommand(this));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverSettings.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverSettings.java
new file mode 100644
index 000000000..b06c62e3c
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverSettings.java
@@ -0,0 +1,23 @@
+package mineplex.game.clans.clans.observer;
+
+import java.util.EnumSet;
+
+import mineplex.core.common.Rank;
+
+public enum ObserverSettings
+{
+	CAN_OPEN_CHESTS,
+	CAN_BREAK_BLOCKS,
+	CAN_INTERACT,
+	CAN_PICKUP_ITEMS,
+	CAN_CLICK_INVENTORY;
+
+
+	public static EnumSet<ObserverSettings> getSettings(Rank rank)
+	{
+		if (rank.has(Rank.DEVELOPER))
+			return EnumSet.of(CAN_OPEN_CHESTS);
+
+		return EnumSet.noneOf(ObserverSettings.class);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/command/ObserverCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/command/ObserverCommand.java
new file mode 100644
index 000000000..e4a016c1f
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/command/ObserverCommand.java
@@ -0,0 +1,63 @@
+package mineplex.game.clans.clans.observer.command;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.ClansUtility;
+import mineplex.game.clans.clans.observer.ObserverManager;
+
+public class ObserverCommand extends CommandBase<ObserverManager>
+{
+	public ObserverCommand(ObserverManager plugin)
+	{
+		super(plugin, Rank.HELPER, "observer", "o");
+	}
+
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		if (args == null || args.length == 0)
+		{
+			// Toggle Observer Mode
+			if (Plugin.isObserver(caller))
+			{
+				Plugin.removeObserver(caller);
+				UtilPlayer.message(caller, F.main("Observer", "You are no longer in " + F.elem("Observer Mode")));
+			}
+			else
+			{
+				if (!Plugin.canEnterObserverMode(caller, true))
+					return;
+
+				Plugin.setObserver(caller);
+				UtilPlayer.message(caller, F.main("Observer", "You have entered " + F.elem("Observer Mode")));
+			}
+		}
+		else
+		{
+			String playername = args[0];
+			Player player = UtilPlayer.searchOnline(caller, playername, true);
+
+			if (player != null)
+			{
+				// Observe Player
+
+				if (Plugin.isObserver(caller))
+				{
+					caller.teleport(player);
+					UtilPlayer.message(caller, F.main("Observer", "Teleported to " + F.elem(player.getName())));
+				}
+				else
+				{
+					UtilPlayer.message(caller, F.main("Observer", "You must enter " + F.elem("Observer Mode") + " to teleport"));
+				}
+
+			}
+		}
+
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/potato/PotatoManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/potato/PotatoManager.java
new file mode 100644
index 000000000..fe8880d24
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/potato/PotatoManager.java
@@ -0,0 +1,138 @@
+package mineplex.game.clans.clans.potato;
+
+import java.util.Iterator;
+
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.projectile.IThrown;
+import mineplex.core.projectile.ProjectileUser;
+import mineplex.game.clans.clans.ClansManager;
+
+public class PotatoManager extends MiniPlugin implements IThrown
+{
+	private static final String POTATO_NAME = C.cGray + "Potato";
+
+	private ClansManager _clansManager;
+
+	public PotatoManager(JavaPlugin plugin, ClansManager clansManager)
+	{
+		super("Potato", plugin);
+
+		_clansManager = clansManager;
+	}
+
+	@EventHandler
+	public void onRespawn(PlayerRespawnEvent event)
+	{
+		give(event.getPlayer(), 5);
+	}
+
+	private void give(Player player, int count)
+	{
+		ItemStack potato = new ItemStack(Material.BAKED_POTATO, count);
+		ItemMeta meta = potato.getItemMeta();
+		meta.setDisplayName(POTATO_NAME);
+		potato.setItemMeta(meta);
+		player.getInventory().addItem(potato);
+	}
+
+	public boolean isPotato(ItemStack item)
+	{
+		if (item == null)
+			return false;
+		else if (item.getType() != Material.BAKED_POTATO)
+			return false;
+		else
+			return item.getItemMeta() != null && POTATO_NAME.equals(item.getItemMeta().getDisplayName());
+	}
+
+	@EventHandler
+	public void tossPotato(PlayerInteractEvent event)
+	{
+		if (event.getAction() == Action.LEFT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK)
+		{
+			Player player = event.getPlayer();
+			ItemStack item = event.getPlayer().getItemInHand();
+			if (isPotato(item))
+			{
+				UtilInv.remove(event.getPlayer(), Material.BAKED_POTATO, (byte) 0, 1);
+				UtilInv.Update(event.getPlayer());
+
+				Item ent = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.BAKED_POTATO));
+				UtilAction.velocity(ent, player.getLocation().getDirection(), 1.2, false, 0, 0.2, 10, false);
+				_clansManager.getProjectile().AddThrow(ent, player, this, -1, true, true, true, false, 0.5f);
+			}
+		}
+	}
+
+	@EventHandler
+	public void onItemDrop(PlayerDropItemEvent event)
+	{
+		ItemStack item = event.getItemDrop().getItemStack();
+		if (isPotato(item))
+		{
+			event.setCancelled(true);
+			ItemStack hand = event.getPlayer().getItemInHand();
+			if (hand != null && isPotato(hand))
+			{
+				hand.setAmount(hand.getAmount() - 1);
+				event.getPlayer().setItemInHand(hand);
+			}
+		}
+	}
+
+	@EventHandler
+	public void onDeath(PlayerDeathEvent event)
+	{
+		Iterator<ItemStack> iterator = event.getDrops().iterator();
+		while (iterator.hasNext())
+		{
+			if (isPotato(iterator.next())) iterator.remove();
+		}
+	}
+
+	@Override
+	public void Collide(LivingEntity target, Block block, ProjectileUser data)
+	{
+		if (target instanceof Player)
+		{
+			Player player = ((Player) target);
+			give(player, 1);
+		}
+
+		data.GetThrown().getWorld().playSound(data.GetThrown().getLocation(), Sound.CHICKEN_EGG_POP, 1f, 1.6f);
+
+		data.GetThrown().remove();
+	}
+
+	@Override
+	public void Idle(ProjectileUser data)
+	{
+
+	}
+
+	@Override
+	public void Expire(ProjectileUser data)
+	{
+
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/redis/ClanDeleteCommandHandler.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/redis/ClanDeleteCommandHandler.java
new file mode 100644
index 000000000..c08e9425c
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/redis/ClanDeleteCommandHandler.java
@@ -0,0 +1,29 @@
+package mineplex.game.clans.clans.redis;
+
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.core.ClanDeleteCommand;
+import mineplex.serverdata.commands.CommandCallback;
+import mineplex.serverdata.commands.ServerCommand;
+
+public class ClanDeleteCommandHandler implements CommandCallback
+{
+
+	public void run(ServerCommand command)
+	{
+		if (command instanceof ClanDeleteCommand)
+		{
+			ClanDeleteCommand serverCommand = (ClanDeleteCommand) command;
+			String clanName = serverCommand.getClanName();
+			ClanInfo clanInfo = ClansManager.getInstance().getClan(clanName);
+			
+			if (clanInfo != null)
+			{
+				// Kick all online players from clan and delete clan info locally
+				UtilPlayer.kick(clanInfo.getOnlinePlayers(), "Clans", "Your clan leader has moved your clan to another server!", true);
+				ClansManager.getInstance().getClanDataAccess().deleteLocally(clanInfo);	
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/redis/ClanLoadCommandHandler.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/redis/ClanLoadCommandHandler.java
new file mode 100644
index 000000000..54274dd5d
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/redis/ClanLoadCommandHandler.java
@@ -0,0 +1,41 @@
+package mineplex.game.clans.clans.redis;
+
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.core.ClanDeleteCommand;
+import mineplex.game.clans.core.ClanLoadCommand;
+import mineplex.game.clans.core.repository.tokens.ClanToken;
+import mineplex.serverdata.commands.CommandCallback;
+import mineplex.serverdata.commands.ServerCommand;
+
+public class ClanLoadCommandHandler implements CommandCallback
+{
+
+	public void run(ServerCommand command)
+	{
+		if (command instanceof ClanLoadCommand)
+		{
+			ClanLoadCommand serverCommand = (ClanLoadCommand) command;
+			final String clanName = serverCommand.getClanName();
+			
+			ClansManager.getInstance().getClanDataAccess().retrieveClan(clanName, new Callback<ClanToken>()
+			{
+				@Override
+				public void run(ClanToken clan)
+				{
+					if (clan != null)
+					{
+						ClansManager.getInstance().loadClan(clan);	// Load the clan data locally
+						System.out.println("Successfully finished loading and transferring clan '" + clanName + "'!");
+					}
+					else
+					{
+						System.out.println("ERROR: UNABLE TO LOAD CLAN " + clanName + " DURING REMOTE CLAN LOAD COMMAND!");
+					}
+				}
+			});
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
new file mode 100644
index 000000000..21cf7f5cb
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
@@ -0,0 +1,241 @@
+package mineplex.game.clans.clans.regions;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.WorldBorder;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import net.minecraft.server.v1_8_R3.PacketPlayOutWorldBorder;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansDataAccessLayer;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.spawn.Spawn;
+import mineplex.minecraft.game.classcombat.Skill.event.SkillTeleportEvent;
+
+public class ClansRegions extends MiniPlugin
+{
+	public final static String DEFAULT_WORLD_NAME = "world";
+	public final static int SPAWN_RADIUS = 3;			// Radius of spawn claim area (measured in chunks)
+	public final static int SHOP_RADIUS = 5;			// Radius of shop claim area (measured in chunks)
+	public final static int FIELDS_RADIUS = 7;			// Radius of fields claim area (measured in chunks)
+	public final static int BORDERLANDS_RADIUS = 50;	// Radius of borderlands claim area (measured in chunks)
+	public static final int BORDER_RADIUS = 768;
+	
+	private ClansManager _manager;
+	private World _world;
+	
+	public ClansRegions(JavaPlugin plugin, ClansManager manager, String worldName)
+	{
+		super("Clans Regions" + worldName, plugin);
+		_manager = manager;
+		_world = Bukkit.getWorld(worldName);
+		initializeBorder();
+	}
+	
+	public ClansRegions(JavaPlugin plugin, ClansManager manager)
+	{
+		this(plugin, manager, DEFAULT_WORLD_NAME);
+	}
+	
+	public void initializeRegions()
+	{
+		Location worldCenter = new Location(_world, 0, 0, 0);
+
+		// Initialize Spawn faction and claims
+		claimArea("Spawn", SPAWN_RADIUS, 0, false, true, new Location[]{Spawn.getEastSpawn(), Spawn.getWestSpawn()});
+
+		claimArea("Shops", 2, 0, true, false, new Location[]{Spawn.getNorthTownCenter(), Spawn.getSouthTownCenter()});
+		claimArea("Shops", SHOP_RADIUS, 2, false, false, new Location[]{Spawn.getNorthTownCenter(), Spawn.getSouthTownCenter()});
+
+		// Initialize Fields and Borderlands factions and claims
+		claimArea("Fields", FIELDS_RADIUS, 0, false, true, worldCenter);
+		claimArea("Borderlands", BORDERLANDS_RADIUS, 32, false, true, worldCenter);
+		
+		//debugClan("Spawn");
+		//debugClan("Shops");
+		//debugClan("Fields");
+		//debugClan("Borderlands");
+	}
+
+	public void initializeBorder()
+	{
+		WorldBorder worldBorder = _world.getWorldBorder();
+		worldBorder.setCenter(0, 0);
+		worldBorder.setSize(BORDER_RADIUS * 2);
+	}
+	
+	public void debugClan(String clanName)
+	{
+		ClanInfo clan = _manager.getClan(clanName);
+		
+		if (clan != null)
+		{
+			System.out.println("Clan " + clanName + " has " + clan.getClaimSet().size() + " claims!");
+		}
+		else
+		{
+			System.out.println("NO CLAN FOUND BY NAME " + clanName);
+		}
+	}
+	
+	public void resetRegions()
+	{
+		clearClaims("Spawn");
+		clearClaims("Shops");
+		clearClaims("Fields");
+		clearClaims("Borderlands");
+		initializeRegions();
+	}
+	
+	private void clearClaims(String name)
+	{
+		ClanInfo clan = _manager.getClan(name);
+		System.out.println("Clearing claims for " + name + " with clan id " + clan.getId() + "!");
+		
+		if (clan != null)
+		{
+			for (String chunk : clan.getClaimSet())
+			{
+				_manager.getClaimMap().remove(chunk);
+			}
+			
+			clan.getClaimSet().clear();
+			_manager.getClanDataAccess().getRepository().removeTerritoryClaims(clan.getId());
+		}
+	}
+	
+	/**
+	 * Initializes a server-side clan and claims area according to the
+	 * location and radius properties passed in.
+	 * @param clanName - the name of the clan to create/claim territory for
+	 * @param locations - the center location to begin the claim
+	 * @param chunkRadius - the radius (in chunks) to claim
+	 * @param claimOffset - the initial offset in claim (creating a 'hole' with chunk offset radius)
+	 * @param safe - whether the chunk claimed is considered a 'safe' (pvp-free) region.
+	 */
+	private void claimArea(final String clanName, final int chunkRadius, final int claimOffset, final boolean safe, final boolean addNegative, final Location... locations)
+	{
+		final ClanInfo clan = _manager.getClan(clanName);
+		
+		if (clan == null )
+		{
+			_manager.getClanDataAccess().create("ClansRegions", clanName, true, new Callback<ClanInfo>()
+			{
+				@Override
+				public void run(ClanInfo data)
+				{
+					if (data != null)
+					{
+						for (Location location : locations)
+						{
+							claimArea(data, location, chunkRadius, claimOffset, addNegative, safe);
+							log(String.format("Initialized %s faction territory and creation!", clanName));
+						}
+						
+						debugClan(clanName);
+					}
+					else
+					{
+						System.out.println("Clans Regions error!");
+						System.out.println("Seek out help!");
+					}
+				}
+			});
+		}
+		else
+		{
+			for (Location location : locations)
+			{
+				claimArea(clan, location, chunkRadius, claimOffset, addNegative, safe);
+			}
+		}
+	}
+	
+	/*private void claimArea(String clanName, int chunkRadius, int claimOffset, boolean safe, Location... locations)
+	{
+		claimArea(clanName, chunkRadius, claimOffset, 0, safe, locations);
+	}*/ 
+	
+	private void claimArea(ClanInfo clan, Location location, int chunkRadius, int claimOffset, boolean addNegative, boolean safe)
+	{
+		int chunkX = location.getChunk().getX();
+		int chunkZ = location.getChunk().getZ();
+		Set<String> chunks = new HashSet<String>();
+
+		int start = addNegative ? -chunkRadius - 1 : -chunkRadius;
+
+		for (int xOffset = start; xOffset <= chunkRadius; xOffset++)
+		{
+			for (int zOffset = start; zOffset <= chunkRadius; zOffset++)
+			{
+				int x = chunkX + xOffset;
+				int z = chunkZ + zOffset;
+				Chunk chunk = location.getWorld().getChunkAt(x, z);
+				String chunkStr = UtilWorld.chunkToStr(chunk);
+
+				if (addNegative)
+				{
+					if (((xOffset < 0 && Math.abs(xOffset) < (claimOffset + 1)) || (xOffset >= 0 && xOffset < claimOffset)) &&
+							((zOffset < 0 && Math.abs(zOffset) < (claimOffset + 1)) || (zOffset >= 0 && zOffset < claimOffset)))
+						continue;
+				}
+				else
+				{
+					if ((Math.abs(xOffset) < claimOffset) && (Math.abs(zOffset) < claimOffset))
+						continue;
+				}
+
+				if (_manager.getClaimMap().containsKey(chunkStr))
+				{
+					System.out.println("get claim map contains " + chunkStr);
+					continue;
+				}
+
+				chunks.add(chunkStr);
+			}
+		}
+		
+		if (chunks.size() > 0)
+		{
+			_manager.getClanDataAccess().claimAll(clan.getName(), "ClansRegions", safe, chunks.toArray(new String[0]));	
+		}
+	}
+
+	@EventHandler
+	public void onSkillTeleport(SkillTeleportEvent event)
+	{
+		if (!isInsideBorders(event.getDestination()))
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	private boolean isInsideBorders(Location location)
+	{
+		return Math.abs(location.getBlockX()) < BORDER_RADIUS && Math.abs(location.getBlockZ()) < BORDER_RADIUS;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanRepository.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanRepository.java
deleted file mode 100644
index e22160e3c..000000000
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanRepository.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package mineplex.game.clans.clans.repository;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.UUID;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import mineplex.core.common.util.NautHashMap;
-import mineplex.core.database.DBPool;
-import mineplex.core.database.RepositoryBase;
-import mineplex.core.database.ResultSetCallable;
-import mineplex.core.database.column.ColumnBoolean;
-import mineplex.core.database.column.ColumnInt;
-import mineplex.core.database.column.ColumnTimestamp;
-import mineplex.core.database.column.ColumnVarChar;
-import mineplex.game.clans.clans.ClanInfo;
-import mineplex.game.clans.clans.repository.tokens.ClanAllianceToken;
-import mineplex.game.clans.clans.repository.tokens.ClanEnemyToken;
-import mineplex.game.clans.clans.repository.tokens.ClanMemberToken;
-import mineplex.game.clans.clans.repository.tokens.ClanTerritoryToken;
-import mineplex.game.clans.clans.repository.tokens.ClanToken;
-
-public class ClanRepository extends RepositoryBase
-{
-	private static String CREATE_CLAN_TABLE = "CREATE TABLE IF NOT EXISTS clans (id INT NOT NULL AUTO_INCREMENT, serverName VARCHAR(100), name VARCHAR(100), description VARCHAR(140), home VARCHAR(140), admin BIT(1), dateCreated DATETIME, lastOnline DATETIME, energy INT, PRIMARY KEY (id), INDEX clanName (name));";
-	private static String CREATE_ACCOUNT_CLAN_TABLE = "CREATE TABLE IF NOT EXISTS accountClan (id INT NOT NULL AUTO_INCREMENT, accountId INT, clanId INT, clanRole VARCHAR(140), PRIMARY KEY (id), FOREIGN KEY (accountId) REFERENCES accounts(id), FOREIGN KEY (clanId) REFERENCES clans(id), INDEX clanIdIndex (clanId));";
-	private static String CREATE_CLAN_TERRITORY_TABLE = "CREATE TABLE IF NOT EXISTS clanTerritory (id INT NOT NULL AUTO_INCREMENT, clanId INT, serverName VARCHAR(100), chunk VARCHAR(100), safe BIT(1), PRIMARY KEY (id), FOREIGN KEY (clanId) REFERENCES clans(id), INDEX clanIdIndex (clanId, serverName));";
-	private static String CREATE_CLAN_ALLIANCE_TABLE = "CREATE TABLE IF NOT EXISTS clanAlliances (id INT NOT NULL AUTO_INCREMENT, clanId INT, otherClanId INT, trusted BIT(1), PRIMARY KEY (id), FOREIGN KEY (otherClanId) REFERENCES clans(id), FOREIGN KEY (clanId) REFERENCES clans(id), INDEX clanIdIndex (clanId));";
-
-	private static String RETRIEVE_START_CLAN_INFO = "SELECT c.id, c.name, c.description, c.home, c.admin, c.energy, c.dateCreated, c.lastOnline, ct.chunk, ct.safe FROM clans AS c LEFT JOIN clanTerritory AS ct ON ct.clanId = c.id WHERE c.serverName = ?;";
-	private static String RETRIEVE_CLAN_MEMBER_INFO = "SELECT c.name, a.name, a.uuid, clanRole FROM accountClan AS ac INNER JOIN accounts AS a ON a.id = ac.accountId INNER JOIN clans AS c on c.id = ac.clanId WHERE c.serverName = ?;";
-	private static String RETRIEVE_CLAN_ALLIANCE_INFO = "SELECT c.name, cOther.name, ca.trusted FROM clanAlliances AS ca INNER JOIN clans AS c ON c.id = ca.clanId INNER JOIN clans as cOther ON cOther.id = ca.otherClanId WHERE c.serverName = ?;";
-	private static String RETRIEVE_CLAN_ENEMY_INFO = "SELECT c.name, cOther.name, clanScore, otherClanScore, clanKills, otherClanKills, timeFormed FROM clanEnemies AS ce INNER JOIN clans AS c ON c.id = ce.clanId INNER JOIN clans as cOther ON cOther.id = ce.otherClanId WHERE c.serverName = ?;";
-	
-	private static String DELETE_CLAN_MEMBER = "DELETE aC FROM accountClan AS aC INNER JOIN accounts ON accounts.id = aC.accountId WHERE aC.clanId = ? AND accounts.name = ?;";
-	private static String DELETE_CLAN_MEMBERS = "DELETE FROM accountClan WHERE clanId = ?;";	
-	private static String DELETE_CLAN_TERRITORY = "DELETE FROM clanTerritory WHERE clanId = ? AND serverName = ? AND chunk = ?;";
-	private static String DELETE_CLAN_TERRITORIES = "DELETE FROM clanTerritory WHERE clanId = ?;";
-	private static String DELETE_CLAN_ALLIANCE = "DELETE FROM clanAlliances WHERE clanId = ? AND otherClanId = ?;";
-	private static String DELETE_CLAN_ALLIANCES = "DELETE FROM clanAlliances WHERE clanId = ? OR otherClanId = ?;";
-	private static String DELETE_CLAN_ENEMY = "DELETE FROM clanEnemies WHERE clanId = ? OR otherClanId = ?;";
-	private static String DELETE_CLAN = "DELETE FROM clans WHERE id = ?;";
-	
-	private static String ADD_CLAN = "INSERT INTO clans (serverName, name, description, home, admin, dateCreated, energy, lastOnline) VALUES (?, ?, ?, ?, ?, now(), ?, now());";
-	private static String ADD_CLAN_MEMBER = "INSERT INTO accountClan (accountId, clanId, clanRole) SELECT accounts.id, ?, ? FROM accounts WHERE accounts.name = ?;";
-	private static String ADD_CLAN_ALLIANCE = "INSERT INTO clanAlliances (clanId, otherClanId, trusted) VALUES (?, ?, ?);";
-	private static String ADD_CLAN_ENEMY = "INSERT INTO clanEnemies (clanId, otherClanId, timeFormed) VALUES (?, ?, now());";
-	private static String ADD_CLAN_TERRITORY = "INSERT INTO clanTerritory (clanId, serverName, chunk, safe) VALUES (?, ?, ?, ?);";
-	
-	private static String UPDATE_CLAN = "UPDATE clans SET name = ?, description = ?, home = ?, admin = ?, energy = ?, lastOnline = ? WHERE id = ?;";
-	private static String UPDATE_CLAN_MEMBER = "UPDATE accountClan AS AC INNER JOIN accounts ON accounts.id = AC.accountId SET AC.clanRole = ? WHERE AC.clanId = ? AND accounts.name = ?;";
-	private static String UPDATE_CLAN_ALLIANCE = "UPDATE clanAlliances SET trusted = ? WHERE clanId = ? AND otherClanId = ?;";
-	private static String UPDATE_CLAN_ENEMY = "UPDATE clanEnemies SET clanScore = ?, otherClanScore = ?, clanKills = ?, otherClanKills = ? WHERE clanId = ? AND otherClanId = ?;";
-	private static String UPDATE_CLAN_TERRITORY = "UPDATE clanTerritory SET safe = ? WHERE serverName = ? AND chunk = ?;";
-	
-	private String _serverName;
-	
-	public ClanRepository(JavaPlugin plugin, String serverName)
-	{
-		super(plugin, DBPool.ACCOUNT);
-		
-		_serverName = serverName;
-	}
-
-	@Override
-	protected void initialize()
-	{
-		executeUpdate(CREATE_CLAN_TABLE);
-		executeUpdate(CREATE_ACCOUNT_CLAN_TABLE);
-		executeUpdate(CREATE_CLAN_TERRITORY_TABLE);
-		executeUpdate(CREATE_CLAN_ALLIANCE_TABLE);
-	}
-
-	public Collection<ClanToken> retrieveClans()
-	{
-		final NautHashMap<String, ClanToken> clans = new NautHashMap<String, ClanToken>();
-		
-		executeQuery(RETRIEVE_START_CLAN_INFO, new ResultSetCallable()
-		{
-			@Override
-			public void processResultSet(ResultSet resultSet) throws SQLException
-			{
-				while (resultSet.next())
-				{
-					ClanToken token = new ClanToken();
-					token.Id = resultSet.getInt(1);
-					token.Name = resultSet.getString(2);
-					token.Description = resultSet.getString(3);
-					token.Home = resultSet.getString(4);
-					token.Admin = resultSet.getBoolean(5);
-					token.Energy = resultSet.getInt(6);
-					token.DateCreated = resultSet.getTimestamp(7);
-					token.LastOnline = resultSet.getTimestamp(8);
-					
-					ClanTerritoryToken territoryToken = new ClanTerritoryToken();
-					territoryToken.ClanName = token.Name;
-					territoryToken.Chunk = resultSet.getString(9);
-					territoryToken.Safe = resultSet.getBoolean(10);
-					
-					if (!clans.containsKey(token.Name))
-					{
-						clans.put(token.Name, token);
-					}
-					
-					if (territoryToken.Chunk != null)
-						clans.get(token.Name).Territories.add(territoryToken);
-				}
-			}
-			
-		}, new ColumnVarChar("serverName", 100, _serverName));
-		
-		executeQuery(RETRIEVE_CLAN_MEMBER_INFO, new ResultSetCallable()
-		{
-			@Override
-			public void processResultSet(ResultSet resultSet) throws SQLException
-			{
-				while (resultSet.next())
-				{
-					String clanName = resultSet.getString(1);
-					
-					if (clans.containsKey(clanName))
-					{
-						ClanMemberToken memberToken = new ClanMemberToken();
-						memberToken.Name = resultSet.getString(2);
-						memberToken.PlayerUUID = UUID.fromString(resultSet.getString(3));
-						memberToken.ClanRole = resultSet.getString(4);
-						
-						clans.get(clanName).Members.add(memberToken);
-					}
-				}
-			}
-			
-		}, new ColumnVarChar("serverName", 100, _serverName));
-		
-		executeQuery(RETRIEVE_CLAN_ALLIANCE_INFO, new ResultSetCallable()
-		{
-			@Override
-			public void processResultSet(ResultSet resultSet) throws SQLException
-			{
-				while (resultSet.next())
-				{
-					String clanName = resultSet.getString(1);
-					
-					if (clans.containsKey(clanName))
-					{
-						ClanAllianceToken allianceToken = new ClanAllianceToken();
-						allianceToken.ClanName = resultSet.getString(2);
-						allianceToken.Trusted = resultSet.getBoolean(3);
-						
-						clans.get(clanName).Alliances.add(allianceToken);
-					}
-				}
-			}
-			
-		}, new ColumnVarChar("serverName", 100, _serverName));
-
-		executeQuery(RETRIEVE_CLAN_ENEMY_INFO, new ResultSetCallable()
-		{
-			@Override
-			public void processResultSet(ResultSet resultSet) throws SQLException
-			{
-				while (resultSet.next())
-				{
-					ClanEnemyToken clanToken = new ClanEnemyToken();
-					ClanEnemyToken otherClanToken = new ClanEnemyToken();
-
-					//c.name, cOther.name, clanScore, otherClanScore, clanKills, otherClanKills
-					String clanName = resultSet.getString(1);
-					String otherClanName = resultSet.getString(2);
-					int clanScore = resultSet.getInt(3);
-					int otherClanScore = resultSet.getInt(4);
-					int clanKills = resultSet.getInt(5);
-					int otherClanKills = resultSet.getInt(6);
-					Timestamp timeFormed = resultSet.getTimestamp(7);
-
-					clanToken.EnemyName = otherClanName;
-					clanToken.Score = clanScore;
-					clanToken.Kills = clanKills;
-					clanToken.Initiator = true;
-					clanToken.TimeFormed = timeFormed;
-
-					otherClanToken.EnemyName = clanName;
-					otherClanToken.Score = otherClanScore;
-					otherClanToken.Kills = otherClanKills;
-					otherClanToken.Initiator = false;
-					otherClanToken.TimeFormed = timeFormed;
-
-					clans.get(clanName).EnemyToken = clanToken;
-					clans.get(otherClanName).EnemyToken = otherClanToken;
-				}
-			}
-
-		}, new ColumnVarChar("serverName", 100, _serverName));
-		
-		return clans.values();
-	}
-	
-	@Override
-	protected void update()
-	{
-	}
-
-	public void deleteClan(int clanId)
-	{
-		executeUpdate(DELETE_CLAN, new ColumnInt("clanid", clanId));
-	}
-
-	public void addClan(final ClanInfo clan, final ClanToken token)
-	{
-		executeInsert(ADD_CLAN, new ResultSetCallable()
-		{
-			@Override
-			public void processResultSet(ResultSet resultSet) throws SQLException
-			{
-				while (resultSet.next())
-				{
-					clan.setId(resultSet.getInt(1));
-				}
-			}
-			
-		}, new ColumnVarChar("serverName", 100, _serverName), new ColumnVarChar("name", 100, token.Name), new ColumnVarChar("description", 100, token.Description), new ColumnVarChar("home", 100, token.Home), new ColumnBoolean("admin", token.Admin), new ColumnInt("energy", token.Energy));		
-		
-	}
-
-	public void addMember(int clanId, String playerName, String role)
-	{
-		executeUpdate(ADD_CLAN_MEMBER, new ColumnInt("clanid", clanId), new ColumnVarChar("clanRole", 100, role), new ColumnVarChar("name", 100, playerName));
-	}
-
-	public void removeMember(int clanId, String playerName)
-	{
-		executeUpdate(DELETE_CLAN_MEMBER, new ColumnInt("clanid", clanId), new ColumnVarChar("name", 100, playerName));
-	}
-
-	public void updateMember(int clanId, String playerName, String role)
-	{
-		executeUpdate(UPDATE_CLAN_MEMBER, new ColumnVarChar("clanRole", 100, role) , new ColumnInt("clanid", clanId), new ColumnVarChar("name", 100, playerName));
-	}
-
-	public void addClanRelationship(int clanId, int otherClanId, boolean trusted)
-	{
-		executeUpdate(ADD_CLAN_ALLIANCE, new ColumnInt("clanid", clanId), new ColumnInt("otherClanId", otherClanId), new ColumnBoolean("trusted", trusted));
-	}
-
-	public void updateClanRelationship(int clanId, int otherClanId, boolean trusted)
-	{
-		executeUpdate(UPDATE_CLAN_ALLIANCE, new ColumnBoolean("trusted", trusted), new ColumnInt("clanid", clanId), new ColumnInt("otherClanId", otherClanId));
-	}
-
-	public void removeClanRelationship(int clanId, int otherClanId)
-	{
-		executeUpdate(DELETE_CLAN_ALLIANCE, new ColumnInt("clanid", clanId), new ColumnInt("otherClanId", otherClanId));
-	}
-
-	public void addTerritoryClaim(int clanId, String chunk, boolean safe)
-	{
-		executeUpdate(ADD_CLAN_TERRITORY, new ColumnInt("clanId", clanId), new ColumnVarChar("serverName", 100, _serverName), new ColumnVarChar("chunk", 100, chunk), new ColumnBoolean("safe", safe));
-	}
-
-	public void addEnemy(int clanId, int otherClanId)
-	{
-		executeUpdate(ADD_CLAN_ENEMY, new ColumnInt("clanId", clanId), new ColumnInt("otherClanId", otherClanId));
-	}
-
-	public void removeTerritoryClaim(int clanId, String chunk)
-	{
-		executeUpdate(DELETE_CLAN_TERRITORY, new ColumnInt("clanId", clanId), new ColumnVarChar("serverName", 100, _serverName), new ColumnVarChar("chunk", 100, chunk));
-	}
-
-	public void updateClan(int clanId, String name, String desc, String home, boolean admin, int energy, Timestamp lastOnline)
-	{
-		executeUpdate(UPDATE_CLAN, new ColumnVarChar("name", 100, name), new ColumnVarChar("desc", 100, desc), new ColumnVarChar("home", 100, home), new ColumnBoolean("admin", admin), new ColumnInt("energy", energy), new ColumnTimestamp("lastOnline", lastOnline), new ColumnInt("clanId", clanId));
-	}
-
-	public void updateEnemy(int clanId, int otherClanId, int clanScore, int otherClanScore, int clanKills, int otherClanKills)
-	{
-		executeUpdate(UPDATE_CLAN_ENEMY, new ColumnInt("clanId", clanId), new ColumnInt("otherClanId", otherClanId),
-				new ColumnInt("clanScore", clanScore), new ColumnInt("otherClanScore", otherClanScore), new ColumnInt("clanKills", clanKills),
-				new ColumnInt("otherClanKills", otherClanKills), new ColumnInt("clanId", clanId), new ColumnInt("otherClanId", otherClanId));
-	}
-
-	public void updateTerritoryClaim(String chunk, boolean safe)
-	{
-		executeUpdate(UPDATE_CLAN_TERRITORY, new ColumnBoolean("safe", safe), new ColumnVarChar("serverName", 100, _serverName), new ColumnVarChar("chunk", 100, chunk));
-	}
-}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/ClansPlayerScoreboard.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/ClansPlayerScoreboard.java
new file mode 100644
index 000000000..4fc9e80ab
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/ClansPlayerScoreboard.java
@@ -0,0 +1,136 @@
+package mineplex.game.clans.clans.scoreboard;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
+import org.bukkit.entity.Player;
+import org.bukkit.scoreboard.DisplaySlot;
+import org.bukkit.scoreboard.Objective;
+import org.bukkit.scoreboard.Scoreboard;
+import org.bukkit.scoreboard.Team;
+
+import net.minecraft.server.v1_8_R3.ScoreboardTeam;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilText;
+import mineplex.core.scoreboard.PlayerScoreboard;
+import mineplex.core.scoreboard.ScoreboardManager;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.ClansUtility.ClanRelation;
+
+public class ClansPlayerScoreboard extends PlayerScoreboard
+{
+	private ClansManager _clansManager;
+
+	public ClansPlayerScoreboard(ScoreboardManager manager, ClansManager clansManager, Player player)
+	{
+		super(manager, player);
+		_clansManager = clansManager;
+	}
+
+	@Override
+	protected void addTeams(Player player)
+	{
+		refreshTeams(player);
+	}
+
+	public void refreshTeams(Player player)
+	{
+		System.out.println("<--> SB refresh");
+		for (Player otherPlayer : Bukkit.getOnlinePlayers())
+		{
+			if (otherPlayer.equals(player))
+			{
+				ClanInfo clan = _clansManager.getClan(player);
+				ClanRelation rel = _clansManager.getClanUtility().rel(clan, clan);
+				// Add Self to Self
+				add(getScoreboard(), otherPlayer, clan, rel, 0);
+			}
+			else
+			{
+				ClanInfo clan = _clansManager.getClan(player);
+				ClanInfo otherClan = _clansManager.getClan(otherPlayer);
+				ClanRelation rel = _clansManager.getClanUtility().rel(clan, otherClan);
+				int clanScore = (clan != null && otherClan != null) ? clan.getWarPoints(otherClan) : 0;
+				int otherClanScore = (clan != null && otherClan != null) ? otherClan.getWarPoints(clan) : 0;
+
+				// Add Other to Self
+				add(getScoreboard(), otherPlayer, otherClan, rel, clanScore);
+				// Add Self to Other
+				add(otherPlayer.getScoreboard(), player, clan, rel, otherClanScore);
+			}
+		}
+	}
+	
+	public void removeFromAllTeams(Scoreboard scoreboard, Player player)
+	{
+		for (Team team : scoreboard.getTeams())
+		{
+			if (team.hasPlayer(player))
+			{
+				team.removePlayer(player);
+			}
+		}
+	}
+
+	public void add(Scoreboard scoreboard, Player otherPlayer, ClanInfo clanInfo, ClanRelation relation, int ownScore)
+	{
+		if (otherPlayer.getGameMode().equals(GameMode.CREATIVE))
+		{
+			String teamName = UtilText.trim(16, _clansManager.getClientManager().Get(otherPlayer).GetRank().getRawTag() + "CREATIVE");
+			Team team = scoreboard.getTeam(teamName);
+			if (team == null)
+			{
+				team = scoreboard.registerNewTeam(teamName);
+				team.setPrefix(UtilText.trim(16, _clansManager.getClientManager().Get(otherPlayer).GetRank().getTag(true, true) + ChatColor.RESET + " "));
+				team.setSuffix(C.cRed + " STAFF MODE");
+			}
+
+			Objective domObjective;
+			if ((domObjective = scoreboard.getObjective(DisplaySlot.BELOW_NAME)) == null)
+			{
+				domObjective = scoreboard.registerNewObjective("war", "dummy");
+				domObjective.setDisplayName("War Points");
+				domObjective.setDisplaySlot(DisplaySlot.BELOW_NAME);
+			}
+
+			if (clanInfo != null)
+				domObjective.getScore(otherPlayer.getName()).setScore(ownScore);
+
+			team.addPlayer(otherPlayer);
+			
+			return;
+		}
+		
+		String teamName = getTeamName(clanInfo, relation, ownScore);
+		Team team = scoreboard.getTeam(teamName);
+		if (team == null)
+		{
+			team = scoreboard.registerNewTeam(teamName);
+			if (clanInfo != null)
+				team.setPrefix(relation.getColor(true) + clanInfo.getName() + relation.getColor(false) + " ");
+			else
+				team.setPrefix(relation.getColor(false).toString());
+		}
+		
+
+		Objective domObjective;
+		if ((domObjective = scoreboard.getObjective(DisplaySlot.BELOW_NAME)) == null)
+		{
+			domObjective = scoreboard.registerNewObjective("war", "dummy");
+			domObjective.setDisplayName("War Points");
+			domObjective.setDisplaySlot(DisplaySlot.BELOW_NAME);
+		}
+
+		if (clanInfo != null)
+			domObjective.getScore(otherPlayer.getName()).setScore(ownScore);
+
+		team.addPlayer(otherPlayer);
+	}
+
+	public String getTeamName(ClanInfo clanInfo, ClanRelation relation, int ownScore)
+	{
+		return (clanInfo == null ? "" : clanInfo.getId() + "") + relation.ordinal();
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/ClansScoreboardManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/ClansScoreboardManager.java
new file mode 100644
index 000000000..dcefd85aa
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/ClansScoreboardManager.java
@@ -0,0 +1,88 @@
+package mineplex.game.clans.clans.scoreboard;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.scoreboard.PlayerScoreboard;
+import mineplex.core.scoreboard.ScoreboardData;
+import mineplex.core.scoreboard.ScoreboardManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.Clans;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.scoreboard.elements.ScoreboardElementClan;
+import mineplex.game.clans.clans.scoreboard.elements.ScoreboardElementPlayer;
+import mineplex.game.clans.clans.scoreboard.elements.ScoreboardElementPlayerCount;
+import mineplex.game.clans.clans.war.WarManager;
+import mineplex.game.clans.clans.worldevent.WorldEventManager;
+import mineplex.game.clans.tutorials.Tutorial;
+import mineplex.game.clans.tutorials.TutorialManager;
+
+public class ClansScoreboardManager extends ScoreboardManager
+{
+	private ClansManager _clansManager;
+	private WarManager _warManager;
+	private WorldEventManager _worldEvent;
+
+	public ClansScoreboardManager(JavaPlugin plugin, TutorialManager tutorialManager, ClansManager clansManager, WarManager warManager, WorldEventManager worldEvent, CoreClientManager clientManager, DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager);
+		
+		_clansManager = clansManager;
+		_warManager = warManager;
+		_worldEvent = worldEvent;
+		
+		init(tutorialManager);
+	}
+	
+	private void init(TutorialManager tutorialManager)
+	{
+		setTitle(" MINEPLEX CLANS ");
+		
+		ScoreboardData data = getData("default", true);
+
+		data.write(C.cGreen + "Clans Alpha " + Clans.VERSION);
+		data.writeEmpty();
+		data.writeElement(new ScoreboardElementClan(_clansManager));
+		data.writeElement(new ScoreboardElementPlayer(_clansManager));
+		data.writeElement(new ScoreboardElementPlayerCount(_clansManager));
+		
+		data.writeElement(_worldEvent);
+		data.writeElement(_warManager);
+		
+		for (Tutorial tutorial : tutorialManager.getTutorials().values())
+		{
+			data.writeElement(tutorial);
+		}
+	}
+	
+	@EventHandler
+	public void drawUpdate(UpdateEvent event)
+	{
+		if (event.getType() == UpdateType.FASTER) draw();
+	}
+	
+	@Override
+	protected PlayerScoreboard createScoreboard(Player player)
+	{
+		return new ClansPlayerScoreboard(this, _clansManager, player);
+	}
+	
+	public void refresh(ClanInfo clanInfo)
+	{
+		for (Player player : clanInfo.getOnlinePlayers())
+		{
+			refresh(player);
+		}
+	}
+	
+	public void refresh(Player player)
+	{
+		((ClansPlayerScoreboard) getCurrentScoreboard(player)).refreshTeams(player);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementClan.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementClan.java
new file mode 100644
index 000000000..d27d2c34b
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementClan.java
@@ -0,0 +1,48 @@
+package mineplex.game.clans.clans.scoreboard.elements;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.scoreboard.ScoreboardManager;
+import mineplex.core.scoreboard.elements.ScoreboardElement;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+
+public class ScoreboardElementClan implements ScoreboardElement
+{
+	private ClansManager _clansManager;
+
+	public ScoreboardElementClan(ClansManager clansManager)
+	{
+		_clansManager = clansManager;
+	}
+
+	@Override
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
+	{
+		List<String> output = new ArrayList<String>();
+
+		ClanInfo clanInfo = _clansManager.getClan(player);
+
+		if (clanInfo != null)
+		{
+			output.add(C.cYellow + "Clan " + C.cWhite + clanInfo.getName());
+			output.add(C.cYellow + "Online " + C.cWhite + clanInfo.getOnlinePlayers().size() + "/" + clanInfo.getMembers().size());
+
+			// Energy
+			if (clanInfo.getEnergyCostPerMinute() > 0)
+			output.add(C.cYellow + "Energy " + C.cWhite + UtilTime.convertString((clanInfo.getEnergy() / clanInfo.getEnergyCostPerMinute()) * 60000L, 1, UtilTime.TimeUnit.FIT));
+			output.add(C.cYellow + "Home " + C.cWhite + clanInfo.getBedStatusStr());
+		}
+		else
+		{
+			output.add(C.cYellow + "You are not in a Clan");
+		}
+
+		return output;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementPlayer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementPlayer.java
new file mode 100644
index 000000000..36d4ac271
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementPlayer.java
@@ -0,0 +1,52 @@
+package mineplex.game.clans.clans.scoreboard.elements;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.common.CurrencyType;
+import mineplex.core.common.util.C;
+import mineplex.core.scoreboard.ScoreboardManager;
+import mineplex.core.scoreboard.elements.ScoreboardElement;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.ClansUtility;
+import mineplex.game.clans.core.repository.ClanTerritory;
+
+public class ScoreboardElementPlayer implements ScoreboardElement
+{
+	private ClansManager _clansManager;
+
+	public ScoreboardElementPlayer(ClansManager clansManager)
+	{
+		_clansManager = clansManager;
+	}
+
+	@Override
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
+	{
+		List<String> output = new ArrayList<String>();
+		output.add(C.cYellow + "Gold " + C.cWhite + manager.getDonation().Get(player).GetBalance(CurrencyType.Gold) + "");
+		output.add("");
+
+		String regionString = C.xWilderness + "Wilderness";
+
+		ClanTerritory claim = _clansManager.getClanUtility().getClaim(player.getLocation());
+		if (claim != null)
+		{
+			//Relation
+			ClansUtility.ClanRelation relation = _clansManager.getClanUtility().relPT(player, claim.Chunk);
+
+			//Name
+			regionString = _clansManager.getClanUtility().mRel(relation, claim.Owner, false);
+
+			//Trust
+			if (relation == ClansUtility.ClanRelation.ALLY_TRUST)
+				regionString += C.mBody + "(" + C.mElem + "Trusted" + C.mBody + ")";
+
+		}
+		output.add(regionString);
+
+		return output;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementPlayerCount.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementPlayerCount.java
new file mode 100644
index 000000000..be56178a3
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementPlayerCount.java
@@ -0,0 +1,36 @@
+package mineplex.game.clans.clans.scoreboard.elements;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.common.CurrencyType;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.scoreboard.ScoreboardManager;
+import mineplex.core.scoreboard.elements.ScoreboardElement;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.ClansUtility;
+import mineplex.game.clans.core.repository.ClanTerritory;
+
+public class ScoreboardElementPlayerCount implements ScoreboardElement
+{
+	private ClansManager _clansManager;
+
+	public ScoreboardElementPlayerCount(ClansManager clansManager)
+	{
+		_clansManager = clansManager;
+	}
+
+	@Override
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
+	{
+		List<String> output = new ArrayList<String>();
+		
+		output.add("");
+		output.add(C.cYellow + "Players Online " + UtilServer.getPlayers().length + "/100");
+
+		return output;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/stuck/StuckClient.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/stuck/StuckClient.java
new file mode 100644
index 000000000..ab5a8b285
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/stuck/StuckClient.java
@@ -0,0 +1,15 @@
+package mineplex.game.clans.clans.stuck;
+
+import org.bukkit.Location;
+
+public class StuckClient
+{
+	public Location StartLoc = null;
+	public long UnstickStartTime = -1;
+	public long UnstickEndTime = -1;
+	
+	public long getTimeLeft()
+	{
+		return UnstickEndTime - System.currentTimeMillis();
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/stuck/StuckManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/stuck/StuckManager.java
new file mode 100644
index 000000000..4dd767615
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/stuck/StuckManager.java
@@ -0,0 +1,109 @@
+package mineplex.game.clans.clans.stuck;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import mineplex.core.MiniClientPlugin;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.stuck.commands.StuckCommand;
+import mineplex.game.clans.spawn.Spawn;
+
+public class StuckManager extends MiniClientPlugin<StuckClient>
+{
+	public static final long UNSTICK_WAIT_TIME = UtilTime.convert(35, TimeUnit.SECONDS, TimeUnit.MILLISECONDS);
+	
+	public StuckManager(ClansManager clans)
+	{
+		super("Stuck Handler", clans.getPlugin());
+	}
+	
+	@Override
+	public void addCommands()
+	{
+		addCommand(new StuckCommand(this));
+	}
+
+	@Override
+	protected StuckClient AddPlayer(String player)
+	{
+		return new StuckClient();
+	}
+
+	public void unstick(Player player)
+	{
+		Get(player).UnstickStartTime = System.currentTimeMillis();
+		Get(player).UnstickEndTime = Get(player).UnstickStartTime + UNSTICK_WAIT_TIME;
+		Get(player).StartLoc = player.getLocation();
+	}
+
+	public boolean isUnsticking(Player caller)
+	{
+		return Get(caller).UnstickStartTime != -1;
+	}
+	
+	@EventHandler
+	public void updateTeleport(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FASTER)
+		{
+			for (Player player : Bukkit.getOnlinePlayers())
+			{
+				if (isUnsticking(player))
+				{
+					if (player.getLocation().distance(Get(player).StartLoc) >= 0.75)
+					{
+						cancelTeleport(player);
+						break;
+					}
+					
+					UtilTextMiddle.display("", "Teleporting to Spawn in " + F.elem(UtilTime.MakeStr(Get(player).getTimeLeft())), 0, 20, 60, player);
+					
+					if (Get(player).getTimeLeft() <= 500)
+					{
+						teleport(player);
+					}
+				}
+			}
+		}
+	}
+
+	private void cancelTeleport(Player player)
+	{
+		UtilPlayer.message(player, F.main("Clans", "You have moved, and cancelled the teleport."));
+		
+		Get(player).UnstickStartTime = -1;
+		Get(player).UnstickEndTime = -1;
+		Get(player).StartLoc = null;
+	}
+
+	private void teleport(Player player)
+	{
+		Recharge.Instance.use(player, "Spawn Teleport", UtilTime.convert(15, TimeUnit.MINUTES, TimeUnit.MILLISECONDS), false, false);
+		
+		UtilPlayer.message(player, F.main("Clans", "You have been teleported to Spawn."));
+		
+		Get(player).UnstickStartTime = -1;
+		Get(player).UnstickEndTime = -1;
+		Get(player).StartLoc = null;
+		
+		if (Math.random() < .5)
+		{
+			player.teleport(Spawn.getEastSpawn());
+		}
+		else
+		{
+			player.teleport(Spawn.getWestSpawn());
+		}
+		
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/stuck/commands/StuckCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/stuck/commands/StuckCommand.java
new file mode 100644
index 000000000..f43064682
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/stuck/commands/StuckCommand.java
@@ -0,0 +1,48 @@
+package mineplex.game.clans.clans.stuck.commands;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.recharge.Recharge;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.stuck.StuckManager;
+
+public class StuckCommand extends CommandBase<StuckManager>
+{	
+	public StuckCommand(StuckManager plugin)
+	{
+		super(plugin, Rank.ALL, "spawn", "stuck", "unstick", "unstuck");
+	}
+ 
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		if (Plugin.isUnsticking(caller))
+		{
+			UtilPlayer.message(caller, F.main("Clans", "You are already teleporting to Spawn."));
+			
+			return;
+		}
+		
+		if (!Recharge.Instance.usable(caller, "Spawn Teleport", true))
+		{
+			return;
+		}
+		
+		if(ClansManager.getInstance().getClanUtility().getClaim(caller.getLocation()) != null && !ClansManager.getInstance().getClanUtility().getClaim(caller.getLocation()).Owner.equals("Borderlands") &&
+				!ClansManager.getInstance().getClanUtility().getClaim(caller.getLocation()).Owner.equals("Shops") && !ClansManager.getInstance().getClanUtility().getClaim(caller.getLocation()).Owner.equals("Spawn"))
+		{
+			UtilPlayer.message(caller, F.main("Clans", "You must be in the Wilderness/Borderlands/Shops/Spawn to use this command."));
+			
+			return;
+		}
+		
+		UtilPlayer.message(caller, F.main("Clans", "Teleporting to Spawn... Please do not move for " + F.elem(UtilTime.MakeStr(StuckManager.UNSTICK_WAIT_TIME))) + ".");
+		
+		Plugin.unstick(caller);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/supplyDrop/SupplyDrop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/supplyDrop/SupplyDrop.java
new file mode 100644
index 000000000..9aa27baff
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/supplyDrop/SupplyDrop.java
@@ -0,0 +1,200 @@
+package mineplex.game.clans.clans.supplyDrop;
+
+import java.lang.reflect.Field;
+import java.util.Random;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Color;
+import org.bukkit.FireworkEffect;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.Chest;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import net.minecraft.server.v1_8_R3.BlockPosition;
+import net.minecraft.server.v1_8_R3.TileEntity;
+import net.minecraft.server.v1_8_R3.TileEntityBeacon;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilFirework;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.hologram.Hologram;
+import mineplex.core.hologram.HologramManager;
+import mineplex.game.clans.clans.ClansManager;
+
+public class SupplyDrop implements Listener
+{
+	private static int DROP_TICKS = 20 * 10;
+	private static int REMOVE_TICKS = DROP_TICKS + (20 * 120); // 2 Minutes
+	public static Material SUPPLY_DROP_MATERIAL = Material.BEACON;
+
+	private ClansManager _clansManager;
+
+	private Block _block;
+	private Player _owner;
+	private int _ticks;
+	private boolean _running;
+	private Hologram _hologram;
+	private Random _random;
+
+	protected SupplyDrop(Player owner, Block block, ClansManager clansManager, HologramManager hologramManager)
+	{
+		_owner = owner;
+		_block = block;
+		_ticks = 0;
+		_running = true;
+		_hologram = new Hologram(hologramManager, _block.getLocation().add(0.5, 1.5, 0.5));
+		_hologram.start();
+		_random = new Random();
+		_clansManager = clansManager;
+
+		System.out.println("supply drop");
+
+		block.setType(SUPPLY_DROP_MATERIAL);
+
+		for (int x = -1; x <= 1; x++)
+		{
+			for (int z = -1; z <= 1; z++)
+			{
+				Block b = block.getRelative(x, -1, z);
+				clansManager.getBlockRestore().add(b, Material.DIAMOND_BLOCK.getId(), (byte) 0, 60000);
+			}
+		}
+	}
+
+	public void tick()
+	{
+		if (getTicks() < DROP_TICKS)
+		{
+			if (getTicks() == 10)
+			{
+				/*
+				try
+				{
+					TileEntity tileEntity = ((CraftWorld) _block.getWorld()).getHandle().getTileEntity(new BlockPosition(_block.getX(), _block.getY(), _block.getZ()));
+					Field k = TileEntityBeacon.class.getDeclaredField("k");
+					k.setAccessible(true);
+
+					Field l = TileEntityBeacon.class.getDeclaredField("l");
+					l.setAccessible(true);
+
+					if (tileEntity instanceof TileEntityBeacon)
+					{
+						k.set(tileEntity, true);
+						l.set(tileEntity, 3);
+						tileEntity.update();
+					}
+				}
+				catch (Exception e)
+				{
+					e.printStackTrace();
+				}
+				*/
+			}
+
+			if (getTicks() > 15 && getTicks() % 10 == 0)
+			{
+				FireworkEffect effect = FireworkEffect.builder().with(FireworkEffect.Type.BURST).withColor(Color.AQUA, Color.WHITE, Color.GRAY).withFade(Color.BLACK).withFlicker().build();
+				UtilFirework.playFirework(_block.getLocation().add(0.5, 0.5, 0.5), effect);
+			}
+
+			if (getTicks() % 20 == 0)
+			{
+				long millis = (DROP_TICKS - getTicks()) * 50; // Multiply by 50 to convert ticks to ms
+				_hologram.setText(getChatColor(millis) + UtilTime.convertString(millis, 0, UtilTime.TimeUnit.SECONDS) + " Until Drop");
+			}
+		}
+		else
+		{
+			if (getTicks() == DROP_TICKS)
+			{
+				placeChest();
+			}
+
+			// Drop supply drop
+			if (getTicks() % 20 == 0)
+			{
+				long millis = (REMOVE_TICKS - getTicks()) * 50; // Multiply by 50 to convert ticks to ms
+				_hologram.setText(getChatColor(millis) + UtilTime.convertString(millis, 0, UtilTime.TimeUnit.SECONDS) + " Remaining");
+			}
+
+			if (getTicks() >= REMOVE_TICKS)
+			{
+				finish();
+			}
+		}
+
+		_ticks++;
+	}
+
+	private void placeChest()
+	{
+		getBlock().setType(Material.CHEST);
+
+		_clansManager.runSyncLater(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				Chest chest = (Chest) getBlock().getState();
+
+				Inventory inventory = chest.getBlockInventory();
+				int slots = inventory.getSize();
+				int drops = 5 + _random.nextInt(11); // 5 -> 15
+
+				for (int i = 0; i < drops; i++)
+				{
+					int slot = _random.nextInt(slots);
+					ItemStack item = _clansManager.getLootManager().getRareItemStack();
+					inventory.setItem(slot, item);
+				}
+			}
+		}, 5);
+	}
+
+	private void finish()
+	{
+		_running = false;
+		_hologram.stop();
+		getBlock().setType(Material.AIR);
+	}
+
+	private String getChatColor(long millis)
+	{
+		if (millis > 30000)
+			return C.cAqua;
+		else if (millis > 10000)
+			return C.cYellow;
+		else
+			return C.cRed;
+	}
+
+	public boolean isRunning()
+	{
+		return _running;
+	}
+
+	public Block getBlock()
+	{
+		return _block;
+	}
+
+	public Player getOwner()
+	{
+		return _owner;
+	}
+
+	public int getTicks()
+	{
+		return _ticks;
+	}
+
+	public boolean contains(Block block)
+	{
+		return _block.equals(block);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/supplyDrop/SupplyDropManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/supplyDrop/SupplyDropManager.java
new file mode 100644
index 000000000..8380afa6e
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/supplyDrop/SupplyDropManager.java
@@ -0,0 +1,156 @@
+package mineplex.game.clans.clans.supplyDrop;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.core.repository.ClanTerritory;
+
+public class SupplyDropManager extends MiniPlugin
+{
+	private ClansManager _clansManager;
+	private List<SupplyDrop> _supplyDrops;
+
+	public SupplyDropManager(JavaPlugin plugin, ClansManager clansManager)
+	{
+		super("Supply Drops", plugin);
+
+		_clansManager = clansManager;
+		_supplyDrops = new LinkedList<SupplyDrop>();
+	}
+
+	@EventHandler
+	public void placeSupplyDrop(BlockPlaceEvent event)
+	{
+		ItemStack item = event.getItemInHand();
+
+		if (isSupplyDropItem(item))
+		{
+			ClanTerritory claim = _clansManager.getClanUtility().getClaim(event.getBlock().getLocation());
+			if (claim != null)
+			{
+				UtilPlayer.message(event.getPlayer(), F.main("Clans", "You can only place " + F.elem("Supply Drop") + " in the Wilderness"));
+				event.setCancelled(true);
+				return;
+			}
+
+			event.getPlayer().setItemInHand(null);
+			placeSupplyDrop(event.getPlayer(), event.getBlock());
+
+			Bukkit.broadcastMessage(F.main("Clans", F.name(event.getPlayer().getName()) + " placed a supply drop at " + F.elem(UtilWorld.blockToStrClean(event.getBlock()))));
+		}
+	}
+
+//	@EventHandler
+//	public void debug(PlayerCommandPreprocessEvent event)
+//	{
+//		if (event.getMessage().equalsIgnoreCase("/supplydrop"))
+//		{
+//			UtilPlayer.message(event.getPlayer(), F.main("Clans", "You received a " + F.elem("Supply Drop")));
+//			giveSupplyDropItem(event.getPlayer());
+//		}
+//	}
+
+	@EventHandler
+	public void update(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		Iterator<SupplyDrop> iterator = _supplyDrops.iterator();
+
+		while (iterator.hasNext())
+		{
+			SupplyDrop supplyDrop = iterator.next();
+
+			if (supplyDrop.isRunning())
+			{
+				supplyDrop.tick();
+			}
+			else
+			{
+//				supplyDrop.getBlock().setType(Material.AIR);
+				HandlerList.unregisterAll(supplyDrop);
+				iterator.remove();
+			}
+		}
+	}
+
+	@EventHandler
+	public void cancelInteract(PlayerInteractEvent event)
+	{
+		if (event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)
+		{
+			if (event.getClickedBlock() != null && event.getClickedBlock().getType() == SupplyDrop.SUPPLY_DROP_MATERIAL)
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+
+	@EventHandler
+	public void cancelBreak(BlockBreakEvent event)
+	{
+		for (SupplyDrop supplyDrop : _supplyDrops)
+		{
+			if (supplyDrop.contains(event.getBlock()))
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+
+	private void placeSupplyDrop(Player player, Block block)
+	{
+		SupplyDrop supplyDrop = new SupplyDrop(player, block, _clansManager, _clansManager.getHologramManager());
+		getPlugin().getServer().getPluginManager().registerEvents(supplyDrop, getPlugin());
+		_supplyDrops.add(supplyDrop);
+	}
+
+	private void giveSupplyDropItem(Player player)
+	{
+		ItemStack item = ItemStackFactory.Instance.CreateStack(Material.BEACON, (byte) 0, 1, C.cGold + "Supply Drop");
+		player.getInventory().addItem(item);
+	}
+
+	private boolean isSupplyDropItem(ItemStack item)
+	{
+		if (item == null)
+			return false;
+
+		return item.getType() == SupplyDrop.SUPPLY_DROP_MATERIAL;
+
+//		if (item.getType() == SUPPLY_DROP_MATERIAL)
+//		{
+//			CustomItem customItem = GearManager.parseItem(item);
+//			if (customItem != null && customItem instanceof SupplyDropItem)
+//			{
+//				return true;
+//			}
+//		}
+//
+//		return false;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGenerator.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGenerator.java
new file mode 100644
index 000000000..3712896f2
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGenerator.java
@@ -0,0 +1,45 @@
+package mineplex.game.clans.clans.tntGenerator;
+
+import org.bukkit.block.Block;
+
+public class TntGenerator
+{
+	private Block _block;
+	private int _ticks;
+	private int _stock;
+
+	public TntGenerator(Block block)
+	{
+		_block = block;
+	}
+
+	public int getTicks()
+	{
+		return _ticks;
+	}
+
+	public void setTicks(int ticks)
+	{
+		_ticks = ticks;
+	}
+
+	public void incrementTicks()
+	{
+		_ticks++;
+	}
+
+	public int getStock()
+	{
+		return _stock;
+	}
+
+	public void setStock(int stock)
+	{
+		_stock = stock;
+	}
+
+	public Block getBlock()
+	{
+		return _block;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGeneratorManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGeneratorManager.java
new file mode 100644
index 000000000..aa54d362a
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGeneratorManager.java
@@ -0,0 +1,279 @@
+package mineplex.game.clans.clans.tntGenerator;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import net.minecraft.server.v1_8_R3.TileEntityBrewingStand;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.event.ClanDeleteEvent;
+
+public class TntGeneratorManager extends MiniPlugin
+{
+	public static final Material GENERATOR_MATERIAL = Material.BREWING_STAND;
+	public static final Material GENERATOR_DROP_MATERIAL = Material.BREWING_STAND_ITEM;
+	public static final int SECONDS_PER_TNT = 60 * 60 * 10; // 10 Hours
+	public static final int MAX_GENERATOR_STOCK = 3;
+
+	private ClansManager _clansManager;
+
+	public TntGeneratorManager(JavaPlugin plugin, ClansManager clansManager)
+	{
+		super("Tnt Generator", plugin);
+
+		_clansManager = clansManager;
+	}
+
+	@EventHandler
+	public void updateGenerators(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+			return;
+
+		for (ClanInfo clanInfo : _clansManager.getClanMap().values())
+		{
+			TntGenerator generator = clanInfo.getGenerator();
+			if (generator != null)
+			{
+				// Check that generator still exists
+				if (generator.getBlock().getType() != GENERATOR_MATERIAL)
+				{
+					clanInfo.setGenerator(null);
+					_clansManager.getClanDataAccess().updateGenerator(clanInfo, null);
+					continue;
+				}
+
+				// Check that generator is still in clan territory
+				ClanInfo owner = _clansManager.getClanUtility().getOwner(generator.getBlock().getLocation());
+				if (!clanInfo.equals(owner))
+				{
+					_clansManager.messageClan(clanInfo, F.main("Clans", "Your " + F.elem("TNT Generator") + " has been destroyed due to the land no longer being claimed"));
+					destroyGenerator(generator);
+					clanInfo.setGenerator(null);
+					_clansManager.getClanDataAccess().updateGenerator(clanInfo, null);
+					continue;
+				}
+
+
+				if (generator.getStock() >= MAX_GENERATOR_STOCK)
+				{
+					generator.setTicks(0);
+				}
+				else
+				{
+					if (generator.getTicks() >= SECONDS_PER_TNT)
+					{
+						_clansManager.messageClan(clanInfo, F.main("Clans", "Your " + F.elem("TNT Generator") + " has a new TNT available"));
+						generator.setStock(generator.getStock() + 1);
+						generator.setTicks(0);
+						updateBrewingStand(generator);
+						_clansManager.getClanDataAccess().updateGenerator(clanInfo, null);
+					}
+
+					generator.incrementTicks();
+				}
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+	public void onPlace(BlockPlaceEvent event)
+	{
+		if (event.getBlockPlaced().getType() == GENERATOR_MATERIAL)
+		{
+			ClanInfo clan = _clansManager.getClan(event.getPlayer());
+
+			if (clan == null)
+			{
+				UtilPlayer.message(event.getPlayer(), F.main("Clans", "You must be in a clan to place a " + F.elem("TNT Generator")));
+				event.setCancelled(true);
+				return;
+			}
+
+			// Confirm they are placing in their own land
+			ClanInfo owner = _clansManager.getClanUtility().getOwner(event.getBlock().getLocation());
+			if (!clan.equals(owner))
+			{
+				UtilPlayer.message(event.getPlayer(), F.main("Clans", "You must place the " + F.elem("TNT Generator") + " on your own land"));
+				event.setCancelled(true);
+				return;
+			}
+
+			TntGenerator oldGenerator = clan.getGenerator();
+
+			if (oldGenerator != null)
+			{
+				UtilPlayer.message(event.getPlayer(), F.main("Clans", "Your clan already has a " + F.elem("TNT Generator")));
+				event.setCancelled(true);
+				return;
+			}
+
+//			event.getBlockPlaced().setType(GENERATOR_MATERIAL);
+
+			TntGenerator generator = new TntGenerator(event.getBlock());
+			clan.setGenerator(generator);
+			_clansManager.getClanDataAccess().updateGenerator(clan, null);
+
+			_clansManager.messageClan(clan, F.main("Clans", F.name(event.getPlayer().getName()) + " placed a " + F.elem("TNT Generator") + " at " + F.elem(UtilWorld.blockToStrClean(event.getBlock()))));
+		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+	public void onBreak(BlockBreakEvent event)
+	{
+		if (event.getBlock() != null && event.getBlock().getType() == GENERATOR_MATERIAL)
+		{
+			ClanInfo clan = getGenerator(event.getBlock());
+			if (clan != null)
+			{
+				destroyGenerator(clan.getGenerator());
+				clan.setGenerator(null);
+				_clansManager.getClanDataAccess().updateGenerator(clan, null);
+				_clansManager.messageClan(clan, F.main("Clans", "Your " + F.elem("TNT Generator") + " has been destroyed by " + F.elem(event.getPlayer().getName())));
+			}
+
+			clearStand(event.getBlock());
+			event.getBlock().setTypeId(0);
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler
+	public void onInteract(final PlayerInteractEvent event)
+	{
+		if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock() != null && event.getClickedBlock().getType() == GENERATOR_MATERIAL)
+		{
+			ClanInfo clan = getGenerator(event.getClickedBlock());
+			if (clan != null)
+			{
+				final TntGenerator generator = clan.getGenerator();
+				final int stock = generator.getStock();
+
+				if (stock > 0)
+				{
+					generator.setStock(stock - 1);
+					_clansManager.getClanDataAccess().updateGenerator(clan, new Callback<Boolean>()
+					{
+						@Override
+						public void run(Boolean data)
+						{
+							if (data)
+							{
+								updateBrewingStand(generator);
+								dropItem(event.getClickedBlock(), new ItemStack(Material.TNT));
+							}
+							else
+							{
+								// failed
+								generator.setStock(stock);
+							}
+						}
+					});
+				}
+				else
+				{
+					int secondLeft = SECONDS_PER_TNT - generator.getTicks();
+					int msLeft = secondLeft * 1000;
+					UtilTextMiddle.display("", C.cRed + "Next TNT in " + C.cGold + UtilTime.convertString(msLeft, 1, UtilTime.TimeUnit.FIT), event.getPlayer());
+				}
+			}
+
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler
+	public void onDelete(ClanDeleteEvent event)
+	{
+		ClanInfo clan = event.getClanInfo();
+
+		if (clan != null && clan.getGenerator() != null)
+		{
+			clearStand(clan.getGenerator().getBlock());
+			clan.getGenerator().getBlock().setTypeId(0);
+		}
+	}
+
+	private void dropItem(Block dropLocation, ItemStack item)
+	{
+		dropLocation.getWorld().dropItemNaturally(dropLocation.getLocation().add(0.5, 0.5, 0.5), item);
+	}
+
+	public ClanInfo getGenerator(Block block)
+	{
+		for (ClanInfo clanInfo : _clansManager.getClanMap().values())
+		{
+			TntGenerator generator = clanInfo.getGenerator();
+
+			if (generator != null && block.equals(generator.getBlock()))
+				return clanInfo;
+		}
+
+		return null;
+	}
+
+	private void destroyGenerator(TntGenerator generator)
+	{
+		for (int i = 0; i < generator.getStock(); i++)
+		{
+			dropItem(generator.getBlock(), new ItemStack(Material.TNT));
+		}
+
+		generator.setStock(0);
+		dropItem(generator.getBlock(), new ItemStack(GENERATOR_DROP_MATERIAL));
+		clearStand(generator.getBlock());
+		generator.getBlock().setTypeId(0);
+	}
+
+	private void clearStand(Block block)
+	{
+		TileEntityBrewingStand tileEntity = (TileEntityBrewingStand)((CraftWorld)block.getWorld()).getTileEntityAt(block.getX(), block.getY(), block.getZ());
+		if (tileEntity != null)
+		{
+			for (int i = 0; i < 4; i++)
+			{
+				tileEntity.setItem(i, null);
+			}
+		}
+	}
+
+	private void updateBrewingStand(TntGenerator generator)
+	{
+		Block block = generator.getBlock();
+
+		if (block != null && block.getType() == Material.BREWING_STAND)
+		{
+			TileEntityBrewingStand tileEntity = (TileEntityBrewingStand)((CraftWorld)block.getWorld()).getTileEntityAt(block.getX(), block.getY(), block.getZ());
+			for (int i = 0; i < 3; i++)
+			{
+				ItemStack item = new ItemStack(Material.TNT);
+				net.minecraft.server.v1_8_R3.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
+
+				int itemSlot = i;
+				tileEntity.setItem(i, (generator.getStock() > i) ? nmsItem : null);
+			}
+			tileEntity.update();
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarInvasion.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarInvasion.java
new file mode 100644
index 000000000..1358aa376
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarInvasion.java
@@ -0,0 +1,42 @@
+package mineplex.game.clans.clans.war;
+
+public class WarInvasion
+{
+	private String _invadedClan;
+	private String _invaderClan;
+	private long _startTime;
+	private long _endTime;
+
+	public WarInvasion(String invadedClan, String invaderClan)
+	{
+		_invadedClan = invadedClan;
+		_invaderClan = invaderClan;
+		_startTime = System.currentTimeMillis();
+		_endTime = _startTime + WarManager.INVADE_LENGTH;
+	}
+
+	public long getTimeLeft()
+	{
+		return _endTime - System.currentTimeMillis();
+	}
+
+	public String getInvadedClan()
+	{
+		return _invadedClan;
+	}
+
+	public String getInvaderClan()
+	{
+		return _invaderClan;
+	}
+
+	public long getStartTime()
+	{
+		return _startTime;
+	}
+
+	public long getEndTime()
+	{
+		return _endTime;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java
index 1d5437992..cc017df55 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java
@@ -1,258 +1,330 @@
 package mineplex.game.clans.clans.war;
 
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTime;
+import mineplex.core.scoreboard.ScoreboardManager;
+import mineplex.core.scoreboard.elements.ScoreboardElement;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.game.clans.clans.ClanInfo;
 import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.ClansUtility;
+import mineplex.game.clans.clans.ClanTips.TipType;
+import mineplex.game.clans.clans.event.ClanDisbandedEvent;
+import mineplex.game.clans.clans.event.ClansPlayerDeathEvent;
+import mineplex.game.clans.clans.war.command.WarPointsCommand;
+import mineplex.game.clans.clans.war.event.WarInvasionEndEvent;
+import mineplex.game.clans.clans.war.event.WarInvasionStartEvent;
+import mineplex.game.clans.core.war.ClanWarData;
 
-public class WarManager extends MiniPlugin
+public class WarManager extends MiniPlugin implements ScoreboardElement
 {
-	private static final int INVADE_ENEMY_DATE = Calendar.SATURDAY;
-	private static final int CREATE_ENEMY_DATE = Calendar.SUNDAY;
+	public static final int WAR_START_POINTS = 0;
+	public static final int WAR_FINISH_POINTS = 20;
+	public static final long INVADE_LENGTH = 60000L * 30; // 30 Minutes
+	public static final long WAR_COOLDOWN = 60000L * 30; // 30 Minutes
 
 	private final ClansManager _clansManager;
 
-	private WarState _warState;
+	/**
+	 * Map of the active war invasions. This is indexed by the clan that is being invaded on
+	 * We will need to access this when blocks are broken in the invaded on clan's land!
+	 */
+	private Map<String, List<WarInvasion>> _invadedMap;
+	private Map<String, List<WarInvasion>> _invaderMap;
 
 	public WarManager(JavaPlugin plugin, ClansManager clansManager)
 	{
-		super("War Manager", plugin);
+		super("ClanWar Manager", plugin);
 		_clansManager = clansManager;
-		_warState = calculateWarState();
+		_invadedMap = new HashMap<String, List<WarInvasion>>();
+		_invaderMap = new HashMap<String, List<WarInvasion>>();
 	}
 
-	@EventHandler
-	public void update(UpdateEvent event)
+	public ClansManager getClansManager()
 	{
-		if (event.getType() != UpdateType.SLOWEST)
-			return;
-
-		WarState currentState = calculateWarState();
-
-		if (currentState != _warState)
-		{
-			WarStateChangeEvent warEvent = new WarStateChangeEvent(_warState, currentState);
-			UtilServer.getServer().getPluginManager().callEvent(warEvent);
-			_warState = currentState;
-		}
+		return _clansManager;
 	}
 
-	private WarState calculateWarState()
+	public List<WarInvasion> getInvasionsOn(ClanInfo invaded)
 	{
-		// Get a calendar snapshot of the current time using server timezone
-		Calendar calendar = Calendar.getInstance(_clansManager.getServerTimeZone());
-
-		WarState warState = WarState.WAR;
-
-		if (isEnemyTime(calendar))
-			warState = WarState.FORM_ENEMIES;
-		else if (isInvadeTime(calendar))
-			warState = WarState.INVADE;
-
-		return warState;
+		return _invadedMap.get(invaded.getName());
 	}
 
-	public void attemptEnemy(Player player, ClanInfo initiatingClan, ClanInfo otherClan)
+	public List<WarInvasion> getInvasionsFor(ClanInfo invader)
 	{
-		attemptEnemy(player, initiatingClan, otherClan, true);
+		return _invaderMap.get(invader.getName());
 	}
 
-	public void attemptEnemy(Player player, ClanInfo initiatingClan, ClanInfo otherClan, boolean notify)
+	public boolean isBeingInvaded(ClanInfo clanInfo)
 	{
-		String notifyMessage = null;
-
-		if (_warState != WarState.FORM_ENEMIES)
-		{
-			notifyMessage = "Enemies cannot be formed at this time. Please see mineplex.com/clans for info";
-		}
-		else if (initiatingClan.getEnemyData() != null)
-		{
-			notifyMessage = "Your clan already has an enemy.";
-		}
-		else if (otherClan.getEnemyData() != null)
-		{
-			notifyMessage = "The clan " + F.elem(otherClan.getName()) + " already has an enemy.";
-		}
-		else
-		{
-			_clansManager.getClanDataAccess().enemy(initiatingClan, otherClan, player.getName());
-			_clansManager.messageClan(initiatingClan, F.main("Clans", "Your clan is now enemies with " + F.elem(otherClan.getName())));
-			_clansManager.messageClan(otherClan, F.main("Clans", "Your clan is now enemies with " + F.elem(initiatingClan.getName())));
-		}
-
-		if (notify && notifyMessage != null)
-			UtilPlayer.message(player, F.main("Clans", notifyMessage));
+		List<WarInvasion> invasions = _invadedMap.get(clanInfo.getName());
+		return invasions != null && !invasions.isEmpty();
 	}
 
-	@EventHandler
-	public void handleDeath(PlayerDeathEvent event)
+	public boolean isInvading(ClanInfo clanInfo)
 	{
-		Player player = event.getEntity();
-		Player killer = player.getKiller();
+		List<WarInvasion> invasions = _invaderMap.get(clanInfo.getName());
+		return invasions != null && !invasions.isEmpty();
+	}
 
+	public boolean allowFromInvade(Location location, Player player)
+	{
+		ClanInfo clanInfo = _clansManager.getClanUtility().getOwner(location);
 		ClanInfo playerClan = _clansManager.getClan(player);
-		ClanInfo killerClan = _clansManager.getClan(killer);
-
-		if (playerClan != null && killerClan != null)
+		if (clanInfo != null)
 		{
-			if (playerClan.getEnemyData() != null && playerClan.getEnemyData().getEnemyName().equalsIgnoreCase(killerClan.getName()))
+			List<WarInvasion> invasions = _invadedMap.get(clanInfo.getName());
+			if (invasions != null)
 			{
-				// Only adjust score if we are in WAR or FORM ENEMIES state. Once invasion begins score should never change
-				// Adjust kill stats no matter what war state we are in (so we track kills during invasion)
-
-				if (_warState == WarState.WAR || _warState == WarState.FORM_ENEMIES)
+				for (WarInvasion invasion : invasions)
 				{
-					playerClan.getEnemyData().addScore(-1);
-					killerClan.getEnemyData().addScore(1);
+					if (invasion.getInvaderClan().equals(playerClan))
+						return true;
 				}
-
-				killerClan.getEnemyData().addKill();
 			}
 		}
 
-	}
-
-
-	/**
-	 * Check if a specific Calendar is currently in enemy time
-	 * If this returns true, isInvadeTime should always return false for the same Calendar
-	 *
-	 * @param c {@link java.util.Calendar} instance that should be checked
-	 */
-	private boolean isEnemyTime(Calendar c)
-	{
-		int dayOfWeek = c.get(Calendar.DAY_OF_WEEK);
-
-		if (dayOfWeek == CREATE_ENEMY_DATE)
-		{
-			return true;
-		}
-
 		return false;
 	}
 
 	/**
-	 * Check if a specific Calendar is currently in invade time
-	 * If this returns true, isEnemyTime should always return false for the same Calendar
-	 *
-	 * @param c {@link java.util.Calendar} instance that should be checked
+	 * Clear all invasions against clan. This is typically used for when a clan is deleted
 	 */
-	private boolean isInvadeTime(Calendar c)
-	{
-		int dayOfWeek = c.get(Calendar.DAY_OF_WEEK);
+//	public void clearInvasions(String clan)
+//	{
+//		List<WarInvasion> invasions =
+//	}
 
-		if (dayOfWeek == INVADE_ENEMY_DATE)
+	@EventHandler
+	public void handleDeath(final ClansPlayerDeathEvent event)
+	{
+		if (event.getPlayer() != null && event.getPlayer().getClan() != null)
 		{
-			return true;
+			if (event.getKiller() != null && event.getKiller().getClan() != null)
+			{
+				final ClanInfo clan = event.getPlayer().getClan();
+				final ClanInfo killerClan = event.getKiller().getClan();
+
+				ClanWarData war = clan.getWarData(killerClan);
+				if (war != null && !war.isOnCooldown())
+				{
+					// War already exists
+					ClansUtility.ClanRelation rel = _clansManager.getClanUtility().rel(clan, killerClan);
+					_clansManager.messageClan(killerClan, F.main("Clans", "Your clan gained 1 War Point against " + rel.getColor(false) +
+							clan.getName() + " " + C.Reset + "(" + killerClan.getFormattedWarPoints(clan) + C.Reset + ")"));
+					_clansManager.messageClan(clan, F.main("Clans", "Your clan lost 1 War Point against " + rel.getColor(false) +
+							killerClan.getName() + " " + C.Reset + "(" + clan.getFormattedWarPoints(killerClan) + C.Reset + ")"));
+					war.increment(killerClan.getName());
+					checkWarComplete(war);
+
+					ClanInfo clanA = clan.getName().equals(war.getClanA()) ? clan : killerClan;
+					ClanInfo clanB = clan.equals(clanA) ? killerClan : clan;
+					_clansManager.getClanDataAccess().updateWar(clanA, clanB, war, null);
+
+					_clansManager.getScoreboard().refresh(killerClan);
+					_clansManager.getScoreboard().refresh(clan);
+
+					_clansManager.ClanTips.displayTip(TipType.DOMINANCE_RIP, event.getPlayer().getPlayer());
+					_clansManager.ClanTips.displayTip(TipType.DOMINANCE_NOOICE, event.getKiller().getPlayer());
+				}
+				else
+				{
+					// Need to create war
+					_clansManager.getClanDataAccess().war(killerClan, clan, WAR_START_POINTS + 1, new Callback<ClanWarData>()
+					{
+						@Override
+						public void run(ClanWarData data)
+						{
+							ClansUtility.ClanRelation rel = _clansManager.getClanUtility().rel(clan, killerClan);
+							_clansManager.messageClan(killerClan, F.main("Clans", "Your clan gained 1 War Point against " + rel.getColor(false) + clan.getName()));
+							_clansManager.messageClan(clan, F.main("Clans", "Your clan lost 1 War Point against " + rel.getColor(false) + killerClan.getName()));
+
+							_clansManager.getScoreboard().refresh(killerClan);
+							_clansManager.getScoreboard().refresh(clan);
+
+							_clansManager.ClanTips.displayTip(TipType.DOMINANCE_RIP, event.getPlayer().getPlayer());
+							_clansManager.ClanTips.displayTip(TipType.DOMINANCE_NOOICE, event.getKiller().getPlayer());
+						}
+					});
+				}
+			}
 		}
-		return false;
 	}
 
-	/**
-	 * Get the starting time of when enemies can be formed next
-	 * @return The enemy start time in the form of {@link java.util.Date}
-	 */
-	private Date getNextEnemyTime()
+	private void checkWarComplete(ClanWarData war)
 	{
-		Calendar c = Calendar.getInstance(_clansManager.getServerTimeZone());
-		int currDayOfWeek = c.get(Calendar.DAY_OF_WEEK);
+		String invaderClan = null;
+		String invadedClan = null;
 
-		c.set(Calendar.DAY_OF_WEEK, CREATE_ENEMY_DATE);
-		c.set(Calendar.HOUR_OF_DAY, 0);
-		c.set(Calendar.MINUTE, 0);
-		c.set(Calendar.SECOND, 0);
+		if (war.getClanAPoints() >= WAR_FINISH_POINTS)
+		{
+			// Clan A invades Clan B
+			invaderClan = war.getClanA();
+			invadedClan = war.getClanB();
+		}
+		else if (war.getClanBPoints() >= WAR_FINISH_POINTS)
+		{
+			// Clan B invades Clan A
+			invaderClan = war.getClanB();
+			invadedClan = war.getClanA();
+		}
 
-		if (currDayOfWeek >= CREATE_ENEMY_DATE)
-			c.add(Calendar.DATE, 7);
+		if (invadedClan != null && invaderClan != null)
+		{
+			// Reset War to 0:0
+			war.resetPoints();
+			war.setCooldown(WAR_COOLDOWN);
 
-		return c.getTime();
+			WarInvasion invasion = new WarInvasion(invadedClan, invaderClan);
+			startInvasion(invasion);
+		}
 	}
 
-	/**
-	 * Get the starting time of the next enemy invasion
-	 * @return The invasion start time in the form of {@link java.util.Date}
-	 */
-	private Date getNextInvadeTime()
+	private void startInvasion(WarInvasion invasion)
 	{
-		Calendar c = Calendar.getInstance(_clansManager.getServerTimeZone());
-		int currDayOfWeek = c.get(Calendar.DAY_OF_WEEK);
+		String invaded = invasion.getInvadedClan();
+		String invader = invasion.getInvaderClan();
 
-		c.set(Calendar.DAY_OF_WEEK, INVADE_ENEMY_DATE);
-		c.set(Calendar.HOUR_OF_DAY, 0);
-		c.set(Calendar.MINUTE, 0);
-		c.set(Calendar.SECOND, 0);
+		addInvasion(invaded, invasion, _invadedMap);
+		addInvasion(invader, invasion, _invaderMap);
 
-		if (currDayOfWeek >= INVADE_ENEMY_DATE)
-			c.add(Calendar.DATE, 7);
-
-		return c.getTime();
+		WarInvasionStartEvent event = new WarInvasionStartEvent(invasion);
+		UtilServer.getServer().getPluginManager().callEvent(event);
 	}
 
-	/**
-	 * Get the current War State of the server
-	 * War state determines what events are going on
-	 * with respect to the current war.
-	 */
-	public WarState getWarState()
+	private void addInvasion(String name, WarInvasion invasion, Map<String, List<WarInvasion>> invasionMap)
 	{
-		return _warState;
+		if (invasionMap.containsKey(name))
+		{
+			invasionMap.get(name).add(invasion);
+		}
+		else
+		{
+			LinkedList<WarInvasion> invasions = new LinkedList<WarInvasion>();
+			invasions.add(invasion);
+			invasionMap.put(name, invasions);
+		}
 	}
 
 	@EventHandler
-	public void stateChange(WarStateChangeEvent event)
+	public void clearInvasions(UpdateEvent event)
 	{
-		WarState state = event.getNewState();
-		Bukkit.broadcastMessage(F.main("Clans", "War state changed: " + F.elem(state.getDescription())));
+		if (event.getType() != UpdateType.SEC)
+			return;
+
+		long currentTime = System.currentTimeMillis();
+
+		Iterator<Map.Entry<String, List<WarInvasion>>> iterator = _invadedMap.entrySet().iterator();
+		while (iterator.hasNext())
+		{
+			List<WarInvasion> invasions = iterator.next().getValue();
+			Iterator<WarInvasion> invasionIterator = invasions.iterator();
+			while (invasionIterator.hasNext())
+			{
+				WarInvasion invasion = invasionIterator.next();
+				if (currentTime >= invasion.getEndTime())
+				{
+					WarInvasionEndEvent endEvent = new WarInvasionEndEvent(invasion);
+					Bukkit.getServer().getPluginManager().callEvent(endEvent);
+
+					List<WarInvasion> invaderList = _invaderMap.get(invasion.getInvaderClan());
+					if (invaderList != null)
+					{
+						invaderList.remove(invasion);
+						if (invaderList.isEmpty()) _invaderMap.remove(invasion.getInvaderClan());
+					}
+
+					invasionIterator.remove();
+				}
+			}
+
+			if (invasions.isEmpty())
+				iterator.remove();
+		}
 	}
 
-	/**
-	 * Send the current server time information to the player
-	 */
-	public LinkedList<String> mServerTime()
+	@EventHandler
+	public void onInvasionStart(WarInvasionStartEvent event)
 	{
-		LinkedList<String> messageList = new LinkedList<String>();
+		Bukkit.broadcastMessage(F.main("War", F.elem(event.getWarInvasion().getInvaderClan()) + " can now invade " + F.elem(event.getWarInvasion().getInvadedClan())));
+	}
 
-		messageList.add(F.main("Clans", "Server Time"));
-		Date currDate = new Date();
-		SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM d HH:mm:ss yyyy");
-		dateFormat.setTimeZone(_clansManager.getServerTimeZone());
+	@EventHandler
+	public void onInvasionEnd(WarInvasionEndEvent event)
+	{
+		Bukkit.broadcastMessage(F.main("War", F.elem(event.getWarInvasion().getInvaderClan()) + "'s invasion against " + F.elem(event.getWarInvasion().getInvaderClan() + " has ended.")));
 
-		messageList.add(F.value("Server Time", dateFormat.format(currDate)));
+	}
 
-		messageList.add(F.value("Status", _warState.getDescription()));
+	@Override
+	public void addCommands()
+	{
+		addCommand(new WarPointsCommand(this));
+	}
 
-		if (_warState != WarState.INVADE)
+	@EventHandler
+	public void cancelDisband(ClanDisbandedEvent event)
+	{
+		ClanInfo clan = event.getClan();
+		if (isBeingInvaded(clan) || isInvading(clan))
 		{
-			long next = getNextInvadeTime().getTime();
-			long currTime = System.currentTimeMillis();
+			UtilPlayer.message(event.getDisbander(), F.main("Clans", "Clans cannot be disbanded in the middle of an invasion"));
+			event.setCancelled(true);
+		}
+	}
 
-			messageList.add(F.value("Invasion", UtilTime.convertString(next - currTime, 1, UtilTime.TimeUnit.FIT)));
+	@Override
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
+	{
+		List<String> element = new ArrayList<String>();
+
+		ClanInfo clan = _clansManager.getClan(player);
+
+		if (clan != null)
+		{
+			List<WarInvasion> invadedList = _invadedMap.get(clan);
+			List<WarInvasion> invaderList = _invaderMap.get(clan);
+
+			if (invaderList != null && !invaderList.isEmpty())
+			{
+				for (WarInvasion invasion : invaderList)
+				{
+					element.add(C.cPurpleB + "Invading");
+					element.add("  " + invasion.getInvadedClan());
+					element.add("  " + UtilTime.convertString(invasion.getTimeLeft(), 1, UtilTime.TimeUnit.FIT));
+				}
+			}
+
+			if (invadedList != null && !invadedList.isEmpty())
+			{
+				for (WarInvasion invasion : invadedList)
+				{
+					element.add(C.cRedB + "Invaded");
+					element.add("  " + invasion.getInvaderClan());
+					element.add("  " + UtilTime.convertString(invasion.getTimeLeft(), 1, UtilTime.TimeUnit.FIT));
+				}
+			}
 		}
 
-		if (_warState != WarState.FORM_ENEMIES)
-		{
-			long next = getNextEnemyTime().getTime();
-			long currTime = System.currentTimeMillis();
-
-			messageList.add(F.value("Enemy Reset", UtilTime.convertString(next - currTime, 1, UtilTime.TimeUnit.FIT)));
-		}
-
-		return messageList;
+		return element;
 	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarState.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarState.java
deleted file mode 100644
index e8bac93ea..000000000
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarState.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package mineplex.game.clans.clans.war;
-
-public enum WarState
-{
-	FORM_ENEMIES("Enemies can now be formed"),
-	WAR("War is in progress"),
-	INVADE("Winning teams can invade enemies");
-
-	private String _description;
-
-	WarState(String description)
-	{
-		_description = description;
-	}
-
-	public String getDescription()
-	{
-		return _description;
-	}
-}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarStateChangeEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarStateChangeEvent.java
deleted file mode 100644
index b525f63c5..000000000
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarStateChangeEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package mineplex.game.clans.clans.war;
-
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-public class WarStateChangeEvent extends Event
-{
-	private static final HandlerList handlers = new HandlerList();
-
-	private WarState _oldState;
-	private WarState _newState;
-
-	public WarStateChangeEvent(WarState oldState, WarState newState)
-	{
-		_oldState = oldState;
-		_newState = newState;
-	}
-
-	public HandlerList getHandlers()
-	{
-		return handlers;
-	}
-
-	public static HandlerList getHandlerList()
-	{
-		return handlers;
-	}
-
-	public WarState getOldState()
-	{
-		return _oldState;
-	}
-
-	public WarState getNewState()
-	{
-		return _newState;
-	}
-
-}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/command/WarPointsCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/command/WarPointsCommand.java
new file mode 100644
index 000000000..efe673ca6
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/command/WarPointsCommand.java
@@ -0,0 +1,60 @@
+package mineplex.game.clans.clans.war.command;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.core.war.ClanWarData;
+import mineplex.game.clans.clans.war.WarManager;
+
+public class WarPointsCommand extends CommandBase<WarManager>
+{
+	public WarPointsCommand(WarManager plugin)
+	{
+		super(plugin, Rank.ALL, "warpoints", "wp", "dom");
+	}
+
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		ClansManager clansManager = Plugin.getClansManager();
+		ClanInfo clan = clansManager.getClan(caller);
+
+		if (clan == null)
+		{
+			UtilPlayer.message(caller, F.main("War", "You are not in a clan"));
+			return;
+		}
+
+		if (args.length == 1)
+		{
+			ClanInfo search = clansManager.getClanUtility().searchClanPlayer(caller, args[0], true);
+			if (search == null) return;
+
+			String searchName = clansManager.getClanUtility().name(search, clan);
+			String selfName = clansManager.getClanUtility().name(clan, clan);
+
+			ClanWarData war = clan.getWarData(search);
+			if (war == null)
+			{
+				UtilPlayer.message(caller, F.main("War", "War Status with " + searchName));
+				UtilPlayer.message(caller, F.main("War", "War Points: " + F.elem("" + WarManager.WAR_START_POINTS)));
+			}
+			else
+			{
+				UtilPlayer.message(caller, F.main("War", "War Status with " + searchName));
+				UtilPlayer.message(caller, F.main("War", "Initiated by: " + (war.getClanA().equals(clan.getName()) ? selfName : searchName)));
+				UtilPlayer.message(caller, F.main("War", "War Points: " + clan.getFormattedWarPoints(search)));
+				UtilPlayer.message(caller, F.main("War", "Age: " + F.elem(UtilTime.convertString(System.currentTimeMillis() - war.getTimeFormed().getTime(), 1, UtilTime.TimeUnit.FIT))));
+			}
+
+		}
+
+
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarEndEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarEndEvent.java
new file mode 100644
index 000000000..cd3a356bd
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarEndEvent.java
@@ -0,0 +1,26 @@
+package mineplex.game.clans.clans.war.event;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.core.war.ClanWarData;
+
+public class WarEndEvent extends Event
+{
+	private ClanWarData _war;
+
+	public WarEndEvent(ClanWarData war)
+	{
+		_war = war;
+	}
+
+	public ClanWarData getWar()
+	{
+		return _war;
+	}
+
+	// Bukkit event stuff
+	private static final HandlerList handlers = new HandlerList();
+	public static HandlerList getHandlerList() { return handlers; }
+	public HandlerList getHandlers() { return handlers; }
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarInvasionEndEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarInvasionEndEvent.java
new file mode 100644
index 000000000..048ed8dd1
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarInvasionEndEvent.java
@@ -0,0 +1,29 @@
+package mineplex.game.clans.clans.war.event;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.clans.war.WarInvasion;
+
+/**
+ * Called when a war invasion is ended
+ */
+public class WarInvasionEndEvent extends Event
+{
+	private WarInvasion _warInvasion;
+
+	public WarInvasionEndEvent(WarInvasion warInvasion)
+	{
+		_warInvasion = warInvasion;
+	}
+
+	public WarInvasion getWarInvasion()
+	{
+		return _warInvasion;
+	}
+
+	// Bukkit event stuff
+	private static final HandlerList handlers = new HandlerList();
+	public static HandlerList getHandlerList() { return handlers; }
+	public HandlerList getHandlers() { return handlers; }
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarInvasionStartEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarInvasionStartEvent.java
new file mode 100644
index 000000000..9f3d10f0b
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarInvasionStartEvent.java
@@ -0,0 +1,29 @@
+package mineplex.game.clans.clans.war.event;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.clans.war.WarInvasion;
+
+/**
+ * Called when a war invasion is started
+ */
+public class WarInvasionStartEvent extends Event
+{
+	private WarInvasion _warInvasion;
+
+	public WarInvasionStartEvent(WarInvasion warInvasion)
+	{
+		_warInvasion = warInvasion;
+	}
+
+	public WarInvasion getWarInvasion()
+	{
+		return _warInvasion;
+	}
+
+	// Bukkit event stuff
+	private static final HandlerList handlers = new HandlerList();
+	public static HandlerList getHandlerList() { return handlers; }
+	public HandlerList getHandlers() { return handlers; }
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarStartEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarStartEvent.java
new file mode 100644
index 000000000..dbfdaf050
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/event/WarStartEvent.java
@@ -0,0 +1,26 @@
+package mineplex.game.clans.clans.war.event;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.game.clans.core.war.ClanWarData;
+
+public class WarStartEvent extends Event
+{
+	private ClanWarData _war;
+
+	public WarStartEvent(ClanWarData war)
+	{
+		_war = war;
+	}
+
+	public ClanWarData getWar()
+	{
+		return _war;
+	}
+
+	// Bukkit event stuff
+	private static final HandlerList handlers = new HandlerList();
+	public static HandlerList getHandlerList() { return handlers; }
+	public HandlerList getHandlers() { return handlers; }
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/EventTerrainFinder.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/EventTerrainFinder.java
new file mode 100644
index 000000000..ee7e6014d
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/EventTerrainFinder.java
@@ -0,0 +1,163 @@
+package mineplex.game.clans.clans.worldevent;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilItem;
+import mineplex.core.common.util.UtilItem.ItemCategory;
+import mineplex.core.common.util.UtilMath;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.regions.ClansRegions;
+
+public class EventTerrainFinder
+{
+	private WorldEventManager _eventManager;
+	private ClansManager _clansManager;
+	private ClansRegions _clansRegions;
+	
+	public EventTerrainFinder(WorldEventManager eventManager, ClansManager clansManager, ClansRegions clansRegions)
+	{
+		_eventManager = eventManager;
+		_clansManager = clansManager;
+		_clansRegions = clansRegions;
+	}
+	
+	public double posNeg()
+	{
+		if (Math.random() > 0.5) return -1;
+		return 1;
+	}
+	
+	public Location findAreaInBorderlands(World world, int size, int vert)
+	{
+		int borderlandsDist = 31;
+		int borderlandsWidth = 47 - borderlandsDist;
+		
+		for (int i = 0; i < 20; i++)
+		{
+			int x = 0;
+			int z = 0;
+			
+			x = (borderlandsDist * 16) + (UtilMath.clamp(UtilMath.random.nextInt(borderlandsWidth), 2, borderlandsWidth - 2) * 16);
+			z = (borderlandsDist * 16) + (UtilMath.clamp(UtilMath.random.nextInt(borderlandsWidth), 2, borderlandsWidth - 2) * 16);
+			
+			if (UtilMath.random.nextBoolean())
+			{
+				x = -x;
+				z = -z;
+			}
+			
+			Location loc = UtilBlock.getHighest(world, x, z).getLocation();
+			
+			int blocks = ((size * 2) + 1) * ((size * 2) + 1);
+			
+			boolean suitable = true;
+			
+			int liquids = 0;
+			for (x = -size; x < size; x++)
+			{
+				for (z = -size; z < size; z++)
+				{
+					Block topBlock = loc.getWorld().getBlockAt(loc.getBlockX() + x, UtilBlock.getHighest(loc.getWorld(), loc.getBlockX() + x, loc.getBlockZ() + z, new HashSet<Material>(UtilItem.listIn(ItemCategory.BOUNDLESS))).getY(), loc.getBlockZ());
+					
+					if (255 - topBlock.getY() < size)
+					{
+						suitable = false;
+						continue;
+					}
+					
+					if (topBlock.isLiquid())
+					{
+						liquids++;
+					}
+				}
+			}
+			
+			if (liquids > 1 && (((double) blocks)) / ((double) liquids) > 0.25)
+			{
+				System.out.println("water bad");
+				suitable = false;
+			}
+			
+			// If this region is not suitable, try again.
+			if (!suitable)
+			{
+				continue;
+			}
+			
+			System.out.println("Done finding area... [success]");
+			
+			// Success
+			return loc;
+		}
+		
+		System.out.println("Done finding area...");
+		
+		return null;
+	}
+	
+	public Location locateSpace(Location areaSource, int areaRadius, int xArea, int yArea, int zArea, boolean replaceBlocks, boolean aboveOther, Set<Block> otherBlock)
+	{
+		for (int i = 0; i < 20; i++)
+		{
+			int x = UtilMath.r(areaRadius * 2) - areaRadius + areaSource.getBlockX();
+			int z = UtilMath.r(areaRadius * 2) - areaRadius + areaSource.getBlockZ();
+			
+			Block block = UtilBlock.getHighest(areaSource.getWorld(), x, z);
+			
+			if (!aboveOther) if (otherBlock.contains(block.getRelative(BlockFace.DOWN))) continue;
+			
+			boolean valid = true;
+			
+			int overlaps = 0;
+			
+			// Previous
+			for (x = -xArea; x <= xArea; x++)
+			{
+				for (z = -zArea; z <= zArea; z++)
+				{
+					for (int y = 0; y <= yArea; y++)
+					{
+						// Check Blocks
+						Block cur = areaSource.getWorld().getBlockAt(block.getX() + x, block.getY() + y, block.getZ() + z);
+						
+						if (cur.getRelative(BlockFace.DOWN).isLiquid())
+						{
+							valid = false;
+							break;
+						}
+						
+						if (otherBlock.contains(cur))
+						{
+							valid = false;
+							break;
+						}
+						
+						// Check Area
+						if (!UtilBlock.airFoliage(cur)) overlaps += 1;
+					}
+					
+					if (!valid) break;
+				}
+				
+				if (!valid) break;
+			}
+			
+			if (!replaceBlocks && overlaps > 0) continue;
+			
+			if (!valid) continue;
+			
+			return block.getLocation();
+		}
+		
+		return null;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/WorldEventManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/WorldEventManager.java
new file mode 100644
index 000000000..6db1192cd
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/WorldEventManager.java
@@ -0,0 +1,269 @@
+package mineplex.game.clans.clans.worldevent;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.blockrestore.BlockRestore;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.scoreboard.ScoreboardManager;
+import mineplex.core.scoreboard.elements.ScoreboardElement;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.loot.LootManager;
+import mineplex.game.clans.clans.regions.ClansRegions;
+import mineplex.game.clans.clans.worldevent.command.WorldEventCommand;
+import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.core.boss.EventState;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+import mineplex.minecraft.game.core.damage.DamageManager;
+
+public class WorldEventManager extends MiniPlugin implements ScoreboardElement
+{
+	private final List<WorldEvent> _runningEvents;
+	
+	private Random _random;
+	private ClansManager _clansManager;
+	private EventTerrainFinder _terrainFinder;
+	private DamageManager _damageManager;
+	private LootManager _lootManager;
+	private BlockRestore _blockRestore;
+	
+	private SkillFactory _skillFactory;
+	
+	private long _nextEventStart;
+	
+	public WorldEventManager(JavaPlugin plugin, ClansManager clansManager, DamageManager damageManager, LootManager lootManager, BlockRestore blockRestore, ClansRegions clansRegions, SkillFactory skillFactory)
+	{
+		super("World Event", plugin);
+		
+		_random = new Random();
+		_terrainFinder = new EventTerrainFinder(this, clansManager, clansRegions);
+		_clansManager = clansManager;
+		_damageManager = damageManager;
+		_lootManager = lootManager;
+		_blockRestore = blockRestore;
+		_runningEvents = new LinkedList<WorldEvent>();
+		
+		_skillFactory = skillFactory;
+		
+		updateNextEventTime();
+	}
+	
+	public void addCommands()
+	{
+		addCommand(new WorldEventCommand(this));
+	}
+	
+	// PS: This never gets called
+	@Override
+	public void disable()
+	{
+		for (WorldEvent event : _runningEvents)
+		{
+			event.cancel();
+		}
+	}
+	
+	@EventHandler
+	public void update(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+		{
+			return;
+		}
+		
+		boolean removed = false;
+		
+		Iterator<WorldEvent> iterator = _runningEvents.iterator();
+		while (iterator.hasNext())
+		{
+			WorldEvent worldEvent = iterator.next();
+			if (worldEvent.getState() == EventState.COMPLETE || worldEvent.getState() == EventState.CANCELLED)
+			{
+				HandlerList.unregisterAll(worldEvent);
+				iterator.remove();
+				
+				// If the event was cancelled, cleanup was already done.
+				if (worldEvent.getState() == EventState.COMPLETE)
+				{
+					worldEvent.cleanup();
+				}
+				
+				removed = true;
+			}
+		}
+		
+		if (removed && _runningEvents.size() == 0)
+		{
+			updateNextEventTime();
+		}
+
+		if (_runningEvents.size() == 0 && System.currentTimeMillis() >= _nextEventStart)
+		{
+			if (UtilServer.getPlayers().length > 0)
+			{
+				tryStartEvent();
+			}
+			else
+			{
+				updateNextEventTime();
+			}
+		}
+	}
+	
+	private void tryStartEvent()
+	{
+		WorldEventType[] types = WorldEventType.values();
+		WorldEventType type = types[_random.nextInt(types.length)];
+		Location location = _terrainFinder.findAreaInBorderlands(Bukkit.getWorlds().get(0), type.getAreaNeeded(), type.getAreaNeeded());
+		if (location != null)
+		{
+			initializeEvent(type.createInstance(this, location, _skillFactory));
+		}
+		else
+		{
+			// Try again in 5 minutes
+			_nextEventStart = System.currentTimeMillis() + (5 * 60 * 1000);
+		}
+	}
+	
+	private void initializeEvent(WorldEvent event)
+	{
+		if (event == null)
+		{
+			throw new RuntimeException("WorldEvent may not be null");
+		}
+		
+		event.loadMap();
+		event.start();
+		getPlugin().getServer().getPluginManager().registerEvents(event, getPlugin());
+		_runningEvents.add(event);
+	}
+
+	public WorldEvent startEventFromName(Location location, String name)
+	{
+		WorldEventType eventType = WorldEventType.valueOf(name);
+		if (eventType != null)
+		{
+			WorldEvent event = eventType.createInstance(this, location, _skillFactory);
+			initializeEvent(event);
+			return event;
+		}
+		
+		return null;
+	}
+	public WorldEvent startEventFromType(Location location, WorldEventType eventType)
+	{
+		if (eventType != null)
+		{
+			WorldEvent event = eventType.createInstance(this, location, _skillFactory);
+			initializeEvent(event);
+			return event;
+		}
+		
+		return null;
+	}
+	
+	public void clearEvents()
+	{
+		Iterator<WorldEvent> iterator = _runningEvents.iterator();
+		while (iterator.hasNext())
+		{
+			WorldEvent event = iterator.next();
+			if (event.getState() != EventState.COMPLETE) event.cancel();
+			HandlerList.unregisterAll(event);
+			iterator.remove();
+		}
+		
+		updateNextEventTime();
+	}
+	
+	public ClansManager getClans()
+	{
+		return _clansManager;
+	}
+	
+	public DamageManager getDamage()
+	{
+		return _damageManager;
+	}
+	
+	public LootManager getLoot()
+	{
+		return _lootManager;
+	}
+	
+	public EventTerrainFinder getTerrainFinder()
+	{
+		return _terrainFinder;
+	}
+	
+	private void updateNextEventTime()
+	{
+		// 45 Minutes + (0 - 15 Minutes)
+		long waitTime = (45 * 60 * 1000) + _random.nextInt(15 * 60 * 1000);
+		_nextEventStart = System.currentTimeMillis() + waitTime;
+	}
+	
+	@Override
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
+	{
+		List<String> output = new ArrayList<String>();
+		
+		Iterator<WorldEvent> iterator = _runningEvents.iterator();
+		while (iterator.hasNext())
+		{
+			WorldEvent event = iterator.next();
+			
+			if (event.getState() == EventState.LIVE)
+			{
+				output.add(" ");
+				output.add(C.cAqua + C.Bold + "Event");
+				
+				Location eventLocation = event.getCenterLocation();
+				String locationString = eventLocation.getBlockX() + ", " + eventLocation.getBlockY() + ", " + eventLocation.getBlockZ();
+				output.add("  " + C.cWhite + event.getName());
+				output.add("  " + C.cWhite + locationString);
+				
+				List<String> scoreboardLines = event.getLines(manager, player, out);
+				if (scoreboardLines != null)
+				{
+					output.addAll(scoreboardLines);
+				}
+				
+				break;
+			}
+		}
+		
+		return output;
+	}
+	
+	public BlockRestore getBlockRestore()
+	{
+		return _blockRestore;
+	}
+	
+	public List<WorldEvent> getEvents()
+	{
+		return _runningEvents;
+	}
+
+	/** I know this is a bad work around... sorry */
+	public void setFactory(SkillFactory skillManager)
+	{
+		_skillFactory = skillManager;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/WorldEventType.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/WorldEventType.java
new file mode 100644
index 000000000..3852f4451
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/WorldEventType.java
@@ -0,0 +1,73 @@
+package mineplex.game.clans.clans.worldevent;
+
+import java.lang.reflect.Constructor;
+
+import org.bukkit.Location;
+
+import mineplex.game.clans.clans.worldevent.kinghill.KingHill;
+import mineplex.game.clans.clans.worldevent.undead.UndeadCamp;
+import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+
+public enum WorldEventType
+{
+	// SLIME_KING("Slime King", SlimeBoss.class, 30),
+//	KING_HILL("King of The Hill", KingHill.class, 30),
+	UNDEAD_CAMP("Undead Camp", UndeadCamp.class, 30);// ,
+	// Golem("Iron Wizard", GolemBoss.class, 30);
+	
+	private String _name;
+	private Class<? extends WorldEvent> _clazz;
+	private int _areaNeeded;
+	
+	WorldEventType(String name, Class<? extends WorldEvent> clazz, int areaNeeded)
+	{
+		_name = name;
+		_clazz = clazz;
+		_areaNeeded = areaNeeded;
+	}
+	
+	public int getAreaNeeded()
+	{
+		return _areaNeeded;
+	}
+	
+	public WorldEvent createInstance(WorldEventManager eventManager, Location centerLocation, SkillFactory skillFactory)
+	{
+		WorldEvent worldEvent = null;
+		
+		try
+		{
+			for (Constructor<?> con : _clazz.getConstructors())
+			{
+				Class<?>[] classes = con.getParameterTypes();
+				
+				if (classes[0] == WorldEventManager.class)
+				{
+					if (classes.length == 3)
+					{
+						worldEvent = (WorldEvent) con.newInstance(eventManager, centerLocation, skillFactory);
+					}
+					else
+					{
+						worldEvent = (WorldEvent) con.newInstance(eventManager, centerLocation);
+					}
+				}
+				else if (classes.length == 4)
+				{
+					worldEvent = (WorldEvent) con.newInstance(eventManager.getDamage(), eventManager.getBlockRestore(), eventManager.getClans().getCondition(), centerLocation);
+				}
+				else
+				{
+					worldEvent = (WorldEvent) con.newInstance(eventManager.getDamage(), eventManager.getBlockRestore(), eventManager.getClans().getCondition(), eventManager.getClans().getProjectile(), centerLocation);
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
+		
+		return worldEvent;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/command/ClearCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/command/ClearCommand.java
new file mode 100644
index 000000000..18d845188
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/command/ClearCommand.java
@@ -0,0 +1,30 @@
+package mineplex.game.clans.clans.worldevent.command;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.game.clans.clans.worldevent.WorldEventManager;
+
+/**
+ * ClearCommand
+ *
+ * @author Shaun Bennett
+ * @since 6/9/2015
+ */
+public class ClearCommand extends CommandBase<WorldEventManager>
+{
+	public ClearCommand(WorldEventManager plugin)
+	{
+		super(plugin, Rank.EVENT, "clear");
+	}
+	
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		Plugin.clearEvents();
+		UtilPlayer.message(caller, F.main("Clans", "All world events cleared!"));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/command/StartCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/command/StartCommand.java
new file mode 100644
index 000000000..e808e9981
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/command/StartCommand.java
@@ -0,0 +1,46 @@
+package mineplex.game.clans.clans.worldevent.command;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.game.clans.clans.worldevent.WorldEventManager;
+import mineplex.game.clans.clans.worldevent.WorldEventType;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+
+public class StartCommand extends CommandBase<WorldEventManager>
+{
+	public StartCommand(WorldEventManager plugin)
+	{
+		super(plugin, Rank.EVENT, "start", "create");
+	}
+	
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		// start specific world event type
+		if (args != null && args.length == 1)
+		{
+			try
+			{
+				WorldEventType eventType = WorldEventType.valueOf(args[0]);
+				WorldEvent event = Plugin.startEventFromType(caller.getLocation(), eventType);
+				
+				if (event == null)
+				{
+					UtilPlayer.message(caller, F.main("WorldEvent", "Error whilst starting the world event you chose."));
+				}
+				else
+				{
+					UtilPlayer.message(caller, F.main("worldEvent", "Started WorldEvent " + F.elem(args[0]) + " at your current location"));
+				}
+			}
+			catch (IllegalArgumentException e)
+			{
+				UtilPlayer.message(caller, F.main("WorldEvent", "Could not find a WorldEvent with the name " + F.elem(args[0])));
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/command/WorldEventCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/command/WorldEventCommand.java
new file mode 100644
index 000000000..4512180ba
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/command/WorldEventCommand.java
@@ -0,0 +1,24 @@
+package mineplex.game.clans.clans.worldevent.command;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.MultiCommandBase;
+import mineplex.core.common.Rank;
+import mineplex.game.clans.clans.worldevent.WorldEventManager;
+
+public class WorldEventCommand extends MultiCommandBase<WorldEventManager>
+{
+	public WorldEventCommand(WorldEventManager plugin)
+	{
+		super(plugin, Rank.EVENT, "worldevent", "we", "event");
+		
+		AddCommand(new StartCommand(Plugin));
+		AddCommand(new ClearCommand(Plugin));
+	}
+	
+	@Override
+	protected void Help(Player caller, String[] args)
+	{
+	
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/kinghill/HillData.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/kinghill/HillData.java
new file mode 100644
index 000000000..7ed32b8b4
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/kinghill/HillData.java
@@ -0,0 +1,55 @@
+package mineplex.game.clans.clans.worldevent.kinghill;
+
+import java.io.File;
+import java.io.IOException;
+
+import mineplex.core.common.block.schematic.Schematic;
+import mineplex.core.common.block.schematic.UtilSchematic;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+
+import org.bukkit.Location;
+
+public class HillData
+{
+	private Schematic _schematic;
+	private int _hillX;
+	private int _hillY;
+	private int _hillZ;
+	private int _lengthX;
+	private int _lengthY;
+	private int _lengthZ;
+
+	public HillData(String fileName, int hillX, int hillY, int hillZ, int lengthX, int lengthY, int lengthZ) throws IOException
+	{
+		File file = new File("schematic" + File.separator + fileName);
+		System.out.println(file.getAbsolutePath());
+		_schematic = UtilSchematic.loadSchematic(file);
+		_hillX = hillX;
+		_hillY = hillY;
+		_hillZ = hillZ;
+		_lengthX = lengthX;
+		_lengthY = lengthY;
+		_lengthZ = lengthZ;
+	}
+
+	public Schematic getSchematic()
+	{
+		return _schematic;
+	}
+
+	public boolean isOnHill(Location location, Location eventLocation)
+	{
+		return location.getWorld().equals(eventLocation.getWorld()) && UtilMath.offset(location, eventLocation.clone().add(0, 12, 0)) <= 7.5;
+	}
+
+	public Location getHillCenter(Location eventLocation)
+	{
+		Location hill = eventLocation.clone();
+		hill.add(_hillX, _hillY, _hillZ);
+		hill.add(_lengthX / 2.0, _lengthY / 2.0, _lengthZ / 2.0);
+		return hill;
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/kinghill/KingHill.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/kinghill/KingHill.java
new file mode 100755
index 000000000..6d08c9e19
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/kinghill/KingHill.java
@@ -0,0 +1,187 @@
+package mineplex.game.clans.clans.worldevent.kinghill;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.scoreboard.ScoreboardManager;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.worldevent.WorldEventManager;
+import mineplex.game.clans.economy.GoldManager;
+import mineplex.minecraft.game.core.boss.EventMap;
+import mineplex.minecraft.game.core.boss.EventState;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+
+public class KingHill extends WorldEvent
+{
+	private static List<HillData> LOADED_HILLS = new ArrayList<HillData>();
+	
+	private static int GOLD_PER_TICK = 4;
+	
+	private ClanInfo _clanOnHill;
+	
+	static
+	{
+		// TODO load hills from schematic folder with extra hill data from a
+		// config file?
+		try
+		{
+			LOADED_HILLS.add(new HillData("ClansKOTH.schematic", 28, 28, 28, 5, 5, 5));
+		}
+		catch (IOException e)
+		{
+			e.printStackTrace();
+		}
+		
+	}
+	
+	private ClansManager _clansManager;
+	private Map<ClanInfo, CaptureData> _scoreMap;
+	private HillData _hill;
+	private long _nextLootDrop;
+	private int _lootDropCount;
+	
+	private long _lastGoldDrop;
+	private long _lastOnHillMessage;
+	private long _goldDrops;
+	
+	public KingHill(WorldEventManager eventManager, Location centerLocation)
+	{
+		super(eventManager.getClans().getDisguiseManager(), eventManager.getClans().getProjectile(), eventManager.getDamage(), eventManager.getBlockRestore(), eventManager.getClans().getCondition(), "King of the Hill", centerLocation);
+		_clansManager = eventManager.getClans();
+		_scoreMap = new HashMap<ClanInfo, CaptureData>();
+		_hill = LOADED_HILLS.get(0);
+		_nextLootDrop = System.currentTimeMillis() + getRandomRange(300000, 600000);
+		
+	}
+	
+	@Override
+	protected void customStart()
+	{
+		setMap(new EventMap(_hill.getSchematic(), getCenterLocation()), new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				setState(EventState.LIVE);
+			}
+		});
+	}
+	
+	@Override
+	protected void customCancel()
+	{
+		System.out.println("Custom Cancel - King Hill");
+	}
+	
+	@Override
+	protected void customTick()
+	{
+		tickHill();
+		
+		if (getState() == EventState.PREPARE)
+		{
+			System.out.println("Constructed " + getName() + " at " + UtilWorld.locToStrClean(getCenterLocation()) + ".");
+			announceStart();
+			setState(EventState.LIVE);
+		}
+		
+		if (System.currentTimeMillis() > _nextLootDrop)
+		{
+			// Drop Loot!
+			_lootDropCount++;
+			_nextLootDrop = System.currentTimeMillis() + getRandomRange(300000, 600000);
+			
+			if (_lootDropCount >= 4) setState(EventState.COMPLETE);
+		}
+	}
+	
+	private void tickHill()
+	{
+		int clanCount = 0;
+		ClanInfo lastClan = null;
+		
+		for (Player player : UtilServer.getPlayers())
+		{
+			if (_hill.isOnHill(player.getLocation(), getCenterLocation()))
+			{
+				ClanInfo playerClan = _clansManager.getClan(player);
+				if (playerClan != null && !playerClan.equals(lastClan))
+				{
+					clanCount++;
+					lastClan = playerClan;
+				}
+				
+				updateLastActive();
+			}
+		}
+		
+		if (clanCount == 1 && lastClan != null)
+		{
+			_clanOnHill = lastClan;
+			
+			CaptureData capData = _scoreMap.get(lastClan);
+			if (capData == null)
+			{
+				capData = new CaptureData();
+				_scoreMap.put(lastClan, capData);
+			}
+			capData.TicksOnHill++;
+			
+			if (System.currentTimeMillis() - _lastGoldDrop > 20000)
+			{
+				_goldDrops = 1;
+				_lastGoldDrop = System.currentTimeMillis();
+			}
+			
+			if (_goldDrops > 0 && _goldDrops < 200)
+			{
+				GoldManager.getInstance().dropGold(getCenterLocation().clone().add(0, 13, 0), GOLD_PER_TICK);
+				_goldDrops++;
+			}
+			else
+			{
+				_goldDrops = 0;
+			}
+			
+			if (System.currentTimeMillis() - _lastOnHillMessage > 60000)
+			{
+				Bukkit.broadcastMessage(F.main("Hill", F.elem(lastClan.getName()) + " own the hill (" + F.time(UtilTime.MakeStr(capData.TicksOnHill * 50)) + ")"));
+				_lastOnHillMessage = System.currentTimeMillis();
+			}
+		}
+		else
+		{
+			_clanOnHill = null;
+		}
+	}
+	
+	@Override
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
+	{
+		List<String> list = new ArrayList<String>(1);
+		
+		if (_clanOnHill != null && _scoreMap.containsKey(_clanOnHill))
+		{
+			list.add("  " + _clanOnHill.getName() + " are on the Hill");
+		}
+		
+		return list;
+	}
+	
+	private static class CaptureData
+	{
+		public int TicksOnHill;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/CampSize.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/CampSize.java
new file mode 100644
index 000000000..e6a8d6ca1
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/CampSize.java
@@ -0,0 +1,84 @@
+package mineplex.game.clans.clans.worldevent.undead;
+
+import mineplex.core.common.util.UtilMath;
+
+public enum CampSize
+{
+	SMALL("Undead Outpost", 15, 0, 1),
+
+	MEDIUM("Undead Village", 20, 10, 2),
+
+	LARGE("Undead City", 30, 20, 3);
+
+	// Base Values
+	private static final int HUT_MIN = 4;
+	private static final int HUT_MAX = 8;
+	private static final int TOWER_MIN = 4;
+	private static final int TOWER_MAX = 8;
+	private static final int POLE_MIN = 10;
+	private static final int POLE_MAX = 20;
+	private static final int UNDEAD_MIN = 10;
+	private static final int UNDEAD_MAX = 20;
+
+	private String _name;
+	private int _areaNeeded;
+	private int _playersNeeded;
+	private int _modValue;
+
+	CampSize(String name, int areaNeeded, int playersNeeded, int modValue)
+	{
+		_name = name;
+		_areaNeeded = areaNeeded;
+		_playersNeeded = playersNeeded;
+		_modValue = modValue;
+	}
+
+	public String getName()
+	{
+		return _name;
+	}
+
+	public int getAreaNeeded()
+	{
+		return _areaNeeded;
+	}
+
+	public int getPlayersNeeded()
+	{
+		return _playersNeeded;
+	}
+
+	public int generateHutCount()
+	{
+		return _modValue * UtilMath.rRange(HUT_MIN, HUT_MAX);
+	}
+
+	public int generateTowerCount()
+	{
+		return _modValue * UtilMath.rRange(TOWER_MIN, TOWER_MAX);
+	}
+
+	public int generatePoleCount()
+	{
+		return _modValue * UtilMath.rRange(POLE_MIN, POLE_MAX);
+	}
+
+	public int generateUndeadCount()
+	{
+		return _modValue * UtilMath.rRange(UNDEAD_MIN, UNDEAD_MAX);
+	}
+
+	public static CampSize getCampSize(int playerCount)
+	{
+		CampSize campSize = CampSize.SMALL;
+
+		for (CampSize c : values())
+		{
+			if (playerCount >= c.getPlayersNeeded() && (campSize == null || c.getPlayersNeeded() > campSize.getPlayersNeeded()))
+				campSize = c;
+		}
+
+		return campSize;
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/CampType.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/CampType.java
new file mode 100644
index 000000000..3d7adeb54
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/CampType.java
@@ -0,0 +1,45 @@
+package mineplex.game.clans.clans.worldevent.undead;
+
+import org.bukkit.Material;
+import org.bukkit.material.MaterialData;
+
+public enum CampType
+{
+	OAK(new MaterialData(Material.LOG, (byte) 0), new MaterialData(Material.WOOD, (byte) 0), Material.ENDER_CHEST, Material.FURNACE),
+	SPRUCE(new MaterialData(Material.LOG, (byte) 1), new MaterialData(Material.WOOD, (byte) 1), Material.ENDER_CHEST, Material.FURNACE),
+	BIRCH(new MaterialData(Material.LOG, (byte) 2), new MaterialData(Material.WOOD, (byte) 2), Material.ENDER_CHEST, Material.FURNACE),
+	JUNGLE(new MaterialData(Material.LOG, (byte) 3), new MaterialData(Material.WOOD, (byte) 3), Material.ENDER_CHEST, Material.FURNACE);
+
+	private MaterialData _log;
+	private MaterialData _wood;
+	private Material _chest;
+	private Material _furance;
+
+	CampType(MaterialData log, MaterialData wood, Material chest, Material furnace)
+	{
+		_log = log;
+		_wood = wood;
+		_chest = chest;
+		_furance = furnace;
+	}
+
+	public MaterialData getLog()
+	{
+		return _log;
+	}
+
+	public MaterialData getWood()
+	{
+		return _wood;
+	}
+
+	public Material getFurnace()
+	{
+		return _furance;
+	}
+
+	public Material getChest()
+	{
+		return _chest;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/UndeadCamp.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/UndeadCamp.java
new file mode 100644
index 000000000..0c98c5f45
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/UndeadCamp.java
@@ -0,0 +1,510 @@
+package mineplex.game.clans.clans.worldevent.undead;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.worldevent.WorldEventManager;
+import mineplex.game.clans.clans.worldevent.undead.creature.UndeadArcher;
+import mineplex.game.clans.clans.worldevent.undead.creature.UndeadWarrior;
+import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.core.boss.EventState;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+
+public class UndeadCamp extends WorldEvent
+{
+	private int _hutLeft = 0;
+	private int _poleLeft = 0;
+	private int _towerLeft = 0;
+	private int _undeadCount = 0;
+	
+	private final CampType _campType;
+	private final CampSize _campSize;
+	private Set<Block> _containers;
+	private WorldEventManager _eventManager;
+	
+	private SkillFactory _skillFactory;
+	
+	public UndeadCamp(WorldEventManager eventManager, Location centerLocation, SkillFactory skillFactory)
+	{
+		super(eventManager.getClans().getDisguiseManager(), eventManager.getClans().getProjectile(), eventManager.getDamage(), eventManager.getBlockRestore(), eventManager.getClans().getCondition(), "Undead Camp", centerLocation);
+		
+		_eventManager = eventManager;
+		_campSize = CampSize.getCampSize(UtilServer.getPlayers().length);
+		_campType = CampType.values()[getRandom().nextInt(CampType.values().length)];
+		_containers = new HashSet<Block>();
+		
+		_hutLeft = _campSize.generateHutCount();
+		_poleLeft = _campSize.generatePoleCount();
+		_towerLeft = _campSize.generateTowerCount();
+		_undeadCount = _campSize.generateUndeadCount();
+		
+		setName(_campSize.getName());
+		
+		_skillFactory = skillFactory;
+	}
+	
+	public WorldEventManager getEventManager()
+	{
+		return _eventManager;
+	}
+	
+	@Override
+	protected void customStart()
+	{
+	
+	}
+	
+	@Override
+	protected void customTick()
+	{
+		if (getState() == EventState.PREPARE)
+		{
+			if (_hutLeft > 0)
+				createHut();
+			else if (_towerLeft > 0)
+				createTower();
+			else if (_poleLeft > 0)
+				createLamp();
+			else if (getCreatures().size() < _undeadCount)
+				createUndead();
+			else
+			{
+				System.out.println("Constructed " + getName() + " at " + UtilWorld.locToStrClean(getCenterLocation()) + ".");
+				announceStart();
+				setState(EventState.LIVE);
+			}
+		}
+	}
+	
+	private void createHut()
+	{
+		int hutX = UtilMath.r(4) + 2;
+		int hutZ = UtilMath.r(4) + 2;
+		int hutY = UtilMath.r(2) + 3;
+		
+		int buffer = Math.max(hutX, hutZ) / 2 + 1;
+		
+		Location loc = getEventManager().getTerrainFinder().locateSpace(getCenterLocation(), _campSize.getAreaNeeded() - buffer, hutX, hutY + 2, hutZ, true, false, getBlocks().getChangedBlocks());
+		
+		if (loc == null) return;
+		
+		boolean xWall = (Math.random() > 0.5);
+		boolean zWall = (Math.random() > 0.5);
+		
+		// Base
+		for (int x = -hutX; x <= hutX; x++)
+			for (int z = -hutZ; z <= hutZ; z++)
+			{
+				Block block = loc.getBlock().getRelative(x, -1, z);
+				
+				// Space
+				for (int y = 0; y <= hutY; y++)
+					setBlock(loc.getBlock().getRelative(x, y, z), 0, (byte) 0);
+					
+				// Walls
+				if (!xWall && x == -hutX || xWall && x == hutX || !zWall && z == -hutZ || zWall && z == hutZ) for (int y = 0; y <= hutY; y++)
+					setBlock(loc.getBlock().getRelative(x, y, z), _campType.getWood().getItemTypeId(), _campType.getWood().getData());
+					
+				// Corners
+				if (Math.abs(x) == hutX && Math.abs(z) == hutZ)
+				{
+					setBlock(block, _campType.getLog().getItemTypeId(), _campType.getLog().getData());
+					for (int y = 0; y <= hutY; y++)
+						setBlock(loc.getBlock().getRelative(x, y, z), _campType.getLog().getItemTypeId(), _campType.getLog().getData());
+						
+					// Support Stands
+					boolean support = true;
+					Block below = block;
+					while (support)
+					{
+						below = below.getRelative(BlockFace.DOWN);
+						
+						if (!UtilBlock.fullSolid(below) || below.isLiquid())
+							setBlock(below, _campType.getLog().getItemTypeId(), _campType.getLog().getData());
+							
+						else
+							support = false;
+					}
+				}
+				
+				// Floor & Roof
+				else
+				{
+					setBlock(block, _campType.getWood().getItemTypeId(), _campType.getWood().getData());
+					setBlock(loc.getBlock().getRelative(x, hutY - 1, z), 126, (byte) 8);
+				}
+				
+				// Insides
+				if (Math.abs(x) != hutX && Math.abs(z) != hutZ)
+				{
+					if (Math.random() > 0.90)
+					{
+						addChest(block.getRelative(BlockFace.UP));
+					}
+					else if (Math.random() > 0.95)
+					{
+						addFurnace(block.getRelative(BlockFace.UP));
+					}
+					else if (Math.random() > 0.95)
+					{
+						registerCreature(new UndeadWarrior(this, block.getRelative(BlockFace.UP).getLocation().add(0.5, 0.5, 0.5)));
+					}
+				}
+			}
+			
+		_hutLeft--;
+	}
+	
+	private void addChest(Block chest)
+	{
+		Block side;
+		int adj = 0;
+		
+		side = chest.getRelative(BlockFace.NORTH);
+		if (side.getType() == Material.CHEST)
+		{
+			adj++;
+			if (side.getRelative(BlockFace.NORTH).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.SOUTH).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.EAST).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.WEST).getType() == Material.CHEST) return;
+		}
+		
+		side = chest.getRelative(BlockFace.SOUTH);
+		if (side.getType() == Material.CHEST)
+		{
+			adj++;
+			if (side.getRelative(BlockFace.NORTH).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.SOUTH).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.EAST).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.WEST).getType() == Material.CHEST) return;
+		}
+		
+		side = chest.getRelative(BlockFace.EAST);
+		if (side.getType() == Material.CHEST)
+		{
+			adj++;
+			if (side.getRelative(BlockFace.NORTH).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.SOUTH).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.EAST).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.WEST).getType() == Material.CHEST) return;
+		}
+		
+		side = chest.getRelative(BlockFace.WEST);
+		if (side.getType() == Material.CHEST)
+		{
+			adj++;
+			if (side.getRelative(BlockFace.NORTH).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.SOUTH).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.EAST).getType() == Material.CHEST) return;
+			if (side.getRelative(BlockFace.WEST).getType() == Material.CHEST) return;
+		}
+		
+		if (adj > 1) return;
+		
+		setBlock(chest, 130, (byte) (UtilMath.r(4) + 2));
+		_containers.add(chest);
+	}
+	
+	private void addFurnace(Block furnace)
+	{
+		Block side;
+		int adj = 0;
+		
+		side = furnace.getRelative(BlockFace.NORTH);
+		if (side.getType() == Material.FURNACE)
+		{
+			adj++;
+			if (side.getRelative(BlockFace.NORTH).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.SOUTH).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.EAST).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.WEST).getType() == Material.FURNACE) return;
+		}
+		
+		side = furnace.getRelative(BlockFace.SOUTH);
+		if (side.getType() == Material.FURNACE)
+		{
+			adj++;
+			if (side.getRelative(BlockFace.NORTH).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.SOUTH).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.EAST).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.WEST).getType() == Material.FURNACE) return;
+		}
+		
+		side = furnace.getRelative(BlockFace.EAST);
+		if (side.getType() == Material.FURNACE)
+		{
+			adj++;
+			if (side.getRelative(BlockFace.NORTH).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.SOUTH).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.EAST).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.WEST).getType() == Material.FURNACE) return;
+		}
+		
+		side = furnace.getRelative(BlockFace.WEST);
+		if (side.getType() == Material.FURNACE)
+		{
+			adj++;
+			if (side.getRelative(BlockFace.NORTH).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.SOUTH).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.EAST).getType() == Material.FURNACE) return;
+			if (side.getRelative(BlockFace.WEST).getType() == Material.FURNACE) return;
+		}
+		
+		if (adj > 1) return;
+		
+		setBlock(furnace, 61, (byte) 0);
+		_containers.add(furnace);
+	}
+	
+	private void createUndead()
+	{
+		Location loc = getEventManager().getTerrainFinder().locateSpace(getCenterLocation(), _campSize.getAreaNeeded(), 0, 3, 0, false, true, getBlocks().getChangedBlocks());
+		
+		if (loc == null) return;
+		
+		registerCreature(new UndeadWarrior(this, loc.add(0.5, 0.5, 0.5)));
+		
+		// _poleLeft--;
+		// ResetIdleTicks();
+	}
+	
+	private void createTower()
+	{
+		int towerX = UtilMath.r(3) + 1;
+		int towerZ = UtilMath.r(3) + 1;
+		int towerY = UtilMath.r(4) + 3;
+		
+		int buffer = Math.max(towerX, towerZ) / 2 + 1;
+		
+		Location loc = getEventManager().getTerrainFinder().locateSpace(getCenterLocation(), _campSize.getAreaNeeded() - buffer, towerX, towerY + 2, towerZ, false, true, getBlocks().getChangedBlocks());
+		
+		if (loc == null) return;
+		
+		int ladder = UtilMath.r(4);
+		
+		// Base
+		for (int x = -towerX; x <= towerX; x++)
+			for (int z = -towerZ; z <= towerZ; z++)
+			{
+				Block block = loc.getBlock().getRelative(x, towerY, z);
+				
+				// Space
+				for (int y = 0; y <= towerY; y++)
+					setBlock(loc.getBlock().getRelative(x, y, z), 0, (byte) 0);
+					
+				// Corner
+				if (Math.abs(x) == towerX && Math.abs(z) == towerZ)
+				{
+					setBlock(block, _campType.getWood().getItemTypeId(), _campType.getWood().getData());
+					setBlock(block.getRelative(BlockFace.UP), 85, (byte) 0);
+					
+					// Support Stands
+					boolean support = true;
+					Block below = block;
+					while (support)
+					{
+						below = below.getRelative(BlockFace.DOWN);
+						
+						if (!UtilBlock.fullSolid(below) && !below.isLiquid())
+							setBlock(below, 85, (byte) 0);
+							
+						else if (below.isLiquid())
+							setBlock(below, _campType.getLog().getItemTypeId(), _campType.getLog().getData());
+							
+						else
+							support = false;
+					}
+					
+					// Ladder
+					if (ladder == 0 && x == -towerX && z == -towerZ || ladder == 1 && x == -towerX && z == towerZ || ladder == 2 && x == towerX && z == -towerZ || ladder == 3 && x == towerX && z == towerZ)
+					{
+						boolean laddering = true;
+						below = block;
+						while (laddering)
+						{
+							below = below.getRelative(BlockFace.DOWN);
+							
+							if (!UtilBlock.fullSolid(below))
+							{
+								setBlock(below, _campType.getWood().getItemTypeId(), _campType.getWood().getData());
+								
+								if (ladder == 0)
+									setBlock(below.getRelative(-1, 0, 0), 65, (byte) 4);
+								else if (ladder == 1)
+									setBlock(below.getRelative(-1, 0, 0), 65, (byte) 4);
+								else if (ladder == 2)
+									setBlock(below.getRelative(1, 0, 0), 65, (byte) 5);
+								else if (ladder == 3) setBlock(below.getRelative(1, 0, 0), 65, (byte) 5);
+							}
+							
+							else
+								laddering = false;
+						}
+					}
+				}
+				
+				// Platform
+				else
+					setBlock(block, 126, (byte) 8);
+					
+				// Features
+				if (Math.random() > 0.95)
+					addChest(block.getRelative(BlockFace.UP));
+					
+				else if (Math.random() > 0.95) registerCreature(new UndeadArcher(this, block.getRelative(BlockFace.UP).getLocation().add(0.5, 0.5, 0.5), _skillFactory));
+			}
+			
+		_towerLeft--;
+	}
+	
+	private void createLamp()
+	{
+		Location loc = getEventManager().getTerrainFinder().locateSpace(getCenterLocation(), _campSize.getAreaNeeded(), 0, 4, 0, false, true, getBlocks().getChangedBlocks());
+		
+		if (loc == null) return;
+		
+		setBlock(loc.getBlock(), 85, (byte) 0);
+		setBlock(loc.getBlock().getRelative(BlockFace.UP), 85, (byte) 0);
+		setBlock(loc.getBlock().getRelative(BlockFace.UP).getRelative(BlockFace.UP), 50, (byte) 0);
+		
+		_poleLeft--;
+	}
+	
+	private void openChest(Block block)
+	{
+		_containers.remove(block);
+		
+		// Effect
+		block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, Material.ENDER_CHEST.getId());
+		
+		setBlock(block, Material.AIR);
+		
+		// Loot
+		int count = 1 + UtilMath.r(3);
+		for (int i = 0; i < count; i++)
+		{
+			getEventManager().getLoot().dropCommon(block.getLocation().add(0.5, 0.5, 0.5));
+		}
+	}
+	
+	private void openFurnace(Block block)
+	{
+		_containers.remove(block);
+		
+		block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, Material.FURNACE.getId());
+		
+		setBlock(block, Material.AIR);
+		
+		double random = Math.random();
+		
+		if (random < .25)
+		{
+			for (int i = 0; i < UtilMath.r(25); i++)
+			{
+				block.getWorld().dropItemNaturally(block.getLocation().add(0.5, 0.5, 0.5), ItemStackFactory.Instance.CreateStack(Material.IRON_INGOT));
+			}
+		}
+		else if (random < .5)
+		{
+			for (int i = 0; i < UtilMath.r(25); i++)
+			{
+				block.getWorld().dropItemNaturally(block.getLocation().add(0.5, 0.5, 0.5), ItemStackFactory.Instance.CreateStack(Material.GOLD_INGOT));
+			}
+		}
+		else if (random < .75)
+		{
+			for (int i = 0; i < UtilMath.r(25); i++)
+			{
+				block.getWorld().dropItemNaturally(block.getLocation().add(0.5, 0.5, 0.5), ItemStackFactory.Instance.CreateStack(Material.DIAMOND));
+			}
+		}
+		else if (random < 1)
+		{
+			for (int i = 0; i < UtilMath.r(25); i++)
+			{
+				block.getWorld().dropItemNaturally(block.getLocation().add(0.5, 0.5, 0.5), ItemStackFactory.Instance.CreateStack(Material.LEATHER));
+			}
+		}
+	}
+	
+	@EventHandler
+	public void checkEnd(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC) return;
+		
+		// Remove any broken chests/furnaces
+		Iterator<Block> it = _containers.iterator();
+		while (it.hasNext())
+		{
+			Block block = it.next();
+			
+			if (block.getType() != _campType.getChest() && block.getType() != _campType.getFurnace())
+			{
+				it.remove();
+			}
+		}
+		
+		if (_containers.size() == 0)
+		{
+			triggerEnd();
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void onChestOpen(PlayerInteractEvent event)
+	{
+		Block block = event.getClickedBlock();
+		if (_containers.contains(block))
+		{
+			event.setCancelled(true);
+			
+			if (block.getType() == Material.ENDER_CHEST)
+			{
+				if (!Recharge.Instance.use(event.getPlayer(), "Loot Chest", 60000, true, false))
+				{
+					return;
+				}
+				
+				openChest(block);
+				
+				updateLastActive();
+				
+				UtilPlayer.message(event.getPlayer(), F.main(getName(), "You smash open an " + F.elem("Undead Chest") + "!"));
+			}
+			else if (block.getType() == Material.FURNACE)
+			{
+				if (!Recharge.Instance.use(event.getPlayer(), "Loot Furnace", 60000, true, false))
+				{
+					return;
+				}
+				
+				openFurnace(block);
+				
+				updateLastActive();
+				
+				UtilPlayer.message(event.getPlayer(), F.main(getName(), "You smash open an " + F.elem("Undead Furnace") + "!"));
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/creature/UndeadArcher.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/creature/UndeadArcher.java
new file mode 100644
index 000000000..657b33af4
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/creature/UndeadArcher.java
@@ -0,0 +1,173 @@
+package mineplex.game.clans.clans.worldevent.undead.creature;
+
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.Skeleton;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityShootBowEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+public class UndeadArcher extends EventCreature<Skeleton>
+{
+	public static final int BARBED_LEVEL = 1;
+	
+	private HashSet<Projectile> _arrows = new HashSet<Projectile>();
+	
+	private SkillFactory _skillFactory;
+	
+	public UndeadArcher(WorldEvent event, Location spawnLocation, SkillFactory skillFactory)
+	{
+		super(event, spawnLocation, "Undead Archer", true, 100, Skeleton.class);
+		
+		_skillFactory = skillFactory;
+	}
+	
+	@Override
+	protected void spawnCustom()
+	{
+		Skeleton entity = getEntity();
+		EntityEquipment eq = entity.getEquipment();
+		eq.setItemInHand(new ItemStack(Material.BOW));
+		eq.setHelmet(new ItemStack(Material.CHAINMAIL_HELMET));
+		eq.setChestplate(new ItemStack(Material.CHAINMAIL_CHESTPLATE));
+		eq.setLeggings(new ItemStack(Material.CHAINMAIL_LEGGINGS));
+		eq.setBoots(new ItemStack(Material.CHAINMAIL_BOOTS));
+		entity.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 999999, 0));
+	}
+	
+	@Override
+	public void dieCustom()
+	{
+		if (Math.random() > 0.97)
+		{
+			getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.CHAINMAIL_HELMET));
+		}
+		
+		if (Math.random() > 0.97)
+		{
+			getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.CHAINMAIL_CHESTPLATE));
+		}
+		
+		if (Math.random() > 0.97)
+		{
+			getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.CHAINMAIL_LEGGINGS));
+		}
+		
+		if (Math.random() > 0.97)
+		{
+			getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.CHAINMAIL_BOOTS));
+		}
+		
+		if (Math.random() > 0.90)
+		{
+			getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.BOW));
+		}
+		
+		getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.ARROW, UtilMath.r(12) + 1));
+		
+		for (int i = 0; i < UtilMath.r(5) + 1; i++)
+		{
+			getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.EMERALD));
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void bowShoot(EntityShootBowEvent event)
+	{
+		if (BARBED_LEVEL == 0)
+		{
+			return;
+		}
+		
+		if (!(event.getProjectile() instanceof Projectile))
+		{
+			return;
+		}
+		
+		_arrows.add((Projectile) event.getProjectile());
+	}
+	
+	@EventHandler(priority = EventPriority.HIGH)
+	public void damage(CustomDamageEvent event)
+	{
+		if (event.IsCancelled())
+		{
+			return;
+		}
+		
+		if (event.GetCause() != DamageCause.PROJECTILE)
+		{
+			return;
+		}
+		
+		Projectile projectile = event.GetProjectile();
+		LivingEntity damagee = event.GetDamageeEntity();
+		Player damager = event.GetDamagerPlayer(true);
+		
+		if (projectile == null)
+		{
+			return;
+		}
+		
+		if (damagee == null)
+		{
+			return;
+		}
+		
+		if (damager == null)
+		{
+			return;
+		}
+		
+		// Level
+		if (BARBED_LEVEL == 0)
+		{
+			return;
+		}
+		
+		Player damageePlayer = event.GetDamageePlayer();
+		
+		if (damageePlayer != null)
+		{
+			damageePlayer.setSprinting(false);
+		}
+		
+		// Damage
+		event.AddMod(damager.getName(), "Barbed Arrows", 0, false);
+		
+		// Condition
+		_skillFactory.Condition().Factory().Slow("Barbed Arrows", damagee, damager, (projectile.getVelocity().length() / 3) * (2 + BARBED_LEVEL), 0, false, true, true, true);
+	}
+	
+	@EventHandler
+	public void clean(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC) return;
+		
+		for (Iterator<Projectile> arrowIterator = _arrows.iterator(); arrowIterator.hasNext();)
+		{
+			Projectile arrow = arrowIterator.next();
+			
+			if (arrow.isDead() || !arrow.isValid()) arrowIterator.remove();
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/creature/UndeadWarrior.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/creature/UndeadWarrior.java
new file mode 100644
index 000000000..6dc3c7b3c
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/creature/UndeadWarrior.java
@@ -0,0 +1,93 @@
+package mineplex.game.clans.clans.worldevent.undead.creature;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Zombie;
+import org.bukkit.event.EventHandler;
+import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+public class UndeadWarrior extends EventCreature<Zombie>
+{
+	public UndeadWarrior(WorldEvent event, Location spawnLocation)
+	{
+		super(event, spawnLocation, "Undead Warrior", true, 100, Zombie.class);
+	}
+
+	@Override
+	protected void spawnCustom()
+	{
+		Zombie entity = getEntity();
+		EntityEquipment eq = entity.getEquipment();
+		eq.setHelmet(new ItemStack(Material.IRON_HELMET));
+		eq.setChestplate(new ItemStack(Material.IRON_CHESTPLATE));
+		eq.setLeggings(new ItemStack(Material.IRON_LEGGINGS));
+		eq.setBoots(new ItemStack(Material.IRON_BOOTS));
+		eq.setItemInHand(new ItemStack(Material.STONE_SWORD));
+		eq.setItemInHandDropChance(0.f);
+		entity.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 999999, 0));
+	}
+
+	@Override
+	public void dieCustom()
+	{
+		if (Math.random() > 0.97)
+			getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.IRON_HELMET));
+
+		if (Math.random() > 0.97)
+			getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.IRON_CHESTPLATE));
+
+		if (Math.random() > 0.97)
+			getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.IRON_LEGGINGS));
+
+		if (Math.random() > 0.97)
+			getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.IRON_BOOTS));
+
+		for (int i=0 ; i<UtilMath.r(5) + 1 ; i++)
+			getEntity().getWorld().dropItem(getEntity().getLocation(), new org.bukkit.inventory.ItemStack(Material.EMERALD));
+	}
+
+	@EventHandler
+	public void leap(UpdateEvent event)
+	{
+		if (getEntity() == null)
+			return;
+
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		if (Math.random() < 0.9)
+			return;
+
+		Zombie zombie = getEntity();
+
+		if (zombie.getTarget() == null)
+			return;
+
+		double dist = UtilMath.offset(zombie.getTarget(), zombie);
+
+		if (dist <= 3 || dist > 16)
+			return;
+
+
+		double power = 0.8 + (1.2 * ((dist-3)/13d));
+
+		//Leap
+		UtilAction.velocity(zombie, UtilAlg.getTrajectory(zombie, zombie.getTarget()),
+				power, false, 0, 0.2, 1, true);
+
+		//Effect
+		zombie.getWorld().playSound(zombie.getLocation(), Sound.ZOMBIE_HURT, 1f, 2f);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GemTransfer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GemTransfer.java
new file mode 100644
index 000000000..c0e12f9df
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GemTransfer.java
@@ -0,0 +1,51 @@
+package mineplex.game.clans.economy;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.bukkit.entity.Player;
+
+import mineplex.serverdata.data.Data;
+
+public class GemTransfer implements Data
+{
+	private static DateFormat dateFormatter = new SimpleDateFormat("dd/MM/yyyy");
+	
+	private String _playerName;
+	private Date _date;
+	
+	public GemTransfer(String playerName)
+	{
+		_playerName = playerName;
+		_date = new Date();
+	}
+	
+	public boolean transferWasToday()
+	{
+		return currentDate().before(_date);
+	}
+	
+	@Override
+	public String getDataId()
+	{
+		return _playerName;
+	}
+	
+	/**
+	 * @return the current date, with hours/minutes/seconds defaulted to 00:00, 12:00am of the
+	 * current day.
+	 */
+	public static Date currentDate()
+	{
+		Date current = new Date();
+		
+		try
+		{
+			return dateFormatter.parse(dateFormatter.format(current));
+		}
+		catch (Exception exception) { }
+		
+		return null;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
new file mode 100644
index 000000000..66261b6ad
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
@@ -0,0 +1,322 @@
+package mineplex.game.clans.economy;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.metadata.FixedMetadataValue;
+import org.bukkit.metadata.MetadataValue;
+import org.bukkit.util.Vector;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.donation.Donor;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.items.economy.GoldToken;
+import mineplex.game.clans.shop.bank.BankShop;
+
+public class GoldManager extends MiniPlugin
+{
+	public static final double GEM_CONVERSION_RATE = 32;	// The number of gold coins when converted from a single gem
+	
+	public static final double DEATH_TAX = 0.04d;		// Percentage of gold lost on death
+	public static final String META_STRING = "clans.goldAmount";
+	
+	private static GoldManager _instance;
+	public static GoldManager getInstance() { return _instance; }
+	
+	private DonationManager _donationManager;
+	private TransferTracker _transferTracker;
+	private Set<Item> _itemSet;
+	private Map<Player, Integer> _playerPickupMap;
+	private BankShop _bankShop;
+	
+	public GoldManager(ClansManager plugin, CoreClientManager clientManager, DonationManager donationManager) 
+	{
+		super("Clans Gold", plugin.getPlugin());
+		
+		_instance = this;
+		_donationManager = donationManager;
+		_transferTracker = new TransferTracker();
+		_itemSet = new HashSet<Item>();
+		_playerPickupMap = new HashMap<Player, Integer>();
+		_bankShop = new BankShop(plugin, clientManager, donationManager);
+	}
+
+	@EventHandler
+	public void onPlayerDeath(PlayerDeathEvent event)
+	{
+		final Player player = event.getEntity();
+		final Player killer = player.getKiller();
+		
+		int gold = getGold(player);
+		final int droppedGold = (int) (gold * DEATH_TAX);
+		final Location deathLocation = player.getLocation();
+		
+		if (droppedGold > 0)
+		{
+			deductGold(new Callback<Boolean>()
+			{
+				public void run(Boolean success)
+				{
+					runSync(new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							GoldManager.notify(player, "You dropped " + F.elem(droppedGold + "") + " gold on your death!");
+
+							dropGold(deathLocation, droppedGold);
+						}
+					});
+//					if (killer != null)
+//					{
+//						addGold(killer, droppedGold);
+//						GoldManager.notify(killer, String.format("You looted %d gold off of %s's corpse!", droppedGold, player.getName()));
+//					}
+				}
+			}, player, droppedGold);
+		}
+	}
+	
+	@EventHandler
+	public void playerCmd(PlayerCommandPreprocessEvent event)
+	{
+		if (event.getMessage().startsWith("/gold"))
+		{
+			notify(event.getPlayer(), "Your Balance is " + C.cYellow + getGold(event.getPlayer()) + "g");
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler
+	public void onPickup(PlayerPickupItemEvent event)
+	{
+		if (_itemSet.contains(event.getItem()))
+		{
+			event.setCancelled(true);
+
+			int goldAmount = 1;
+			List<MetadataValue> meta = event.getItem().getMetadata(META_STRING);
+			if (meta != null && meta.size() == 1)
+			{
+				goldAmount = meta.get(0).asInt();
+			}
+
+			event.getItem().remove();
+			event.getPlayer().playSound(event.getPlayer().getEyeLocation(), Sound.ORB_PICKUP, 1F, 2F);
+			addGold(event.getPlayer(), goldAmount);
+
+			int pickupMapGold = goldAmount;
+			if (_playerPickupMap.containsKey(event.getPlayer()))
+				pickupMapGold += _playerPickupMap.get(event.getPlayer());
+
+			_playerPickupMap.put(event.getPlayer(), pickupMapGold);
+		}
+	}
+
+	@EventHandler
+	public void notifyPickup(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+			return;
+
+		for (Map.Entry<Player, Integer> entry : _playerPickupMap.entrySet())
+		{
+			if (entry.getKey().isOnline())
+			{
+				notify(entry.getKey(), "You picked up " + F.elem(entry.getValue() + " gold"));
+			}
+		}
+
+		_playerPickupMap.clear();
+	}
+
+	@EventHandler
+	public void cleanItems(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC) return;
+
+		Iterator<Item> itemIterator = _itemSet.iterator();
+
+		while (itemIterator.hasNext())
+		{
+			Item item = itemIterator.next();
+
+			if (!item.isValid() || item.getTicksLived() >= 12000) // 10 minutes
+			{
+				item.remove();
+				itemIterator.remove();
+			}
+		}
+	}
+	
+	public int getGold(Player player)
+	{
+		return getDonor(player).getGold();
+	}
+	
+	public int getGems(Player player)
+	{
+		return getDonor(player).GetGems();
+	}
+	
+	public void transferGemsToCoins(Player player, int gemAmount)
+	{
+		int gemCount = getGems(player);
+		int goldCount = (int) (((double) gemAmount) * GEM_CONVERSION_RATE);
+		
+		if (gemCount >= gemAmount)
+		{
+			deductGems(player, gemAmount);
+			addGold(player, goldCount);
+			notify(player, String.format("You have transferred %d gems into %d gold coins!", gemAmount, goldCount));
+			_transferTracker.insertTransfer(player);
+		}
+	}
+	
+	/**
+	 * @param player - the player to be checked for whether they can transfer gems into coins
+	 * @return true, if the player has not converted gems into coins within the
+	 * last day, false otherwise.
+	 */
+	public boolean canTransferGems(Player player)
+	{
+		return !_transferTracker.hasTransferredToday(player);
+	}
+	
+	public void addGold(Player player, int amount)
+	{
+		if (amount >= 0)
+			_donationManager.rewardGold(null, "GoldManager", player, amount);
+	}
+	
+	public void deductGold(Callback<Boolean> resultCallback, Player player, int amount)
+	{
+		if (amount >= 0)
+			_donationManager.rewardGold(resultCallback, "GoldManager", player, -amount);
+	}
+
+	public void cashIn(Player player, GoldToken token)
+	{
+		int value = token.getGoldValue(); 
+		addGold(player, value);
+		notify(player, String.format("You have cashed in a gold token worth %dg!", value));
+	}
+
+	public void dropGold(Location location, int amount)
+	{
+		dropGold(location, amount, 0.15);
+	}
+
+	public void dropGold(Location location, int amount, double velMult)
+	{
+		int count = amount / 1000;
+		int extraGold = amount % 1000;
+
+		for (int i = 0; i < count; i++)
+		{
+			double x = Math.random() * 2 * Math.PI;
+			Vector velocity = new Vector(Math.sin(x), 0, Math.cos(x));
+			dropGold(location, 1000, velocity, velMult, "Gold " + i);
+		}
+
+		// Drop Extra
+		if (extraGold > 0)
+		{
+			double x = Math.random() * 2 * Math.PI;
+			Vector velocity = new Vector(Math.sin(x), 0, Math.cos(x));
+			dropGold(location, extraGold, velocity, velMult, "extra gold");
+		}
+	}
+
+	private void dropGold(Location location, int amount, Vector velocity, double velMult, String name)
+	{
+		ItemStack stack = new ItemStack(Material.GOLD_NUGGET);
+		ItemMeta meta = stack.getItemMeta();
+		meta.setDisplayName(name);
+		stack.setItemMeta(meta);
+
+		Item item = location.getWorld().dropItem(location, stack);
+		item.setPickupDelay(40);
+		item.setMetadata(META_STRING, new FixedMetadataValue(getPlugin(), amount));
+
+		_itemSet.add(item);
+	
+		// Velocity
+		UtilAction.velocity(item, velocity, velMult, false, 0, 0.2, 0.2, false);
+	}
+	
+	public void purchaseToken(final Player player, final int tokenValue)
+	{
+		final GoldToken token = new GoldToken(tokenValue);
+		deductGold(new Callback<Boolean>()
+		{
+			public void run(Boolean success)
+			{
+				if (success)
+				{
+					player.getInventory().addItem(token.toItemStack());
+					GoldManager.notify(player, String.format("You have purchased a gold token worth %dg!", tokenValue));
+				}
+				else
+				{
+					GoldManager.notify(player, String.format("You have purchased a gold token worth %dg!", tokenValue));
+				}
+			}
+		}, player, tokenValue);
+	}
+	
+	public void addGems(Player player, int amount)
+	{
+		_donationManager.RewardGemsLater("GoldManager", player, amount);
+	}
+	
+	public void deductGems(Player player, int amount)
+	{
+		addGems(player, -amount);
+	}
+	
+	private Donor getDonor(Player player)
+	{
+		return _donationManager.Get(player.getName());
+	}
+	
+	public static void notify(Player player, String message)
+	{
+		UtilPlayer.message(player, F.main("Gold", message));
+	}
+
+	@Override
+	public void disable()
+	{
+		for (Item item : _itemSet)
+		{
+			item.remove();
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/TransferTracker.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/TransferTracker.java
new file mode 100644
index 000000000..140a2872e
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/TransferTracker.java
@@ -0,0 +1,37 @@
+package mineplex.game.clans.economy;
+
+import org.bukkit.entity.Player;
+
+import mineplex.serverdata.Region;
+import mineplex.serverdata.data.DataRepository;
+import mineplex.serverdata.redis.RedisDataRepository;
+import mineplex.serverdata.servers.ServerManager;
+
+/**
+ * Tracks when a player last converted gems into coins.
+ * @author MrTwiggy
+ *
+ */
+public class TransferTracker 
+{
+	public static final int TRANSFER_TIMEOUT = 24 * 60 * 60;	// Time before transfer entry expires from DB (in seconds)
+	private DataRepository<GemTransfer> _repository;
+	
+	public TransferTracker()
+	{
+		_repository = new RedisDataRepository<GemTransfer>(ServerManager.getMasterConnection(), ServerManager.getSlaveConnection(),
+						Region.currentRegion(), GemTransfer.class, "GemTransfers");
+	}
+	
+	public void insertTransfer(Player player)
+	{
+		GemTransfer transfer = new GemTransfer(player.getName());
+		_repository.addElement(transfer, TRANSFER_TIMEOUT);
+	}
+	
+	public boolean hasTransferredToday(Player player)
+	{
+		GemTransfer transfer = _repository.getElement(player.getName());
+		return transfer != null && transfer.transferWasToday();
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/Field.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/Field.java
index 8fcce106e..f02c1e6e7 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/Field.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/Field.java
@@ -5,8 +5,8 @@ import org.bukkit.plugin.java.JavaPlugin;
 import mineplex.core.MiniPlugin;
 import mineplex.core.creature.Creature;
 import mineplex.core.energy.Energy;
+import mineplex.game.clans.clans.ClansManager;
 import mineplex.game.clans.fields.repository.FieldRepository;
-import mineplex.minecraft.game.core.condition.ConditionFactory;
 import mineplex.minecraft.game.core.condition.ConditionManager;
 
 public class Field extends MiniPlugin
@@ -15,12 +15,13 @@ public class Field extends MiniPlugin
 	private FieldOre _ore;
 	private FieldMonster _mob;
 	
-	public Field(JavaPlugin plugin, Creature creature, ConditionManager condition, Energy energy, String serverName) 
+	public Field(JavaPlugin plugin, Creature creature, ConditionManager condition, 
+				ClansManager clansManager, Energy energy, String serverName) 
 	{
 		super("Field Factory", plugin);
 		
 		FieldRepository repository = new FieldRepository(plugin);
-		_block = new FieldBlock(plugin, condition, energy, repository, serverName);
+		_block = new FieldBlock(plugin, condition, clansManager, energy, repository, serverName);
 		_ore = new FieldOre(plugin, repository, serverName);
 		_mob = new FieldMonster(plugin, repository, creature, serverName);
 	}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlock.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlock.java
index aa98cb5d2..48921d8a4 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlock.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlock.java
@@ -2,6 +2,8 @@ package mineplex.game.clans.fields;
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.WeakHashMap;
 
 import org.bukkit.Effect;
@@ -16,18 +18,18 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import mineplex.core.MiniPlugin;
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.core.updater.UpdateType;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilGear;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilWorld;
-import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.energy.Energy;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
 import mineplex.game.clans.fields.commands.FieldBlockCommand;
-import mineplex.game.clans.fields.commands.FieldOreCommand;
 import mineplex.game.clans.fields.repository.FieldBlockToken;
 import mineplex.game.clans.fields.repository.FieldRepository;
 import mineplex.minecraft.game.core.condition.ConditionFactory;
@@ -38,27 +40,30 @@ public class FieldBlock extends MiniPlugin
 	private ConditionFactory _conditionFactory;
 	private Energy _energy;
 	private FieldRepository _repository;
-	private HashMap<String, FieldBlockData> _blocks;
+	private Map<String, FieldBlockData> _blocks;
+	private ClansManager _clansManager;
 
-	private HashSet<String> _active = new HashSet<String>();
+	private Set<String> _active = new HashSet<String>();
 	
 	//Player Info
-	private WeakHashMap<Player, String> _title = new WeakHashMap<Player, String>();
-	private WeakHashMap<Player, Integer> _stock = new WeakHashMap<Player, Integer>();
-	private WeakHashMap<Player, Double> _regen = new WeakHashMap<Player, Double>();
-	private WeakHashMap<Player, Integer> _emptyId = new WeakHashMap<Player, Integer>();
-	private WeakHashMap<Player, Byte> _emptyData = new WeakHashMap<Player, Byte>();
-	private WeakHashMap<Player, String> _lootString = new WeakHashMap<Player, String>();
+	private Map<Player, String> _title = new WeakHashMap<Player, String>();
+	private Map<Player, Integer> _stock = new WeakHashMap<Player, Integer>();
+	private Map<Player, Double> _regen = new WeakHashMap<Player, Double>();
+	private Map<Player, Integer> _emptyId = new WeakHashMap<Player, Integer>();
+	private Map<Player, Byte> _emptyData = new WeakHashMap<Player, Byte>();
+	private Map<Player, String> _lootString = new WeakHashMap<Player, String>();
 
 	private String _serverName;
 	
-	public FieldBlock(JavaPlugin plugin, ConditionManager condition, Energy energy, FieldRepository repository, String serverName) 
+	public FieldBlock(JavaPlugin plugin, ConditionManager condition, ClansManager clansManager,
+						Energy energy, FieldRepository repository, String serverName) 
 	{
 		super("Field Block", plugin);
 	
 		_conditionFactory = condition.Factory();
 		_energy = energy;
 		_repository = repository;
+		_clansManager = clansManager;
 		_blocks = new HashMap<String, FieldBlockData>();
 		
 		_serverName = serverName;
@@ -151,7 +156,7 @@ public class FieldBlock extends MiniPlugin
 		for (FieldBlockData cur : _blocks.values())
 		{
 			cur.setEmpty();
-			_repository.deleteFieldBlock(_serverName, UtilWorld.locToStr(cur.getLocation()));
+			_repository.deleteFieldBlock(cur.getServer(), UtilWorld.locToStr(cur.getLocation()));
 		}
 
 		_blocks.clear();
@@ -161,13 +166,18 @@ public class FieldBlock extends MiniPlugin
 
 	private void delBlock(Player player, PlayerInteractEvent event) 
 	{
-		_repository.deleteFieldBlock(_serverName, UtilWorld.locToStr(event.getClickedBlock().getLocation()));
+		String locString = UtilWorld.locToStr(event.getClickedBlock().getLocation());
+		FieldBlockData block = _blocks.get(locString);
+		if (block != null)
+		{
+			_repository.deleteFieldBlock(block.getServer(), locString);
 
-		//Inform
-		event.getClickedBlock().getWorld().playEffect(event.getClickedBlock().getLocation(), Effect.STEP_SOUND, 42);
-		UtilPlayer.message(player, F.main(_moduleName, "Field Block removed."));
+			//Inform
+			event.getClickedBlock().getWorld().playEffect(event.getClickedBlock().getLocation(), Effect.STEP_SOUND, 42);
+			UtilPlayer.message(player, F.main(_moduleName, "Field Block removed."));
 
-		event.setCancelled(true);
+			event.setCancelled(true);
+		}
 	}
 
 	private void addBlock(Player player, PlayerInteractEvent event) 
@@ -177,7 +187,7 @@ public class FieldBlock extends MiniPlugin
 
 		FieldBlockToken token = new FieldBlockToken();
 
-		token.Server = _serverName;
+		token.Server = "ALL";
 		token.Location = UtilWorld.locToStr(event.getClickedBlock().getLocation());
 		token.BlockId = event.getClickedBlock().getTypeId();
 		token.BlockData = event.getClickedBlock().getData();
@@ -206,17 +216,19 @@ public class FieldBlock extends MiniPlugin
 		event.setCancelled(true);
 	}
 
-	@EventHandler(priority = EventPriority.LOWEST)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void BlockBreak(BlockBreakEvent event)
-	{
-		if (event.isCancelled())
-			return;
+	{			
+		if (_clansManager.isFields(event.getBlock().getLocation()))
+		{
+			event.setCancelled(true);	// Cancel all block breaks in fields. Handle custom breaking for FieldBlocks and Ores.
 			
-		FieldBlockData fieldBlock = getFieldBlock(event.getBlock());
-		if (fieldBlock == null)		return;
-
-		fieldBlock.handleMined(event.getPlayer());
-		event.setCancelled(true);
+			FieldBlockData fieldBlock = getFieldBlock(event.getBlock());
+			if (fieldBlock != null)
+			{
+				fieldBlock.handleMined(event.getPlayer());
+			}
+		}
 	}
 
 	@EventHandler
@@ -238,7 +250,7 @@ public class FieldBlock extends MiniPlugin
 		for (FieldBlockToken token : _repository.getFieldBlocks(_serverName))
 		{
 			Location loc = UtilWorld.strToLoc(token.Location);
-			_blocks.put(token.Location, new FieldBlockData(this, loc, token.BlockId, token.BlockData, token.EmptyId, token.EmptyData, token.StockMax, token.StockRegenTime, token.Loot));
+			_blocks.put(token.Location, new FieldBlockData(this, token.Server, loc, token.BlockId, token.BlockData, token.EmptyId, token.EmptyData, token.StockMax, token.StockRegenTime, token.Loot));
 		}
 	}
 
@@ -263,39 +275,39 @@ public class FieldBlock extends MiniPlugin
 		return _energy;
 	}
 
-	public HashSet<String> getActive()
+	public Set<String> getActive()
 	{
 		return _active;
 	}
 
-	public WeakHashMap<Player, String> getLootString()
+	public Map<Player, String> getLootString()
 	{
 		return _lootString;
 	}
 
-	public WeakHashMap<Player, Integer> getEmptyId()
+	public Map<Player, Integer> getEmptyId()
 	{
 		return _emptyId;
 	}
 
-	public WeakHashMap<Player, Byte> getEmptyData()
+	public Map<Player, Byte> getEmptyData()
 	{
 		return _emptyData;
 	}
 
-	public WeakHashMap<Player, Double> getRegen()
+	public Map<Player, Double> getRegen()
 	{
 		return _regen;
 	}
 
-	public WeakHashMap<Player, Integer> getStock()
+	public Map<Player, Integer> getStock()
 	{
 		return _stock;
 	}
 
-	public WeakHashMap<Player, String> getTitle()
+	public Map<Player, String> getTitle()
 	{
-		return null;
+		return _title;
 	}
 
 	public ConditionFactory getCondition()
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlockData.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlockData.java
index b81f8c853..997f8b3df 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlockData.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlockData.java
@@ -1,6 +1,12 @@
 package mineplex.game.clans.fields;
 
 import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
 
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilMath;
@@ -9,17 +15,13 @@ import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilTime.TimeUnit;
 import mineplex.core.itemstack.ItemStackFactory;
 
-import org.bukkit.Effect;
-import org.bukkit.Location;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-
 public class FieldBlockData 
 {
 	//Block
+	private String _server;
 	private Location _loc;
 
-	private ArrayList<FieldBlockLootData> _loot;
+	private List<FieldBlockLootData> _loot;
 
 	private int _stockCur;
 	private int _stockMax;
@@ -36,13 +38,14 @@ public class FieldBlockData
 	private FieldBlock Field;
 
 	//Constructor
-	public FieldBlockData(FieldBlock field, Location loc, 
+	public FieldBlockData(FieldBlock field, String server, Location loc,
 			int blockId, byte blockData, int emptyId, byte emptyData, 
 			int stockMax, double regenTime, String lootString)
 	{
 		Field = field;
 		
 		//Block
+		_server = server;
 		_loc = loc;
 
 		//Loot
@@ -192,6 +195,11 @@ public class FieldBlockData
 			cur.showInfo(player);
 	}
 
+	public String getServer()
+	{
+		return _server;
+	}
+
 	public void clean() 
 	{
 		_loc.getBlock().setTypeIdAndData(_emptyId, _emptyData, false);	
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldMonster.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldMonster.java
index 5da66cd1a..ba314af44 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldMonster.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldMonster.java
@@ -1,6 +1,8 @@
 package mineplex.game.clans.fields;
 
 import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.WeakHashMap;
 
 import org.bukkit.Location;
@@ -18,7 +20,6 @@ import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilWorld;
 import mineplex.core.creature.Creature;
 import mineplex.game.clans.fields.commands.FieldMonsterCommand;
-import mineplex.game.clans.fields.commands.FieldOreCommand;
 import mineplex.game.clans.fields.monsters.FieldMonsterBase;
 import mineplex.game.clans.fields.repository.FieldMonsterToken;
 import mineplex.game.clans.fields.repository.FieldRepository;
@@ -27,10 +28,10 @@ public class FieldMonster extends MiniPlugin
 {
 	private Creature _creature;
 	private FieldRepository _repository;
-	private HashSet<FieldMonsterBase> _pits;
+	private Set<FieldMonsterBase> _pits;
 	private String _serverName;
 
-	private WeakHashMap<Player, FieldMonsterInput> _input = new WeakHashMap<Player, FieldMonsterInput>();
+	private Map<Player, FieldMonsterInput> _input = new WeakHashMap<Player, FieldMonsterInput>();
 
 	public FieldMonster(JavaPlugin plugin, FieldRepository repository, Creature creature, String serverName) 
 	{
@@ -85,7 +86,7 @@ public class FieldMonster extends MiniPlugin
 			}
 		}
 
-		FieldMonsterBase pit = new FieldMonsterBase(this, name, _serverName, input.type, input.mobMax, input.mobRate, caller.getLocation(), input.radius, input.height);
+		FieldMonsterBase pit = new FieldMonsterBase(this, name, "ALL", input.type, input.mobMax, input.mobRate, caller.getLocation(), input.radius, input.height);
 		Add(pit, true);
 
 		UtilPlayer.message(caller, F.main(getName(), "You created Monster Field."));
@@ -124,7 +125,7 @@ public class FieldMonster extends MiniPlugin
 		HandlerList.unregisterAll(pit);
 		
 		if (repo)
-			_repository.deleteFieldMonster(_serverName, pit.GetToken().Name); 
+			_repository.deleteFieldMonster(pit.GetToken());
 	}
 
 	public void Wipe(Player player, boolean repo)
@@ -168,12 +169,12 @@ public class FieldMonster extends MiniPlugin
 			pit.RemoveMonsters();
 	}
 
-	public WeakHashMap<Player, FieldMonsterInput> getInput()
+	public Map<Player, FieldMonsterInput> getInput()
 	{
 		return _input;
 	}
 
-	public HashSet<FieldMonsterBase> getPits()
+	public Set<FieldMonsterBase> getPits()
 	{
 		return _pits;
 	}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOre.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOre.java
index 8f07206e3..ccc507af6 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOre.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOre.java
@@ -1,7 +1,11 @@
 package mineplex.game.clans.fields;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.bukkit.Effect;
 import org.bukkit.Location;
@@ -15,17 +19,17 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import mineplex.core.MiniPlugin;
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.core.updater.UpdateType;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilGear;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilWorld;
-import mineplex.core.common.util.UtilEvent.ActionType;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
 import mineplex.game.clans.fields.commands.FieldOreCommand;
 import mineplex.game.clans.fields.repository.FieldOreToken;
 import mineplex.game.clans.fields.repository.FieldRepository;
@@ -33,12 +37,12 @@ import mineplex.game.clans.fields.repository.FieldRepository;
 public class FieldOre extends MiniPlugin
 {
 	private FieldRepository _repository;
-	private HashSet<String> _active = new HashSet<String>();
+	private Set<String> _active = new HashSet<String>();
 	
-	private ArrayList<FieldOreData> _oreInactive = new ArrayList<FieldOreData>();
-	private ArrayList<FieldOreData> _oreActive = new ArrayList<FieldOreData>();
+	private List<FieldOreData> _oreInactive = new ArrayList<FieldOreData>();
+	private List<FieldOreData> _oreActive = new ArrayList<FieldOreData>();
 
-	private HashSet<Location> _oreLocations = new HashSet<Location>();
+	private Map<Location, String> _oreLocations = new HashMap<Location, String>();
 
 	private long _oreRegen = 0;
 	private long _oreRegenTime = 20000;
@@ -119,9 +123,9 @@ public class FieldOre extends MiniPlugin
 	{
 		reset(player);
 		
-		for (Location loc : _oreLocations)
+		for (Map.Entry<Location, String> entry : _oreLocations.entrySet())
 		{
-			_repository.deleteFieldOre(_serverName, UtilWorld.locToStr(loc));
+			_repository.deleteFieldOre(entry.getValue(), UtilWorld.locToStr(entry.getKey()));
 		}
 
 		_oreInactive.clear();
@@ -132,7 +136,7 @@ public class FieldOre extends MiniPlugin
 	
 	private void addBlock(Player player, PlayerInteractEvent event) 
 	{
-		Block block = player.getTargetBlock(null, 0);
+		Block block = player.getTargetBlock(((Set<Material>) null), 0);
 
 		if (Get(block.getLocation()) != null)
 		{
@@ -142,12 +146,12 @@ public class FieldOre extends MiniPlugin
 
 		//Repo
 		FieldOreToken token = new FieldOreToken();
-		token.Server = _serverName;
+		token.Server = "ALL";
 		token.Location = UtilWorld.locToStr(block.getLocation());
 		_repository.addFieldOre(token);
 
 		//Memory
-		_oreInactive.add(new FieldOreData(this, block.getLocation()));
+		_oreInactive.add(new FieldOreData(this, token.Server, block.getLocation()));
 
 		//Inform
 		block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, 57);
@@ -160,15 +164,15 @@ public class FieldOre extends MiniPlugin
 	{
 		event.setCancelled(true);
 
-		FieldOreData ore = Get(event.getPlayer().getTargetBlock(null, 0).getLocation());
+		FieldOreData ore = Get(event.getPlayer().getTargetBlock(((Set<Material>) null), 0).getLocation());
 
 		if (ore == null)
 		{
 			UtilPlayer.message(player, F.main(_moduleName, "This is not Field Ore."));
 			return;
 		}
-		
-		_repository.deleteFieldOre(_serverName, UtilWorld.locToStr(event.getClickedBlock().getLocation()));
+
+		_repository.deleteFieldOre(ore._server, UtilWorld.locToStr(event.getClickedBlock().getLocation()));
 
 		ore.GetLocation().getBlock().setType(Material.STONE);
 
@@ -176,7 +180,7 @@ public class FieldOre extends MiniPlugin
 
 		_oreActive.remove(ore);
 		_oreInactive.remove(ore);
-		_oreLocations.remove(ore);
+		_oreLocations.remove(ore._loc);
 
 		//Inform
 		event.getClickedBlock().getWorld().playEffect(event.getClickedBlock().getLocation(), Effect.STEP_SOUND, 57);
@@ -196,15 +200,12 @@ public class FieldOre extends MiniPlugin
 		return null;
 	}
 
-	@EventHandler(priority = EventPriority.LOWEST)
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public void Break(BlockBreakEvent event)
 	{
-		if (event.isCancelled())
+		if (!_oreLocations.containsKey(event.getBlock().getLocation()))
 			return;
 
-		if (!_oreLocations.contains(event.getBlock().getLocation()))
-			return;
-		
 		FieldOreData ore = Get(event.getBlock().getLocation());
 
 		if (ore == null)
@@ -233,17 +234,17 @@ public class FieldOre extends MiniPlugin
 		_oreInactive.get(UtilMath.r(_oreInactive.size())).StartVein(2 + UtilMath.r(5));
 	}
 
-	public ArrayList<FieldOreData> GetActive() 
+	public List<FieldOreData> GetActive() 
 	{
 		return _oreActive;
 	}
 
-	public ArrayList<FieldOreData> GetInactive() 
+	public List<FieldOreData> GetInactive() 
 	{
 		return _oreInactive;
 	}
 	
-	public HashSet<Location> GetLocations()
+	public Map<Location, String> getLocationMap()
 	{
 		return _oreLocations;
 	}
@@ -257,8 +258,8 @@ public class FieldOre extends MiniPlugin
 			Location loc = UtilWorld.strToLoc(token.Location);
 			
 			loc.getBlock().setType(Material.STONE);
-			_oreInactive.add(new FieldOreData(this, loc));
-			_oreLocations.add(loc);
+			_oreInactive.add(new FieldOreData(this, token.Server, loc));
+			_oreLocations.put(loc, token.Server);
 		}
 	}
 
@@ -270,7 +271,7 @@ public class FieldOre extends MiniPlugin
 		_oreLocations.clear();
 	}
 
-	public HashSet<String> getActivePlayers()
+	public Set<String> getActivePlayers()
 	{
 		return _active;
 	}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOreData.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOreData.java
index 7e5d9bd5e..85bc87bb0 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOreData.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOreData.java
@@ -19,17 +19,19 @@ public class FieldOreData
 	protected boolean _active = false;
 
 	protected Location _loc = null;
+	protected String _server;
 	protected HashSet<FieldOreData> _neighbours = new HashSet<FieldOreData>();
 	protected double _neighbourDist = 4;
 
 	protected FieldOre Field;
 
-	public FieldOreData(FieldOre field, Location loc)
+	public FieldOreData(FieldOre field, String server, Location loc)
 	{
 		Field = field;
 		_loc = loc;
+		_server = server;
 		
-		Field.GetLocations().add(_loc);
+		Field.getLocationMap().put(_loc, server);
 
 		for (FieldOreData other : Field.GetInactive())
 		{
@@ -192,7 +194,7 @@ public class FieldOreData
 		for (FieldOreData other : _neighbours)
 			other.RemoveNeighbour(this);
 		
-		Field.GetLocations().remove(_loc);
+		Field.getLocationMap().remove(_loc);
 
 		_neighbours.clear();
 		_neighbours = null;
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/monsters/FieldMonsterBase.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/monsters/FieldMonsterBase.java
index d9ba62a23..9fe52c945 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/monsters/FieldMonsterBase.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/monsters/FieldMonsterBase.java
@@ -3,24 +3,12 @@ package mineplex.game.clans.fields.monsters;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilBlock;
-import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilTime;
-import mineplex.core.common.util.UtilWorld;
-import mineplex.game.clans.fields.FieldMonster;
-import mineplex.game.clans.fields.UtilField;
-import mineplex.game.clans.fields.repository.FieldMonsterToken;
-import net.minecraft.server.v1_7_R4.EntityCreature;
-import net.minecraft.server.v1_7_R4.Navigation;
+import java.util.List;
+import java.util.Map;
 
 import org.bukkit.Location;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftCreature;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftCreature;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -28,6 +16,20 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityCombustEvent;
 
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.fields.FieldMonster;
+import mineplex.game.clans.fields.UtilField;
+import mineplex.game.clans.fields.repository.FieldMonsterToken;
+import net.minecraft.server.v1_8_R3.EntityCreature;
+import net.minecraft.server.v1_8_R3.NavigationAbstract;
+
 public class FieldMonsterBase implements Listener
 {
 	public FieldMonster Manager;
@@ -37,9 +39,9 @@ public class FieldMonsterBase implements Listener
 	private EntityType _type;
 	
 	private int _mobMax;
-	private HashMap<Entity, Integer> _mobs = new HashMap<Entity, Integer>();
+	private Map<Entity, Integer> _mobs = new HashMap<Entity, Integer>();
 	
-	private ArrayList<Location> _locs = new ArrayList<Location>();
+	private List<Location> _locs = new ArrayList<Location>();
 	
 	private double _mobRate = 0.5;
 	private long _mobLast = 0;
@@ -124,7 +126,7 @@ public class FieldMonsterBase implements Listener
 				if (time < 10)
 				{
 					EntityCreature ec = ((CraftCreature)mob).getHandle();
-					Navigation nav = ec.getNavigation();
+					NavigationAbstract nav = ec.getNavigation();
 					nav.a(loc.getX(), loc.getY(), loc.getZ(), 0.2f);
 				}
 				
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/repository/FieldRepository.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/repository/FieldRepository.java
index f5be7a077..cd45b22bc 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/repository/FieldRepository.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/repository/FieldRepository.java
@@ -17,19 +17,21 @@ import mineplex.core.database.column.ColumnVarChar;
 
 public class FieldRepository extends RepositoryBase
 {
+	private static String ALL_STRING = "ALL";
+
 	private static String CREATE_FIELD_BLOCK_TABLE = "CREATE TABLE IF NOT EXISTS fieldBlock (id INT NOT NULL AUTO_INCREMENT, server VARCHAR(100), location VARCHAR(100), blockId INT, blockData TINYINT, emptyId INT, emptyData TINYINT, stockMax INT, stockRegenTime DOUBLE, loot VARCHAR(100), PRIMARY KEY (id), INDEX serverLocation (server, location));";
 	private static String CREATE_FIELD_ORE_TABLE = "CREATE TABLE IF NOT EXISTS fieldOre (id INT NOT NULL AUTO_INCREMENT, server VARCHAR(100), location VARCHAR(100), PRIMARY KEY (id), INDEX serverLocation (server, location));";
 	private static String CREATE_FIELD_MONSTER_TABLE = "CREATE TABLE IF NOT EXISTS fieldMonster (id INT NOT NULL AUTO_INCREMENT, server VARCHAR(100), name VARCHAR(100), type VARCHAR(100), mobMax INT, mobRate DOUBLE, center VARCHAR(100), radius INT, height INT, PRIMARY KEY (id), INDEX serverName (server, name));";
-	private static String RETRIEVE_FIELD_BLOCKS = "SELECT server, location, blockId, blockData, emptyId, emptyData, stockMax, stockRegenTime, loot FROM fieldBlock WHERE server = ?;";
+	private static String RETRIEVE_FIELD_BLOCKS = "SELECT server, location, blockId, blockData, emptyId, emptyData, stockMax, stockRegenTime, loot FROM fieldBlock WHERE server = ? OR server = \"" + ALL_STRING + "\";";
 	private static String ADD_FIELD_BLOCK = "INSERT INTO fieldBlock (server, location, blockId, blockData, emptyId, emptyData, stockMax, stockRegenTime, loot) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?);";
-	private static String DEL_FIELD_BLOCK = "DELETE FROM fieldBlock WHERE server = ? AND location = ?;";	
-	private static String RETRIEVE_FIELD_ORES = "SELECT server, location FROM fieldOre WHERE server = ?;";
+	private static String DEL_FIELD_BLOCK = "DELETE FROM fieldBlock WHERE server = ? AND location = ?;";
+	private static String RETRIEVE_FIELD_ORES = "SELECT server, location FROM fieldOre WHERE server = ? OR server = \"" + ALL_STRING + "\";";
 	private static String ADD_FIELD_ORE = "INSERT INTO fieldOre (server, location) VALUES (?, ?);";
-	private static String DEL_FIELD_ORE = "DELETE FROM fieldOre WHERE server = ? AND location = ?;";	
-	private static String RETRIEVE_FIELD_MONSTERS = "SELECT server, name, type, mobMax, mobRate, center, radius, height FROM fieldMonster WHERE server = ?;";
+	private static String DEL_FIELD_ORE = "DELETE FROM fieldOre WHERE server = ? AND location = ?;";
+	private static String RETRIEVE_FIELD_MONSTERS = "SELECT server, name, type, mobMax, mobRate, center, radius, height FROM fieldMonster WHERE server = ? OR server = \"" + ALL_STRING + "\";";
 	private static String ADD_FIELD_MONSTER = "INSERT INTO fieldMonster (server, name, type, mobMax, mobRate, center, radius, height) VALUES (?, ?, ?, ?, ?, ?, ?, ?);";
 	private static String DEL_FIELD_MONSTER = "DELETE FROM fieldMonster WHERE server = ? AND name = ?;";
-	
+
 	public FieldRepository(JavaPlugin plugin)
 	{
 		super(plugin, DBPool.ACCOUNT);
@@ -67,7 +69,7 @@ public class FieldRepository extends RepositoryBase
 
 	public void addFieldBlock(FieldBlockToken token)
 	{
-		executeUpdate(ADD_FIELD_BLOCK, 
+		executeUpdate(ADD_FIELD_BLOCK,
 				new ColumnVarChar("server", 100, token.Server),
 				new ColumnVarChar("location", 100, token.Location),
 				new ColumnInt("blockId", token.BlockId),
@@ -110,7 +112,7 @@ public class FieldRepository extends RepositoryBase
 
 	public void addFieldOre(FieldOreToken token)
 	{
-		executeUpdate(ADD_FIELD_ORE, 
+		executeUpdate(ADD_FIELD_ORE,
 				new ColumnVarChar("server", 100, token.Server),
 				new ColumnVarChar("location", 100, token.Location)
 		);
@@ -133,8 +135,8 @@ public class FieldRepository extends RepositoryBase
 				while (resultSet.next())
 				{
 					FieldMonsterToken token = new FieldMonsterToken();
-					token.Name = resultSet.getString(1);
-					token.Server = resultSet.getString(2);
+					token.Server = resultSet.getString(1);
+					token.Name = resultSet.getString(2);
 					token.Type = resultSet.getString(3);
 					token.MobMax = resultSet.getInt(4);
 					token.MobRate = resultSet.getDouble(5);
@@ -145,28 +147,28 @@ public class FieldRepository extends RepositoryBase
 					fieldMonsters.add(token);
 				}
 			}
-		}, new ColumnVarChar("serverName", 100, server));
+		}, new ColumnVarChar("server", 100, server));
 		
 		return fieldMonsters;
 	}
 
 	public void addFieldMonster(FieldMonsterToken token)
 	{
-		executeUpdate(ADD_FIELD_MONSTER, 
+		executeUpdate(ADD_FIELD_MONSTER,
 				new ColumnVarChar("server", 100, token.Server),
 				new ColumnVarChar("name", 100, token.Name),
 				new ColumnVarChar("blockId", 100, token.Type),
 				new ColumnInt("mobMax", token.MobMax),
 				new ColumnDouble("mobRate", token.MobRate),
 				new ColumnVarChar("center", 100, token.Centre),
-				new ColumnInt("redius", token.Radius),
+				new ColumnInt("radius", token.Radius),
 				new ColumnInt("height", token.Height)
 		);
 	}
 
-	public void deleteFieldMonster(String server, String name)
+	public void deleteFieldMonster(FieldMonsterToken token)
 	{
-		executeUpdate(DEL_FIELD_MONSTER, new ColumnVarChar("server", 100, server), new ColumnVarChar("name", 100, name));
+		executeUpdate(DEL_FIELD_MONSTER, new ColumnVarChar("server", 100, token.Server), new ColumnVarChar("name", 100, token.Name));
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/CustomCreatures.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/CustomCreatures.java
new file mode 100644
index 000000000..b97ecbc2c
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/CustomCreatures.java
@@ -0,0 +1,43 @@
+package mineplex.game.clans.gameplay;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.inventory.CraftItemEvent;
+import org.bukkit.inventory.Recipe;
+
+public class CustomCreatures implements Listener
+{
+
+	private static final EntityType[] DISABLED_CREATURES = { EntityType.WITCH, EntityType.PIG_ZOMBIE,
+															 EntityType.HORSE, EntityType.ENDERMAN };
+	
+	@EventHandler
+	public void onCreatureSpawn(CreatureSpawnEvent event)
+	{
+		if (isDisabledCreature(event.getEntityType()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	private boolean isDisabledCreature(EntityType entityType)
+	{
+		for (EntityType disabledCreature : DISABLED_CREATURES)
+		{
+			if (disabledCreature == entityType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/CustomRecipes.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/CustomRecipes.java
new file mode 100644
index 000000000..5b6195a54
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/CustomRecipes.java
@@ -0,0 +1,48 @@
+package mineplex.game.clans.gameplay;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+
+import org.bukkit.Material;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.CraftItemEvent;
+import org.bukkit.inventory.Recipe;
+
+public class CustomRecipes implements Listener
+{
+
+	private static final Material[] DISABLED_RECIPES = { Material.EXPLOSIVE_MINECART, Material.JUKEBOX, Material.FISHING_ROD };
+	
+	@EventHandler
+	public void onPlayerCraftItem(CraftItemEvent event)
+	{
+		if (isDisabledRecipe(event.getRecipe()))
+		{
+			event.setCancelled(true);
+			notify(event.getWhoClicked(), "Crafting this item is disabled!");
+		}
+	}
+	
+	private boolean isDisabledRecipe(Recipe recipe)
+	{
+		Material itemType = recipe.getResult().getType();
+		
+		for (Material disabledRecipe : DISABLED_RECIPES)
+		{
+			if (disabledRecipe == itemType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	public static void notify(HumanEntity player, String message)
+	{
+		UtilPlayer.message(player, F.main("Recipes", message));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java
index 8b7e87d8f..6cb5196a7 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java
@@ -2,123 +2,223 @@ package mineplex.game.clans.gameplay;
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 
-import mineplex.core.MiniPlugin;
-import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
-import mineplex.minecraft.game.core.damage.CustomDamageEvent;
-import mineplex.minecraft.game.core.damage.DamageManager;
-import mineplex.core.itemstack.ItemStackFactory;
-import mineplex.core.recharge.Recharge;
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.blockrestore.BlockRestore;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilEvent;
-import mineplex.core.common.util.UtilGear;
-import mineplex.core.common.util.UtilInv;
-import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilTime;
-import mineplex.core.common.util.UtilEvent.ActionType;
-import mineplex.game.clans.clans.ClansManager;
-
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.Color;
 import org.bukkit.Effect;
-import org.bukkit.GameMode;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
+import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockBurnEvent;
 import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockDispenseEvent;
 import org.bukkit.event.block.BlockIgniteEvent;
 import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityShootBowEvent;
+import org.bukkit.event.entity.EntitySpawnEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.player.PlayerBucketEmptyEvent;
 import org.bukkit.event.player.PlayerBucketFillEvent;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.bukkit.event.player.PlayerFishEvent.State;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.weather.WeatherChangeEvent;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.LeatherArmorMeta;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import mineplex.core.MiniPlugin;
+import mineplex.core.blockrestore.BlockRestore;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilEvent.ActionType;
+import mineplex.core.common.util.UtilGear;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilItem;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.items.generation.Weight;
+import mineplex.game.clans.items.generation.WeightSet;
+import mineplex.minecraft.game.classcombat.Class.ClientClass;
+import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
+import mineplex.minecraft.game.classcombat.Skill.event.BlockTossEvent;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+import mineplex.minecraft.game.core.damage.DamageManager;
+
 public class Gameplay extends MiniPlugin
 {
 	private ClansManager _clansManager;
 	private BlockRestore _blockRestore;
 	private DamageManager _damageManager;
+	private WeightSet<Boolean> _foodDecrease; // Weighted probability sets for
+												// food decrease event outcomes
 	
-	private HashMap<Block, Long> _bucketWater = new HashMap<Block, Long>();
-
-	public Gameplay(JavaPlugin plugin, ClansManager clansManager, BlockRestore blockRestore, DamageManager damageManager) 
+	private Map<Block, Long> _bucketWater = new HashMap<Block, Long>();
+	
+	public Gameplay(JavaPlugin plugin, ClansManager clansManager, BlockRestore blockRestore, DamageManager damageManager)
 	{
 		super("PvP Gameplay", plugin);
-	
+		
 		_clansManager = clansManager;
 		_blockRestore = blockRestore;
 		_damageManager = damageManager;
+		_foodDecrease = new WeightSet<Boolean>(new Weight<Boolean>(10, true), new Weight<Boolean>(90, false));
+		
+		// Register the custom recipes and mobs
+		Bukkit.getPluginManager().registerEvents(new CustomRecipes(), plugin);
+		Bukkit.getPluginManager().registerEvents(new CustomCreatures(), plugin);
 	}
-
+	
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void spawnDamage(CustomDamageEvent event)
+	{
+		if (_clansManager.getClanUtility().getClaim(event.GetDamageeEntity().getLocation()) != null && _clansManager.getClanUtility().getClaim(event.GetDamageeEntity().getLocation()).isSafe(event.GetDamageeEntity().getLocation()))
+		{
+			event.SetCancelled("Safe Zone");
+		}
+	}
+	
+	@EventHandler
+	public void onPlayerFishing(PlayerFishEvent event)
+	{
+		State state = event.getState();
+		if (state == State.CAUGHT_ENTITY || state == State.CAUGHT_FISH)
+		{
+			event.setCancelled(true);
+			notify(event.getPlayer(), "Fishing is disabled!");
+		}
+	}
+	
+	@EventHandler
+	public void onBlockToss(BlockTossEvent event)
+	{
+		Location location = event.getLocation();
+		if (_clansManager.getClanUtility().isClaimed(location))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	@EventHandler
+	public void itemFrameRotate(PlayerInteractEntityEvent event)
+	{
+		if (event.getRightClicked() instanceof ItemFrame)
+		{
+			if (_clansManager.getClanUtility().isClaimed(event.getRightClicked().getLocation()) && _clansManager.getClanUtility().getClaim(event.getRightClicked().getLocation()).isSafe(event.getRightClicked().getLocation()))
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+	
+	@EventHandler
+	public void onBowShoot(EntityShootBowEvent event)
+	{
+		if (event.getEntity() instanceof Player)
+		{
+			Player player = (Player) event.getEntity();
+			ClientClass playerClass = _clansManager.getClassManager().Get(player);
+			
+			if (!playerClass.IsGameClass(ClassType.Assassin, ClassType.Ranger))
+			{
+				notify(player, "You cannot use bows without the proper class!");
+				event.setCancelled(true);
+			}
+		}
+	}
+	
 	@EventHandler
 	public void BucketEmpty(PlayerBucketEmptyEvent event)
 	{
 		event.setCancelled(true);
-
+		
 		Block block = event.getBlockClicked().getRelative(event.getBlockFace());
-
+		
 		if (event.getBucket() == Material.WATER_BUCKET)
 		{
-			block.setTypeIdAndData(8, (byte)1, true);
-			_blockRestore.Add(event.getBlockClicked().getRelative(event.getBlockFace()), 8, (byte)0, 1000);
+			block.setTypeIdAndData(8, (byte) 1, true);
+			_blockRestore.add(event.getBlockClicked().getRelative(event.getBlockFace()), 8, (byte) 0, 1000);
 			_bucketWater.put(block, System.currentTimeMillis());
 		}
-
+		
 		if (event.getBucket() == Material.LAVA_BUCKET)
 		{
-			block.setTypeIdAndData(10, (byte)6, true);
-			_blockRestore.Add(event.getBlockClicked().getRelative(event.getBlockFace()), 10, (byte)0, 2000);
+			block.setTypeIdAndData(10, (byte) 6, true);
+			_blockRestore.add(event.getBlockClicked().getRelative(event.getBlockFace()), 10, (byte) 0, 2000);
 		}
-
-
-		event.getPlayer().setItemInHand(ItemStackFactory.Instance.CreateStack(Material.BUCKET));	
+		
+		event.getPlayer().setItemInHand(ItemStackFactory.Instance.CreateStack(Material.BUCKET));
 		UtilInv.Update(event.getPlayer());
 	}
-
+	
+	/**
+	 * Decreases the hunger rate decrease speed by arbitrarily canceling a
+	 * portion of decrease events.
+	 * 
+	 * @param event
+	 */
+	@EventHandler(ignoreCancelled = true)
+	public void foodChangeLevel(FoodLevelChangeEvent event)
+	{
+		Player player = (Player) event.getEntity();
+		
+		if (event.getFoodLevel() < player.getFoodLevel()) // Hunger is
+															// decreasing for
+															// player
+		{
+			event.setCancelled(_foodDecrease.generateRandom());
+		}
+	}
+	
 	@EventHandler
 	public void BucketFill(PlayerBucketFillEvent event)
 	{
 		event.setCancelled(true);
-
-		if (event.getItemStack().getType() == Material.WATER_BUCKET)
-			if (!_bucketWater.containsKey(event.getBlockClicked()))
-				event.getPlayer().setItemInHand(ItemStackFactory.Instance.CreateStack(Material.WATER_BUCKET));
-
+		
+		if (event.getItemStack().getType() == Material.WATER_BUCKET) if (!_bucketWater.containsKey(event.getBlockClicked())) event.getPlayer().setItemInHand(ItemStackFactory.Instance.CreateStack(Material.WATER_BUCKET));
+		
 		UtilInv.Update(event.getPlayer());
 	}
-
+	
 	@EventHandler
 	public void BucketWaterExpire(UpdateEvent event)
 	{
-		if (event.getType() != UpdateType.FAST)
-			return;
-
+		if (event.getType() != UpdateType.FAST) return;
+		
 		HashSet<Block> remove = new HashSet<Block>();
-
+		
 		for (Block cur : _bucketWater.keySet())
-			if (UtilTime.elapsed(_bucketWater.get(cur), 2000))
-				remove.add(cur);
-
+			if (UtilTime.elapsed(_bucketWater.get(cur), 2000)) remove.add(cur);
+			
 		for (Block cur : remove)
 			_bucketWater.remove(cur);
 	}
-
+	
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void ObsidianCancel(BlockPlaceEvent event)
 	{
@@ -132,37 +232,74 @@ public class Gameplay extends MiniPlugin
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void CommandPlace(BlockPlaceEvent event)
 	{
-		if (event.getBlock().getType() == Material.COMMAND || 
-			event.getBlock().getType() == Material.NOTE_BLOCK || 
-			event.getBlock().getType() == Material.REDSTONE_LAMP_ON)
+		if (event.getBlock().getType() == Material.COMMAND || event.getBlock().getType() == Material.NOTE_BLOCK || event.getBlock().getType() == Material.REDSTONE_LAMP_ON)
 		{
 			UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot place " + F.item("Proximity Devices") + "."));
 			event.setCancelled(true);
 		}
 	}
 	
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void RedstoneCancel(BlockPlaceEvent event)
+	{
+		if (event.getBlock().getType().toString().startsWith("REDSTONE"))
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot place redstone based items."));
+			event.setCancelled(true);
+		}
+	}
+	
+	/**
+	 * Disable all Piston related events in Clans
+	 * 
+	 * @param event
+	 */
+	@EventHandler
+	public void onPistonExtend(BlockPistonExtendEvent event)
+	{
+		event.setCancelled(true);
+	}
+	
+	/**
+	 * Disable all Piston related events in Clans
+	 * 
+	 * @param event
+	 */
+	@EventHandler
+	public void onPistonRetract(BlockPistonRetractEvent event)
+	{
+		event.setCancelled(true);
+	}
+	
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void DispenseLiquidCancel(BlockDispenseEvent event)
+	{
+		Material material = event.getItem().getType();
+		
+		if (material == Material.LAVA_BUCKET || material == Material.LAVA || material == Material.WATER_BUCKET || material == Material.WATER)
+		{
+			event.setCancelled(true);
+		}
+	}
+	
 	@EventHandler
 	public void WebBreak(BlockDamageEvent event)
 	{
-		if (event.isCancelled())
-			return;
-	
-		if (event.getBlock().getType() == Material.WEB)
-			event.setInstaBreak(true);
+		if (event.isCancelled()) return;
+		
+		if (event.getBlock().getType() == Material.WEB) event.setInstaBreak(true);
 	}
-
+	
 	@EventHandler
 	public void LapisPlace(BlockPlaceEvent event)
 	{
-		if (event.isCancelled())
-			return;
-
-		if (event.getBlock().getType() != Material.LAPIS_BLOCK)
-			return;
+		if (event.isCancelled()) return;
 		
-		event.setCancelled(true);	
+		if (event.getBlock().getType() != Material.LAPIS_BLOCK) return;
 		
-		UtilInv.remove(event.getPlayer(), Material.LAPIS_BLOCK, (byte)0, 1);
+		event.setCancelled(true);
+		
+		UtilInv.remove(event.getPlayer(), Material.LAPIS_BLOCK, (byte) 0, 1);
 		
 		final Block block = event.getBlock();
 		
@@ -171,7 +308,7 @@ public class Gameplay extends MiniPlugin
 			public void run()
 			{
 				block.setType(Material.WATER);
-				block.setData((byte)0);
+				block.setData((byte) 0);
 				block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, 8);
 				block.getWorld().playSound(block.getLocation(), Sound.SPLASH, 2f, 1f);
 			}
@@ -181,247 +318,301 @@ public class Gameplay extends MiniPlugin
 	@EventHandler
 	public void EnderChestBreak(BlockBreakEvent event)
 	{
-		if (event.isCancelled())
-			return;
+		if (event.isCancelled()) return;
+		
+		if (event.getBlock().getType() != Material.ENDER_CHEST) return;
 		
-		if (event.getBlock().getType() != Material.ENDER_CHEST)
-			return;
-	
 		event.setCancelled(true);
 		
 		event.getBlock().setTypeId(0);
 		event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation().add(0.5, 0.5, 0.5), ItemStackFactory.Instance.CreateStack(Material.ENDER_CHEST));
 	}
-
+	
+	@EventHandler
+	public void disableEnderPearls(PlayerInteractEvent event)
+	{
+		if (!isRightClick(event.getAction())) return;
+		
+		if (event.hasItem() && event.getItem().getType() == Material.ENDER_PEARL)
+		{
+			event.setCancelled(true);
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot use ender pearls!"));
+		}
+	}
+	
+	@EventHandler
+	public void disableFlintNSteel(PlayerInteractEvent event)
+	{
+		if (!isRightClick(event.getAction())) return;
+		
+		if (event.hasItem() && event.getItem().getType() == Material.FLINT_AND_STEEL)
+		{
+			event.setCancelled(true);
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot use flint & steel!"));
+		}
+	}
+	
+	private static boolean isRightClick(Action action)
+	{
+		return action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK;
+	}
+	
 	@EventHandler
 	public void IronDoor(PlayerInteractEvent event)
 	{
-		if (!UtilEvent.isAction(event, ActionType.R_BLOCK))
-			return;
-
-		if (event.getClickedBlock().getTypeId() != 71)
-			return;
-
+		if (!UtilEvent.isAction(event, ActionType.R_BLOCK)) return;
+		
+		if (event.getClickedBlock().getTypeId() != 71) return;
+		
 		Block block = event.getClickedBlock();
-
-		//Knock
+		
+		// Knock
 		if (event.isCancelled())
 		{
-			if (!Recharge.Instance.use(event.getPlayer(), "Door Knock", 500, false, false))
-				return;
-
+			if (!Recharge.Instance.use(event.getPlayer(), "Door Knock", 500, false, false)) return;
+			
 			block.getWorld().playEffect(block.getLocation(), Effect.ZOMBIE_CHEW_WOODEN_DOOR, 0);
 		}
-
-		//Open
+		
+		// Open
 		else
 		{
-			if (block.getData() >= 8)
-				block = block.getRelative(BlockFace.DOWN);
-
-			if (block.getData() < 4)	block.setData((byte)(block.getData()+4), true);
-			else						block.setData((byte)(block.getData()-4), true);
-
-			//Effect
+			if (block.getData() >= 8) block = block.getRelative(BlockFace.DOWN);
+			
+			if (block.getData() < 4)
+				block.setData((byte) (block.getData() + 4), true);
+			else
+				block.setData((byte) (block.getData() - 4), true);
+				
+			// Effect
 			block.getWorld().playEffect(block.getLocation(), Effect.DOOR_TOGGLE, 0);
 		}
 	}
-
+	
 	@EventHandler
 	public void BrewingDisable(PlayerInteractEvent event)
 	{
-		if (!UtilEvent.isAction(event, ActionType.R_BLOCK))
-			return;
-
-		if (event.getClickedBlock().getTypeId() != 117)
-			return;
-
+		if (!UtilEvent.isAction(event, ActionType.R_BLOCK)) return;
+		
+		if (event.getClickedBlock().getTypeId() != 117) return;
+		
 		event.setCancelled(true);
 	}
 	
-	@EventHandler
-	public void BrewingBreak(BlockBreakEvent event)
-	{
-		if (event.isCancelled())
-			return;
-		
-		if (event.getBlock().getType() != Material.BREWING_STAND)
-			return;
-	
-		event.setCancelled(true);
-		
-		event.getBlock().setTypeId(0);
-		event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation().add(0.5, 0.5, 0.5), ItemStackFactory.Instance.CreateStack(Material.BREWING_STAND));
-	}
-
 	@EventHandler
 	public void AnvilDisable(PlayerInteractEvent event)
 	{
+		Player player = event.getPlayer();
+		
 		if (!UtilEvent.isAction(event, ActionType.R_BLOCK))
 			return;
-
-		if (event.getClickedBlock().getType() != Material.ANVIL)
+		else if (event.getClickedBlock().getType() != Material.ANVIL)
 			return;
-
+		else if (player.isSneaking() && player.getItemInHand().getType() != Material.AIR) return;
+		
 		event.setCancelled(true);
 	}
+	
+	@EventHandler
+	public void BonemealCancel(PlayerInteractEvent event)
+	{
+		if (!UtilEvent.isAction(event, ActionType.R)) return;
+		
+		Player player = event.getPlayer();
+		
+		if (player.getItemInHand() == null) return;
+		
+		if (player.getItemInHand().getType() != Material.INK_SACK) return;
+		
+		if (player.getItemInHand().getData() == null) return;
+		
+		if (player.getItemInHand().getData().getData() != 15) return;
+		
+		event.setCancelled(true);
+	}
+	
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void replantTree(BlockBreakEvent event)
+	{
+		final Block block = event.getBlock();
+		
+		if (!UtilItem.isLog(block.getType()))
+		{
+			return;
+		}
+		
+		if (UtilItem.isLog(block.getRelative(BlockFace.DOWN).getType()))
+		{
+			return;
+		}
+		
+		if (UtilItem.isLeaf(block.getRelative(BlockFace.DOWN).getType()))
+		{
+			return;
+		}
+		
+		if (block.getRelative(BlockFace.DOWN).getType() != Material.DIRT && block.getRelative(BlockFace.DOWN).getType() != Material.GRASS)
+		{
+			return;
+		}
+		
+		final byte data = block.getData();
+		
+		UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() {
+			public void run()
+			{
+				block.setType(Material.SAPLING);
+				block.setData(data);
+			}
+		}, 20 * 5);
+	}
 
 	@EventHandler
-	public void BonemealCancel(PlayerInteractEvent event)
-	{	
-		if (!UtilEvent.isAction(event, ActionType.R))
-			return;
-
-		Player player = event.getPlayer();
-
-		if (player.getItemInHand() == null)
-			return;
-
-		if (player.getItemInHand().getType() != Material.INK_SACK)
-			return;
-
-		if (player.getItemInHand().getData() == null)
-			return;
-
-		if (player.getItemInHand().getData().getData() != 15)
-			return;
-
-		event.setCancelled(true);
+	public void killRain(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TWOSEC){
+			for (World world : Bukkit.getWorlds()){
+				world.setWeatherDuration(0);
+				world.setThunderDuration(0);
+				world.setThundering(false);
+			}
+		}
 	}
 	
 	@EventHandler
 	public void WildfireSpread(BlockBurnEvent event)
 	{
-		if (event.isCancelled())
-			return;
+		if (event.isCancelled()) return;
 		
 		event.setCancelled(true);
 		
-		for (int x=-1 ; x<=1 ; x++)
-			for (int y=-1 ; y<=1 ; y++)
-				for (int z=-1 ; z<=1 ; z++)
+		for (int x = -1; x <= 1; x++)
+			for (int y = -1; y <= 1; y++)
+				for (int z = -1; z <= 1; z++)
 				{
-					//Self
+					// Self
 					if (x == 0 && y == 0 && z == 0)
 					{
 						event.getBlock().setType(Material.FIRE);
 						
-						if (event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.GRASS)
-							event.getBlock().getRelative(BlockFace.DOWN).setType(Material.DIRT);
+						if (event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.GRASS) event.getBlock().getRelative(BlockFace.DOWN).setType(Material.DIRT);
 						
 						return;
 					}
 					
 					Block block = event.getBlock().getRelative(x, y, z);
 					
-					if (block.getRelative(BlockFace.DOWN).getType() == Material.GRASS)
-						block.getRelative(BlockFace.DOWN).setType(Material.DIRT);
+					if (block.getRelative(BlockFace.DOWN).getType() == Material.GRASS) block.getRelative(BlockFace.DOWN).setType(Material.DIRT);
 					
-					//Surroundings
-					if (!(
-							(x == 0 && y == 0) ||
-							(x == 0 && z == 0) ||
-							(y == 0 && z == 0)
-							))
-						continue;
-
-					if (block.getTypeId() == 0)
-						block.setType(Material.FIRE);
+					// Surroundings
+					if (!((x == 0 && y == 0) || (x == 0 && z == 0) || (y == 0 && z == 0))) continue;
+					
+					if (block.getTypeId() == 0) block.setType(Material.FIRE);
 				}
 	}
 	
 	@EventHandler
 	public void WildfireDirt(BlockIgniteEvent event)
 	{
-		if (event.isCancelled())
-			return;
+		if (event.isCancelled()) return;
 		
-		if (event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.GRASS)
-			event.getBlock().getRelative(BlockFace.DOWN).setType(Material.DIRT);
+		if (event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.GRASS) event.getBlock().getRelative(BlockFace.DOWN).setType(Material.DIRT);
 	}
 	
 	@EventHandler(priority = EventPriority.LOW)
 	public void WildfireCancel(BlockIgniteEvent event)
 	{
-		if (event.isCancelled())
-			return;
+		if (event.isCancelled()) return;
 		
-		if (event.getBlock().getBiome() == Biome.JUNGLE || event.getBlock().getBiome() == Biome.JUNGLE_HILLS)
-			if (event.getCause() == IgniteCause.SPREAD)
-				event.setCancelled(true);
+		if (event.getBlock().getBiome() == Biome.JUNGLE || event.getBlock().getBiome() == Biome.JUNGLE_HILLS) if (event.getCause() == IgniteCause.SPREAD) event.setCancelled(true);
 	}
 	
+	// @EventHandler
+	// public void onBlockPlace(BlockPlaceEvent event)
+	// {
+	// Location location = event.getBlock().getLocation();
+	//
+	// if (_clansManager.getClanUtility().isNearAdminClaim(location))
+	// {
+	// event.setCancelled(true);
+	// UtilPlayer.message(event.getPlayer(), F.main("Admin", "You cannot place
+	// blocks near admin territories!"));
+	// }
+	// }
+	//
+	// @EventHandler
+	// public void onBlockBreak(BlockBreakEvent event)
+	// {
+	// Location location = event.getBlock().getLocation();
+	//
+	// if (_clansManager.getClanUtility().isNearAdminClaim(location))
+	// {
+	// event.setCancelled(true);
+	// UtilPlayer.message(event.getPlayer(), F.main("Admin", "You cannot break
+	// blocks near admin territories!"));
+	// }
+	// }
+	
 	/*
-	@EventHandler (priority = EventPriority.HIGHEST)
-	public void MoneyLossSteal(CombatDeathEvent event)
-	{
-		if (!(event.GetEvent().getEntity() instanceof Player))
-			return;
-		
-		Player player = (Player)event.GetEvent().getEntity();
-		
-		int balance = Clients().Get(player).Game().GetEconomyBalance();
-		
-		int lose = (int) (0.04 * balance);
-		
-		//Balance
-		Clients().Get(player).Game().SetEconomyBalance(balance - lose);
-
-		CombatLog log = event.GetLog();
-		if (log.GetKiller() != null)
-		{
-			//Inform
-			UtilPlayer.message(UtilPlayer.searchExact(log.GetKiller().getName()), F.main("Death", "You stole " + F.count((lose) + " Coins") + " from " + F.name(player.getName()) + "."));
-			
-			//Inform
-			UtilPlayer.message(player, F.main("Death", "You lost " + F.count((lose) + " Coins") + " to " + F.name(log.GetKiller().getName()) + "."));
-		}
-		else
-		{
-			//Inform
-			UtilPlayer.message(player, F.main("Death", "You lost " + F.count((lose) + " Coins") + " for dying."));
-		}
-	}
-	*/
+	 * @EventHandler (priority = EventPriority.HIGHEST) public void
+	 * MoneyLossSteal(CombatDeathEvent event) { if
+	 * (!(event.GetEvent().getEntity() instanceof Player)) return; Player player
+	 * = (Player)event.GetEvent().getEntity(); int balance =
+	 * Clients().Get(player).Game().GetEconomyBalance(); int lose = (int) (0.04
+	 * * balance); //Balance
+	 * Clients().Get(player).Game().SetEconomyBalance(balance - lose); CombatLog
+	 * log = event.GetLog(); if (log.GetKiller() != null) { //Inform
+	 * UtilPlayer.message(UtilPlayer.searchExact(log.GetKiller().getName()),
+	 * F.main("Death", "You stole " + F.count((lose) + " Coins") + " from " +
+	 * F.name(player.getName()) + ".")); //Inform UtilPlayer.message(player,
+	 * F.main("Death", "You lost " + F.count((lose) + " Coins") + " to " +
+	 * F.name(log.GetKiller().getName()) + ".")); } else { //Inform
+	 * UtilPlayer.message(player, F.main("Death", "You lost " + F.count((lose) +
+	 * " Coins") + " for dying.")); } }
+	 */
 	
 	@EventHandler
 	public void SpawnDamage(CustomDamageEvent event)
 	{
-		if (event.IsCancelled())
-			return;
-
-		if (event.GetCause() != DamageCause.FALL)
-			return;
-
-		if (!_clansManager.getClanUtility().isSpecial(event.GetDamageeEntity().getLocation(), "Spawn"))
-			return;
-
+		if (event.IsCancelled()) return;
+		
+		if (event.GetCause() != DamageCause.FALL) return;
+		
+		if (!_clansManager.getClanUtility().isSpecial(event.GetDamageeEntity().getLocation(), "Spawn")) return;
+		
 		event.SetCancelled("Spawn Fall");
 	}
-
+	
+	/**
+	 * Cancel the spawning of all Witches.
+	 * 
+	 * @param event
+	 */
+	@EventHandler
+	public void cancelWitchSpawns(EntitySpawnEvent event)
+	{
+		if (event.getEntityType() == EntityType.WITCH)
+		{
+			event.setCancelled(true);
+		}
+	}
+	
 	@EventHandler
 	public void Repair(PlayerInteractEvent event)
 	{
-		if (event.getClickedBlock() == null)
-			return;
-
-		if (event.getClickedBlock().getType() != Material.ANVIL)
-			return;
-		
-		if (!UtilEvent.isAction(event, ActionType.R_BLOCK))
-			return;
-
 		Player player = event.getPlayer();
 		
+		if (event.getClickedBlock() == null || event.getClickedBlock().getType() != Material.ANVIL || !UtilEvent.isAction(event, ActionType.R_BLOCK) || player.isSneaking() || player.getItemInHand().getType() == Material.AIR)
+		{
+			return;
+		}
+		
 		if (UtilMath.offset(player.getLocation(), event.getClickedBlock().getLocation()) > 2)
 		{
 			UtilPlayer.message(player, F.main("Repair", "You are too far from the " + F.item("Anvil") + "."));
 			return;
 		}
-
-		if (player.getItemInHand() == null)
-			return;
-
+		
 		ItemStack item = player.getItemInHand();
 		
 		if (item.getDurability() <= 0)
@@ -435,47 +626,76 @@ public class Gameplay extends MiniPlugin
 			UtilPlayer.message(player, F.main("Repair", "You cannot repair " + F.item(item.getItemMeta().getDisplayName()) + "."));
 			return;
 		}
-
-		String 	creator = ItemStackFactory.Instance.GetLoreVar(item, "Owner");
-
+		
+		int repairs = ItemStackFactory.Instance.GetLoreVar(item, "Repaired", 0);
+		boolean canRepair = canRepair(item);
+		
+		if (!canRepair)
+		{
+			UtilPlayer.message(player, F.main("Repair", "This item cannot be repaired anymore."));
+			return;
+		}
+		
+		String creator = ItemStackFactory.Instance.GetLoreVar(item, "Owner");
+		
 		if (creator != null)
 		{
-			if (creator.length() > 2)
-				creator = creator.substring(2, creator.length());
+			if (creator.length() > 2) creator = creator.substring(2, creator.length());
 			
 			if (!creator.equals(player.getName()))
 			{
-				UtilPlayer.message(player, F.main("Repair", "You cannot repair " + F.item(item.getItemMeta().getDisplayName()) + " by " + F.name(creator) + "."));	
+				UtilPlayer.message(player, F.main("Repair", "You cannot repair " + F.item(item.getItemMeta().getDisplayName()) + " by " + F.name(creator) + "."));
 				return;
 			}
 		}
-
-		//Repair!
+		
+		// Repair!
 		UtilPlayer.message(player, F.main("Repair", "You repaired " + F.item(item.getItemMeta().getDisplayName()) + "."));
-		item.setDurability((short)0);
+		item.setDurability((short) 0);
 		UtilInv.Update(player);
-
-		//Break
-		if (Math.random() > 0.85)
-			event.getClickedBlock().setData((byte) (event.getClickedBlock().getData() + 4));
+		
+		// Break
+		if (Math.random() > 0.85) event.getClickedBlock().setData((byte) (event.getClickedBlock().getData() + 4));
 		
 		if (event.getClickedBlock().getData() >= 12)
 		{
 			player.getWorld().playEffect(event.getClickedBlock().getLocation(), Effect.STEP_SOUND, 145);
-			event.getClickedBlock().setTypeIdAndData(0, (byte)0, true);
+			event.getClickedBlock().setTypeIdAndData(0, (byte) 0, true);
 		}
-
-		//Record
-		int repairs = 1 + ItemStackFactory.Instance.GetLoreVar(item, "Repaired", 0);
-
-		ItemStackFactory.Instance.SetLoreVar(item, "Repaired", "" + repairs);
 		
-		//Effect
+		// Record
+		ItemStackFactory.Instance.SetLoreVar(item, "Repaired", (repairs + 1) + "");
+		if (!canRepair(item))
+		{
+			ItemMeta meta = item.getItemMeta();
+			meta.getLore().add(ChatColor.BLUE + "Nonfixable");
+			item.setItemMeta(meta);
+		}
+		
+		// Effect
 		player.playSound(player.getLocation(), Sound.ANVIL_USE, 1f, 1f);
 	}
-
+	
+	private boolean canRepair(ItemStack item)
+	{
+		int repairs = ItemStackFactory.Instance.GetLoreVar(item, "Repaired", 0);
+		boolean gold = UtilGear.isGold(item);
+		boolean canRepair = true;
+		
+		if (repairs >= 3 && gold)
+			canRepair = false;
+		else if (repairs >= 2 && !gold) canRepair = false;
+		
+		return canRepair;
+	}
+	
 	public DamageManager getDamageManager()
 	{
 		return _damageManager;
 	}
+	
+	public static void notify(Player player, String message)
+	{
+		UtilPlayer.message(player, F.main("Clans", message));
+	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/SafeLog.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/SafeLog.java
new file mode 100644
index 000000000..9539a639e
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/SafeLog.java
@@ -0,0 +1,123 @@
+package mineplex.game.clans.gameplay.safelog;
+
+import java.io.File;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerKickEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilFile;
+import mineplex.core.common.util.UtilFile.ChunkType;
+import mineplex.core.common.util.UtilFile.DataFileReader;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.common.util.UtilTime;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.ClanTips.TipType;
+import mineplex.game.clans.gameplay.safelog.npc.NPCManager;
+
+public class SafeLog extends MiniPlugin
+{
+	public static final long REJOIN_TIME = 60000;
+	
+	// Track Offline Players
+	private ClansManager _clansManager;
+	
+	public SafeLog(JavaPlugin plugin, ClansManager clansManager)
+	{
+		super("SafeLog", plugin);
+		
+		_clansManager = clansManager;
+		
+		new File(clansManager.UserDataDir).mkdir();
+	}
+	
+	public void onPlayerQuit(Player player)
+	{
+		boolean isSafeLog = false;
+		
+		if (_clansManager.getClanUtility().isSafe(player.getLocation()))
+		{
+			isSafeLog = true;
+		}
+		
+		if (!isSafeLog)
+		{
+			NPCManager.getInstance().spawnLogoutNpc(player);
+		}
+	}
+	
+	public void onPlayerJoin(final Player player)
+	{
+		// Despawn the player's logout NPC if they have one existing on login
+		if (NPCManager.getInstance().hasLogoutNpc(player))
+		{
+			NPCManager.getInstance().despawnLogoutNpc(player);
+		}
+		
+		File deathFile = new File(_clansManager.UserDataDir + String.format("DEATH_%s.dat", player.getUniqueId().toString()));
+		
+		if (deathFile.exists())
+		{
+			try
+			{
+				DataFileReader reader = UtilFile.beginReading(_clansManager.UserDataDir + String.format("DEATH_%s.dat", player.getUniqueId().toString()));
+				
+				final long time = (long) reader.readChunk(ChunkType.LONG);
+				final String killerName = (String) reader.readChunk(ChunkType.STRING);
+				
+				UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
+				{
+					public void run()
+					{
+						_clansManager.ClanTips.displayTip(TipType.NPC_RIPPARONI, player);
+						UtilPlayer.message(player, F.main("SafeLog", "You were killed by " + F.elem(killerName) + " when you logged out! This happened about " + F.time(UtilTime.MakeStr(System.currentTimeMillis() - time))) + " ago.");
+						UtilTextMiddle.display("Offline Death", "Log out in a safer place next time!", 15, 80, 40, player);
+					}
+				}, 15);
+				reader.close();
+				
+				deathFile.delete();
+			}
+			catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	@EventHandler
+	public void onPlayerQuit(PlayerQuitEvent event)
+	{
+		event.setQuitMessage(null);
+		UtilServer.broadcast(F.sys("Quit", event.getPlayer().getName()));
+		
+		onPlayerQuit(event.getPlayer());
+	}
+	
+	@EventHandler
+	public void onPlayerKicked(PlayerKickEvent event)
+	{
+		event.setLeaveMessage(null);
+		UtilServer.broadcast(F.sys("Quit", event.getPlayer().getName()));
+		
+		onPlayerQuit(event.getPlayer());
+	}
+	
+	@EventHandler
+	public void onPlayerJoin(PlayerJoinEvent event)
+	{
+		event.setJoinMessage(null);
+		UtilServer.broadcast(F.sys("Join", event.getPlayer().getName()));
+		
+		onPlayerJoin(event.getPlayer());
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/CombatLogNPC.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/CombatLogNPC.java
new file mode 100644
index 000000000..9d4e04f83
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/CombatLogNPC.java
@@ -0,0 +1,238 @@
+package mineplex.game.clans.gameplay.safelog.npc;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Skeleton;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilFile;
+import mineplex.core.common.util.UtilFile.ChunkType;
+import mineplex.core.common.util.UtilFile.DataFileChunk;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.disguise.DisguiseManager;
+import mineplex.core.disguise.disguises.DisguisePlayer;
+import mineplex.core.hologram.Hologram;
+import mineplex.core.hologram.HologramManager;
+
+public class CombatLogNPC
+{
+	public final static EntityType NPC_TYPE = EntityType.VILLAGER;
+	
+	private PlayerInfo _playerInfo;
+	
+	private Hologram _hologram;
+	
+	private DisguiseManager _disguiseManager;
+	private long _spawnDate;
+	private final long _endingTime;
+	private double _spawnHealth;
+	
+	private boolean _creative;
+	
+	private LivingEntity _npc;
+	private ArmorStand _stand;
+	
+	private CraftLivingEntity _lastDamager;
+	
+	private String _userDataPath;
+	
+	public int getEntityId()
+	{
+		return _npc.getEntityId();
+	}
+	
+	public CombatLogNPC(Player player, DisguiseManager disguiseManager, HologramManager hologramManager, boolean wasCreative, String userDataPath)
+	{
+		_playerInfo = new PlayerInfo(player);
+		_creative = wasCreative;
+		_userDataPath = userDataPath;
+		
+		_disguiseManager = disguiseManager;
+		_hologram = new Hologram(hologramManager, player.getEyeLocation().add(0, 1, 0), C.cYellow + UtilTime.MakeStr(NPCManager.COMBAT_LOG_DURATION) + C.cWhite + " Seconds left before despawn");
+		_spawnDate = 0;
+		_endingTime = System.currentTimeMillis() + NPCManager.COMBAT_LOG_DURATION;
+		_spawnHealth = player.getHealth();
+		_hologram.start();
+	}
+	
+	/**
+	 * Called when the {@code _npc} associated with this CombatLogNPC is killed
+	 * and thus drops all the owner's items.
+	 */
+	public void onDeath(CraftLivingEntity killer)
+	{
+		Location location = _npc.getLocation();
+		World world = location.getWorld();
+		
+		File file = new File(world.getWorldFolder(), String.format("playerdata/%s.dat", _playerInfo.getPlayerUuid()));
+		file.delete(); // Delete the player's .dat file so they will join with
+						// empty inventory/respawn on next login
+		if (killer != null)
+		{
+			String killerName = "Unknown";
+			
+			if (killer instanceof CraftPlayer)
+			{
+				killerName = ((CraftPlayer) killer).getName();
+			}
+			else if (killer != null)
+			{
+				killerName = UtilEnt.getName(killer);
+			}
+			
+			System.out.println(killerName);
+			
+			try
+			{
+				UtilFile.writeDataFile(new File(_userDataPath + String.format("DEATH_%s.dat", _playerInfo.getPlayerUuid())), new DataFileChunk(ChunkType.LONG, System.currentTimeMillis()), new DataFileChunk(ChunkType.STRING, killerName));
+			}
+			catch (IOException e)
+			{
+				System.out.println(String.format("FATAL ERROR while trying to create player death lock for %s, meaning %s will not be informed that they died next time they log in.", _playerInfo.getPlayerName(), _playerInfo.getPlayerName()));
+			}
+			
+			UtilServer.broadcast(F.main("Death", F.elem(_playerInfo.getPlayerName()) + " was killed by " + F.elem(killerName) + " while combat logged."));
+		}
+		
+		_playerInfo.dropItems(location);
+		_disguiseManager.undisguise(_npc);
+	}
+	
+	public void update()
+	{
+		_hologram.setText("Quitting in " + UtilTime.MakeStr(Math.max(_endingTime - System.currentTimeMillis(), 0)));
+	}
+	
+	/**
+	 * @return true, if the {@code _npc} associated with this CombatLogNPC is
+	 *         alive, false otherwise.
+	 */
+	public boolean isAlive()
+	{
+		return _npc != null && !_npc.isDead();
+	}
+	
+	/**
+	 * @return the amount of time (in milliseconds) that this npc has been alive
+	 *         an spawned in.
+	 */
+	public long getAliveDuation()
+	{
+		return System.currentTimeMillis() - _spawnDate;
+	}
+	
+	public void spawn()
+	{
+		if (_npc != null) despawn();
+		
+		_npc = spawnNpc(getPlayer());
+		_spawnDate = System.currentTimeMillis();
+	}
+	
+	public void despawn()
+	{
+		System.out.println("Despawning");
+		if (_npc != null)
+		{
+			if (_stand != null)
+			{
+				_stand.setPassenger(null);
+				_stand.remove();
+				_stand = null;
+			}
+			
+			_npc.remove();
+			_npc = null;
+			_hologram.stop();
+			_hologram = null;
+		}
+	}
+	
+	public void remove()
+	{
+		_hologram.stop();
+		_hologram = null;
+	}
+	
+	public PlayerInfo getPlayerInfo()
+	{
+		return _playerInfo;
+	}
+	
+	public Player getPlayer()
+	{
+		return _playerInfo.getPlayer();
+	}
+	
+	public boolean matchesPlayer(Player player)
+	{
+		return _playerInfo.getPlayerName().equalsIgnoreCase(player.getName());
+	}
+	
+	private LivingEntity spawnNpc(Player player)
+	{
+		Location spawnLoc = player.getLocation();
+		Skeleton skel = player.getWorld().spawn(spawnLoc, Skeleton.class);
+		skel.teleport(spawnLoc);
+		skel.setHealth(_spawnHealth);
+		UtilEnt.Vegetate(skel);
+		UtilEnt.silence(skel, true);
+		
+		skel.getEquipment().setHelmet(player.getInventory().getHelmet());
+		skel.getEquipment().setChestplate(player.getInventory().getChestplate());
+		skel.getEquipment().setLeggings(player.getInventory().getLeggings());
+		skel.getEquipment().setBoots(player.getInventory().getBoots());
+		skel.getEquipment().setItemInHand(player.getItemInHand());
+		
+		// Get in range
+		List<Player> inRange = UtilPlayer.getNearby(spawnLoc, 75d);
+		
+		// Disguise
+		DisguisePlayer disguise = new DisguisePlayer(skel, ((CraftPlayer) player).getHandle().getProfile());
+		_disguiseManager.disguise(disguise, inRange.toArray(new Player[inRange.size()]));
+		
+		if (!UtilEnt.isGrounded(player))
+		{
+			ArmorStand stand = player.getWorld().spawn(spawnLoc.clone().subtract(0,1,0), ArmorStand.class);
+			
+			stand.setVisible(false);
+			stand.setPassenger(skel);
+			stand.setGravity(false);
+			
+			_stand = stand;
+		}
+			
+		return skel;
+	}
+	
+	public boolean wasCreative()
+	{
+		return _creative;
+	}
+	
+	public CraftLivingEntity getLastDamager()
+	{
+		return _lastDamager;
+	}
+	
+	public void setLastDamager(CraftLivingEntity damager)
+	{
+		_lastDamager = damager;
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/NPCManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/NPCManager.java
new file mode 100644
index 000000000..57b3ae3c2
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/NPCManager.java
@@ -0,0 +1,235 @@
+package mineplex.game.clans.gameplay.safelog.npc;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.bukkit.GameMode;
+import org.bukkit.Sound;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityCombustEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.world.ChunkUnloadEvent;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.hologram.HologramManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class NPCManager extends MiniPlugin
+{
+	public static final long COMBAT_LOG_DURATION = 30000;
+	
+	private static NPCManager _instance;
+	
+	public static NPCManager getInstance()
+	{
+		return _instance;
+	}
+	
+	private ClansManager _clansManager;
+	private Set<CombatLogNPC> _logoutNpcs;
+	private Set<Integer> _toKillIds;
+	
+	private HologramManager _hologramManager;
+	
+	public NPCManager(ClansManager plugin, HologramManager hologramManager)
+	{
+		super("NPC Manager", plugin.getPlugin());
+		
+		_instance = this;
+		_logoutNpcs = new HashSet<>();
+		_toKillIds = new HashSet<>();
+		_clansManager = plugin;
+		_hologramManager = hologramManager;
+	}
+	
+	@Override
+	public void disable()
+	{
+		log("Killing logout npcs");
+		
+		// Despawn/kill all combat log NPCs on server shutdown
+		for (CombatLogNPC npc : _logoutNpcs)
+		{
+			npc.despawn();
+		}
+		_logoutNpcs.clear();
+	}
+	
+	public void spawnLogoutNpc(Player player)
+	{
+		if (!hasLogoutNpc(player))
+		{
+			CombatLogNPC npc = new CombatLogNPC(player, _clansManager.getDisguiseManager(), _hologramManager, player.getGameMode().equals(GameMode.CREATIVE), _clansManager.UserDataDir);
+			npc.spawn();
+			_logoutNpcs.add(npc);
+			log(String.format("Spawned combat log NPC for %s!", player.getName()));
+		}
+	}
+	
+	public void despawnLogoutNpc(Player player)
+	{
+		CombatLogNPC npc = getLogoutNpc(player);
+		
+		if (npc != null)
+		{
+			_toKillIds.add(npc.getEntityId());
+			npc.despawn();
+			_logoutNpcs.remove(npc);
+			log(String.format("Despawned combat log NPC for %s!", player.getName()));
+		}
+	}
+	
+	public boolean hasLogoutNpc(Player player)
+	{
+		return getLogoutNpc(player) != null;
+	}
+	
+	public CombatLogNPC getLogoutNpc(Player player)
+	{
+		for (CombatLogNPC logoutNpc : _logoutNpcs)
+		{
+			if (logoutNpc.matchesPlayer(player))
+			{
+				return logoutNpc;
+			}
+		}
+		
+		return null;
+	}
+	
+	@EventHandler
+	public void onChunkUnload(ChunkUnloadEvent event)
+	{
+		for (Entity entity : event.getChunk().getEntities())
+		{
+			for (CombatLogNPC npc : _logoutNpcs)
+			{
+				if (entity.getEntityId() == npc.getEntityId())
+				{
+					event.setCancelled(true);
+					
+					break;
+				}
+			}
+		}
+	}
+	
+	@EventHandler(ignoreCancelled = true)
+	public void onEntityDeath(EntityDeathEvent event)
+	{
+		CombatLogNPC logoutNpc = getLogoutNpc(event.getEntity());
+		
+		if (logoutNpc != null)
+		{
+			logoutNpc.onDeath(logoutNpc.getLastDamager());
+			event.getDrops().clear(); // Clear the entity's item drops. Manually
+										// drops combat log items earlier
+		}
+	}
+	
+	@EventHandler(ignoreCancelled = true)
+	public void onEntityDamaged(CustomDamageEvent event)
+	{
+		CombatLogNPC logoutNpc = getLogoutNpc(event.GetDamageeEntity());
+		
+		if (logoutNpc != null && event.GetDamagerEntity(true) != null)
+		{
+			if (logoutNpc.wasCreative())
+			{
+				event.SetCancelled("Cannot hurt creative player");
+				return;
+			}
+			
+			if (event.GetDamagerPlayer(true) != null)
+			{
+				ClanInfo clan = this._clansManager.getClan(event.GetDamagerPlayer(true));
+				
+				if (clan != null && clan.isMember(logoutNpc.getPlayerInfo().getUniqueId()))
+				{
+					event.SetCancelled("Cannot hurt clan member.");
+					return;
+				}
+				
+				event.GetDamagerPlayer(true).playSound(event.GetDamagerPlayer(true).getLocation(), Sound.HURT_FLESH, 1, 1);
+			}
+			
+			logoutNpc.setLastDamager(((CraftLivingEntity) event.GetDamagerEntity(true)));
+			event.SetKnockback(false);
+		}
+	}
+	
+	@EventHandler
+	public void onEntityIgnite(EntityCombustEvent event)
+	{
+		if (isLogoutNpc(event.getEntity()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() == UpdateType.FASTER)
+		{
+			for (CombatLogNPC npc : _logoutNpcs)
+			{
+				npc.update();
+			}
+		}
+		
+		if (event.getType() == UpdateType.SEC)
+		{
+			Iterator<CombatLogNPC> iterator = _logoutNpcs.iterator();
+			
+			while (iterator.hasNext())
+			{
+				CombatLogNPC npc = iterator.next();
+				
+				if (!npc.isAlive())
+				{
+					System.out.println("NOT ALIVE AND REMOVING");
+					npc.remove();
+					iterator.remove();
+				}
+				else if (npc.getAliveDuation() > COMBAT_LOG_DURATION)
+				{
+					System.out.println("DESPAWNING");
+					npc.despawn();
+					iterator.remove();
+				}
+			}
+		}
+	}
+	
+	private boolean isLogoutNpc(Entity entity)
+	{
+		return getLogoutNpc(entity) != null;
+	}
+	
+	private CombatLogNPC getLogoutNpc(Entity entity)
+	{
+		return getLogoutNpc(entity.getEntityId());
+	}
+	
+	private CombatLogNPC getLogoutNpc(int entityId)
+	{
+		for (CombatLogNPC npc : _logoutNpcs)
+		{
+			if (npc.getEntityId() == entityId)
+			{
+				return npc;
+			}
+		}
+		
+		return null;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/PlayerInfo.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/PlayerInfo.java
new file mode 100644
index 000000000..69a138d67
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/PlayerInfo.java
@@ -0,0 +1,82 @@
+package mineplex.game.clans.gameplay.safelog.npc;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+public class PlayerInfo
+{
+	private String _playerName;
+	private UUID _playerUuid;
+	private Set<ItemStack> _items;
+	
+	public PlayerInfo(Player player)
+	{
+		_playerName = player.getName();
+		_playerUuid = player.getUniqueId();
+		_items = fetchItems(player.getInventory());
+	}
+	
+	public void dropItems(Location location)
+	{
+		World world = location.getWorld();
+		for (ItemStack item : _items)
+		{
+			world.dropItemNaturally(location, item);
+		}
+	}
+	
+	public String getPlayerName()
+	{
+		return _playerName;
+	}
+	
+	public Set<ItemStack> getItems()
+	{
+		return _items;
+	}
+	
+	public UUID getUniqueId()
+	{
+		return _playerUuid;
+	}
+	
+	public String getPlayerUuid()
+	{
+		return _playerUuid.toString();
+	}
+	
+	public Player getPlayer()
+	{
+		return Bukkit.getPlayerExact(_playerName);
+	}
+	
+	private Set<ItemStack> fetchItems(PlayerInventory inventory)
+	{
+		Set<ItemStack> items = new HashSet<ItemStack>();
+		
+		addItems(items, inventory.getArmorContents());
+		addItems(items, inventory.getContents());
+		
+		return items;
+	}
+	
+	private void addItems(Set<ItemStack> items, ItemStack[] itemsToAdd)
+	{
+		for (ItemStack item : itemsToAdd)
+		{
+			if (item != null && item.getType() != Material.AIR)
+			{
+				items.add(item);
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java
new file mode 100644
index 000000000..83a5c7dcc
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java
@@ -0,0 +1,216 @@
+package mineplex.game.clans.items;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import mineplex.core.common.util.UtilInv;
+import mineplex.game.clans.items.attributes.AttributeContainer;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+/**
+ * Represents a customizable wrapper for an {@link ItemStack}, enabling the
+ * possession of special abilities, attributes, and triggers on item.
+ * 
+ * @author MrTwiggy
+ *		
+ */
+public class CustomItem
+{
+	
+	private static final ChatColor TITLE_COLOR = ChatColor.GOLD; // Chat color
+																	// used for
+																	// item
+																	// display
+																	// name
+	private static final ChatColor ATTRIBUTE_COLOR = ChatColor.WHITE; // Chat
+																		// color
+																		// used
+																		// for
+																		// attribute
+																		// descriptions
+	
+	private AttributeContainer _attributes;
+	
+	public AttributeContainer getAttributes()
+	{
+		return _attributes;
+	}
+	
+	protected String _displayName;
+	private String[] _description;
+	private Material _material;
+	
+	private String _uuid;
+	
+	private boolean _dullEnchantment;
+	
+	public String getUuid()
+	{
+		return _uuid;
+	}
+	
+	public CustomItem(String displayName, String[] description, Material material)
+	{
+		_displayName = displayName;
+		_description = description;
+		_material = material;
+		_attributes = new AttributeContainer();
+		_uuid = UUID.randomUUID().toString();
+	}
+	
+	public CustomItem(Material material)
+	{
+		this(prettifyName(material), null, material);
+	}
+	
+	/**
+	 * @return the name displayed to players for the item.
+	 */
+	public String getDisplayName()
+	{
+		return ChatColor.RESET.toString() + TITLE_COLOR + _attributes.formatItemName(_displayName);
+	}
+	
+	public String[] getDescription()
+	{
+		return _description;
+	}
+	
+	public List<String> getLore()
+	{
+		List<String> lore = new ArrayList<String>();
+		
+		if (getDescription() != null)
+		{
+			for (String desc : getDescription())
+			{
+				lore.add(ATTRIBUTE_COLOR + desc);
+			}
+		}
+		
+		// Display attribute descriptions and stats in lore
+		for (ItemAttribute attribute : _attributes.getAttributes())
+		{
+			String attributeLine = ATTRIBUTE_COLOR + "• " + attribute.getDescription();
+			lore.add(attributeLine);
+		}
+		
+		// Add encoded JSON form of this item, not seen by user.
+		String serialization = GearManager.getItemSerialization(this);
+		lore.add(serialization);
+		
+		return lore;
+	}
+	
+	public ItemStack toItemStack(int amount)
+	{
+		ItemStack item = new ItemStack(_material, amount);
+		update(item);
+		
+		if (_dullEnchantment)
+		{
+			UtilInv.addDullEnchantment(item);
+		}
+		
+		return item;
+	}
+	
+	public ItemStack toItemStack()
+	{
+		return toItemStack(1);
+	}
+	
+	public void addDullEnchantment()
+	{
+		_dullEnchantment = true;
+	}
+	
+	public void removeDullEnchantment()
+	{
+		_dullEnchantment = false;
+	}
+	
+	public void onInteract(PlayerInteractEvent event)
+	{
+		for (ItemAttribute attribute : _attributes.getAttributes())
+		{
+			attribute.onInteract(event);
+		}
+	}
+	
+	public void onAttack(CustomDamageEvent event)
+	{
+		for (ItemAttribute attribute : _attributes.getAttributes())
+		{
+			attribute.onAttack(event);
+		}
+	}
+	
+	public void onAttacked(CustomDamageEvent event)
+	{
+		for (ItemAttribute attribute : _attributes.getAttributes())
+		{
+			attribute.onAttacked(event);
+		}
+	}
+	
+	/**
+	 * @param item - the item to check for a matching link
+	 * @return true, if {@code item} matches this CustomItem via UUID, false
+	 *         otherwise.
+	 */
+	public boolean matches(CustomItem item)
+	{
+		return item.getUuid().equals(_uuid);
+	}
+	
+	/**
+	 * Update {@code item} with the proper meta properties suited for this
+	 * {@link CustomItem}.
+	 * 
+	 * @param item - the item whose meta properties are being updated to become
+	 *        a version of this updated custom item.
+	 */
+	public void update(ItemStack item)
+	{
+		ItemMeta meta = item.getItemMeta();
+		
+		String displayName = getDisplayName();
+		List<String> lore = getLore();
+		
+		meta.setDisplayName(displayName);
+		meta.setLore(lore);
+		
+		item.setItemMeta(meta);
+	}
+	
+	public static String prettifyName(Material material)
+	{
+		String name = "";
+		String[] words = material.toString().split("_");
+		
+		for (String word : words)
+		{
+			word = word.toLowerCase();
+			name += word.substring(0, 1).toUpperCase() + word.substring(1) + " ";
+		}
+		
+		return name;
+	}
+
+	public Material getMaterial()
+	{
+		return _material;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/GearManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/GearManager.java
new file mode 100644
index 000000000..c3a3acc07
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/GearManager.java
@@ -0,0 +1,561 @@
+package mineplex.game.clans.items;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.packethandler.IPacketHandler;
+import mineplex.core.packethandler.PacketHandler;
+import mineplex.core.packethandler.PacketInfo;
+import mineplex.game.clans.items.attributes.AttributeContainer;
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.attributes.armor.ConqueringArmorAttribute;
+import mineplex.game.clans.items.attributes.armor.LavaAttribute;
+import mineplex.game.clans.items.attributes.armor.PaddedAttribute;
+import mineplex.game.clans.items.attributes.armor.ReinforcedAttribute;
+import mineplex.game.clans.items.attributes.armor.SlantedAttribute;
+import mineplex.game.clans.items.attributes.bow.HeavyArrowsAttribute;
+import mineplex.game.clans.items.attributes.bow.HuntingAttribute;
+import mineplex.game.clans.items.attributes.bow.InverseAttribute;
+import mineplex.game.clans.items.attributes.bow.LeechingAttribute;
+import mineplex.game.clans.items.attributes.bow.RecursiveAttribute;
+import mineplex.game.clans.items.attributes.bow.ScorchingAttribute;
+import mineplex.game.clans.items.attributes.bow.SlayingAttribute;
+import mineplex.game.clans.items.attributes.weapon.ConqueringAttribute;
+import mineplex.game.clans.items.attributes.weapon.FlamingAttribute;
+import mineplex.game.clans.items.attributes.weapon.FrostedAttribute;
+import mineplex.game.clans.items.attributes.weapon.HasteAttribute;
+import mineplex.game.clans.items.attributes.weapon.JaggedAttribute;
+import mineplex.game.clans.items.attributes.weapon.SharpAttribute;
+import mineplex.game.clans.items.commands.GearCommand;
+import mineplex.game.clans.items.economy.GoldToken;
+import mineplex.game.clans.items.generation.Weight;
+import mineplex.game.clans.items.generation.WeightSet;
+import mineplex.game.clans.items.legendaries.AlligatorsTooth;
+import mineplex.game.clans.items.legendaries.GiantsBroadsword;
+import mineplex.game.clans.items.legendaries.HyperAxe;
+import mineplex.game.clans.items.legendaries.LegendaryItem;
+import mineplex.game.clans.items.legendaries.MagneticMaul;
+import mineplex.game.clans.items.legendaries.WindBlade;
+import mineplex.game.clans.items.smelting.SmeltingListener;
+import mineplex.game.clans.items.ui.GearShop;
+import mineplex.serverdata.serialization.RuntimeTypeAdapterFactory;
+
+import net.minecraft.server.v1_8_R3.NBTTagCompound;
+import net.minecraft.server.v1_8_R3.Packet;
+import net.minecraft.server.v1_8_R3.PacketPlayOutChat;
+import net.minecraft.server.v1_8_R3.PacketPlayOutSetSlot;
+import net.minecraft.server.v1_8_R3.PacketPlayOutWindowItems;
+
+/**
+ * Manages creation and retrieval of associated {@link PlayerGear}s with online
+ * players, as well as offering methods for parsing and handling
+ * {@link CustomItem}s.
+ * 
+ * @author MrTwiggy
+ * 		
+ */
+public class GearManager extends MiniPlugin implements IPacketHandler, Runnable
+{
+	private static final String ITEM_SERIALIZATION_TAG = "-JSON-";
+	private static Gson _gson;
+	private static GearManager _instance; // Singleton instance
+	
+	private Map<String, PlayerGear> _playerGears; // Mapping of player names
+													// (key) to cached gear set
+													// (value).
+	private WeightSet<Integer> _attributeWeights; // Weightings for randomly
+													// selecting number of
+													// attributes (1, 2, 3)
+	private WeightSet<ItemType> _typeWeights; // Weightings for randomly
+												// selecting item type
+												// (legendary/weapon/armor/bow)
+	private Set<String> _creativePlayers; // Set of names for all players
+	// currently in Creative gamemode
+	
+	// Legendary generation
+	private WeightSet<Class<? extends LegendaryItem>> _legendaryWeights;
+	
+	// Weapon generation
+	private WeightSet<Material> _weaponTypes;
+	
+	// Armor generation
+	private WeightSet<Material> _armorTypes;
+	
+	// Attribute generation
+	private WeightSet<Class<? extends ItemAttribute>> _weaponAttributes;
+	private WeightSet<Class<? extends ItemAttribute>> _armorAttributes;
+	private WeightSet<Class<? extends ItemAttribute>> _bowAttributes;
+
+	// Attribute Masks
+	private EnumSet<Material> _maskAttributes;
+	
+	private GearShop _shop;
+	
+	public GearManager(JavaPlugin plugin, PacketHandler packetHandler, CoreClientManager clientManager, DonationManager donationManager)
+	{
+		super("CustomGear", plugin);
+		
+		_instance = this;
+		
+		_shop = new GearShop(this, clientManager, donationManager);
+		
+		_creativePlayers = new HashSet<String>();
+		_playerGears = new HashMap<String, PlayerGear>();
+		// TODO: Introduce configurable non-hardcoded values for generation
+		// weights?
+		_attributeWeights = new WeightSet<Integer>(new Weight<Integer>(3, 3), new Weight<Integer>(20, 2), new Weight<Integer>(77, 1));
+		_typeWeights = new WeightSet<ItemType>(new Weight<ItemType>(10, ItemType.LEGENDARY), new Weight<ItemType>(45, ItemType.ARMOR), new Weight<ItemType>(23, ItemType.WEAPON), new Weight<ItemType>(22, ItemType.BOW));
+		
+		// Weapon-based attributes
+		_weaponAttributes = new WeightSet<Class<? extends ItemAttribute>>(FrostedAttribute.class, SharpAttribute.class, JaggedAttribute.class, HasteAttribute.class, FlamingAttribute.class, ConqueringAttribute.class);
+		
+		// Armor-based attributes
+		_armorAttributes = new WeightSet<Class<? extends ItemAttribute>>(SlantedAttribute.class, ReinforcedAttribute.class, ConqueringArmorAttribute.class, PaddedAttribute.class, LavaAttribute.class);
+		
+		// Bow-based attributes
+		_bowAttributes = new WeightSet<Class<? extends ItemAttribute>>(HeavyArrowsAttribute.class, HuntingAttribute.class, InverseAttribute.class, LeechingAttribute.class, RecursiveAttribute.class, ScorchingAttribute.class, SlayingAttribute.class);
+		
+		// Weapon material types
+		_weaponTypes = new WeightSet<Material>(Material.DIAMOND_SWORD, Material.GOLD_SWORD, Material.IRON_SWORD, Material.DIAMOND_AXE, Material.GOLD_AXE, Material.IRON_AXE);
+		
+		// Armor material types
+		_armorTypes = new WeightSet<Material>(Material.DIAMOND_HELMET, Material.DIAMOND_CHESTPLATE, Material.DIAMOND_LEGGINGS, Material.DIAMOND_BOOTS, Material.IRON_HELMET, Material.IRON_CHESTPLATE, Material.IRON_LEGGINGS, Material.IRON_BOOTS, Material.GOLD_HELMET, Material.GOLD_CHESTPLATE, Material.GOLD_LEGGINGS, Material.GOLD_BOOTS);
+		
+		// TODO: Initialize list of attributes and types
+		
+		// Initialize various LegendaryItem types
+		_legendaryWeights = new WeightSet<Class<? extends LegendaryItem>>(AlligatorsTooth.class, WindBlade.class, GiantsBroadsword.class, HyperAxe.class, MagneticMaul.class);
+		// TODO: Add rest of legendaries, find better way?
+		
+		// Register listeners
+		UtilServer.getServer().getPluginManager().registerEvents(new ItemListener(getPlugin()), getPlugin());
+		UtilServer.getServer().getPluginManager().registerEvents(new SmeltingListener(), getPlugin());
+		
+		// Initialize attribute types factory for JSON handling of polymorphism.
+		RuntimeTypeAdapterFactory<ItemAttribute> attributeFactory = RuntimeTypeAdapterFactory.of(ItemAttribute.class);
+		
+		for (Class<? extends ItemAttribute> attributeType : _armorAttributes.elements())
+		{
+			attributeFactory.registerSubtype(attributeType);
+		}
+		for (Class<? extends ItemAttribute> attributeType : _weaponAttributes.elements())
+		{
+			attributeFactory.registerSubtype(attributeType);
+		}
+		for (Class<? extends ItemAttribute> attributeType : _bowAttributes.elements())
+		{
+			attributeFactory.registerSubtype(attributeType);
+		}
+		
+		// Initialize legendary item type factory for JSON handling of
+		// polymorphism.
+		RuntimeTypeAdapterFactory<CustomItem> customItemType = RuntimeTypeAdapterFactory.of(CustomItem.class);
+		customItemType.registerSubtype(CustomItem.class);
+		customItemType.registerSubtype(LegendaryItem.class);
+		customItemType.registerSubtype(GoldToken.class);
+		for (Class<? extends CustomItem> itemType : _legendaryWeights.elements())
+		{
+			customItemType.registerSubtype(itemType);
+		}
+		
+		// Build GSON instance off factories for future serialization of items.
+		_gson = new GsonBuilder().registerTypeAdapterFactory(attributeFactory).registerTypeAdapterFactory(customItemType).create();
+		
+		packetHandler.addPacketHandler(this, PacketPlayOutSetSlot.class, PacketPlayOutWindowItems.class);
+		
+		plugin.getServer().getScheduler().runTaskTimer(plugin, this, 1l, 1l);
+
+		_maskAttributes = EnumSet.of(Material.GOLD_RECORD, Material.GREEN_RECORD, Material.RECORD_3, Material.RECORD_4, Material.RECORD_5, Material.RECORD_6,
+				Material.RECORD_7, Material.RECORD_8, Material.RECORD_9, Material.RECORD_10, Material.RECORD_11, Material.RECORD_12);
+	}
+	
+	@Override
+	public void addCommands()
+	{
+		addCommand(new GearCommand(this));
+	}
+	
+	public void addCreativePlayer(Player player)
+	{
+		_creativePlayers.add(player.getName());
+		player.updateInventory();
+	}
+	
+	public void removeCreativePlayer(Player player)
+	{
+		_creativePlayers.remove(player.getName());
+		player.updateInventory();
+	}
+	
+	/**
+	 * Tick & update internal logic for {@link GearManager}. Called once per
+	 * tick.
+	 */
+	@Override
+	public void run()
+	{
+		Iterator<PlayerGear> iterator = _playerGears.values().iterator();
+		while (iterator.hasNext())
+		{
+			PlayerGear gear = iterator.next();
+			if (gear.isOnline())
+			{
+				gear.update();
+			}
+			else
+			{
+				iterator.remove();
+			}
+		}
+	}
+	
+	/**
+	 * @param player - the player whose {@link PlayerGear} set is to be fetched.
+	 * @return the cached or newly instantiated {@link PlayerGear} associated
+	 *         with {@code player}.
+	 */
+	public PlayerGear getPlayerGear(Player player)
+	{
+		String playerName = player.getName();
+		if (!_playerGears.containsKey(playerName))
+		{
+			PlayerGear gear = new PlayerGear(playerName);
+			_playerGears.put(playerName, gear);
+		}
+		
+		return _playerGears.get(playerName);
+	}
+	
+	public CustomItem generateItem()
+	{
+		int attributeCount = _attributeWeights.generateRandom();
+		ItemType itemType = _typeWeights.generateRandom();
+		
+		RareItemFactory factory = RareItemFactory.begin(itemType);
+		
+		if (itemType == ItemType.LEGENDARY)
+		{
+			factory.setLegendary(_legendaryWeights.generateRandom());
+		}
+		else if (itemType == ItemType.ARMOR)
+		{
+			factory.setType(_armorTypes.generateRandom());
+		}
+		else if (itemType == ItemType.WEAPON)
+		{
+			factory.setType(_weaponTypes.generateRandom());
+		}
+		else if (itemType == ItemType.BOW)
+		{
+			factory.setType(Material.BOW);
+		}
+		
+		if (itemType != ItemType.LEGENDARY) // Only non-legendaries have
+											// attributes
+		{
+			AttributeContainer attributes = new AttributeContainer();
+			generateAttributes(attributes, itemType, attributeCount);
+
+			System.out.println("Generating attributes...");
+			System.out.println("Remaining size: " + attributes.getRemainingTypes().size());
+			
+			if (attributes.getSuperPrefix() != null)
+			{
+				System.out.println("Set super prefix: " + attributes.getSuperPrefix().getClass());
+				factory.setSuperPrefix(attributes.getSuperPrefix().getClass());
+			}
+			if (attributes.getPrefix() != null)
+			{
+				System.out.println("Set prefix: " + attributes.getPrefix().getClass());
+				factory.setPrefix(attributes.getPrefix().getClass());
+			}
+			if (attributes.getSuffix() != null)
+			{
+				System.out.println("Set suffix: " + attributes.getSuffix().getClass());
+				factory.setSuffix(attributes.getSuffix().getClass());
+			}
+		}
+		
+		return factory.getWrapper();
+	}
+	
+	private void generateAttributes(AttributeContainer container, ItemType type, int count)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			int attempts = 0;
+			Set<AttributeType> remaining = container.getRemainingTypes();
+			ItemAttribute attribute = null;
+			
+			while (remaining.size() > 0 && attempts < 10 && attribute == null)
+			{
+				ItemAttribute sampleAttribute = null;
+				
+				switch (type)
+				{
+					case ARMOR:
+						sampleAttribute = instantiate(_armorAttributes.generateRandom());
+						break;
+					case WEAPON:
+						sampleAttribute = instantiate(_weaponAttributes.generateRandom());
+						break;
+					case BOW:
+						sampleAttribute = instantiate(_bowAttributes.generateRandom());
+						break;
+					default:
+						break;
+				}
+				
+				if (sampleAttribute != null && remaining.contains(sampleAttribute.getType()))
+				{
+					attribute = sampleAttribute; // Select valid attribute to
+													// add
+				}
+			}
+			
+			container.addAttribute(attribute);
+		}
+	}
+	
+	public void spawnItem(Location location)
+	{
+		CustomItem item = generateItem();
+		location.getWorld().dropItem(location, item.toItemStack());
+	}
+	
+	public static CustomItem parseItem(ItemStack item)
+	{
+		String serialization = getItemSerialization(item);
+		
+		if (serialization != null)
+		{
+			CustomItem customItem = null;
+			
+			try
+			{
+				customItem = deserialize(serialization);
+			}
+			catch (Exception exception)
+			{
+				System.out.println("==========");
+				System.out.println("GearManager parse problem :");
+				System.out.println(serialization);
+				System.out.println("==========");
+			}
+			
+			return customItem;
+		}
+		
+		return null; // No serialization found in item's lore, not a custom
+						// item!
+	}
+	
+	public static boolean isCustomItem(ItemStack item)
+	{
+		return getItemSerialization(item) != null;
+	}
+	
+	public static String getItemSerialization(CustomItem customItem)
+	{
+		String serialization = serialize(customItem);
+		
+		return ITEM_SERIALIZATION_TAG + serialization;
+	}
+	
+	/**
+	 * @param type - the class-type of the object to be instantiated. (must have
+	 *        zero-argument constructor)
+	 * @return a newly instantiated instance of {@code type} class-type.
+	 *         Instantied with zero argument constructor.
+	 */
+	private static <T> T instantiate(Class<T> type)
+	{
+		try
+		{
+			return type.newInstance();
+		}
+		catch (Exception e)
+		{
+			return null;
+		}
+	}
+	
+	private static String getItemSerialization(ItemStack item)
+	{
+		if (item == null || item.getItemMeta() == null || item.getItemMeta().getLore() == null) return null;
+		
+		ItemMeta meta = item.getItemMeta();
+		
+		for (String lore : meta.getLore())
+		{
+			if (lore.startsWith(ITEM_SERIALIZATION_TAG)) // Found serialization
+															// lore-line
+			{
+				int tagLength = ITEM_SERIALIZATION_TAG.length();
+				String serialization = lore.substring(tagLength);
+				
+				return serialization;
+			}
+		}
+		
+		return null; // Unable to find any serialized lore lines, hence not a
+						// CustomItem.
+	}
+	
+	public static String serialize(CustomItem customItem)
+	{
+		return _gson.toJson(customItem, CustomItem.class);
+	}
+	
+	public static String serialize(AttributeContainer attributes)
+	{
+		return _gson.toJson(attributes, AttributeContainer.class);
+	}
+	
+	public static CustomItem deserialize(String serialization)
+	{
+		return _gson.fromJson(serialization, CustomItem.class);
+	}
+	
+	public static <T> T deserialize(String serialization, Class<T> type)
+	{
+		return _gson.fromJson(serialization, type);
+	}
+	
+	/**
+	 * @return singleton instance of {@link GearManager}.
+	 */
+	public static GearManager getInstance()
+	{
+		return _instance;
+	}
+	
+	public static void notify(Player player, String message)
+	{
+		UtilPlayer.message(player, F.main("Gear", message));
+	}
+	
+	/**
+	 * @param player - the player to see if they should have their out-going
+	 *        packets masked on CustomGear items.
+	 * @return true, if the player should have their gear lore masked, false
+	 *         otherwise.
+	 */
+	private boolean maskGearPacket(Player player)
+	{
+		return player.getGameMode() != GameMode.CREATIVE && !_creativePlayers.contains(player.getName());
+	}
+	
+	public void handle(PacketInfo packetInfo)
+	{
+		// Don't mask custom gear lore for creative players, as this will break
+		// them.
+		if (!maskGearPacket(packetInfo.getPlayer())) return;
+		
+		Packet<?> packet = packetInfo.getPacket();
+		
+		if (packet instanceof PacketPlayOutSetSlot)
+		{
+			PacketPlayOutSetSlot slotPacket = (PacketPlayOutSetSlot) packet;
+			slotPacket.c = maskItem(slotPacket.c); // Mask all out-going item
+													// packets
+		}
+		else if (packet instanceof PacketPlayOutWindowItems)
+		{
+			PacketPlayOutWindowItems itemsPacket = (PacketPlayOutWindowItems) packet;
+			
+			for (int i = 0; i < itemsPacket.b.length; i++)
+			{
+				itemsPacket.b[i] = maskItem(itemsPacket.b[i]); // Mask all
+																// out-going
+																// item packets
+				ItemStack item = CraftItemStack.asCraftMirror(itemsPacket.b[i]);
+				if (item != null && _maskAttributes.contains(item.getType()))
+					itemsPacket.b[i] = removeAttributes(itemsPacket.b[i]);
+			}
+		}
+	}
+
+	private net.minecraft.server.v1_8_R3.ItemStack removeAttributes(net.minecraft.server.v1_8_R3.ItemStack item)
+	{
+		if (item == null) return null;
+
+		if (item.getTag() == null)
+		{
+			item.setTag(new NBTTagCompound());
+		}
+
+		item.getTag().setInt("HideFlags", 62);
+
+		return item;
+	}
+	
+	private net.minecraft.server.v1_8_R3.ItemStack maskItem(net.minecraft.server.v1_8_R3.ItemStack item)
+	{
+		// Cannot mask a null item
+		if (item == null)
+		{
+			return null;
+		}
+		
+		CraftItemStack originalItem = CraftItemStack.asCraftMirror(item);
+		ItemMeta originalMeta = originalItem.getItemMeta();
+		
+		// No need to modify item packets with no lore
+		if (originalMeta == null || originalMeta.getLore() == null)
+		{
+			return item;
+		}
+		
+		List<String> lore = new ArrayList<String>();
+		
+		for (String line : originalMeta.getLore())
+		{
+			if (!line.startsWith(ITEM_SERIALIZATION_TAG)) // Remove
+															// serialization
+															// lines from
+															// out-going lore
+			{
+				lore.add(line);
+			}else{
+			}
+		}
+		
+		net.minecraft.server.v1_8_R3.ItemStack newItem = CraftItemStack.asNMSCopy(originalItem);
+		CraftItemStack newCopy = CraftItemStack.asCraftMirror(newItem);
+		ItemMeta newMeta = newCopy.getItemMeta();
+		newMeta.setLore(lore);
+		newCopy.setItemMeta(newMeta);
+		return newItem;
+	}
+	
+	public void openShop(Player player)
+	{
+		_shop.attemptShopOpen(player);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ItemListener.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ItemListener.java
new file mode 100644
index 000000000..8e499d6a5
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ItemListener.java
@@ -0,0 +1,186 @@
+package mineplex.game.clans.items;
+
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityShootBowEvent;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.PlayerGameModeChangeEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.metadata.FixedMetadataValue;
+import org.bukkit.metadata.MetadataValue;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.game.clans.items.attributes.AttributeContainer;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+/**
+ * Listens for item-related trigger events and accordingly triggers appropriate 
+ * {@link PlayerGear} events for {@link CustomItem} abilities and attributes.
+ * @author MrTwiggy
+ *
+ */
+public class ItemListener implements Listener
+{
+
+	public static final String PROJECTILE_META_TAG = "[CustomGearProj]";
+	
+	private JavaPlugin _plugin;
+	
+	public ItemListener(JavaPlugin plugin)
+	{
+		_plugin = plugin;
+	}
+
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+	public void onGamemodeChange(PlayerGameModeChangeEvent event)
+	{
+		if (event.getNewGameMode() == GameMode.CREATIVE)				// Entering creative mode
+		{
+			GearManager.getInstance().addCreativePlayer(event.getPlayer());
+		}
+		else if (event.getPlayer().getGameMode() == GameMode.CREATIVE)	// Exiting creative mode
+		{
+			GearManager.getInstance().removeCreativePlayer(event.getPlayer());
+			
+			// Update/refresh the players inventory in 5 ticks once they're in survival mode again
+			final Player player = event.getPlayer();
+			Bukkit.getScheduler().runTaskLater(_plugin, new Runnable()
+			{
+				@Override
+				public void run() 
+				{
+					player.updateInventory();
+				}
+			}, 5l);
+		}
+	}
+	
+	/**
+	 * Handle players shuffling CustomItems around by properly updating
+	 * and managing their movement.
+	 * @param event
+	 */
+	@EventHandler
+	public void onInventoryClick(InventoryClickEvent event)
+	{
+		// TODO: Update any custom-items that are selected/moved to save proper stats if they
+		// TODO: are active. (IE: PlayerGear possesses it as armor slot or weapon)
+	}
+	
+	/**
+	 * Handle updated CustomItem stats and lore upon player
+	 * switching items.
+	 * @param event
+	 */
+	@EventHandler
+	public void onItemHeldChanged(PlayerItemHeldEvent event)
+	{
+		Player player = event.getPlayer();
+		PlayerGear gear = getGear(player);
+		
+		gear.onItemHeldChanged(event);
+	}
+
+	/**
+	 * Handle the trigger of custom gear related effects and abilities.
+	 * @param event
+	 */
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onPlayerAttack(CustomDamageEvent event)
+	{
+		if (event.IsCancelled()) return;	// Checks for Pre-Cancelled event and stops
+		
+		Player damager = event.GetDamagerPlayer(false);	// For non-ranged attacks
+		Player damagee = event.GetDamageePlayer();
+		Projectile projectile = event.GetProjectile();
+		
+		// Trigger custom gear effects for attacker melee weapons
+		if (damager != null && event.GetCause() == DamageCause.ENTITY_ATTACK)
+		{
+			PlayerGear attackerGear = getGear(damager);
+			attackerGear.onAttack(event);
+		}
+		
+		// Trigger custom gear effects for defender armor
+		if (damagee != null)
+		{
+			PlayerGear defenderGear = getGear(damagee);
+			defenderGear.onAttacked(event);
+		}
+		
+		// Trigger bow-related attribute effects properly
+		if (projectile != null)
+		{
+			if (projectile.hasMetadata(PROJECTILE_META_TAG))
+			{
+				for (MetadataValue data : projectile.getMetadata(PROJECTILE_META_TAG))
+				{
+					String serialization = data.asString();
+					AttributeContainer container = GearManager.deserialize(serialization, AttributeContainer.class);
+					
+					for (ItemAttribute attribute : container.getAttributes())
+					{
+						attribute.onAttack(event);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Properly marks projectiles shot from a custom-gear bow so that it will properly trigger events.
+	 * @param event
+	 */
+	@EventHandler
+	public void onEntityShootBow(EntityShootBowEvent event)
+	{
+		if (event.getEntity() instanceof Player)
+		{
+			Player player = (Player) event.getEntity();
+			PlayerGear gear = getGear(player);
+			
+			CustomItem weapon = gear.getWeapon();
+			
+			if (weapon != null)
+			{
+				// Copy weapon attributes onto projectile for later processing				
+				AttributeContainer attributes = weapon.getAttributes();
+				String serialization = GearManager.serialize(attributes);
+
+				Entity projectile = event.getProjectile();
+				projectile.setMetadata(PROJECTILE_META_TAG, new FixedMetadataValue(_plugin, serialization));
+				
+			}
+		}
+	}
+	
+	/**
+	 * Handle weapon ability activation of custom gear.
+	 * @param event
+	 */
+	@EventHandler
+	public void onPlayerInteract(PlayerInteractEvent event)
+	{
+		// Activate weapon interact abilities
+		PlayerGear playerGear = getGear(event.getPlayer());
+		playerGear.onInteract(event);
+	}
+	
+	/**
+	 * @param player - the player whose gear is to be fetched
+	 * @return the {@link PlayerGear} associated with {@code player}.
+	 */
+	private PlayerGear getGear(Player player)
+	{
+		return GearManager.getInstance().getPlayerGear(player);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ItemType.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ItemType.java
new file mode 100644
index 000000000..e4b52a9b2
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ItemType.java
@@ -0,0 +1,18 @@
+package mineplex.game.clans.items;
+
+import com.google.common.collect.Sets;
+
+import mineplex.game.clans.items.generation.WeightSet;
+import mineplex.game.clans.items.legendaries.AlligatorsTooth;
+import mineplex.game.clans.items.legendaries.WindBlade;
+
+public enum ItemType
+{
+	LEGENDARY,
+	
+	ARMOR,
+	
+	WEAPON,
+	
+	BOW;
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/PlayerGear.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/PlayerGear.java
new file mode 100644
index 000000000..fbc03131d
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/PlayerGear.java
@@ -0,0 +1,241 @@
+package mineplex.game.clans.items;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import mineplex.game.clans.items.legendaries.LegendaryItem;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+/**
+ * PlayerGear caches and manages a players set of {@link CustomItem}s that they
+ * currently wield.
+ * 
+ * @author MrTwiggy
+ *		
+ */
+public class PlayerGear
+{
+	private String _playerName; // Name of player who owns the gear
+	
+	// Cached custom item information for player's gear
+	private CustomItem weapon;
+	private CustomItem helmet;
+	private CustomItem chestplate;
+	private CustomItem leggings;
+	private CustomItem boots;
+	
+	/**
+	 * Class constructor
+	 * 
+	 * @param playerName
+	 */
+	public PlayerGear(String playerName)
+	{
+		_playerName = playerName;
+	}
+	
+	/**
+	 * Tick & update internal logic for the PlayerGear and required custom items
+	 * that are equipped.
+	 */
+	public void update()
+	{
+		if (isOnline())
+		{
+			CustomItem item = getWeapon();
+			
+			if (item != null && item instanceof LegendaryItem)
+			{
+				LegendaryItem legendary = (LegendaryItem) item;
+				legendary.update(getPlayer());
+			}
+		}
+	}
+	
+	public boolean isOnline()
+	{
+		Player player = getPlayer();
+		return player != null && player.isOnline();
+	}
+	
+	/**
+	 * @return the {@link Player} that owns this gear set.
+	 */
+	public Player getPlayer()
+	{
+		return Bukkit.getPlayer(_playerName);
+	}
+	
+	/**
+	 * @return the {@link PlayerInventory} associated with the owner of this
+	 *         {@link PlayerGear}.
+	 */
+	public PlayerInventory getInventory()
+	{
+		return getPlayer().getInventory();
+	}
+	
+	public String getPlayerName()
+	{
+		return _playerName;
+	}
+	
+	/**
+	 * Trigger interact events for the set of equipped {@link CustomItem}s in
+	 * gear set.
+	 * 
+	 * @param event - the triggering interact event
+	 */
+	public void onInteract(PlayerInteractEvent event)
+	{
+		for (CustomItem item : getGear())
+		{
+			item.onInteract(event);
+		}
+	}
+	
+	/**
+	 * Trigger on-attack events for the set of equipped {@link CustomItem}s in
+	 * gear set.
+	 * 
+	 * @param event - the triggering on-attack event
+	 */
+	public void onAttack(CustomDamageEvent event)
+	{
+		for (CustomItem item : getGear())
+		{
+			item.onAttack(event);
+		}
+	}
+	
+	/**
+	 * Trigger attacked events for the set of equipped {@link CustomItem}s in
+	 * gear set.
+	 * 
+	 * @param event - the triggering attacked event
+	 */
+	public void onAttacked(CustomDamageEvent event)
+	{
+		for (CustomItem item : getGear())
+		{
+			item.onAttacked(event);
+		}
+	}
+	
+	/**
+	 * Update appropriate gear status and item lores.
+	 * 
+	 * @param event - the triggering item held change event.
+	 */
+	public void onItemHeldChanged(PlayerItemHeldEvent event)
+	{
+		ItemStack item = getPlayer().getItemInHand();
+		CustomItem weapon = getWeapon();
+		
+		if (weapon != null)
+		{
+			weapon.update(item); // Update held-item's stats.
+		}
+	}
+	
+	public CustomItem getWeapon()
+	{
+		ItemStack weaponItem = getPlayer().getInventory().getItemInHand();
+		
+		if (!itemsMatch(weapon, weaponItem))
+		{
+			weapon = parseItem(weaponItem);
+		}
+		
+		return weapon;
+	}
+	
+	public CustomItem getHelmet()
+	{
+		ItemStack helmetItem = getPlayer().getInventory().getHelmet();
+		
+		if (!itemsMatch(helmet, helmetItem))
+		{
+			helmet = parseItem(helmetItem);
+		}
+		
+		return helmet;
+	}
+	
+	public CustomItem getChestplate()
+	{
+		ItemStack chestplateItem = getPlayer().getInventory().getChestplate();
+		
+		if (!itemsMatch(chestplate, chestplateItem))
+		{
+			chestplate = parseItem(chestplateItem);
+		}
+		
+		return chestplate;
+	}
+	
+	public CustomItem getLeggings()
+	{
+		ItemStack leggingsItem = getPlayer().getInventory().getLeggings();
+		
+		if (!itemsMatch(leggings, leggingsItem))
+		{
+			leggings = parseItem(leggingsItem);
+		}
+		
+		return leggings;
+	}
+	
+	public CustomItem getBoots()
+	{
+		ItemStack bootsItem = getPlayer().getInventory().getBoots();
+		
+		if (!itemsMatch(boots, bootsItem))
+		{
+			boots = parseItem(bootsItem);
+		}
+		
+		return boots;
+	}
+	
+	/**
+	 * @return set of currently equipped {@link CustomItem}s in the gear set.
+	 */
+	public Set<CustomItem> getGear()
+	{
+		Set<CustomItem> items = new HashSet<CustomItem>();
+		if (getWeapon() != null) items.add(getWeapon());
+		if (getHelmet() != null) items.add(getHelmet());
+		if (getChestplate() != null) items.add(getChestplate());
+		if (getLeggings() != null) items.add(getLeggings());
+		if (getBoots() != null) items.add(getBoots());
+		
+		return items;
+	}
+	
+	private boolean itemsMatch(CustomItem customItem, ItemStack item)
+	{
+		if (customItem == null || item == null) return false;
+		
+		if (GearManager.isCustomItem(item))
+		{
+			CustomItem customItem2 = GearManager.parseItem(item);
+			return customItem2.matches(customItem);
+		}
+		
+		return false;
+	}
+	
+	private CustomItem parseItem(ItemStack item)
+	{
+		return GearManager.parseItem(item);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/RareItemFactory.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/RareItemFactory.java
new file mode 100644
index 000000000..a2723f7e6
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/RareItemFactory.java
@@ -0,0 +1,145 @@
+package mineplex.game.clans.items;
+
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.UtilInv;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.legendaries.LegendaryItem;
+
+/**
+ * Quick little guide on how to use this thing:
+ * <p>
+ * The method fabricate() returns an ItemStack.
+ * <p>
+ * 
+ * For creating a legendary item, do:
+ * <p>
+ * RareItemFactory.begin(ItemType.LEGENDARY).setLegendary(AlligatorsTooth.class)
+ * .fabricate();
+ * <p>
+ * 
+ * For creating a Flaming Jagged Diamond Sword of Conquering, simply do:
+ * <p>
+ * RareItemFactory.begin(ItemType.WEAPON).setType(Material.DIAMOND_SWORD).
+ * setSuperPrefix(FlamingAttribute.class).setPrefix(JaggedAttribute.class).
+ * setSuffix(ConqueringAttribute.class).fabricate();
+ */
+public class RareItemFactory
+{
+	private Class<? extends ItemAttribute> _superPrefix;
+	private Class<? extends ItemAttribute> _prefix;
+	private Class<? extends ItemAttribute> _suffix;
+	
+	private ItemType _itemType;
+	private Material _material;
+	private CustomItem _item;
+	
+	public RareItemFactory(ItemType itemType)
+	{
+		_itemType = itemType;
+	}
+	
+	public static RareItemFactory begin(ItemType itemType)
+	{
+		return new RareItemFactory(itemType);
+	}
+	
+	public RareItemFactory setType(Material type)
+	{
+		_item = new CustomItem(type);
+		_item.addDullEnchantment();
+		_material = type;
+		return this;
+	}
+	
+	public RareItemFactory setLegendary(Class<? extends LegendaryItem> legendary)
+	{
+		if (_itemType.equals(ItemType.LEGENDARY))
+		{
+			try
+			{
+				_item = legendary.newInstance();
+				_material = _item.getMaterial();
+			}
+			catch (InstantiationException | IllegalAccessException e)
+			{
+				e.printStackTrace();
+			}
+		}
+		else
+		{
+			throw new RuntimeException("Unexpected call to setLegendary(LegendaryType)");
+		}
+		
+		return this;
+	}
+	
+	public RareItemFactory setSuperPrefix(Class<? extends ItemAttribute> superPrefix)
+	{
+		_superPrefix = superPrefix;
+		return this;
+	}
+	
+	public RareItemFactory setPrefix(Class<? extends ItemAttribute> prefix)
+	{
+		_prefix = prefix;
+		return this;
+	}
+	
+	public RareItemFactory setSuffix(Class<? extends ItemAttribute> suffix)
+	{
+		_suffix = suffix;
+		return this;
+	}
+	
+	public ItemStack fabricate()
+	{
+		applyAttributes();
+		
+		ItemStack item = _item.toItemStack();
+		
+		return item;
+	}
+
+	private void applyAttributes()
+	{
+		try
+		{
+			if (_superPrefix != null)
+			{
+				_item.getAttributes().addAttribute(_superPrefix.newInstance());
+			}
+
+			if (_prefix != null)
+			{
+				_item.getAttributes().addAttribute(_prefix.newInstance());
+			}
+
+			if (_suffix != null)
+			{
+				_item.getAttributes().addAttribute(_suffix.newInstance());
+			}
+		}
+		catch (InstantiationException | IllegalAccessException e)
+		{
+			e.printStackTrace();
+		}
+	}
+	
+	public ItemType getItemType()
+	{
+		return _itemType;
+	}
+	
+	public Material getMaterial()
+	{
+		return _material;
+	}
+	
+	public CustomItem getWrapper()
+	{
+		applyAttributes();
+		return _item;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java
new file mode 100644
index 000000000..836665064
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java
@@ -0,0 +1,43 @@
+package mineplex.game.clans.items.attributes;
+
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+/**
+ * Represents an attribute that triggers a special ability after a specified number
+ * of attacks with a weapon possessing the attribute.
+ * @author MrTwiggy
+ *
+ */
+public abstract class AttackAttribute extends ItemAttribute 
+{
+
+	private int _attackLimit;
+	public int getAttackLimit() { return _attackLimit; }
+	
+	private int _attackCount;
+	
+	public AttackAttribute(AttributeType type, int attackLimit)
+	{
+		super(type);
+		
+		_attackLimit = attackLimit;
+		_attackCount = 0;
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+		_attackCount++;
+		System.out.println("Attack count " + _attackCount + " - " + _attackLimit);
+		if (_attackCount >= _attackLimit)
+		{
+			_attackCount = 0;
+			triggerAttack(event.GetDamagerEntity(true), event.GetDamageeEntity());
+		}
+	}
+	
+	public abstract void triggerAttack(Entity attacker, Entity defender);
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttributeContainer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttributeContainer.java
new file mode 100644
index 000000000..8e1c17139
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttributeContainer.java
@@ -0,0 +1,92 @@
+package mineplex.game.clans.items.attributes;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class AttributeContainer 
+{
+
+	private ItemAttribute _superPrefix;
+	public ItemAttribute getSuperPrefix() { return _superPrefix; }
+	public void setSuperPrefix(ItemAttribute attribute) { _superPrefix = attribute; }
+	 
+	private ItemAttribute _prefix;
+	public ItemAttribute getPrefix() { return _prefix; }
+	public void setPrefix(ItemAttribute attribute) { _prefix = attribute; }
+	
+	private ItemAttribute _suffix;
+	public ItemAttribute getSuffix() { return _suffix; }
+	public void setSuffix(ItemAttribute attribute) { _suffix = attribute; }
+	
+	public AttributeContainer(ItemAttribute superPrefix, ItemAttribute prefix, ItemAttribute suffix)
+	{
+		_superPrefix = superPrefix;
+		_prefix = prefix;
+		_suffix = suffix;
+	}
+	
+	public AttributeContainer()
+	{
+		this(null, null, null);
+	}
+	
+	public Set<ItemAttribute> getAttributes()
+	{
+		Set<ItemAttribute> attributes = new HashSet<ItemAttribute>();
+		
+		if (_superPrefix != null) attributes.add(_superPrefix);
+		if (_prefix != null) attributes.add(_prefix);
+		if (_suffix != null) attributes.add(_suffix);
+		
+		return attributes;
+	}
+	
+	public Set<AttributeType> getRemainingTypes()
+	{
+		Set<AttributeType> remainingTypes = new HashSet<AttributeType>();
+		
+		if (_superPrefix == null) remainingTypes.add(AttributeType.SUPER_PREFIX);
+		if (_prefix == null) remainingTypes.add(AttributeType.PREFIX);
+		if (_suffix == null) remainingTypes.add(AttributeType.SUFFIX);
+		
+		return remainingTypes;
+	}
+	
+	public String formatItemName(String displayName)
+	{
+		String itemName = displayName;
+		
+		if (_prefix != null)
+		{
+			itemName = _prefix.getDisplayName() + " " + itemName;
+		} 
+		
+		if (_superPrefix != null)
+		{
+			itemName = _superPrefix.getDisplayName() + " " + itemName;
+		}
+		
+		if (_suffix != null)
+		{
+			itemName += "of " + _suffix.getDisplayName();
+		}
+		
+		return itemName;
+	}
+	
+	public void addAttribute(ItemAttribute attribute)
+	{
+		switch(attribute.getType())
+		{
+		case SUPER_PREFIX:
+			setSuperPrefix(attribute);
+			break;
+		case PREFIX:
+			setPrefix(attribute);
+			break;
+		case SUFFIX:
+			setSuffix(attribute);
+			break;
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttributeType.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttributeType.java
new file mode 100644
index 000000000..df1a59954
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttributeType.java
@@ -0,0 +1,8 @@
+package mineplex.game.clans.items.attributes;
+
+public enum AttributeType 
+{
+	SUPER_PREFIX,
+	PREFIX,
+	SUFFIX;
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/DamageAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/DamageAttribute.java
new file mode 100644
index 000000000..b61ef7dd7
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/DamageAttribute.java
@@ -0,0 +1,31 @@
+package mineplex.game.clans.items.attributes;
+
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+public abstract class DamageAttribute extends ItemAttribute
+{
+	private double _bonusDamage;
+	public double getBonusDamage() { return _bonusDamage; }
+	
+	public DamageAttribute(AttributeType type, ValueDistribution damageGen) 
+	{
+		super(type);
+		
+		_bonusDamage = damageGen.generateValue();
+	}
+
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+		if (grantBonusDamage(event.GetDamageeEntity()))
+		{
+			event.AddMod("Damage Attribute", _bonusDamage);
+		}
+	}
+	
+	public abstract boolean grantBonusDamage(Entity defender);
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/ItemAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/ItemAttribute.java
new file mode 100644
index 000000000..a2593c271
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/ItemAttribute.java
@@ -0,0 +1,130 @@
+package mineplex.game.clans.items.attributes;
+
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+/**
+ * Represents an attribute that can be attached to {@link CustomItem} to augment their abilities 
+ * and special effects on trigger.
+ * @author MrTwiggy
+ *
+ */
+public abstract class ItemAttribute
+{
+
+	private AttributeType _type;
+	public AttributeType getType() { return _type; }
+	public boolean matchesType(AttributeType type) { return _type == type; }
+	
+	public ItemAttribute(AttributeType type)
+	{
+		_type = type;
+	}
+	
+	/**
+	 * @return the attribute name display to players.
+	 */
+	public abstract String getDisplayName();
+	
+	/**
+	 * @return a user-friendly description of this attribute, entailing it's effects
+	 * and current associated values.
+	 */
+	public String getDescription() { return "???IMPLEMENT???"; }
+
+	public void onInteract(PlayerInteractEvent event)
+	{
+		// Implementation left to subclasses.
+	}
+	
+	public void onAttack(CustomDamageEvent event)
+	{
+		// Implementation left to subclasses.
+	}
+	
+	public void onAttacked(CustomDamageEvent event)
+	{
+		// Implementation left to subclasses.
+	}
+	
+	/**
+	 * @param minValue - the minimum value for attribute value range
+	 * @param maxValue - the maximum value for attribute value range
+	 * @return newly instantiated {@link ValueDistribution} for attribute values in range [{@code minValue}. {@code maxValue}].
+	 */
+	public static ValueDistribution generateDistribution(double minValue, double maxValue)
+	{
+		return new ValueDistribution(minValue, maxValue);
+	}
+	
+	/**
+	 * @param amplifier - the amplifier for a potion effect intensity
+	 * @return the roman-numeral properly representing the amplifier
+	 */
+	public static String amplifierToRoman(int amplifier)
+	{
+		return integerToRomanNumeral(amplifier + 1);	// Add one because amplifiers are zero-based
+	}
+	
+	// Ugly int-to-roman numeral conversion found online. Don't judge!
+	public static String integerToRomanNumeral(int input) {
+	    if (input < 1 || input > 3999)
+	        return "???";
+	    String s = "";
+	    while (input >= 1000) {
+	        s += "M";
+	        input -= 1000;        }
+	    while (input >= 900) {
+	        s += "CM";
+	        input -= 900;
+	    }
+	    while (input >= 500) {
+	        s += "D";
+	        input -= 500;
+	    }
+	    while (input >= 400) {
+	        s += "CD";
+	        input -= 400;
+	    }
+	    while (input >= 100) {
+	        s += "C";
+	        input -= 100;
+	    }
+	    while (input >= 90) {
+	        s += "XC";
+	        input -= 90;
+	    }
+	    while (input >= 50) {
+	        s += "L";
+	        input -= 50;
+	    }
+	    while (input >= 40) {
+	        s += "XL";
+	        input -= 40;
+	    }
+	    while (input >= 10) {
+	        s += "X";
+	        input -= 10;
+	    }
+	    while (input >= 9) {
+	        s += "IX";
+	        input -= 9;
+	    }
+	    while (input >= 5) {
+	        s += "V";
+	        input -= 5;
+	    }
+	    while (input >= 4) {
+	        s += "IV";
+	        input -= 4;
+	    }
+	    while (input >= 1) {
+	        s += "I";
+	        input -= 1;
+	    }    
+	    return s;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ConqueringArmorAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ConqueringArmorAttribute.java
new file mode 100644
index 000000000..9e47e5923
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ConqueringArmorAttribute.java
@@ -0,0 +1,39 @@
+package mineplex.game.clans.items.attributes.armor;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+// A.K.A Conquering for Armor
+public class ConqueringArmorAttribute extends FlatReductionAttribute
+{
+	private static ValueDistribution reductionGen = generateDistribution(1.0d, 4.0d);
+	private static ReductionConfig config = new ReductionConfig();
+	
+	public ConqueringArmorAttribute()
+	{
+		super(AttributeType.SUFFIX, reductionGen, config);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Conquering";
+	}
+
+	@Override
+	public String getDescription()
+	{
+		return String.format("-%.1f damage taken from mobs & bosses", getFlatReduction());
+	}
+	
+	@Override
+	public boolean reducesDamage(DamageCause cause, Entity attacker)
+	{
+		return attacker != null;	// Reduces damage from all entities
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/EscapeAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/EscapeAttribute.java
new file mode 100644
index 000000000..c4f0db81e
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/EscapeAttribute.java
@@ -0,0 +1,27 @@
+package mineplex.game.clans.items.attributes.armor;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+public class EscapeAttribute extends ItemAttribute
+{
+	// TODO: Replace with your generators
+	private static ValueDistribution healGen = generateDistribution(4, 12);		// Value generator for heal amount
+	
+	private int _healPercent;
+	
+	public EscapeAttribute()
+	{
+		super(AttributeType.SUFFIX);
+		
+		_healPercent = healGen.generateIntValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "";	// TODO: Fill in name
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/FlatReductionAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/FlatReductionAttribute.java
new file mode 100644
index 000000000..b78b4d143
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/FlatReductionAttribute.java
@@ -0,0 +1,25 @@
+package mineplex.game.clans.items.attributes.armor;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+public abstract class FlatReductionAttribute extends ReductionAttribute
+{
+
+	private double _reduction;
+	public double getFlatReduction() { return _reduction; }
+	
+	public FlatReductionAttribute(AttributeType type, ValueDistribution reductionGen, ReductionConfig config)
+	{
+		super(type, config);
+		
+		_reduction = reductionGen.generateValue();
+	}
+	
+	@Override
+	public double getDamageReduction(double originalDamage) 
+	{
+		return _reduction;
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/LavaAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/LavaAttribute.java
new file mode 100644
index 000000000..69313c2ae
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/LavaAttribute.java
@@ -0,0 +1,30 @@
+package mineplex.game.clans.items.attributes.armor;
+
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+public class LavaAttribute extends PercentReductionAttribute
+{	
+	private static ValueDistribution reductionGen = generateDistribution(0.2d, 1.0d);		// Value generator for heal amount
+	private static ReductionConfig lavaConfig = new ReductionConfig(DamageCause.FIRE, DamageCause.LAVA, DamageCause.FIRE_TICK);
+	
+	public LavaAttribute()
+	{
+		super(AttributeType.SUPER_PREFIX, reductionGen, lavaConfig);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Lava Forged";
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Reduces damage from fire and lava by %.1f%%", getReductionPercent() * 100d);
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/PaddedAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/PaddedAttribute.java
new file mode 100644
index 000000000..99606cb43
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/PaddedAttribute.java
@@ -0,0 +1,30 @@
+package mineplex.game.clans.items.attributes.armor;
+
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+public class PaddedAttribute extends FlatReductionAttribute
+{	
+	private static ValueDistribution reductionGen = generateDistribution(1.0d, 4.0d);
+	private static ReductionConfig config = new ReductionConfig(DamageCause.FALL);
+	
+	public PaddedAttribute()
+	{
+		super(AttributeType.PREFIX, reductionGen, config);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Padded";
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("-%.1f damage taken from falls", getFlatReduction());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/PercentReductionAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/PercentReductionAttribute.java
new file mode 100644
index 000000000..681324004
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/PercentReductionAttribute.java
@@ -0,0 +1,24 @@
+package mineplex.game.clans.items.attributes.armor;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+public abstract class PercentReductionAttribute extends ReductionAttribute
+{
+	private double _reductionPercent;
+	public double getReductionPercent() { return _reductionPercent; }
+	
+	public PercentReductionAttribute(AttributeType type, ValueDistribution reductionGen, ReductionConfig config)
+	{
+		super(type, config);
+		
+		_reductionPercent = reductionGen.generateValue();
+	}
+	
+	@Override
+	public double getDamageReduction(double originalDamage) 
+	{
+		return originalDamage * _reductionPercent;
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ReductionAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ReductionAttribute.java
new file mode 100644
index 000000000..c7362f417
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ReductionAttribute.java
@@ -0,0 +1,53 @@
+package mineplex.game.clans.items.attributes.armor;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public abstract class ReductionAttribute extends ItemAttribute
+{
+
+	private ReductionConfig _config;
+	
+	public ReductionAttribute(AttributeType type, ReductionConfig config)
+	{
+		super(type);
+		
+		_config = config;
+	}
+	
+	@Override
+	public void onAttacked(CustomDamageEvent event)
+	{
+		DamageCause cause = event.GetCause();
+		Entity attacker = event.GetDamagerEntity(true);
+		
+		if (reducesDamage(cause, attacker))
+		{
+			double damage = event.GetDamage();
+			double reduction = getDamageReduction(damage);
+			event.AddMod("Reduction Armor", -reduction);
+			System.out.println("Reduced damage by " + reduction);
+		}
+		else
+		{
+//			System.out.println("Armor doesn't reduce " + cause);
+		}
+	}
+	
+	public boolean reducesDamage(DamageCause cause, Entity attacker)
+	{
+		return _config.reducesDamage(cause, attacker);
+	}
+	
+	public abstract double getDamageReduction(double originalDamage);
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ReductionConfig.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ReductionConfig.java
new file mode 100644
index 000000000..034f52f24
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ReductionConfig.java
@@ -0,0 +1,46 @@
+package mineplex.game.clans.items.attributes.armor;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+
+public class ReductionConfig 
+{
+
+	private Set<EntityType> _reducedAttackers;	// EntityTypes whose attacks are reduced by this attribute
+	private Set<DamageCause> _reducedCauses;	// DamageCauses that are reduced by this attribute
+	
+	public ReductionConfig()
+	{
+		_reducedAttackers = new HashSet<EntityType>();
+		_reducedCauses = new HashSet<DamageCause>();
+	}
+	
+	public ReductionConfig(DamageCause... reducedCauses)
+	{
+		this();
+		
+		for (DamageCause cause : reducedCauses)
+		{
+			_reducedCauses.add(cause);
+		}
+	}
+	
+	public ReductionConfig(EntityType... reducedAttackers)
+	{
+		this();
+		
+		for (EntityType attacker : reducedAttackers)
+		{
+			_reducedAttackers.add(attacker);
+		}
+	}
+	
+	public boolean reducesDamage(DamageCause cause, Entity attacker)
+	{
+		return _reducedCauses.contains(cause) || (attacker != null && _reducedAttackers.contains(attacker.getType()));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ReinforcedAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ReinforcedAttribute.java
new file mode 100644
index 000000000..10ab3c7aa
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/ReinforcedAttribute.java
@@ -0,0 +1,29 @@
+ package mineplex.game.clans.items.attributes.armor;
+
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+public class ReinforcedAttribute extends FlatReductionAttribute
+{
+	private static ValueDistribution reductionGen = generateDistribution(0.5d, 1.0d);
+	private static ReductionConfig config = new ReductionConfig(DamageCause.ENTITY_ATTACK);
+	
+	public ReinforcedAttribute()
+	{
+		super(AttributeType.PREFIX, reductionGen, config);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Reinforced";
+	}
+
+	@Override
+	public String getDescription()
+	{
+		return String.format("-%.1f damage taken from melee", getFlatReduction());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/SeaAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/SeaAttribute.java
new file mode 100644
index 000000000..4292b3d56
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/SeaAttribute.java
@@ -0,0 +1,27 @@
+package mineplex.game.clans.items.attributes.armor;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+public class SeaAttribute extends ItemAttribute
+{
+	// TODO: Replace with your generators
+	private static ValueDistribution healGen = generateDistribution(4, 12);		// Value generator for heal amount
+	
+	private int _healPercent;
+	
+	public SeaAttribute()
+	{
+		super(AttributeType.SUFFIX);
+		
+		_healPercent = healGen.generateIntValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "";	// TODO: Fill in name
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/SlantedAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/SlantedAttribute.java
new file mode 100644
index 000000000..23d2767ad
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/armor/SlantedAttribute.java
@@ -0,0 +1,30 @@
+package mineplex.game.clans.items.attributes.armor;
+
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+public class SlantedAttribute extends FlatReductionAttribute
+{
+	private static ValueDistribution reductionGen = generateDistribution(0.5d, 1.5d);
+	private static ReductionConfig config = new ReductionConfig(DamageCause.PROJECTILE);
+	
+	public SlantedAttribute()
+	{
+		super(AttributeType.PREFIX, reductionGen, config);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Slanted";
+	}
+
+	@Override
+	public String getDescription()
+	{
+		return String.format("-%.1f damage taken from projectiles", getFlatReduction());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/DestructionAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/DestructionAttribute.java
new file mode 100644
index 000000000..b9586869d
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/DestructionAttribute.java
@@ -0,0 +1,38 @@
+package mineplex.game.clans.items.attributes.bow;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Entity;
+
+public class DestructionAttribute extends ItemAttribute
+{
+	private static ValueDistribution attackGen = generateDistribution(2, 4);	
+	private static ValueDistribution fireGen = generateDistribution(60, 120);	
+	
+	
+	public DestructionAttribute()
+	{
+		super(AttributeType.SUFFIX);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "";	
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return "";
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HeavyArrowsAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HeavyArrowsAttribute.java
new file mode 100644
index 000000000..16aa30a21
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HeavyArrowsAttribute.java
@@ -0,0 +1,40 @@
+package mineplex.game.clans.items.attributes.bow;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Entity;
+
+public class HeavyArrowsAttribute extends ItemAttribute
+{
+	private static ValueDistribution knockbackGen = generateDistribution(25, 75);	
+	
+	private double _knockbackPercent;
+	
+	public HeavyArrowsAttribute()
+	{
+		super(AttributeType.PREFIX);
+		
+		_knockbackPercent = knockbackGen.generateValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Heavy";	
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Increase knockback by %.2f%%", _knockbackPercent);
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+		event.AddKnockback("HeavyAttribute", _knockbackPercent);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HuntingAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HuntingAttribute.java
new file mode 100644
index 000000000..9e7d680d5
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HuntingAttribute.java
@@ -0,0 +1,56 @@
+package mineplex.game.clans.items.attributes.bow;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+public class HuntingAttribute extends ItemAttribute
+{
+	private static ValueDistribution amountGen = generateDistribution(0, 2);	// Value generator for slow amount range
+	private static ValueDistribution durationGen = generateDistribution(1, 4);	// Value generator for slow duration range
+	
+	private int _slowAmount;		// The slowness level/amplifier
+	private double _slowDuration;	// The duration (in ticks) of slow effect
+	
+	public HuntingAttribute()
+	{
+		super(AttributeType.PREFIX);
+		
+		_slowAmount = amountGen.generateIntValue();
+		_slowDuration = durationGen.generateValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Hunting";	
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Damaged enemies receive slowness %s for %.2f seconds", amplifierToRoman(_slowAmount), _slowDuration);
+	}
+	
+	@Override
+	public void onAttacked(CustomDamageEvent event)
+	{
+		Player damager = event.GetDamagerPlayer(true);
+		
+		if (damager != null)
+		{
+			damager.addPotionEffect(generateSlowEffect());	// Slow attacking player
+		}
+	}
+	
+	private PotionEffect generateSlowEffect()
+	{
+		return new PotionEffect(PotionEffectType.SLOW, (int) (_slowDuration * 20), _slowAmount);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/InverseAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/InverseAttribute.java
new file mode 100644
index 000000000..6c3026887
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/InverseAttribute.java
@@ -0,0 +1,41 @@
+package mineplex.game.clans.items.attributes.bow;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Entity;
+
+public class InverseAttribute extends ItemAttribute
+{
+private static ValueDistribution knockbackGen = generateDistribution(-0.5d, 1.0d);	
+	
+	private double _knockbackModifier;
+	
+	public InverseAttribute()
+	{
+		super(AttributeType.PREFIX);
+		
+		_knockbackModifier = knockbackGen.generateValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Inverse";	
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Reverse knockback and modify amount to %.2f percent", (1.0d + _knockbackModifier) * 100d);
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+		event.AddKnockback("InverseAttribute", _knockbackModifier);
+		event.invertKnockback();
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/LeechingAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/LeechingAttribute.java
new file mode 100644
index 000000000..2ae4632d6
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/LeechingAttribute.java
@@ -0,0 +1,50 @@
+package mineplex.game.clans.items.attributes.bow;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+public class LeechingAttribute extends ItemAttribute
+{
+	private static ValueDistribution healGen = generateDistribution(5, 15);
+	
+	private int _healPercent;
+	
+	public LeechingAttribute()
+	{
+		super(AttributeType.SUPER_PREFIX);
+		
+		_healPercent = healGen.generateIntValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Leeching";
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Heal for %d percentage of damage dealt", _healPercent);
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+		Player damager = event.GetDamagerPlayer(true);
+		
+		double damage = event.GetDamage();
+		double healAmount = damage * (_healPercent / 100d);
+		heal(damager, healAmount);
+	}
+
+	private void heal(Player player, double healAmount)
+	{
+		player.setHealth(player.getHealth() + healAmount);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/ReboundingAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/ReboundingAttribute.java
new file mode 100644
index 000000000..51889a397
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/ReboundingAttribute.java
@@ -0,0 +1,38 @@
+package mineplex.game.clans.items.attributes.bow;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Entity;
+
+public class ReboundingAttribute extends ItemAttribute
+{
+	private static ValueDistribution attackGen = generateDistribution(2, 4);	
+	private static ValueDistribution fireGen = generateDistribution(60, 120);	
+	
+	
+	public ReboundingAttribute()
+	{
+		super(AttributeType.SUPER_PREFIX);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "";	
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return "";
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/RecursiveAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/RecursiveAttribute.java
new file mode 100644
index 000000000..a18a0adda
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/RecursiveAttribute.java
@@ -0,0 +1,37 @@
+package mineplex.game.clans.items.attributes.bow;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.DamageAttribute;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Entity;
+
+public class RecursiveAttribute extends DamageAttribute
+{
+	private static ValueDistribution attackGen = generateDistribution(2, 6);	
+	
+	public RecursiveAttribute()
+	{
+		super(AttributeType.PREFIX, attackGen);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Recursive";	
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Increase damage by %.2f half-hearts", getBonusDamage());
+	}
+	
+	@Override
+	public boolean grantBonusDamage(Entity defender)
+	{
+		return true;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/ScorchingAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/ScorchingAttribute.java
new file mode 100644
index 000000000..daa299754
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/ScorchingAttribute.java
@@ -0,0 +1,39 @@
+package mineplex.game.clans.items.attributes.bow;
+
+import mineplex.game.clans.items.attributes.AttackAttribute;
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+import org.bukkit.entity.Entity;
+
+public class ScorchingAttribute extends AttackAttribute
+{
+	private static ValueDistribution fireGen = generateDistribution(2, 6);	
+	
+	private double _fireDuration;
+	
+	public ScorchingAttribute()
+	{
+		super(AttributeType.SUPER_PREFIX, 1);	// Activates every hit
+		_fireDuration = fireGen.generateValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Scorching";
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Struck enemies catch fire for %.2f seconds", _fireDuration);
+	}
+	
+	@Override
+	public void triggerAttack(Entity attacker, Entity defender)
+	{
+		defender.setFireTicks((int) (_fireDuration * 20));
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/SlayingAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/SlayingAttribute.java
new file mode 100644
index 000000000..e93011563
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/SlayingAttribute.java
@@ -0,0 +1,38 @@
+package mineplex.game.clans.items.attributes.bow;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.DamageAttribute;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Monster;
+
+public class SlayingAttribute extends DamageAttribute
+{
+	private static ValueDistribution attackGen = generateDistribution(2, 12);	
+	
+	public SlayingAttribute()
+	{
+		super(AttributeType.SUFFIX, attackGen);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Slaying";	
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Increase damage by %.2f half-hearts against mobs & bosses", getBonusDamage());
+	}
+	
+	@Override
+	public boolean grantBonusDamage(Entity defender)
+	{
+		return defender instanceof Monster;	// TODO: Check to see if defender is also a WorldEvent boss?
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/SpectralAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/SpectralAttribute.java
new file mode 100644
index 000000000..3107b5614
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/SpectralAttribute.java
@@ -0,0 +1,38 @@
+package mineplex.game.clans.items.attributes.bow;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Entity;
+
+public class SpectralAttribute extends ItemAttribute
+{
+	private static ValueDistribution attackGen = generateDistribution(2, 4);	
+	private static ValueDistribution fireGen = generateDistribution(60, 120);	
+	
+	
+	public SpectralAttribute()
+	{
+		super(AttributeType.SUPER_PREFIX);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "";	
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return "";
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/ConqueringAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/ConqueringAttribute.java
new file mode 100644
index 000000000..bc0a56ec8
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/ConqueringAttribute.java
@@ -0,0 +1,37 @@
+package mineplex.game.clans.items.attributes.weapon;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.DamageAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+public class ConqueringAttribute extends DamageAttribute
+{
+	private static ValueDistribution damageGen = generateDistribution(1.0d, 6.0d);		
+	
+	public ConqueringAttribute()
+	{
+		super(AttributeType.SUFFIX, damageGen);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Conquering";	
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("%.2f bonus damage against mobs & bosses", getBonusDamage());
+	}
+	
+	@Override
+	public boolean grantBonusDamage(Entity entity)
+	{
+		return !(entity instanceof Player);	// TODO: Check to see if entity is mob and/or a boss!
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java
new file mode 100644
index 000000000..84ab060c0
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java
@@ -0,0 +1,40 @@
+package mineplex.game.clans.items.attributes.weapon;
+
+import mineplex.game.clans.items.attributes.AttackAttribute;
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+import org.bukkit.entity.Entity;
+
+public class FlamingAttribute extends AttackAttribute
+{
+	private static ValueDistribution attackGen = generateDistribution(2, 4);	
+	private static ValueDistribution fireGen = generateDistribution(60, 120);	
+	
+	private int _fireDuration;
+	
+	public FlamingAttribute()
+	{
+		super(AttributeType.SUPER_PREFIX, attackGen.generateIntValue());
+		_fireDuration = fireGen.generateIntValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Flaming";
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Every %d attacks gives Fire for %.1f seconds", getAttackLimit(), (_fireDuration / 20d));
+	}
+	
+	@Override
+	public void triggerAttack(Entity attacker, Entity defender)
+	{
+		defender.setFireTicks(_fireDuration);
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FrostedAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FrostedAttribute.java
new file mode 100644
index 000000000..ce21cacfd
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FrostedAttribute.java
@@ -0,0 +1,65 @@
+package mineplex.game.clans.items.attributes.weapon;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+/**
+ * Frosted attribute to be added onto custom armor. Applies a slowing effect to players that 
+ * attack the wearer of a Frosted {@link CustomItem}.
+ * @author MrTwiggy
+ *
+ */
+public class FrostedAttribute extends ItemAttribute
+{
+	private static ValueDistribution amountGen = generateDistribution(0, 3);	// Value generator for slow amount range
+	private static ValueDistribution durationGen = generateDistribution(20, 60);	// Value generator for slow duration range
+	
+	private int _slowAmount;		// The slowness level/amplifier
+	private int _slowDuration;		// The duration (in ticks) of slow effect
+	
+	/**
+	 * Class constructor
+	 */
+	public FrostedAttribute()
+	{
+		super(AttributeType.SUPER_PREFIX);
+		
+		_slowAmount = amountGen.generateIntValue();
+		_slowDuration = durationGen.generateIntValue();
+	}
+	
+	@Override
+	public String getDisplayName()
+	{
+		return "Frosted";
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Apply slowness %s for %d ticks to enemies", amplifierToRoman(_slowAmount), _slowDuration);
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+		Player victim = event.GetDamageePlayer();
+		
+		if (victim != null)
+		{
+			victim.addPotionEffect(generateSlowEffect());	// Slow attacking player
+		}
+	}
+	
+	private PotionEffect generateSlowEffect()
+	{
+		return new PotionEffect(PotionEffectType.SLOW, _slowDuration, _slowAmount);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/HasteAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/HasteAttribute.java
new file mode 100644
index 000000000..c476fc2b5
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/HasteAttribute.java
@@ -0,0 +1,52 @@
+package mineplex.game.clans.items.attributes.weapon;
+
+import mineplex.game.clans.items.attributes.AttackAttribute;
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.util.Vector;
+
+public class HasteAttribute extends AttackAttribute
+{
+	private static ValueDistribution attackGen = generateDistribution(2, 4);		
+	private static ValueDistribution speedGen = generateDistribution(0, 2);	
+	private static ValueDistribution durationGen = generateDistribution(60, 120);	
+	
+	private int _speedAmount;
+	private int _speedDuration;
+	
+	public HasteAttribute()
+	{
+		super(AttributeType.SUFFIX, attackGen.generateIntValue());
+		
+		_speedAmount = speedGen.generateIntValue();
+		_speedDuration = durationGen.generateIntValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Haste";	
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Every %d attacks gives you Speed %s for %.1f seconds", getAttackLimit(), amplifierToRoman(_speedAmount), (_speedDuration / 20f));
+	}
+	
+	@Override
+	public void triggerAttack(Entity attacker, Entity defender)
+	{
+		if (attacker instanceof Player)
+		{
+			Player player = (Player) attacker;
+			player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, _speedDuration, _speedAmount));
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/HeavyAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/HeavyAttribute.java
new file mode 100644
index 000000000..b1be4ca9d
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/HeavyAttribute.java
@@ -0,0 +1,39 @@
+package mineplex.game.clans.items.attributes.weapon;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class HeavyAttribute extends ItemAttribute
+{
+	private static ValueDistribution knockbackGen = generateDistribution(25, 75);		// Value generator for knockback % boost.
+	
+	private double _knockbackBoost;
+	
+	public HeavyAttribute()
+	{
+		super(AttributeType.PREFIX);
+		
+		_knockbackBoost = knockbackGen.generateValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Heavy";
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("%.1f%% additional knockback", _knockbackBoost);
+	}
+
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+		double knockback = (_knockbackBoost / 100d) * event.getKnockbackValue();
+		event.AddKnockback("Heavy Attribute", knockback);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/JaggedAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/JaggedAttribute.java
new file mode 100644
index 000000000..3c4186d94
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/JaggedAttribute.java
@@ -0,0 +1,37 @@
+package mineplex.game.clans.items.attributes.weapon;
+
+import mineplex.game.clans.items.attributes.AttackAttribute;
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.util.Vector;
+
+public class JaggedAttribute extends AttackAttribute
+{
+	private static ValueDistribution attackGen = generateDistribution(2, 4);
+	
+	public JaggedAttribute()
+	{
+		super(AttributeType.PREFIX, attackGen.generateIntValue());
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Jagged";
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Every %d attacks mini-stuns enemies", getAttackLimit());
+	}
+	
+	@Override
+	public void triggerAttack(Entity attacker, Entity defender)
+	{
+		defender.setVelocity(new Vector(0, 0, 0));
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/SharpAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/SharpAttribute.java
new file mode 100644
index 000000000..c1c996ab0
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/SharpAttribute.java
@@ -0,0 +1,36 @@
+package mineplex.game.clans.items.attributes.weapon;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.DamageAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+import org.bukkit.entity.Entity;
+
+public class SharpAttribute extends DamageAttribute
+{
+	private static ValueDistribution damageGen = generateDistribution(0.5d, 1.5d);
+	
+	public SharpAttribute()
+	{
+		super(AttributeType.PREFIX, damageGen);
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Sharp";
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("%.2f bonus damage", getBonusDamage());
+	}
+	
+	@Override
+	public boolean grantBonusDamage(Entity defender)
+	{
+		return true;
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/SmashingAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/SmashingAttribute.java
new file mode 100644
index 000000000..6dc1833b3
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/SmashingAttribute.java
@@ -0,0 +1,26 @@
+package mineplex.game.clans.items.attributes.weapon;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+public class SmashingAttribute extends ItemAttribute
+{
+	// TODO: Replace with your generators
+	private static ValueDistribution healGen = generateDistribution(4, 12);		// Value generator for heal amount
+	
+	private int _healPercent;
+	
+	public SmashingAttribute()
+	{
+		super(AttributeType.SUFFIX);
+		_healPercent = healGen.generateIntValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "";	// TODO: Fill in name
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/SwiftAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/SwiftAttribute.java
new file mode 100644
index 000000000..587fb09b1
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/SwiftAttribute.java
@@ -0,0 +1,27 @@
+package mineplex.game.clans.items.attributes.weapon;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+
+public class SwiftAttribute extends ItemAttribute
+{
+	// TODO: Replace with your generators
+	private static ValueDistribution healGen = generateDistribution(4, 12);		// Value generator for heal amount
+	
+	private int _healPercent;
+	
+	public SwiftAttribute()
+	{
+		super(AttributeType.PREFIX);
+		
+		_healPercent = healGen.generateIntValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "";	// TODO: Fill in name
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/VampiricAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/VampiricAttribute.java
new file mode 100644
index 000000000..3589216a8
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/VampiricAttribute.java
@@ -0,0 +1,50 @@
+package mineplex.game.clans.items.attributes.weapon;
+
+import mineplex.game.clans.items.attributes.AttributeType;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+public class VampiricAttribute extends ItemAttribute
+{
+	private static ValueDistribution healGen = generateDistribution(4, 12);
+	
+	private int _healPercent;
+	
+	public VampiricAttribute()
+	{
+		super(AttributeType.SUPER_PREFIX);
+		
+		_healPercent = healGen.generateIntValue();
+	}
+
+	@Override
+	public String getDisplayName() 
+	{
+		return "Vampiric";
+	}
+	
+	@Override
+	public String getDescription()
+	{
+		return String.format("Heal yourself for %d% of damage dealt", _healPercent);
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+		Player damager = event.GetDamagerPlayer(false);
+		
+		double damage = event.GetDamage();
+		double healAmount = damage * (_healPercent / 100d);
+		heal(damager, healAmount);
+	}
+
+	private void heal(Player player, double healAmount)
+	{
+		player.setHealth(player.getHealth() + healAmount);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/commands/GearCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/commands/GearCommand.java
new file mode 100644
index 000000000..8309d5fc5
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/commands/GearCommand.java
@@ -0,0 +1,32 @@
+package mineplex.game.clans.items.commands;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.game.clans.items.GearManager;
+
+public class GearCommand extends CommandBase<GearManager>
+{
+	private GearManager _gearManager;
+	
+	public GearCommand(GearManager plugin)
+	{
+		super(plugin, Rank.ADMIN, "gear", "custom-gear");
+		_gearManager = plugin;
+	}
+	
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		if (args == null || args.length == 0)
+		{
+			_gearManager.openShop(caller);
+		}
+		else
+		{
+			caller.updateInventory();
+		}
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/economy/GoldToken.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/economy/GoldToken.java
new file mode 100644
index 000000000..2cdc2da23
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/economy/GoldToken.java
@@ -0,0 +1,35 @@
+package mineplex.game.clans.items.economy;
+
+import org.bukkit.Material;
+
+import mineplex.game.clans.items.CustomItem;;
+
+public class GoldToken extends CustomItem
+{
+	private int _goldValue;
+	
+	public GoldToken()
+	{
+		this(0);
+	}
+	
+	public GoldToken(int goldValue)
+	{
+		super("Gold Token", null, Material.RECORD_12);
+		
+		_goldValue = goldValue;
+	}
+	
+	public int getGoldValue()
+	{
+		return _goldValue;
+	}
+	
+	@Override
+	public String[] getDescription()
+	{
+		return new String[] {
+				String.format("A gold token worth %s gold coins.", _goldValue),
+		};
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/generation/ValueDistribution.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/generation/ValueDistribution.java
new file mode 100644
index 000000000..15d13691c
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/generation/ValueDistribution.java
@@ -0,0 +1,56 @@
+package mineplex.game.clans.items.generation;
+
+import java.util.Random;
+
+/**
+ * Handles the random generation of attribute values in specified value range
+ * and probability distribution.
+ * @author MrTwiggy
+ *
+ */
+public class ValueDistribution
+{
+	private static Random random = new Random();	// Used for RNG of value generation
+	
+	private double _min;			// Minimum value range available for distribution
+	private double _max;			// Maximum value range available for distribution
+	private double _lambdaScaler;	// Scales exponential probability distribution to skew range values
+	
+	/**
+	 * Class constructor for distribution of range [min, max]
+	 * @param min - the minimum value for generation range
+	 * @param max - the maximum value for generation range
+	 */
+	public ValueDistribution(double min, double max)
+	{
+		_min = min;
+		_max = max;
+	}
+	
+	/**
+	 * @return randomly generated value conforming to the range and value distribution.
+	 */
+	public double generateValue()
+	{
+		double roll = random.nextDouble() * random.nextDouble();
+		
+		double delta = getRange() * roll;
+		return _min + delta;
+	}
+	
+	/**
+	 * @return randomly generated distribution value, rounding to nearest integer.
+	 */
+	public int generateIntValue()
+	{
+		return (int) Math.round(generateValue());
+	}
+	
+	/**
+	 * @return the value range associated with this distribution.
+	 */
+	public double getRange()
+	{
+		return _max - _min;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/generation/Weight.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/generation/Weight.java
new file mode 100644
index 000000000..108347832
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/generation/Weight.java
@@ -0,0 +1,19 @@
+package mineplex.game.clans.items.generation;
+
+public class Weight<T>
+{
+
+	private int _weight;
+	public int getWeight() { return _weight; }
+	
+	private T _value;
+	public T getValue() { return _value; }
+	
+	public Weight(int weight, T value)
+	{
+		_weight = weight;
+		_value = value;
+	}
+	
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/generation/WeightSet.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/generation/WeightSet.java
new file mode 100644
index 000000000..7af1d76a7
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/generation/WeightSet.java
@@ -0,0 +1,99 @@
+package mineplex.game.clans.items.generation;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Set;
+
+public class WeightSet<T>
+{
+
+	private static Random random = new Random();
+	
+	private Set<Weight<T>> _weights;
+	
+	public WeightSet()
+	{
+		_weights = new HashSet<Weight<T>>();
+	}
+	
+	@SafeVarargs
+	public WeightSet(Weight<T>... weights)
+	{
+		this();
+		
+		for (Weight<T> weight : weights)
+		{
+			_weights.add(weight);
+		}
+	}
+	
+	@SafeVarargs
+	public WeightSet(T... elements)
+	{
+		this();
+		
+		for (T element : elements)
+		{
+			_weights.add(new Weight<T>(1, element));	// Constant weight of 1 means all elements are equally likely
+		}
+	}
+	
+	public WeightSet(Collection<T> elements)
+	{
+		this();
+		
+		for (T element : elements)
+		{
+			_weights.add(new Weight<T>(1, element));	// Constant weight of 1 means all elements are equally likely
+		}
+	}
+
+	public void add(int weight, T element)
+	{
+		_weights.add(new Weight<T>(weight, element));
+	}
+	
+	private int getTotalWeight()
+	{
+		int total = 0;
+		
+		for (Weight<T> weight : _weights)
+		{
+			total += weight.getWeight();
+		}
+		
+		return total;
+	}
+	
+	public T generateRandom()
+	{
+		int totalWeight = getTotalWeight();
+		int roll = random.nextInt(totalWeight);
+		
+		for (Weight<T> weight : _weights)
+		{
+			roll -= weight.getWeight();
+			
+			if (roll < 0)
+			{
+				return weight.getValue();
+			}
+		}
+		
+		// Should never reach here.
+		return null;
+	}
+	
+	public Set<T> elements()
+	{
+		Set<T> elements = new HashSet<T>();
+		
+		for (Weight<T> weight : _weights)
+		{
+			elements.add(weight.getValue());
+		}
+		
+		return elements;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/AlligatorsTooth.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/AlligatorsTooth.java
new file mode 100644
index 000000000..b444b690d
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/AlligatorsTooth.java
@@ -0,0 +1,92 @@
+package mineplex.game.clans.items.legendaries;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+
+import org.bukkit.Effect;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.C;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class AlligatorsTooth extends LegendaryItem
+{
+	private static ValueDistribution boostGen = generateDistribution(0.8d, 1.4d);
+	
+	private double _landDamageBonus = 7;
+	private double _waterDamageBonus = 11;
+	private double _swimSpeed;
+	
+	private int _soundUpdateCounter;
+	
+	public AlligatorsTooth()
+	{
+		super("Alligators Tooth", new String[] {
+			C.cWhite + "This deadly tooth was stolen from",
+			C.cWhite + "a nest of reptillian beasts long",
+			C.cWhite + "ago. Legends say that the holder",
+			C.cWhite + "is granted the underwater agility",
+			C.cWhite + "of an Alligator",
+			" ",
+			C.cYellow + "Right-Click" + C.cWhite  + " to use" + C.cGreen + " Swim",
+		}, Material.RECORD_4);
+		
+		_swimSpeed = boostGen.generateValue();
+	}
+	
+	@Override
+	public void update(Player wielder)
+	{
+		if (isInWater(wielder))
+		{
+			// Player gain water breathing while under water with legendary
+			// equipped
+			grantPotionEffect(wielder, PotionEffectType.WATER_BREATHING, 0, 50);
+			
+			if (isHoldingRightClick())
+			{
+				propelPlayer(wielder);
+				if (++_soundUpdateCounter % 3 == 0)
+				{
+					wielder.playSound(wielder.getLocation(), Sound.SPLASH2, .5f, 1.25f);
+					
+					wielder.getLocation().getWorld().playEffect(wielder.getLocation(), Effect.STEP_SOUND, Material.LAPIS_BLOCK.getId());
+				}
+			}
+		}
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event, Player wielder)
+	{
+		if (isInWater(wielder))
+		{
+			event.AddMod("Alligators Tooth", _waterDamageBonus);
+			event.AddKnockback("Alligators Tooth", 0.5d);
+		}
+		else
+		{
+			event.AddMod("Alligators Tooth", _landDamageBonus);
+		}
+		
+	}
+	
+	private void propelPlayer(Player player)
+	{
+		Vector direction = player.getLocation().getDirection().normalize();
+		direction.multiply(_swimSpeed);
+		player.setVelocity(direction);
+	}
+	
+	private boolean isInWater(Player player)
+	{
+		return player.getLocation().getBlock().getType() == Material.WATER || player.getLocation().getBlock().getType() == Material.STATIONARY_WATER;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java
new file mode 100644
index 000000000..d28524af0
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java
@@ -0,0 +1,68 @@
+package mineplex.game.clans.items.legendaries;
+
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffectType;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class GiantsBroadsword extends LegendaryItem
+{
+	public static final int SLOW_AMPLIFIER = 4;
+	public static final int REGEN_AMPLIFIER = 1;
+	public static final int EFFECT_DURATION = 10; // Duration of potion effect
+													// (in ticks)
+	
+	public GiantsBroadsword()
+	{
+		super("Giants Broadsword", new String[]{
+				C.cWhite + "Forged in the godly mines of Plagieus",
+				C.cWhite + "this sword has endured thousands of",
+				C.cWhite + "wars. It is sure to grant certain",
+				C.cWhite + "victory in battle.",
+				C.cWhite + " ",
+				C.cWhite + "Deals " + C.cYellow + "10 Damage" + C.cWhite + " with attack",
+				C.cYellow + "Right-Click" + C.cWhite + " to use " + C.cGreen + "Shield",
+		}, Material.GOLD_RECORD);
+	}
+	
+	@Override
+	public void update(Player wielder)
+	{
+		if (isHoldingRightClick())
+		{
+			buffPlayer(wielder);
+			
+			UtilParticle.PlayParticle(ParticleType.HEART, wielder.getEyeLocation().add(0, 0.25, 0), -.5f + (float) Math.random(), -.5f + (float) Math.random(), -.5f + (float) Math.random(), .2f, 1, ViewDist.NORMAL);
+			wielder.playSound(wielder.getLocation(), Sound.LAVA_POP, 1f, 2f);
+			return;
+		}
+		
+		UtilParticle.PlayParticle(ParticleType.MAGIC_CRIT, wielder.getLocation().add(0, 1, 0), 0, 0, 0, .2f, 3, ViewDist.NORMAL);
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event, Player wielder)
+	{
+		if (isHoldingRightClick())
+		{
+			event.SetCancelled("Giants Broadsword effects");
+			return;
+		}
+		
+		event.AddMod("Giants Bonus", 9);
+		event.AddKnockback("Giants Sword", 0.5d);
+	}
+	
+	
+	private void buffPlayer(Player player)
+	{
+		grantPotionEffect(player, PotionEffectType.SLOW, 20, 10);
+		grantPotionEffect(player, PotionEffectType.REGENERATION, 1, 10);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/HyperAxe.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/HyperAxe.java
new file mode 100644
index 000000000..c9630b26c
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/HyperAxe.java
@@ -0,0 +1,83 @@
+	package mineplex.game.clans.items.legendaries;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+import mineplex.core.common.util.C;
+import mineplex.core.recharge.Recharge;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class HyperAxe extends LegendaryItem
+{
+	public static final long ATTACK_RATE_DURATION = 200;
+	private static ValueDistribution amountGen = generateDistribution(0, 3);		// [1, 4] speed amount
+	private static ValueDistribution durationGen = generateDistribution(80, 320);	// [4, 16] seconds speed duration
+
+	private int _speedAmount;
+	private int _speedDuration;
+	
+	private long _lastAttack;
+	public long timeSinceLastAttack() { return System.currentTimeMillis() - _lastAttack; }
+	
+	public HyperAxe()
+	{
+		super("Hyper Axe", new String[]{
+				C.cWhite + "Of all the weapons known to man,",
+				C.cWhite + "none is more prevalent than the",
+				C.cWhite + "Hyper Axe. Infused with rabbit's",
+				C.cWhite + "speed and pigman's ferocity, this",
+				C.cWhite + "blade can rip through any opponent.",
+				C.cWhite + " ",
+				C.cWhite + "Hit delay is reduced by " + C.cYellow + "50%",
+				C.cWhite + "Deals " + C.cYellow + "10 Damage" + C.cWhite + " with attack",
+				C.cYellow + "Right-Click" + C.cWhite + " to use " + C.cGreen + "Dash",
+		}, Material.RECORD_3);
+		_speedAmount = amountGen.generateIntValue();
+		_speedDuration = durationGen.generateIntValue();
+		_lastAttack = 0;
+	}
+	
+	@Override
+	public void update(Player wielder)
+	{
+		if (isHoldingRightClick() && canBuff())
+		{
+			buffPlayer(wielder);
+			_lastAttack = System.currentTimeMillis();
+		}
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event, Player wielder)
+	{
+		if (timeSinceLastAttack() >= ATTACK_RATE_DURATION)
+		{
+			event.SetIgnoreRate(true);
+//			log("Ignoring rate!");
+			
+			event.AddMod("Hyper Axe", 1);
+		}
+		else
+		{
+			event.SetCancelled("Hyper Axe Cooldown");
+		}
+	}
+	
+	private void buffPlayer(Player wielder)
+	{
+		 if (!Recharge.Instance.use(wielder, "Hyper Rush", 16000, true, true))
+			   return;
+		
+		// Give player speed buff
+		wielder.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, _speedDuration, _speedAmount));
+		log("Buffing");
+	}
+	
+	private boolean canBuff()
+	{
+		return true;	// TODO: Implement cooldown? (None specified in docs, sounds OP)
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/LegendaryItem.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/LegendaryItem.java
new file mode 100644
index 000000000..ffa649364
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/LegendaryItem.java
@@ -0,0 +1,93 @@
+package mineplex.game.clans.items.legendaries;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+import mineplex.game.clans.items.CustomItem;
+import mineplex.game.clans.items.generation.ValueDistribution;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class LegendaryItem extends CustomItem
+{
+	public final long BLOCK_COOLDOWN = 200l;	// Right clicking activates right click for 200ms
+	
+	private long _lastBlock;	// Timestamp of last block from wielder
+	public long timeSinceLastBlock() { return System.currentTimeMillis() - _lastBlock; }
+	
+	public LegendaryItem(String name, String[] description,  Material material)
+	{
+		super(name, description, material);
+		
+		_lastBlock = 0l;
+	}
+	
+	public void update(Player wielder)
+	{
+		//	Leave implementation to potential subtypes
+	}
+	
+	public void onAttack(CustomDamageEvent event, Player wielder)
+	{
+		//	Leave implementation to potential subtypes
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event)
+	{
+		if (event.GetDamagerPlayer(true) != null)
+		{
+			onAttack(event, event.GetDamagerPlayer(true));
+		}
+		
+		super.onAttack(event);
+	}
+	
+	public void onInteract(PlayerInteractEvent event)
+	{
+		Action action = event.getAction();
+		
+		if (action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK)
+		{
+			_lastBlock = System.currentTimeMillis();
+		}
+		
+		super.onInteract(event);
+	}
+	
+	public boolean isHoldingRightClick()
+	{
+		return timeSinceLastBlock() <= BLOCK_COOLDOWN;
+	}
+	
+	protected void log(String message)
+	{
+		System.out.println("[Custom Item - " + _displayName + "] " + message);
+	}
+	
+	/**
+	 * @param minValue - the minimum value for attribute value range
+	 * @param maxValue - the maximum value for attribute value range
+	 * @return newly instantiated {@link ValueDistribution} for attribute values in range [{@code minValue}. {@code maxValue}].
+	 */
+	public static ValueDistribution generateDistribution(double minValue, double maxValue)
+	{
+		return new ValueDistribution(minValue, maxValue);
+	}
+
+	/**
+	 * Add a {@link PotionEffect} to {@code player} with specified {@code type}, {@code amplifier} (power) and
+	 * {@code tickDuration} of the effect.
+	 * @param player - the player to receive the potion effect
+	 * @param type - the type of potion to apply
+	 * @param tickDuration - the duration (in ticks) to apply the potion for
+	 * @param amplifier - the amplifier (level/power, zero-based) of the potion effect
+	 */
+	public static void grantPotionEffect(Player player, PotionEffectType type, int tickDuration, int amplifier)
+	{
+		player.addPotionEffect(new PotionEffect(type, amplifier, tickDuration));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MagneticMaul.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MagneticMaul.java
new file mode 100644
index 000000000..1494de126
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MagneticMaul.java
@@ -0,0 +1,144 @@
+package mineplex.game.clans.items.legendaries;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextBottom;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class MagneticMaul extends LegendaryItem
+{
+	public static final double PULL_RANGE = 10d;
+	
+	private double _power;
+	private double _heat;
+	
+	public MagneticMaul()
+	{
+		super("Magnetic Maul", new String[]{
+				
+		}, Material.RECORD_5);
+	}
+	
+	@Override
+	public void update(Player wielder)
+	{
+		Location loc = wielder.getLocation();
+		if (ClansManager.getInstance().getClaimMap().containsKey(UtilWorld.chunkToStr(loc.getChunk())))
+		{
+			if (ClansManager.getInstance().getClaimMap().get(UtilWorld.chunkToStr(loc.getChunk())).isSafe(wielder.getLocation()))
+			{
+				return;
+			}
+		}
+		
+		if (isHoldingRightClick() && canPull())
+		{
+			pullEntities(wielder);
+		}
+		else
+		{
+			addPower(Math.max(0, 0.65 - (_heat / 150)));
+			
+			if (_heat > 0)
+			{
+				_heat--;
+			}
+		}
+		
+		UtilTextBottom.displayProgress(_power / 80., wielder);
+	}
+
+
+	@Override
+	public void onAttack(CustomDamageEvent event, Player wielder)
+	{
+		event.AddKnockback("Magnetic Blade", -0.5d); // Pull players with negative knockback
+		event.AddMod("Magnetic Maul", 7);
+		log("Negative knockback!");
+	}
+
+	private void pullEntities(Player player)
+	{
+		Vector direction = player.getLocation().getDirection().normalize().multiply(10.0d);
+		Location target = player.getEyeLocation().add(direction);
+		
+		double targetDistance = player.getLocation().distance(target);
+		
+		for (LivingEntity entity : player.getWorld().getLivingEntities())
+		{				
+			if (entity.getEntityId() == player.getEntityId())
+			{
+				continue; // Skip pulling self
+			}
+			
+			double otherDistance = player.getLocation().distance(entity.getLocation());
+			double otherTargetDistance = target.distance(entity.getLocation());
+			
+			// If player is in-front of us and within pulling range
+			if (otherTargetDistance < targetDistance && otherDistance <= PULL_RANGE)
+			{
+				// If entity is in safe zone, don't allow pulling of that entity.
+				if (ClansManager.getInstance().getClaimMap().containsKey(UtilWorld.chunkToStr(entity.getLocation().getChunk())))
+				{
+					if (ClansManager.getInstance().getClaimMap().get(UtilWorld.chunkToStr(entity.getLocation().getChunk())).isSafe(entity.getLocation()))
+					{
+						continue;
+					}
+				}
+				
+				UtilAction.velocity(entity, UtilAlg.getTrajectory(entity, player), 0.3, false, 0, 0, 1, true);
+			}
+		}
+		
+		// Do Particles
+        for (int i=0 ; i<6 ; i++)
+        {
+                Vector random = new Vector(Math.random() * 4 - 2, Math.random() * 4 - 2, Math.random() * 4 - 2);
+                
+                Location origin = player.getLocation().add(0, 1.3, 0);
+                origin.add(player.getLocation().getDirection().multiply(10));
+                origin.add(random);
+                
+                Vector vel = UtilAlg.getTrajectory(origin, player.getLocation().add(0, 1.3, 0));
+                vel.multiply(7);
+                
+                UtilParticle.PlayParticle(ParticleType.MAGIC_CRIT, 
+                                origin, 
+                                (float)vel.getX(), 
+                                (float)vel.getY(), 
+                                (float)vel.getZ(), 
+                                1, 0, ViewDist.LONG, UtilServer.getPlayers());
+        }
+		
+		removePower(1.75);
+		_heat++;
+	}
+	
+	private void addPower(double power)
+	{
+		_power = UtilMath.clamp(_power + power, 0, 80);
+	}
+	
+	private void removePower(double power)
+	{
+		_power = UtilMath.clamp(_power - power, 0, 80);
+	}
+	
+	private boolean canPull()
+	{
+		return _power >= 10 && _heat < 70;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MeteorBow.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MeteorBow.java
new file mode 100644
index 000000000..9c5b7b332
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MeteorBow.java
@@ -0,0 +1,39 @@
+package mineplex.game.clans.items.legendaries;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+public class MeteorBow extends LegendaryItem
+{
+	public static final int MAX_FLIGHT_TIME = 80;	// Max flight of 80 ticks
+	
+	private long _flightTime;	// Time (in ticks) since last touching ground and flying
+	
+	public MeteorBow()
+	{
+		super("Meteor Bow", new String[]{
+				"Shoot explosive arrows!"
+		}, Material.BOW);
+		_flightTime = 0;
+	}
+	
+	@Override
+	public void update(Player wielder)
+	{
+		if (isHoldingRightClick() && canPropel())
+		{
+			propelPlayer(wielder);
+		}
+	}
+
+	private void propelPlayer(Player player)
+	{
+		_flightTime++;
+		// TODO: Propel player forward with ??? velocity
+	}
+	
+	private boolean canPropel()
+	{
+		return _flightTime <= MAX_FLIGHT_TIME;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
new file mode 100644
index 000000000..921f00d61
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
@@ -0,0 +1,154 @@
+package mineplex.game.clans.items.legendaries;
+
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilItem;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTextBottom;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.recharge.Recharge;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class WindBlade extends LegendaryItem
+{
+	public static final double FLIGHT_VELOCITY = 0.75d;
+	
+	private double _power;
+	private double _burnoutThreshold;
+	
+	private int _messageTimer;
+	
+	public WindBlade()
+	{
+		super("Wind Blade", new String[] {
+				C.cWhite + "Long ago, a race of cloud dwellers",
+				C.cWhite + "terrorized the skies. A remnant of",
+				C.cWhite + "their tyranny, this airy blade is",
+				C.cWhite + "the last surviving memorium from",
+				C.cWhite + "their final battle against the Titans.",
+				" ",
+				C.cYellow + "Right-Click" + C.cWhite  + " to use" + C.cGreen + " Fly",
+		}, Material.GREEN_RECORD);
+	}
+	
+	@Override
+	public void update(Player wielder)
+	{
+		long burnoutRemaining = -1L;
+		
+		if (Recharge.Instance.Get(wielder) != null && Recharge.Instance.Get(wielder).containsKey("clans_legendary_windblade_burnout"))
+		{
+			burnoutRemaining = Recharge.Instance.Get(wielder).get("clans_legendary_windblade_burnout").GetRemaining();
+		}
+		
+		// Check if player is attempting to fly and activate
+		if (isHoldingRightClick())
+		{
+			if (canPropel(wielder))
+			{
+				wielder.setFallDistance(0f);
+				
+				if (burnoutRemaining > 0)
+				{
+					_messageTimer++;
+					
+					if (_messageTimer % 4 == 0)
+					{
+						UtilParticle.PlayParticle(ParticleType.SMOKE, wielder.getLocation(), 0.f, 0.f, 0.f, .1f, 1, ViewDist.NORMAL);
+						wielder.playSound(wielder.getLocation(), Sound.FIZZ, .5f, 1.f);
+						
+						removePower(0.15);
+						
+						_burnoutThreshold = 0;
+					}
+					
+					if (_messageTimer % 20 == 0)
+					{
+						UtilPlayer.message(wielder, F.main("Wind Blade", "Flight power damaged whilst scraping the ground! Repairs will be finish in " + F.time(UtilTime.MakeStr(burnoutRemaining)) + "."));
+					}
+					
+					if (_messageTimer % 10 == 0)
+					{
+						wielder.playSound(wielder.getLocation(), Sound.ANVIL_USE, .5f, 1.5f);
+					}
+					
+					return;
+				}
+				
+				removePower(UtilEnt.isGrounded(wielder) ? 1.17 : .88);
+				
+				propelPlayer(wielder);
+				UtilParticle.PlayParticle(ParticleType.EXPLODE, wielder.getLocation().add(0, 1, 0), 0, 0, 0, .1f, 3, ViewDist.NORMAL);
+				
+				wielder.playSound(wielder.getLocation(), Sound.FIRE, .25f, 1.75f);
+			}
+			
+			if (UtilEnt.isGrounded(wielder))
+			{
+				_burnoutThreshold++;
+				wielder.playSound(wielder.getLocation(), Sound.NOTE_STICKS, .75f, 2.f);
+			}
+			else
+			{
+				_burnoutThreshold = 0;
+			}
+		}
+		else
+		{
+			_burnoutThreshold = UtilMath.clamp(_burnoutThreshold - .5, 0, _burnoutThreshold);
+		}
+		
+		if (UtilEnt.isGrounded(wielder, wielder.getLocation()) || UtilEnt.isGrounded(wielder, wielder.getLocation().subtract(0, 1, 0)))
+		{
+			addPower(0.65);
+		}
+		
+		if (_burnoutThreshold > 15 && burnoutRemaining <= 0)
+		{
+			Recharge.Instance.use(wielder, "clans_legendary_windblade_burnout", 2500, false, false);
+		}
+		
+		UtilTextBottom.displayProgress(UtilMath.clamp(_power, .0, 80.) / 80., wielder);
+	}
+	
+	@Override
+	public void onAttack(CustomDamageEvent event, Player wielder)
+	{
+		event.AddMod("Wind Blade", 6);
+	}
+	
+	private void propelPlayer(Player player)
+	{
+		Vector direction = player.getLocation().getDirection().normalize();
+		direction.multiply(FLIGHT_VELOCITY);
+		
+		player.setVelocity(direction);
+	}
+	
+	private boolean canPropel(Player player)
+	{
+		return _power > 0 && !UtilItem.isLiquid(player.getLocation().getBlock().getType());
+	}
+	
+	private void addPower(double power)
+	{
+		_power = UtilMath.clamp(_power + power, -20, 80);
+	}
+	
+	private void removePower(double power)
+	{
+		_power = UtilMath.clamp(_power - power, -20, 80);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/smelting/Smelter.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/smelting/Smelter.java
new file mode 100644
index 000000000..d7eb12c4d
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/smelting/Smelter.java
@@ -0,0 +1,119 @@
+package mineplex.game.clans.items.smelting;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.game.clans.items.GearManager;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+public class Smelter 
+{
+
+	public static void smeltItemInHand(Player player)
+	{
+		ItemStack item = player.getInventory().getItemInHand();
+		
+		if (isSmeltable(item))
+		{
+			ItemStack returns = smeltItem(item);
+			player.getInventory().setItemInHand(returns);
+		}
+
+		notify(player, "You have successfully smelted your item!");
+	}
+	
+	public static ItemStack smeltItem(ItemStack item)
+	{
+		Material material = getSmeltedType(item.getType());
+		int maxAmount = getSmeltAmount(item.getType());
+		int amount = maxAmount;
+		
+		if (!GearManager.isCustomItem(item))
+		{
+			short maxDurability = item.getType().getMaxDurability();
+			int durability = maxDurability - item.getDurability();
+			double percent = durability / (double) maxDurability;
+			System.out.println("Durability: " + item.getDurability() + " -- max: " + item.getType().getMaxDurability() + " --- percent: " + percent);
+			amount = Math.max(1, (int) (maxAmount * percent)); 
+		}
+		
+		return new ItemStack(material, amount);
+	}
+	
+	private static int getSmeltAmount(Material itemType)
+	{
+		switch (itemType)
+		{
+		case IRON_BOOTS:
+		case DIAMOND_BOOTS:
+		case GOLD_BOOTS:
+			return 4;
+		case IRON_HELMET:
+		case DIAMOND_HELMET:
+		case GOLD_HELMET:
+			return 5;
+		case IRON_LEGGINGS:
+		case DIAMOND_LEGGINGS:
+		case GOLD_LEGGINGS:
+			return 7;
+		case IRON_CHESTPLATE:
+		case DIAMOND_CHESTPLATE:
+		case GOLD_CHESTPLATE:
+			return 8;
+		case IRON_SWORD:
+		case DIAMOND_SWORD:
+		case GOLD_SWORD:
+			return 2;
+		case IRON_AXE:
+		case DIAMOND_AXE:
+		case GOLD_AXE:
+			return 3;
+		default:
+			return 0;
+		}
+	}
+	
+	private static boolean isSmeltable(ItemStack item)
+	{
+		if (item == null) return false;
+		
+		return getSmeltedType(item.getType()) != null;
+	}
+	
+	private static Material getSmeltedType(Material itemType)
+	{
+		switch (itemType)
+		{
+		case IRON_BOOTS:
+		case IRON_LEGGINGS:
+		case IRON_CHESTPLATE:
+		case IRON_HELMET:
+		case IRON_SWORD:
+		case IRON_AXE:
+			return Material.IRON_ORE;
+		case DIAMOND_BOOTS:
+		case DIAMOND_LEGGINGS:
+		case DIAMOND_CHESTPLATE:
+		case DIAMOND_HELMET:
+		case DIAMOND_SWORD:
+		case DIAMOND_AXE:
+			return Material.DIAMOND_ORE;
+		case GOLD_BOOTS:
+		case GOLD_LEGGINGS:
+		case GOLD_CHESTPLATE:
+		case GOLD_HELMET:
+		case GOLD_SWORD:
+		case GOLD_AXE:
+			return Material.GOLD_ORE;
+		default:
+			return null;
+		}
+	}
+
+	private static void notify(Player player, String message)
+	{
+		UtilPlayer.message(player, F.main("Smelter", message));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/smelting/SmeltingListener.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/smelting/SmeltingListener.java
new file mode 100644
index 000000000..3d5afd6a2
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/smelting/SmeltingListener.java
@@ -0,0 +1,34 @@
+package mineplex.game.clans.items.smelting;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
+
+/**
+ * Listens for smelting related events triggered by players to carry out
+ * item smelting for base resources and ores.
+ * @author MrTwiggy
+ *
+ */
+public class SmeltingListener implements Listener
+{
+
+	@EventHandler
+	public void onPlayerInteract(PlayerInteractEvent event)
+	{
+		if (event.getAction() == Action.LEFT_CLICK_BLOCK && event.getPlayer().isSneaking())
+		{
+			Block clicked = event.getClickedBlock();
+			
+			if (clicked.getType() == Material.FURNACE)
+			{
+				Smelter.smeltItemInHand(event.getPlayer());
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ui/GearPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ui/GearPage.java
new file mode 100644
index 000000000..536c94df1
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ui/GearPage.java
@@ -0,0 +1,745 @@
+package mineplex.game.clans.items.ui;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.Pair;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilUI;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.items.GearManager;
+import mineplex.game.clans.items.ItemType;
+import mineplex.game.clans.items.RareItemFactory;
+import mineplex.game.clans.items.attributes.ItemAttribute;
+import mineplex.game.clans.items.attributes.armor.ConqueringArmorAttribute;
+import mineplex.game.clans.items.attributes.armor.LavaAttribute;
+import mineplex.game.clans.items.attributes.armor.PaddedAttribute;
+import mineplex.game.clans.items.attributes.armor.ReinforcedAttribute;
+import mineplex.game.clans.items.attributes.armor.SlantedAttribute;
+import mineplex.game.clans.items.attributes.bow.HeavyArrowsAttribute;
+import mineplex.game.clans.items.attributes.bow.HuntingAttribute;
+import mineplex.game.clans.items.attributes.bow.InverseAttribute;
+import mineplex.game.clans.items.attributes.bow.LeechingAttribute;
+import mineplex.game.clans.items.attributes.bow.RecursiveAttribute;
+import mineplex.game.clans.items.attributes.bow.ScorchingAttribute;
+import mineplex.game.clans.items.attributes.bow.SlayingAttribute;
+import mineplex.game.clans.items.attributes.weapon.ConqueringAttribute;
+import mineplex.game.clans.items.attributes.weapon.FlamingAttribute;
+import mineplex.game.clans.items.attributes.weapon.FrostedAttribute;
+import mineplex.game.clans.items.attributes.weapon.HasteAttribute;
+import mineplex.game.clans.items.attributes.weapon.JaggedAttribute;
+import mineplex.game.clans.items.attributes.weapon.SharpAttribute;
+import mineplex.game.clans.items.legendaries.AlligatorsTooth;
+import mineplex.game.clans.items.legendaries.GiantsBroadsword;
+import mineplex.game.clans.items.legendaries.HyperAxe;
+import mineplex.game.clans.items.legendaries.LegendaryItem;
+import mineplex.game.clans.items.legendaries.MagneticMaul;
+import mineplex.game.clans.items.legendaries.WindBlade;
+import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.lang3.tuple.Triple;
+
+public class GearPage extends ShopPageBase<GearManager, GearShop>
+{
+	private int _stage = 0;
+	
+	private RareItemFactory _factory;
+	
+	private final IButton _nextButton;
+	private final IButton _backButton;
+	
+	private Class<? extends ItemAttribute> _superPrefix;
+	private Class<? extends ItemAttribute> _prefix;
+	private Class<? extends ItemAttribute> _suffix;
+	
+	private List<Class<? extends ItemAttribute>> _armorSuperPrefixes;
+	private List<Class<? extends ItemAttribute>> _armorPrefixes;
+	private List<Class<? extends ItemAttribute>> _armorSuffixes;
+	
+	private List<Class<? extends ItemAttribute>> _weaponSuperPrefixes;
+	private List<Class<? extends ItemAttribute>> _weaponPrefixes;
+	private List<Class<? extends ItemAttribute>> _weaponSuffixes;
+	
+	private List<Class<? extends ItemAttribute>> _bowSuperPrefixes;
+	private List<Class<? extends ItemAttribute>> _bowPrefixes;
+	private List<Class<? extends ItemAttribute>> _bowSuffixes;
+	
+	private List<Class<? extends LegendaryItem>> _legendaryItems;
+	
+	private List<Material> _weaponTypes;
+	private List<Material> _armorTypes;
+	
+	public GearPage(final GearManager gearManager, final GearShop shop, final CoreClientManager clientManager, final DonationManager donationManager, final String name, final Player player)
+	{
+		super(gearManager, shop, clientManager, donationManager, name, player);
+		
+		_nextButton = new IButton()
+		{
+			public void onClick(final Player player, final ClickType clickType)
+			{
+				performNext();
+			}
+		};
+		
+		_backButton = new IButton()
+		{
+			public void onClick(final Player player, final ClickType clickType)
+			{
+				performBack();
+			}
+		};
+		
+		_legendaryItems = Arrays.<Class<? extends LegendaryItem>> asList(AlligatorsTooth.class, WindBlade.class, GiantsBroadsword.class, HyperAxe.class, MagneticMaul.class);
+		
+		_armorSuperPrefixes = Arrays.<Class<? extends ItemAttribute>> asList(LavaAttribute.class);
+		_armorPrefixes = Arrays.<Class<? extends ItemAttribute>> asList(PaddedAttribute.class, ReinforcedAttribute.class, SlantedAttribute.class);
+		_armorSuffixes = Arrays.<Class<? extends ItemAttribute>> asList(ConqueringArmorAttribute.class);
+		
+		_weaponSuperPrefixes = Arrays.<Class<? extends ItemAttribute>> asList(FlamingAttribute.class, FrostedAttribute.class);
+		_weaponPrefixes = Arrays.<Class<? extends ItemAttribute>> asList(JaggedAttribute.class, SharpAttribute.class);
+		_weaponSuffixes = Arrays.<Class<? extends ItemAttribute>> asList(ConqueringAttribute.class, HasteAttribute.class);
+		
+		_bowSuperPrefixes = Arrays.<Class<? extends ItemAttribute>> asList(LeechingAttribute.class, ScorchingAttribute.class);
+		_bowPrefixes = Arrays.<Class<? extends ItemAttribute>> asList(HeavyArrowsAttribute.class, HuntingAttribute.class, InverseAttribute.class, RecursiveAttribute.class);
+		_bowSuffixes = Arrays.<Class<? extends ItemAttribute>> asList(SlayingAttribute.class);
+		
+		_armorTypes = Arrays.asList(Material.DIAMOND_HELMET, Material.DIAMOND_CHESTPLATE, Material.DIAMOND_LEGGINGS, Material.DIAMOND_BOOTS, Material.IRON_HELMET, Material.IRON_CHESTPLATE, Material.IRON_LEGGINGS, Material.IRON_BOOTS, Material.GOLD_HELMET, Material.GOLD_CHESTPLATE, Material.GOLD_LEGGINGS, Material.GOLD_BOOTS, Material.LEATHER_HELMET, Material.LEATHER_CHESTPLATE, Material.LEATHER_LEGGINGS, Material.LEATHER_BOOTS);
+		_weaponTypes = Arrays.asList(Material.DIAMOND_SWORD, Material.DIAMOND_AXE, Material.IRON_SWORD, Material.IRON_AXE, Material.GOLD_SWORD, Material.GOLD_AXE, Material.STONE_SWORD, Material.STONE_AXE);
+		
+		buildPage();
+	}
+	
+	protected void buildPage()
+	{
+		clearPage();
+		
+		String stageTitle = "Fatal Error";
+		Material stageMaterial = Material.WOOL;
+		
+		try
+		{
+			if (_stage == 0)
+			{
+				Pair<String, Material> stage1 = doStageOne();
+				
+				stageTitle = stage1.getLeft();
+				if (stage1.getRight() != null)
+				{
+					stageMaterial = stage1.getRight();
+				}
+			}
+			else if (_stage == 1)
+			{
+				Triple<Boolean, String, Material> stage2 = doStageTwo();
+				
+				if (stage2.getLeft())
+				{
+					return;
+				}
+				
+				stageTitle = stage2.getMiddle();
+				if (stage2.getRight() != null)
+				{
+					stageMaterial = stage2.getRight();
+				}
+			}
+			else if (_stage == 2)
+			{
+				Triple<Boolean, String, Material> stage3 = doStageThree();
+				
+				if (stage3.getLeft())
+				{
+					return;
+				}
+				
+				stageTitle = stage3.getMiddle();
+				if (stage3.getRight() != null)
+				{
+					stageMaterial = stage3.getRight();
+				}
+				
+			}
+			else if (_stage == 3)
+			{
+				Pair<String, Material> stage4 = doStageFour();
+				
+				stageTitle = stage4.getLeft();
+				if (stage4.getRight() != null)
+				{
+					stageMaterial = stage4.getRight();
+				}
+			}
+			else if (_stage == 4)
+			{
+				Pair<String, Material> stage5 = doStageFive();
+				
+				stageTitle = stage5.getLeft();
+				if (stage5.getRight() != null)
+				{
+					stageMaterial = stage5.getRight();
+				}
+			}
+			else
+			{
+				finish();
+				stageTitle = "The End";
+			}
+		}
+		catch (InstantiationException | IllegalAccessException e)
+		{
+			e.printStackTrace();
+		}
+		
+		addButton(4, stageMaterial, 0, stageTitle, new IButton()
+		{
+			public void onClick(Player player, ClickType clickType)
+			{
+			}
+		}, false);
+		
+		addButton(45, Material.REDSTONE_BLOCK, 0, C.cRed + "Previous page", _backButton, false);
+		addButton(53, Material.EMERALD_BLOCK, 0, C.cGreen + "Next page", _nextButton, false);
+	}
+	
+	private Pair<String, Material> doStageOne()
+	{
+		String stageTitle;
+		
+		stageTitle = "1. Select Item Type";
+		addButton(9 + 1, Material.GOLD_RECORD, 0, C.cGold + "Legendary", new IButton()
+		{
+			public void onClick(Player player, ClickType clickType)
+			{
+				_factory = RareItemFactory.begin(ItemType.LEGENDARY);
+				performNext();
+				buildPage();
+			}
+		}, _factory != null && ItemType.LEGENDARY.equals(_factory.getItemType()), new String[] { _factory != null && ItemType.LEGENDARY.equals(_factory.getItemType()) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+		
+		addButton(9 + 3, Material.DIAMOND_AXE, 0, C.cDAqua + "Weapon", new IButton()
+		{
+			public void onClick(Player player, ClickType clickType)
+			{
+				_factory = RareItemFactory.begin(ItemType.WEAPON);
+				performNext();
+				buildPage();
+			}
+		}, _factory != null && ItemType.WEAPON.equals(_factory.getItemType()), new String[] { _factory != null && ItemType.WEAPON.equals(_factory.getItemType()) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+		
+		addButton(9 + 5, Material.DIAMOND_CHESTPLATE, 0, C.cDGreen + "Armor", new IButton()
+		{
+			public void onClick(Player player, ClickType clickType)
+			{
+				_factory = RareItemFactory.begin(ItemType.ARMOR);
+				performNext();
+				buildPage();
+			}
+		}, _factory != null && ItemType.ARMOR.equals(_factory.getItemType()), new String[] { _factory != null && ItemType.ARMOR.equals(_factory.getItemType()) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+		
+		addButton(9 + 7, Material.BOW, 0, C.cDGreen + "Bow", new IButton()
+		{
+			public void onClick(Player player, ClickType clickType)
+			{
+				_factory = RareItemFactory.begin(ItemType.BOW);
+				performNext();
+				buildPage();
+			}
+		}, _factory != null && ItemType.BOW.equals(_factory.getItemType()), new String[] { _factory != null && ItemType.BOW.equals(_factory.getItemType()) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+		
+		return Pair.create(stageTitle, null);
+	}
+	
+	private Triple<Boolean, String, Material> doStageTwo() throws InstantiationException, IllegalAccessException
+	{
+		String stageTitle = "Fatal Error";
+		Material stageMaterial = null;
+		boolean _return = false;
+		
+		if (_factory == null || _factory.getItemType() == null)
+		{
+			performBack();
+			return Triple.of(true, stageTitle, stageMaterial);
+		}
+		
+		if (_factory.getItemType().equals(ItemType.LEGENDARY))
+		{
+			stageTitle = "2. Select Legendary Item";
+			stageMaterial = _factory.getMaterial() == null ? stageMaterial : _factory.getMaterial();
+			
+			int[] indices = UtilUI.getIndicesFor(_legendaryItems.size(), 1);
+			
+			int index = 0;
+			for (final Class<? extends LegendaryItem> legendary : _legendaryItems)
+			{
+				final LegendaryItem item = legendary.newInstance();
+				
+				List<String> lore = new ArrayList<>();
+				
+				lore.addAll(Arrays.asList(item.getDescription()));
+				
+				lore.add(" ");
+				lore.add(item.getDisplayName().equals(_factory.getWrapper() == null ? null : _factory.getWrapper().getDisplayName()) ? C.cGreen + "Selected" : C.cRed + "Not Selected");
+				
+				addButton(indices[index], item.toItemStack().getType(), 0, C.cGold + item.getDisplayName(), new IButton()
+				{
+					public void onClick(Player player, ClickType clickType)
+					{
+						_factory.setLegendary(legendary);
+						performNext();
+						buildPage();
+					}
+				}, item.getDisplayName().equals(_factory.getWrapper() == null ? null : _factory.getWrapper().getDisplayName()), lore.toArray(new String[lore.size()]));
+				
+				index++;
+			}
+		}
+		else
+		{
+			switch (_factory.getItemType())
+			{
+				case WEAPON:
+				{
+					stageTitle = "Select Weapon Type";
+					
+					int[] indices = UtilUI.getIndicesFor(_weaponTypes.size(), 1);
+					
+					int index = 0;
+					for (final Material type : _weaponTypes)
+					{
+						addButton(indices[index], type, 0, C.cGold + WordUtils.capitalizeFully(type.toString()), new IButton()
+						{
+							public void onClick(Player player, ClickType clickType)
+							{
+								_factory.setType(type);
+								performNext();
+								buildPage();
+							}
+						}, type.equals(_factory.getMaterial()), new String[] { type.equals(_factory.getMaterial()) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+						index++;
+					}
+					break;
+				}
+				case ARMOR:
+				{
+					stageTitle = "Select Armor Type";
+					
+					int[] indices = UtilUI.getIndicesFor(_armorTypes.size(), 1, 4, 0);
+					
+					int index = 0;
+					for (final Material type : _armorTypes)
+					{
+						addButton(indices[index], type, 0, C.cGold + WordUtils.capitalizeFully(type.toString()), new IButton()
+						{
+							public void onClick(Player player, ClickType clickType)
+							{
+								_factory.setType(type);
+								performNext();
+								buildPage();
+							}
+						}, type.equals(_factory.getMaterial()), new String[] { type.equals(_factory.getMaterial()) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+						index++;
+					}
+					break;
+				}
+				default:
+				{
+					if (_factory.getMaterial() != null)
+					{
+						performBack();
+						performBack();
+						break;
+					}
+					
+					/**
+					 * The only time this code block should be reached is when
+					 * _itemType is BOW, or if there are ever new item types
+					 * added which don't have a case, since LEGENDARY is checked
+					 * seperately, and ARMOR, and WEAPON have their own cases.
+					 */
+					
+					_factory.setType(Material.BOW);
+					_stage = 2;
+					buildPage();
+					_return = true;
+					
+					break;
+				}
+			}
+		}
+		return Triple.of(_return, stageTitle, stageMaterial);
+	}
+	
+	private Triple<Boolean, String, Material> doStageThree() throws InstantiationException, IllegalAccessException
+	{
+		String stageTitle;
+		
+		if (_factory.getMaterial() == null)
+		{
+			performBack();
+			return Triple.of(true, null, null);
+		}
+		
+		Material stageMaterial = _factory.getMaterial();
+		
+		if (_factory.getItemType().equals(ItemType.LEGENDARY))
+		{
+			finish();
+			stageTitle = "The End";
+		}
+		else
+		{
+			switch (_factory.getItemType())
+			{
+				case WEAPON:
+				{
+					stageTitle = "Select Super Prefix";
+					
+					int[] indices = UtilUI.getIndicesFor(_weaponSuperPrefixes.size(), 1);
+					
+					int index = 0;
+					for (final Class<? extends ItemAttribute> attribute : _weaponSuperPrefixes)
+					{
+						final ItemAttribute attrib = attribute.newInstance();
+						
+						addButton(indices[index], stageMaterial, 0, C.cGold + attrib.getDisplayName(), new IButton()
+						{
+							public void onClick(Player player, ClickType clickType)
+							{
+								_superPrefix = (attribute.equals(_superPrefix) ? null : attribute);
+								performNext();
+								buildPage();
+							}
+						}, attribute.equals(_superPrefix), new String[] { C.cWhite + attrib.getDescription(), "", attribute.equals(_superPrefix) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+						
+						index++;
+					}
+					break;
+				}
+				case ARMOR:
+				{
+					stageTitle = "Select Super Prefix";
+					int[] indices = UtilUI.getIndicesFor(_armorSuperPrefixes.size(), 1);
+					
+					int index = 0;
+					for (final Class<? extends ItemAttribute> attribute : _armorSuperPrefixes)
+					{
+						final ItemAttribute attrib = attribute.newInstance();
+						
+						addButton(indices[index], stageMaterial, 0, C.cGold + attrib.getDisplayName(), new IButton()
+						{
+							public void onClick(Player player, ClickType clickType)
+							{
+								_superPrefix = (attribute.equals(_superPrefix) ? null : attribute);
+								performNext();
+								buildPage();
+							}
+						}, attribute.equals(_superPrefix), new String[] { C.cWhite + attrib.getDescription(), "", attribute.equals(_superPrefix) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+						
+						index++;
+					}
+					break;
+				}
+				case BOW:
+				{
+					stageTitle = "Select Super Prefix";
+					
+					int[] indices = UtilUI.getIndicesFor(_bowSuperPrefixes.size(), 1);
+					
+					int index = 0;
+					for (final Class<? extends ItemAttribute> attribute : _bowSuperPrefixes)
+					{
+						final ItemAttribute attrib = attribute.newInstance();
+						
+						addButton(indices[index], Material.BOW, 0, C.cGold + attrib.getDisplayName(), new IButton()
+						{
+							public void onClick(Player player, ClickType clickType)
+							{
+								_superPrefix = (attribute.equals(_superPrefix) ? null : attribute);
+								performNext();
+								buildPage();
+							}
+						}, attribute.equals(_superPrefix), new String[] { C.cWhite + attrib.getDescription(), "", attribute.equals(_superPrefix) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+						
+						index++;
+					}
+					break;
+				}
+				default:
+				{
+					stageTitle = "Fatal Error";
+					stageMaterial = Material.REDSTONE_BLOCK;
+				}
+			}
+		}
+		
+		return Triple.of(false, stageTitle, stageMaterial);
+	}
+	
+	private Pair<String, Material> doStageFour() throws InstantiationException, IllegalAccessException
+	{
+		String stageTitle;
+		Material stageMaterial = _factory.getMaterial();
+		
+		if (_factory.getItemType().equals(ItemType.LEGENDARY))
+		{
+			finish();
+			stageTitle = "The End";
+		}
+		else
+		{
+			switch (_factory.getItemType())
+			{
+				case WEAPON:
+				{
+					stageTitle = "Select Prefix";
+					
+					int[] indices = UtilUI.getIndicesFor(_weaponPrefixes.size(), 1);
+					
+					int index = 0;
+					for (final Class<? extends ItemAttribute> attribute : _weaponPrefixes)
+					{
+						final ItemAttribute attrib = attribute.newInstance();
+						
+						addButton(indices[index], stageMaterial, 0, C.cGold + attrib.getDisplayName(), new IButton()
+						{
+							public void onClick(Player player, ClickType clickType)
+							{
+								_prefix = (attribute.equals(_prefix) ? null : attribute);
+								performNext();
+								buildPage();
+							}
+						}, attribute.equals(_prefix), new String[] { C.cWhite + attrib.getDescription(), "", attribute.equals(_prefix) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+						
+						index++;
+					}
+					break;
+				}
+				case ARMOR:
+				{
+					stageTitle = "Select Prefix";
+					
+					int[] indices = UtilUI.getIndicesFor(_armorPrefixes.size(), 1);
+					
+					int index = 0;
+					for (final Class<? extends ItemAttribute> attribute : _armorPrefixes)
+					{
+						final ItemAttribute attrib = attribute.newInstance();
+						
+						addButton(indices[index], stageMaterial, 0, C.cGold + attrib.getDisplayName(), new IButton()
+						{
+							public void onClick(Player player, ClickType clickType)
+							{
+								_prefix = (attribute.equals(_prefix) ? null : attribute);
+								performNext();
+								buildPage();
+							}
+						}, attribute.equals(_prefix), new String[] { C.cWhite + attrib.getDescription(), "", attribute.equals(_prefix) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+						
+						index++;
+					}
+					break;
+				}
+				case BOW:
+				{
+					stageTitle = "Select Prefix";
+					
+					int[] indices = UtilUI.getIndicesFor(_bowPrefixes.size(), 1);
+					
+					int index = 0;
+					for (final Class<? extends ItemAttribute> attribute : _bowPrefixes)
+					{
+						final ItemAttribute attrib = attribute.newInstance();
+						
+						addButton(indices[index], Material.BOW, 0, C.cGold + attrib.getDisplayName(), new IButton()
+						{
+							public void onClick(Player player, ClickType clickType)
+							{
+								_prefix = (attribute.equals(_prefix) ? null : attribute);
+								performNext();
+								buildPage();
+							}
+						}, attribute.equals(_prefix), new String[] { C.cWhite + attrib.getDescription(), "", attribute.equals(_prefix) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+						
+						index++;
+					}
+					break;
+				}
+				default:
+				{
+					stageTitle = "Fatal Error";
+					stageMaterial = Material.REDSTONE_BLOCK;
+				}
+			}
+		}
+		
+		return Pair.create(stageTitle, stageMaterial);
+	}
+	
+	private Pair<String, Material> doStageFive() throws InstantiationException, IllegalAccessException
+	{
+		String stageTitle;
+		Material stageMaterial = _factory.getMaterial();
+		
+		if (_factory.getItemType().equals(ItemType.LEGENDARY))
+		{
+			finish();
+			stageTitle = "The End";
+		}
+		else
+		{
+			switch (_factory.getItemType())
+			{
+				case WEAPON:
+				{
+					stageTitle = "Select Suffix";
+					
+					int[] indices = UtilUI.getIndicesFor(_weaponSuffixes.size(), 1);
+					
+					int index = 0;
+					for (final Class<? extends ItemAttribute> attribute : _weaponSuffixes)
+					{
+						final ItemAttribute attrib = attribute.newInstance();
+						
+						addButton(indices[index], stageMaterial, 0, C.cGold + attrib.getDisplayName(), new IButton()
+						{
+							public void onClick(Player player, ClickType clickType)
+							{
+								_suffix = (attribute.equals(_suffix) ? null : attribute);
+								performNext();
+								buildPage();
+							}
+						}, attribute.equals(_suffix), new String[] { C.cWhite + attrib.getDescription(), "", attribute.equals(_suffix) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+						
+						index++;
+					}
+					break;
+				}
+				case ARMOR:
+				{
+					stageTitle = "Select Suffix";
+					
+					int[] indices = UtilUI.getIndicesFor(_armorSuffixes.size(), 1);
+					
+					int index = 0;
+					for (final Class<? extends ItemAttribute> attribute : _armorSuffixes)
+					{
+						final ItemAttribute attrib = attribute.newInstance();
+						
+						addButton(indices[index], stageMaterial, 0, C.cGold + attrib.getDisplayName(), new IButton()
+						{
+							public void onClick(Player player, ClickType clickType)
+							{
+								_suffix = (attribute.equals(_suffix) ? null : attribute);
+								performNext();
+								buildPage();
+							}
+						}, attribute.equals(_suffix), new String[] { C.cWhite + attrib.getDescription(), "", attribute.equals(_suffix) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+						index++;
+					}
+					break;
+				}
+				case BOW:
+				{
+					stageTitle = "Select Suffix";
+					
+					int[] indices = UtilUI.getIndicesFor(_bowSuffixes.size(), 1);
+					
+					int index = 0;
+					for (final Class<? extends ItemAttribute> attribute : _bowSuffixes)
+					{
+						final ItemAttribute attrib = attribute.newInstance();
+						
+						addButton(indices[index], Material.BOW, 0, C.cGold + attrib.getDisplayName(), new IButton()
+						{
+							public void onClick(Player player, ClickType clickType)
+							{
+								_suffix = (attribute.equals(_suffix) ? null : attribute);
+								performNext();
+								buildPage();
+							}
+						}, attribute.equals(_suffix), new String[] { C.cWhite + attrib.getDescription(), "", attribute.equals(_suffix) ? C.cGreen + "Selected" : C.cRed + "Not Selected" });
+						
+						index++;
+					}
+					break;
+				}
+				default:
+				{
+					stageTitle = "Fatal Error";
+					stageMaterial = Material.REDSTONE_BLOCK;
+				}
+			}
+		}
+		
+		return Pair.create(stageTitle, stageMaterial);
+	}
+	
+	private void addButton(final int index, final Material type, final int data, final String name, final IButton ibutton, final boolean dullEnchantment, final String... description)
+	{
+		ShopItem shopItem;
+		
+		if (dullEnchantment)
+		{
+			shopItem = new ShopItem(type, (byte) data, name, description, 1, ibutton == null, false).addGlow();
+		}
+		else
+		{
+			shopItem = new ShopItem(type, (byte) data, name, description, 1, ibutton == null, false);
+		}
+		
+		addButton(index, shopItem, ibutton);
+	}
+	
+	private void addButton(final int index, final ItemStack stack, final IButton ibutton, final String... description)
+	{
+		addButton(index, new ShopItem(stack, ibutton == null, false), ibutton);
+	}
+	
+	private void performBack()
+	{
+		if (_stage > 0)
+		{
+			_stage--;
+			buildPage();
+		}
+	}
+	
+	protected void finish()
+	{
+		clearPage();
+		
+		_factory.setSuperPrefix(_superPrefix);
+		_factory.setPrefix(_prefix);
+		_factory.setSuffix(_suffix);
+		
+		final ItemStack item = _factory.fabricate();
+		
+		addButton(9 + 4, item, new IButton()
+		{
+			public void onClick(Player player, ClickType clickType)
+			{
+				player.getInventory().addItem(item);
+				
+			}
+		}, new String[] { C.cWhite + "Click to get item" });
+	}
+	
+	protected void performNext()
+	{
+		if (_stage <= 4)
+		{
+			_stage++;
+		}
+		buildPage();
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ui/GearShop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ui/GearShop.java
new file mode 100644
index 000000000..1454b71ae
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ui/GearShop.java
@@ -0,0 +1,23 @@
+package mineplex.game.clans.items.ui;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.items.GearManager;
+
+public class GearShop extends ShopBase<GearManager>
+{
+	public GearShop(final GearManager plugin, final CoreClientManager clientManager, final DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager, "Customize New Gear");
+	}
+	
+	@Override
+	protected ShopPageBase<GearManager, ? extends ShopBase<GearManager>> buildPagesFor(final Player player)
+	{
+		return new GearPage(getPlugin(), this, getClientManager(), getDonationManager(), "Customize New Gear", player);
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/ClansShopItem.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/ClansShopItem.java
new file mode 100644
index 000000000..71edd59bf
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/ClansShopItem.java
@@ -0,0 +1,197 @@
+package mineplex.game.clans.shop;
+
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+public enum ClansShopItem
+{
+	// PvP Shop
+	GOLD_HELMET(2500, 500, Material.GOLD_HELMET, 1),
+	GOLD_CHESTPLATE(4000, 800, Material.GOLD_CHESTPLATE, 1),
+	GOLD_LEGGINGS(3500, 700, Material.GOLD_LEGGINGS, 1),
+	GOLD_BOOTS(2000, 400, Material.GOLD_BOOTS, 1),
+	LEATHER_HELMET(2500, 500, Material.LEATHER_HELMET, 1),
+	LEATHER_CHESTPLATE(4000, 800, Material.LEATHER_CHESTPLATE, 1),
+	LEATHER_LEGGINGS(3500, 700, Material.LEATHER_LEGGINGS, 1),
+	LEATHER_BOOTS(2000, 400, Material.LEATHER_BOOTS, 1),
+	CHAINMAIL_HELMET(2500, 500, Material.CHAINMAIL_HELMET, 1),
+	CHAINMAIL_CHESTPLATE(4000, 800, Material.CHAINMAIL_CHESTPLATE, 1),
+	CHAINMAIL_LEGGINGS(3500, 700, Material.CHAINMAIL_LEGGINGS, 1),
+	CHAINMAIL_BOOTS(2000, 500, Material.CHAINMAIL_BOOTS, 1),
+	IRON_HELMET(2500, 500, Material.IRON_HELMET, 1),
+	IRON_CHESTPLATE(4000, 800, Material.IRON_CHESTPLATE, 1),
+	IRON_LEGGINGS(3500, 700, Material.IRON_LEGGINGS, 1),
+	IRON_BOOTS(2000, 400, Material.IRON_BOOTS, 1),
+	DIAMOND_HELMET(2500, 500, Material.DIAMOND_HELMET, 1),
+	DIAMOND_CHESTPLATE(4000, 800, Material.DIAMOND_CHESTPLATE, 1),
+	DIAMOND_LEGGINGS(3500, 700, Material.DIAMOND_LEGGINGS, 1),
+	DIAMOND_BOOTS(2000, 400, Material.DIAMOND_BOOTS, 1),
+	IRON_SWORD(1000, 200, Material.IRON_SWORD, 1),
+	DIAMOND_SWORD(9000, 1800, Material.DIAMOND_SWORD, 1),
+	GOLD_SWORD(9000, 1800, Material.GOLD_SWORD, 1),
+	IRON_AXE(1500, 300, Material.IRON_AXE, 1),
+	DIAMOND_AXE(13500, 2700, Material.DIAMOND_AXE, 1),
+	GOLD_AXE(13500, 2700, Material.GOLD_AXE, 1),
+	BOW(175, 35, Material.BOW, 1),
+	ARROW(10, 2, Material.ARROW, 1),
+	ENCHANTMENT_TABLE(30000, 0, Material.ENCHANTMENT_TABLE, 1),
+	TNT(30000, 0, Material.TNT, 1),
+	TNT_GENERATOR(300000, 0, Material.BREWING_STAND_ITEM, 1),
+	// Mining Shop
+	IRON_INGOT(500, 100, Material.IRON_INGOT, 1),
+	GOLD_INGOT(500, 100, Material.GOLD_INGOT, 1),
+	DIAMOND(500, 100, Material.DIAMOND, 1),
+	LEATHER(500, 100, Material.LEATHER, 1),
+	COAL(50, 10, Material.COAL, 1),
+	REDSTONE(10, 2, Material.REDSTONE, 1),
+	LAPIS_BLOCK(500, 100, Material.LAPIS_BLOCK, 1),
+	// Farming Shop
+	POTATO_ITEM(15, 3, Material.POTATO_ITEM, 1),
+	MELON(5, 1, Material.MELON, 1),
+	BREAD(30, 6, Material.BREAD, 1),
+	COOKED_BEEF(50, 10, Material.COOKED_BEEF, 1),
+	GRILLED_PORK(50, 10, Material.GRILLED_PORK, 1),
+	COOKED_CHICKEN(35, 7, Material.COOKED_CHICKEN, 1),
+	FEATHER(50, 10, Material.FEATHER, 1),
+	CARROT_ITEM(10, 2, Material.CARROT_ITEM, 1),
+	MUSHROOM_SOUP(200, 40, Material.MUSHROOM_SOUP, 1),
+	SUGAR_CANE(15, 3, Material.SUGAR_CANE, 1),
+	PUMPKIN(30, 6, Material.PUMPKIN, 1),
+	STRING(50, 10, Material.STRING, 1),
+	BONE(1, 1, Material.BONE, 1),
+	ROTTEN_FLESH(5, 5, Material.ROTTEN_FLESH, 1),
+	SPIDER_EYE(5, 5, Material.SPIDER_EYE, 1),
+	// Building Shop
+	STONE(100, 20, Material.STONE, 1),
+	SMOOTH_BRICK(100, 20, Material.SMOOTH_BRICK, 1),
+	CRACKED_STONE_BRICK(25, 5, Material.SMOOTH_BRICK, 1, (byte) 2),
+	COBBLESTONE(100, 20, Material.COBBLESTONE, 1),
+	LOG(50, 10, Material.LOG, 1),
+	LOG_2(50, 10, Material.LOG_2, 1),
+	SAND(20, 4, Material.SAND, 1),
+	GLASS(30, 6, Material.GLASS, 1),
+	SANDSTONE(80, 16, Material.SANDSTONE, 1),
+	DIRT(10, 2, Material.DIRT, 1),
+	NETHER_BRICK(50, 10, Material.NETHER_BRICK, 1),
+	QUARTZ_BLOCK(75, 15, Material.QUARTZ_BLOCK, 1),
+	CLAY(30, 6, Material.CLAY, 1),
+	GOLD_TOKEN(50000, 50000, Material.GOLD_RECORD, 1, (byte) 0, "Gold Token");
+	
+	private int _buyPrice;
+	private int _sellPrice;
+	private int _amount;
+	private short _data;
+	
+	private String _displayName;
+	
+	private Material _material;
+	
+	ClansShopItem(int buyPrice, int sellPrice, Material material, int amount, short data)
+	{
+		_buyPrice = buyPrice;
+		_sellPrice = sellPrice;
+		_material = material;
+		_amount = amount;
+		_data = data;
+	}
+	
+	ClansShopItem(int buyPrice, int sellPrice, Material material, int amount)
+	{
+		this(buyPrice, sellPrice, material, amount, (byte) 0);
+	}
+	
+	ClansShopItem(int buyPrice, int sellPrice, Material material, int amount, byte data, String name)
+	{
+		this(buyPrice, sellPrice, material, amount, data);
+		_displayName = name;
+	}
+	
+	public int getBuyPrice()
+	{
+		return _buyPrice;
+	}
+	
+	public int getSellPrice()
+	{
+		return _sellPrice;
+	}
+	
+	public short getData()
+	{
+		return _data;
+	}
+	
+	public String getDisplayName()
+	{
+		return _displayName;
+	}
+	
+	public int getBuyPrice(int amount)
+	{
+		return _amount == 1 ? _buyPrice * amount : ((int) (((int) ((double) _buyPrice) / ((double) _amount))) * amount);
+	}
+	
+	public int getSellPrice(int amount)
+	{
+		return _amount == 1 ? _sellPrice * amount : ((int) (((int) ((double) _sellPrice) / ((double) _amount))) * amount);
+	}
+	
+	public int getAmount()
+	{
+		return _amount;
+	}
+	
+	public Material getMaterial()
+	{
+		return _material;
+	}
+	
+	public static ClansShopItem getByMaterial(Material material)
+	{
+		for (ClansShopItem item : values())
+		{
+			if (item.getMaterial().equals(material))
+			{
+				return item;
+			}
+		}
+		
+		return null;
+	}
+	
+	public static ClansShopItem getByItem(Material material, short data)
+	{
+		for (ClansShopItem item : values())
+		{
+			if (item.getMaterial().equals(material) && (item.getData() == -1 || item.getData() == data))
+			{
+				return item;
+			}
+		}
+		
+		return null;
+	}
+	
+	public static ClansShopItem getByItem(ItemStack stack, boolean checkData, boolean checkDisplayName)
+	{
+		for (ClansShopItem item : values())
+		{
+			if (item.getMaterial().equals(stack.getType()))
+			{
+				if (checkData && stack.getDurability() != item.getData())
+				{
+					continue;
+				}
+				
+				if (checkDisplayName && stack.hasItemMeta() && stack.getItemMeta().hasDisplayName() && !stack.getItemMeta().getDisplayName().equals(item.getDisplayName()))
+				{
+					continue;
+				}
+				
+				return item;
+			}
+		}
+		
+		return null;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/ClansShopPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/ClansShopPage.java
new file mode 100644
index 000000000..78169ea47
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/ClansShopPage.java
@@ -0,0 +1,107 @@
+package mineplex.game.clans.shop;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.UtilItem;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.Clans;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.event.ClansShopAddButtonEvent;
+
+public abstract class ClansShopPage<T extends ShopBase<ClansManager>> extends ShopPageBase<ClansManager, T>
+{
+	
+	/**
+	 * Constructor
+	 * 
+	 * @param plugin
+	 * @param shop
+	 * @param clientManager
+	 * @param donationManager
+	 * @param name
+	 * @param player
+	 * @param slots
+	 */
+	public ClansShopPage(ClansManager plugin, T shop, CoreClientManager clientManager, DonationManager donationManager, String name, Player player, int slots)
+	{
+		super(plugin, shop, clientManager, donationManager, name, player, slots);
+	}
+	
+	/**
+	 * Constructor
+	 * 
+	 * @param plugin
+	 * @param shop
+	 * @param clientManager
+	 * @param donationManager
+	 * @param name
+	 * @param player
+	 */
+	public ClansShopPage(ClansManager plugin, T shop, CoreClientManager clientManager, DonationManager donationManager, String name, Player player)
+	{
+		super(plugin, shop, clientManager, donationManager, name, player);
+	}
+	
+	public void addShopItem(int slot, Material material, int buyPrice, int sellPrice)
+	{
+		addShopItem(slot, material, buyPrice, sellPrice, Clans.prettifyName(material));
+	}
+	
+	public void addShopItem(int slot, Material material, int buyPrice, int sellPrice, byte data)
+	{
+		addShopItem(slot, material, buyPrice, sellPrice, data, Clans.prettifyName(material), 1);
+	}
+	
+	public void addShopItem(int slot, Material material, int buyPrice, int sellPrice, String displayName)
+	{
+		addShopItem(slot, material, buyPrice, sellPrice, (byte) 0, displayName, 1);
+	}
+	
+	public void addShopItem(int slot, Material material, int buyPrice, int sellPrice, byte data, String displayName, int amount)
+	{
+		ClansShopAddButtonEvent event = new ClansShopAddButtonEvent(getPlayer(), getShop(), slot, material, buyPrice, sellPrice, data, displayName, amount);
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled()) return;
+		
+		slot = event.getSlot();
+		material = event.getMaterial();
+		buyPrice = event.getBuyPrice();
+		sellPrice = event.getSellPrice();
+		data = event.getData();
+		displayName = event.getDisplayName();
+		amount = event.getAmount();
+		
+		if (!event.isCancelled())
+		{
+			PvpItem item = new PvpItem(material, data, 1, displayName, buyPrice, sellPrice, 64);
+			addButton(slot, item, new ShopItemButton<ClansShopPage<?>>(this, buyPrice, sellPrice, material, data, amount, displayName));
+		}
+	}
+	
+	public void addShopItem(int index, ClansShopItem item, String displayName)
+	{
+		addShopItem(index, item, (byte) 0, displayName, 1);
+	}
+	
+	
+	public void addShopItem(int index, ClansShopItem item)
+	{
+		addShopItem(index, item, (byte) 0);
+	}
+	
+	public void addShopItem(int index, ClansShopItem item, byte data)
+	{
+		addShopItem(index, item.getMaterial(), item.getBuyPrice(), item.getSellPrice(), data);
+	}
+	
+	public void addShopItem(int index, ClansShopItem item, byte data, String displayName, int amount)
+	{
+		addShopItem(index, item.getMaterial(), item.getBuyPrice(), item.getSellPrice(), data, displayName, amount);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/PvpItem.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/PvpItem.java
index 3a3350a49..1dd6c2183 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/PvpItem.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/PvpItem.java
@@ -3,6 +3,7 @@ package mineplex.game.clans.shop;
 import org.bukkit.Material;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilItem;
 import mineplex.core.shop.item.ShopItem;
 
 public class PvpItem extends ShopItem
@@ -11,42 +12,41 @@ public class PvpItem extends ShopItem
 	private static String RIGHT_CLICK_SELL = C.cYellow + "Right-Click" + C.cWhite + " to Sell " + C.cGreen + 1;
 	
 	private int _price;
+	private int _sellPrice;
 	private int _bulkCount;
 	
 	public PvpItem(Material type, byte data, int displayAmount, String name, int price, int bulkCount)
 	{
-		super(type, data, name, new String[] 
-				{
-					C.cWhite + " ",
-					LEFT_CLICK_BUY,
-					C.cWhite + "Costs " + C.cGreen + "$" + price,
-					C.cWhite + " ",
-					C.cYellow + "Shift Left-Click" + C.cWhite + " to Buy " + C.cGreen + bulkCount,
-					C.cWhite + "Costs " + C.cGreen + "$" + (price * bulkCount),
-					C.cWhite + " ",
-					RIGHT_CLICK_SELL,
-					C.cWhite + "Earns " + C.cGreen + "$" + (int)(price / 2),
-					C.cWhite + " ",
-					C.cYellow + "Shift Right-Click" + C.cWhite + " to Sell " + C.cGreen + "All",
-				}, 0, false, false);
+		super(type, data, name, new String[] { C.cWhite + " ", LEFT_CLICK_BUY, C.cWhite + "Costs " + C.cGreen + price + "g", C.cWhite + " ", C.cYellow + "Shift Left-Click" + C.cWhite + " to Buy " + C.cGreen + bulkCount, C.cWhite + "Costs " + C.cGreen + (price * bulkCount) + "g", C.cWhite + " ", RIGHT_CLICK_SELL, C.cWhite + "Earns " + C.cGreen + (int) (price / 2) + "g", C.cWhite + " ", C.cYellow + "Shift Right-Click" + C.cWhite + " to Sell " + C.cGreen + "All", }, 0, false, false);
 		
 		_price = price;
+		_sellPrice = (int) (price / 2);
+		_bulkCount = bulkCount;
+	}
+	
+	public PvpItem(Material type, byte data, int displayAmount, String name, int buyPrice, int sellPrice, int bulkCount)
+	{
+		super(type, data, name, new String[] {
+				C.cWhite + " ",
+				LEFT_CLICK_BUY,
+				C.cWhite + "Costs " + C.cGreen + (buyPrice == 0 ? "Free" : buyPrice + "g"),
+				C.cWhite + " ",
+				UtilItem.isArmor(type) || UtilItem.isTool(type) ? "" : C.cYellow + "Shift Left-Click" + C.cWhite + " to Buy " + C.cGreen + bulkCount,
+				UtilItem.isArmor(type) || UtilItem.isTool(type) ? "" : C.cWhite + "Costs " + C.cGreen + (buyPrice * bulkCount) + "g", C.cWhite + " ",
+				RIGHT_CLICK_SELL,
+				C.cWhite + "Earns " + C.cGreen + (sellPrice == 0 ? "Free" : sellPrice + ""),
+				C.cWhite + " ",
+				C.cYellow + "Shift Right-Click" + C.cWhite + " to Sell " + C.cGreen + "All",
+		}, 0, false, false);
+		
+		_price = buyPrice;
+		_sellPrice = sellPrice;
 		_bulkCount = bulkCount;
 	}
 	
 	public PvpItem(Material type, byte data, int displayAmount, String name, int price)
 	{
-		super(type, data, name, new String[] 
-				{
-					C.cWhite + " ",
-					LEFT_CLICK_BUY,
-					C.cWhite + "Costs " + C.cGreen + "$" + price,
-					C.cWhite + " ",
-					RIGHT_CLICK_SELL,
-					C.cWhite + "Earns " + C.cGreen + "$" + (int)(price / 2),
-					C.cWhite + " ",
-					C.cYellow + "Shift Right-Click" + C.cWhite + " to Sell " + C.cGreen + "All",
-				}, 0, false, false);
+		super(type, data, name, new String[] { C.cWhite + " ", LEFT_CLICK_BUY, C.cWhite + "Costs " + C.cGreen + price + "g", C.cWhite + " ", RIGHT_CLICK_SELL, C.cWhite + "Earns " + C.cGreen + (int) (price / 2) + "g", C.cWhite + " ", C.cYellow + "Shift Right-Click" + C.cWhite + " to Sell " + C.cGreen + "All", }, 0, false, false);
 		
 		_price = price;
 		_bulkCount = -1;
@@ -57,6 +57,11 @@ public class PvpItem extends ShopItem
 		return _price;
 	}
 	
+	public int getSellPrice()
+	{
+		return _sellPrice;
+	}
+	
 	public int getBulkCount()
 	{
 		return _bulkCount;
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/PvpShopButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/PvpShopButton.java
deleted file mode 100644
index 962ea019c..000000000
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/PvpShopButton.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package mineplex.game.clans.shop;
-
-import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventory;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
-import org.bukkit.inventory.ItemStack;
-
-import mineplex.core.common.util.Callback;
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.InventoryUtil;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.itemstack.ItemStackFactory;
-import mineplex.core.shop.item.IButton;
-import mineplex.core.shop.item.ShopItem;
-import mineplex.core.shop.page.ShopPageBase;
-import mineplex.game.clans.clans.ClansManager;
-
-public class PvpShopButton<PageType extends ShopPageBase<ClansManager, ?>> implements IButton
-{
-	protected PageType Page;
-	protected PvpItem Item;
-	
-	public PvpShopButton(PageType page, PvpItem item)
-	{
-		Page = page;
-		Item = item;
-	}
-
-	@Override
-	public void onClick(final Player player, ClickType clickType)
-	{
-		int balance = Page.getDonationManager().Get(player.getName()).getGold();
-		int cost = Item.getPrice();
-		int tempAmount = Item.getAmount();
-		
-		if (clickType == ClickType.SHIFT_LEFT)
-		{
-			cost *= Item.getBulkCount() == -1 ? 1 : Item.getBulkCount();
-			tempAmount = Item.getBulkCount() == -1 ? Item.getAmount() : Item.getBulkCount();
-		}
-		
-		final int deliveryAmount = tempAmount;
-		
-		if (clickType == ClickType.LEFT || clickType == ClickType.SHIFT_LEFT)
-		{
-			if (cost > balance)
-			{
-				Page.playDenySound(player);
-				UtilPlayer.message(player, F.main(Page.getPlugin().getName(), "You do not have enough funds to purchase " + deliveryAmount + " " + Item.GetName() + "."));
-				return;
-			}
-			else
-			{
-				Page.getDonationManager().RewardGold(new Callback<Boolean>()
-				{
-					public void run(Boolean result)
-					{
-						if (result)
-						{
-							Page.playAcceptSound(player);
-							ShopItem item = Item.clone();
-							item.setAmount(deliveryAmount);
-							
-							player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Item.getType(), Item.getData().getData(), Item.getAmount(), Item.GetName()));
-						}
-						else
-						{
-							Page.playDenySound(player);
-							UtilPlayer.message(player, F.main(Page.getPlugin().getName(), "An error occurred processing your purchase."));
-						}
-					}
-				}, "Clans", player.getName(), Page.getClientManager().Get(player).getAccountId(), -cost);
-			}
-		}
-		else if (clickType == ClickType.RIGHT || clickType == ClickType.SHIFT_RIGHT)
-		{
-			int removed = 1;
-			ItemStack dumbItem = new ItemStack(Item.getType(), Item.getAmount(), Item.getDurability());
-			
-			if (InventoryUtil.first((CraftInventory)player.getInventory(), 36, dumbItem, true) == -1)
-			{
-				Page.playDenySound(player);
-				UtilPlayer.message(player, F.main(Page.getPlugin().getName(), "You do not have " + deliveryAmount + " " + Item.GetName() + " in your inventory."));
-				return;
-			}
-			
-			if (clickType == ClickType.RIGHT)
-			{
-				if (player.getInventory().contains(Item.getType(), Item.getAmount()))
-					InventoryUtil.removeItem((CraftInventory)player.getInventory(), 36, dumbItem);
-			}
-			else
-				removed = InventoryUtil.getCountOfObjectsRemoved((CraftInventory)player.getInventory(), 36, dumbItem);
-			
-			final int creditAmount = removed * Item.getPrice() / 2;
-			System.out.println("Crediting " + player.getName() + " with " + creditAmount + " gold.");
-			Page.getDonationManager().RewardGold(new Callback<Boolean>()
-			{
-				public void run(Boolean result)
-				{
-					if (result)
-					{
-						Page.playAcceptSound(player);
-						System.out.println("Credited " + player.getName() + " with " + creditAmount + " gold.");
-					}
-					else
-					{
-						Page.playDenySound(player);
-						UtilPlayer.message(player, F.main(Page.getPlugin().getName(), "An error occurred processing your return."));
-					}
-				}
-			}, "Clans", player.getName(), Page.getClientManager().Get(player).getAccountId(), creditAmount);
-		}
-	}
-}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/ShopItemButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/ShopItemButton.java
new file mode 100644
index 000000000..5b879737a
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/ShopItemButton.java
@@ -0,0 +1,184 @@
+package mineplex.game.clans.shop;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.InventoryUtil;
+import mineplex.core.common.util.UtilItem;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.event.ClansPlayerBuyItemEvent;
+import mineplex.game.clans.clans.event.ClansPlayerSellItemEvent;
+import mineplex.game.clans.economy.GoldManager;
+
+public class ShopItemButton<T extends ShopPageBase<?, ?>> implements IButton
+{
+	private int _buyPrice;
+	private int _sellPrice;
+	private ItemStack _item;
+	private T _page;
+	
+	public ShopItemButton(T page, int buyPrice, int sellPrice, Material material, byte data, int amount, String displayName)
+	{
+		_page = page;
+		_sellPrice = sellPrice;
+		_buyPrice = buyPrice;
+		_item = new ItemStack(material, amount, data);
+		
+		if (displayName != null)
+		{
+			ItemMeta meta = _item.getItemMeta();
+			if (meta == null)
+			{
+				meta = Bukkit.getItemFactory().getItemMeta(material);
+			}
+			
+			meta.setDisplayName(C.Reset + displayName);
+			
+			_item.setItemMeta(meta);
+		}
+	}
+	
+	public ShopItemButton(T page, int buyPrice, int sellPrice, Material material)
+	{
+		this(page, buyPrice, sellPrice, material, (byte) 0, 1, null);
+	}
+	
+	@Override
+	public void onClick(final Player player, ClickType clickType)
+	{
+		boolean shiftClick = (clickType == ClickType.SHIFT_LEFT || clickType == ClickType.SHIFT_RIGHT);
+		
+		if (clickType == ClickType.SHIFT_RIGHT || clickType == ClickType.RIGHT)
+		{
+			int amount = 1; // # of items removed/sold from inventory
+			
+			if (!hasItem(player, _item))
+			{
+				_page.playDenySound(player);
+				notify(player, "You do not have any of the appropriate item in your inventory.");
+				return;
+			}
+			
+			ClansPlayerSellItemEvent event = new ClansPlayerSellItemEvent(player, _page, ShopItemButton.this, _item, getAmount(player, _item) * _sellPrice, getAmount(player, _item));
+			UtilServer.getServer().getPluginManager().callEvent(event);
+			
+			if (event.isCancelled())
+			{
+				return;
+			}
+			
+			if (shiftClick)
+			{
+				amount = InventoryUtil.getCountOfObjectsRemoved((CraftInventory) player.getInventory(), 36, _item);
+			}
+			else
+			{
+				InventoryUtil.removeItem((CraftInventory) player.getInventory(), 36, _item);
+			}
+			
+			int reward = amount * _sellPrice;
+			
+			GoldManager.getInstance().addGold(player, reward);
+			GoldManager.notify(player, String.format("You sold %d items for %dg", amount, reward));
+			_page.playAcceptSound(player);
+		}
+		else if (clickType == ClickType.SHIFT_LEFT || clickType == ClickType.LEFT)
+		{
+			final int amount = !(UtilItem.isArmor(_item.getType()) || UtilItem.isTool(_item.getType())) && shiftClick ? 64 : 1;
+			final int cost = amount * _buyPrice;
+			int goldCount = GoldManager.getInstance().getGold(player);
+			
+			if (goldCount >= cost)
+			{
+				final ItemStack eventItem = _item.clone();
+				eventItem.setAmount(amount);
+				
+				GoldManager.getInstance().deductGold(new Callback<Boolean>()
+				{
+					public void run(Boolean success)
+					{
+						if (success)
+						{
+							ClansPlayerBuyItemEvent event = new ClansPlayerBuyItemEvent(player, _page, ShopItemButton.this, eventItem, cost, amount);
+							UtilServer.getServer().getPluginManager().callEvent(event);
+							
+							if (event.isCancelled())
+							{
+								GoldManager.getInstance().addGold(player, cost);
+								return;
+							}
+							
+							_item = event.getItem();
+							final int finalCost = event.getCost();
+							final int finalAmount = event.getAmount();
+							
+							giftItem(player, finalAmount);
+							GoldManager.notify(player, String.format("You have purchased %d item(s) for %dg", finalAmount, finalCost));
+							
+							_page.playAcceptSound(player);
+						}
+						else
+						{
+							GoldManager.notify(player, "You cannot afford that item! Please relog to update your gold count.");
+							_page.playDenySound(player);
+						}
+					}
+				}, player, cost);
+			}
+			else
+			{
+				GoldManager.notify(player, "You cannot afford that item.");
+				_page.playDenySound(player);
+			}
+		}
+		
+		_page.refresh();
+	}
+	
+	private boolean hasItem(Player player, ItemStack item)
+	{
+		return InventoryUtil.first((CraftInventory) player.getInventory(), 36, item, true) != -1;
+	}
+	
+	private int getAmount(Player player, ItemStack item)
+	{
+		int amount = 0;
+		for (ItemStack stack : player.getInventory().getContents())
+		{
+			if (stack == null)
+			{
+				continue;
+			}
+			
+			if (stack.equals(item))
+			{
+				amount++;
+			}
+		}
+		
+		return amount;
+	}
+	
+	private void notify(Player player, String message)
+	{
+		UtilPlayer.message(player, F.main("Shop", message));
+	}
+	
+	private void giftItem(Player player, int amount)
+	{
+		ItemStack item = _item.clone();
+		item.setAmount(amount);
+		player.getInventory().addItem(item);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/BankPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/BankPage.java
new file mode 100644
index 000000000..dd6fd97e4
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/BankPage.java
@@ -0,0 +1,135 @@
+package mineplex.game.clans.shop.bank;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.DisplayButton;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.economy.GoldManager;
+import mineplex.game.clans.shop.ClansShopItem;
+
+public class BankPage extends ShopPageBase<ClansManager, BankShop>
+{
+	public static final int GEM_CONVERSION = 1000;	// The number of gems that can be converted into gold
+	public static final int TOKEN_VALUE = ClansShopItem.GOLD_TOKEN.getBuyPrice();	// Value of a GoldToken (in gold) that can be stored/cashed in here
+	private ClanInfo _clanInfo;
+
+	public BankPage(ClansManager plugin, BankShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
+	{
+		super(plugin, shop, clientManager, donationManager, "Bank Shop", player, 9);
+		_clanInfo = getPlugin().getClan(getPlayer());
+
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+		buildCashIn();
+		
+		if (hasEnoughGold())
+		{
+			buildTokenPurchasable();
+		}
+		else
+		{
+			buildTokenUnpurchasable();
+		}
+		
+		if (GoldManager.getInstance().canTransferGems(getPlayer()))
+		{
+			buildTransferGems();
+		}
+		else
+		{
+			buildTransferGemsCooldown();
+		}
+	}
+
+	private void buildCashIn()
+	{
+		int playerGold = getPlayerGold();
+		
+		CashInButton button = new CashInButton(this);
+		String title = "Cash In Gold Token";
+		String playerGoldString = ChatColor.RESET + F.value("Your Gold", playerGold + "g");
+		String description = ChatColor.RESET + C.cWhite + "Click with GoldToken to exchange for gold!";
+		ShopItem shopItem = new ShopItem(Material.FURNACE, title, new String[] {" ", playerGoldString, description}, 0, true, true);
+		addButton(5, shopItem, button);
+	}
+	
+	private void buildTransferGems()
+	{
+		int playerGold = getPlayerGold();
+		int playerGems = getPlayerGems();
+		int conversionCount = (int) (GEM_CONVERSION * GoldManager.GEM_CONVERSION_RATE);
+
+		GemTransferButton button = new GemTransferButton(this, GEM_CONVERSION);
+		String title = ChatColor.GOLD + C.Bold + "Convert Gems To Gold!";
+		String playerGoldString = ChatColor.RESET + F.value("Your Gold", playerGold + "g");
+		String playerGemString = ChatColor.RESET + F.value("Your Gems", playerGems + " gems");
+		String purchaseString = ChatColor.RESET + F.value("Conversion Rate", GEM_CONVERSION + " gems for " + conversionCount + " gold");
+		String goldString = ChatColor.RESET + C.cWhite + "Convert gems into gold coins once per day!";
+		ShopItem shopItem = new ShopItem(Material.EMERALD, title, new String[] {" ", playerGoldString, playerGemString, purchaseString, goldString}, 0, true, true);
+		addButton(4, shopItem, button);
+	}
+	
+	private void buildTransferGemsCooldown()
+	{
+		DisplayButton button = new DisplayButton();
+		String title = ChatColor.RED + C.Bold + "Conversion Cooldown!";
+		String purchaseString = ChatColor.RESET + C.cWhite + "You have already converted gems into coins today";
+		ShopItem shopItem = new ShopItem(Material.REDSTONE_BLOCK, title, new String[] {" ", purchaseString, " "}, 0, true, true);
+		addButton(4, shopItem, button);
+	}
+
+	private void buildTokenPurchasable()
+	{
+		int playerGold = getPlayerGold();
+
+		StoreGoldButton button = new StoreGoldButton(this);
+		String title = ChatColor.GOLD + C.Bold + "Purchase Gold Token!";
+		String playerGoldString = ChatColor.RESET + F.value("Your Gold", playerGold + "g");
+		String purchaseString = ChatColor.RESET + F.value("Token Value", TOKEN_VALUE + "g");
+		String goldString = ChatColor.RESET + C.cWhite + "Store your bank gold in the form of a gold token!";
+		ShopItem shopItem = new ShopItem(Material.RECORD_12, title, new String[] {" ", playerGoldString, purchaseString, goldString}, 0, true, true);
+		addButton(3, shopItem, button);
+	}
+	
+	private void buildTokenUnpurchasable()
+	{
+		int playerGold = getPlayerGold();
+		int goldCost = TOKEN_VALUE;
+
+		DisplayButton button = new DisplayButton();
+		String title = ChatColor.RED + C.Bold + "Missing Gold!";
+		String playerGoldString = ChatColor.RESET + F.value("Your Gold", playerGold + "g");
+		String purchaseString = ChatColor.RESET + C.cWhite + "You don't have enough gold";
+		String goldString = ChatColor.RESET + C.cWhite + "You need " + C.cYellow + goldCost + C.cWhite + " gold to purchase a token.";
+		ShopItem shopItem = new ShopItem(Material.RECORD_12, title, new String[] {" ", playerGoldString, purchaseString, goldString}, 0, true, true);
+		addButton(3, shopItem, button);
+	}
+
+	public boolean hasEnoughGold()
+	{
+		return getPlayerGold() >= TOKEN_VALUE;
+	}
+	
+	private int getPlayerGems()
+	{
+		return GoldManager.getInstance().getGems(getPlayer());
+	}
+
+	private int getPlayerGold()
+	{
+		return GoldManager.getInstance().getGold(getPlayer());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/BankShop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/BankShop.java
new file mode 100644
index 000000000..373928881
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/BankShop.java
@@ -0,0 +1,23 @@
+package mineplex.game.clans.shop.bank;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.ClansManager;
+
+public class BankShop extends ShopBase<ClansManager>
+{
+	public BankShop(ClansManager plugin, CoreClientManager clientManager, DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager, "Bank Shop");
+	}
+
+	@Override
+	protected ShopPageBase<ClansManager, ? extends ShopBase<ClansManager>> buildPagesFor(Player player)
+	{
+		return new BankPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/CashInButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/CashInButton.java
new file mode 100644
index 000000000..1589acf09
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/CashInButton.java
@@ -0,0 +1,45 @@
+package mineplex.game.clans.shop.bank;
+
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.Callback;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.IButton;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.economy.GoldManager;
+import mineplex.game.clans.items.CustomItem;
+import mineplex.game.clans.items.GearManager;
+import mineplex.game.clans.items.economy.GoldToken;
+
+public class CashInButton implements IButton
+{
+	private BankPage _page;
+	
+	public CashInButton(BankPage page)
+	{
+		_page = page;
+	}
+	
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		if (clickType != ClickType.LEFT && clickType != ClickType.RIGHT)	return;
+		
+		ItemStack item = player.getItemOnCursor();
+		CustomItem cursorItem = GearManager.parseItem(item);
+		
+		if (cursorItem instanceof GoldToken)
+		{
+			GoldToken token = (GoldToken) cursorItem;
+			GoldManager.getInstance().cashIn(player, token);
+			player.setItemOnCursor(null);	// Delete the gold token on cursor
+			_page.playAcceptSound(player);
+			_page.refresh();
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/GemTransferButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/GemTransferButton.java
new file mode 100644
index 000000000..cd5a969b2
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/GemTransferButton.java
@@ -0,0 +1,41 @@
+package mineplex.game.clans.shop.bank;
+
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.Callback;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.IButton;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.economy.GoldManager;
+import mineplex.game.clans.items.CustomItem;
+import mineplex.game.clans.items.GearManager;
+import mineplex.game.clans.items.economy.GoldToken;
+
+public class GemTransferButton implements IButton
+{
+	private BankPage _page;
+	private int _gemAmount;
+	
+	public GemTransferButton(BankPage page, int gemAmount)
+	{
+		_page = page;
+		_gemAmount = gemAmount;
+	}
+	
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		if (clickType != ClickType.LEFT)	return;
+		
+		if (GoldManager.getInstance().canTransferGems(player))
+		{
+			GoldManager.getInstance().transferGemsToCoins(player, _gemAmount);
+			_page.refresh();
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/StoreGoldButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/StoreGoldButton.java
new file mode 100644
index 000000000..d6dcd4ccb
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/bank/StoreGoldButton.java
@@ -0,0 +1,32 @@
+package mineplex.game.clans.shop.bank;
+
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.shop.item.IButton;
+import mineplex.game.clans.economy.GoldManager;
+
+public class StoreGoldButton implements IButton
+{
+	private BankPage _page;
+
+	public StoreGoldButton(BankPage page)
+	{
+		_page = page;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		if (clickType != ClickType.LEFT)	return;
+		
+		if (_page.hasEnoughGold())
+		{
+			int cost = BankPage.TOKEN_VALUE;
+			GoldManager.getInstance().purchaseToken(player, cost);
+			_page.refresh();
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingPage.java
index 7f94c6835..4eed915d4 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingPage.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingPage.java
@@ -1,15 +1,12 @@
 package mineplex.game.clans.shop.building;
 
-import org.bukkit.Material;
-
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.donation.DonationManager;
-import mineplex.core.shop.page.ShopPageBase;
 import mineplex.game.clans.clans.ClansManager;
-import mineplex.game.clans.shop.PvpItem;
-import mineplex.game.clans.shop.PvpShopButton;
+import mineplex.game.clans.shop.ClansShopItem;
+import mineplex.game.clans.shop.ClansShopPage;
 
-public class BuildingPage extends ShopPageBase<ClansManager, BuildingShop>
+public class BuildingPage extends ClansShopPage<BuildingShop>
 {
 	public BuildingPage(ClansManager plugin, BuildingShop shop, CoreClientManager clientManager, DonationManager donationManager, org.bukkit.entity.Player player)
 	{
@@ -17,18 +14,28 @@ public class BuildingPage extends ShopPageBase<ClansManager, BuildingShop>
 		
 		buildPage();
 	}
-
+	
 	@Override
 	protected void buildPage()
 	{
-		addPvpItem(1, new PvpItem(Material.STONE, (byte)0, 1, "Stone", 25, 64));
-		addPvpItem(2, new PvpItem(Material.WOOD, (byte)0, 1, "Wood", 15, 64));
-		addPvpItem(3, new PvpItem(Material.BRICK, (byte)0, 1, "Bricks", 30, 64));
-		addPvpItem(4, new PvpItem(Material.SANDSTONE, (byte)0, 1, "Sandstone", 30, 64));
-	}
-	
-	public void addPvpItem(int slot, PvpItem item)
-	{
-		addButton(slot, item, new PvpShopButton<BuildingPage>(this, item));
+		addShopItem(1, ClansShopItem.STONE);
+		addShopItem(2, ClansShopItem.SMOOTH_BRICK);
+		addShopItem(3, ClansShopItem.CRACKED_STONE_BRICK, (byte) 2);
+		addShopItem(4, ClansShopItem.COBBLESTONE);
+		
+		addShopItem(10, ClansShopItem.LOG, (byte) 0);
+		addShopItem(11, ClansShopItem.LOG, (byte) 1);
+		addShopItem(12, ClansShopItem.LOG, (byte) 2);
+		addShopItem(13, ClansShopItem.LOG, (byte) 3);
+		addShopItem(14, ClansShopItem.LOG_2, (byte) 0);
+		addShopItem(15, ClansShopItem.LOG_2, (byte) 1);
+		
+		addShopItem(19, ClansShopItem.SAND);
+		addShopItem(20, ClansShopItem.GLASS);
+		addShopItem(21, ClansShopItem.SANDSTONE);
+		addShopItem(22, ClansShopItem.DIRT);
+		addShopItem(23, ClansShopItem.NETHER_BRICK);
+		addShopItem(24, ClansShopItem.QUARTZ_BLOCK);
+		addShopItem(25, ClansShopItem.CLAY);
 	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingShop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingShop.java
index f39503c57..84f1d0e92 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingShop.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingShop.java
@@ -24,14 +24,4 @@ public class BuildingShop extends ShopBase<ClansManager>
 	{
 		return new BuildingPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
 	}
-	
-	@EventHandler
-	public void playerCmd(PlayerCommandPreprocessEvent event)
-	{
-		if (event.getMessage().startsWith("/gold"))
-		{
-			UtilPlayer.message(event.getPlayer(), F.main("Gold", "Your Balance is " + C.cYellow + getDonationManager().Get(event.getPlayer().getName()).getGold() + "g"));
-			event.setCancelled(true);
-		}
-	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPackage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPackage.java
new file mode 100644
index 000000000..1cb0d90c2
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPackage.java
@@ -0,0 +1,25 @@
+package mineplex.game.clans.shop.energy;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import mineplex.core.common.CurrencyType;
+import mineplex.core.shop.item.SalesPackageBase;
+
+public class EnergyPackage extends SalesPackageBase
+{
+	public EnergyPackage(String name, int cost)
+	{
+		super(name, Material.REDSTONE, " ", ChatColor.RESET + "Clan Energy");
+		CurrencyCostMap.put(CurrencyType.Gold, cost);
+		KnownPackage = false;
+		OneTimePurchaseOnly = false;
+	}
+
+	@Override
+	public void Sold(Player player, CurrencyType currencyType)
+	{
+
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPage.java
index 70e2ff348..4e63d4b90 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPage.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPage.java
@@ -1,129 +1,91 @@
 package mineplex.game.clans.shop.energy;
 
+import java.util.ArrayList;
+
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
 import mineplex.core.donation.DonationManager;
-import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.shop.item.ShopItem;
 import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.ClanEnergyManager;
 import mineplex.game.clans.clans.ClanInfo;
-import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.event.ClansShopAddButtonEvent;
+import mineplex.game.clans.clans.event.EnergyPageBuildEvent;
 
-public class EnergyPage extends ShopPageBase<ClansManager, EnergyShop>
+public class EnergyPage extends ShopPageBase<ClanEnergyManager, EnergyShop>
 {
-	private ClanInfo _clanInfo;
-
-	public EnergyPage(ClansManager plugin, EnergyShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
+	public EnergyPage(ClanEnergyManager plugin, EnergyShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
 	{
-		super(plugin, shop, clientManager, donationManager, "Energy Shop", player, 9);
-		_clanInfo = getPlugin().getClan(getPlayer());
-
+		super(plugin, shop, clientManager, donationManager, "Energy Shop", player, 18);
 		buildPage();
 	}
-
+	
 	@Override
 	protected void buildPage()
 	{
-		if (_clanInfo == null)
-		{
+		ClanInfo clanInfo = getPlugin().getClansManager().getClan(getPlayer());
+		if (clanInfo == null)
 			buildNoClan();
-			return;
-		}
-		else if (_clanInfo.getEnergyPurchasable() > 0)
-		{
-			if (hasEnoughGold())
-			{
-				buildPurchasable(_clanInfo);
-			}
-			else
-			{
-				buildNotEnoughGold(_clanInfo);
-			}
-		}
 		else
 		{
-			buildMaxEnergy(_clanInfo);
+			addInfo(clanInfo, 4);
+			buildPurchase(clanInfo);
 		}
 	}
-
-	private void buildPurchasable(ClanInfo _clanInfo)
+	
+	private void buildPurchase(ClanInfo clanInfo)
 	{
-		int playerGold = getPlayerGold();
-		int energyCost = getEnergyPerHour();
-		int goldCost = getGoldPerHour();
-
-		EnergyShopButton button = new EnergyShopButton(getPlayer(), getPlugin(), this, _clanInfo, true, getDonationManager());
-		String title = "Purchase Energy";
-		String currentEnergy = ChatColor.RESET + F.value("Clan Energy", "" + _clanInfo.getEnergy());
-		String energyString = ChatColor.RESET + F.value("Energy drain/hour", "" + energyCost);
-		String playerGoldString = ChatColor.RESET + F.value("Your Gold", playerGold + "g");
-		String purchaseString = ChatColor.RESET + C.cWhite + "Click to buy 1 hour of energy for " + C.cYellow + goldCost + "g";
-		ShopItem shopItem = new ShopItem(Material.LAVA_BUCKET, title, new String[] {" ", currentEnergy, energyString, " ", playerGoldString, purchaseString}, 0, false, false);
-		addButton(4, shopItem, button);
+		int energyPerMin = Math.max(1, clanInfo.getEnergyCostPerMinute());
+		
+		int oneHourEnergy = energyPerMin * 60;
+		int oneDayEnergy = oneHourEnergy * 24;
+		int maxEnergy = clanInfo.getEnergyPurchasable();
+		
+		EnergyPageBuildEvent event = new EnergyPageBuildEvent(getPlayer());
+		
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		addButton(clanInfo, 11, oneHourEnergy, Material.REDSTONE, (byte) 0, event.free(), " ", ChatColor.RESET + "Purchase 1 Hour of Energy for your Clan", " ", ChatColor.RESET + (event.free() ? "FREE! (Tutorial)" : "Costs " + C.cGreen + getPlugin().convertEnergyToGold(oneHourEnergy) + "g"));
+		addButton(clanInfo, 13, oneDayEnergy, Material.REDSTONE_BLOCK, (byte) 0, event.free(), " ", ChatColor.RESET + "Purchase 1 Day of Energy for your Clan", " ", ChatColor.RESET + (event.free() ? "FREE! (Tutorial)" : "Costs " + C.cGreen + getPlugin().convertEnergyToGold(oneDayEnergy) + "g"));
+		addButton(clanInfo, 15, maxEnergy, Material.FURNACE, (byte) 0, event.free(), " ", ChatColor.RESET + "Max Out your Clan's Energy", " ", ChatColor.RESET + (event.free() ? "FREE! (Tutorial)" : "Costs " + C.cGreen + getPlugin().convertEnergyToGold(maxEnergy) + "g"));
 	}
-
-	private void buildNotEnoughGold(ClanInfo _clanInfo)
+	
+	private void addInfo(ClanInfo clanInfo, int slot)
 	{
-		int playerGold = getPlayerGold();
-		int energyCost = getEnergyPerHour();
-		int goldCost = getGoldPerHour();
-
-		EnergyShopButton button = new EnergyShopButton(getPlayer(), getPlugin(), this, _clanInfo, true, getDonationManager());
-		String title = ChatColor.RED + C.Bold + "Missing Gold!";
-		String currentEnergy = ChatColor.RESET + F.value("Clan Energy", "" + _clanInfo.getEnergy());
-		String energyString = ChatColor.RESET + F.value("Energy drain/hour", "" + energyCost);
-		String playerGoldString = ChatColor.RESET + F.value("Your Gold", playerGold + "g");
-		String purchaseString = ChatColor.RESET + C.cWhite + "You don't have enough gold";
-		String goldString = ChatColor.RESET + C.cWhite + "You need " + C.cYellow + goldCost + C.cWhite + " gold to purchase energy";
-		ShopItem shopItem = new ShopItem(Material.GOLD_INGOT, title, new String[] {" ", currentEnergy, energyString, " ", playerGoldString, purchaseString, goldString}, 0, false, false);
-		addButton(4, shopItem, button);
+		String itemName = clanInfo.getName();
+		ArrayList<String> lore = new ArrayList<String>();
+		lore.add(" ");
+		lore.add(C.cYellow + "Energy: " + ChatColor.RESET + clanInfo.getEnergy());
+		lore.add(C.cYellow + "Drain: " + ChatColor.RESET + clanInfo.getEnergyCostPerMinute() * 60 + " per Hour");
+		lore.add(C.cYellow + "Max Energy: " + ChatColor.RESET + clanInfo.getEnergyMax());
+		if (clanInfo.getEnergyCostPerMinute() > 0) lore.add(C.cYellow + "Time Left: " + ChatColor.RESET + UtilTime.convertString((clanInfo.getEnergy() / clanInfo.getEnergyCostPerMinute()) * 60000L, 1, UtilTime.TimeUnit.FIT));
+		
+		ShopItem shopItem = new ShopItem(Material.DIAMOND, itemName, lore.toArray(new String[0]), 1, false, false);
+		setItem(slot, shopItem);
 	}
-
+	
+	private void addButton(ClanInfo clanInfo, int slot, int energyAmount, Material material, byte data, boolean free, String... lore)
+	{
+		boolean locked = energyAmount > clanInfo.getEnergyPurchasable() || energyAmount == 0;
+		String itemName = "Purchase " + energyAmount + " Energy";
+		
+		ShopItem shopItem = new ShopItem(material, itemName, lore, 1, locked, false);
+		
+		if (locked)
+			setItem(slot, shopItem);
+		else
+			addButton(slot, shopItem, new EnergyShopButton(getPlugin(), this, energyAmount, clanInfo, free ? 0 : getPlugin().convertEnergyToGold(energyAmount)));
+	}
+	
 	private void buildNoClan()
 	{
-		ShopItem shopItem = new ShopItem(Material.GLASS, "No Clan!", new String[] {" ", "You need to be in a", "clan to purchase energy!"}, 1, false, false);
+		ShopItem shopItem = new ShopItem(Material.BEDROCK, "No Clan!", new String[] { " ", ChatColor.RESET + "You need to be in a", ChatColor.RESET + "clan to purchase energy!" }, 1, false, false);
 		setItem(4, shopItem);
 	}
-
-	private void buildMaxEnergy(ClanInfo _clanInfo)
-	{
-		int energy = _clanInfo.getEnergy();
-		String title = C.cRed + C.Bold + "Cannot Purchase Energy!";
-		String currentEnergy = ChatColor.RESET + F.value("Clan Energy", "" + energy);
-		String[] lore = new String[] {" ", currentEnergy,  ChatColor.RESET + "Your clan is at the energy cap"};
-		ShopItem shopItem = new ShopItem(Material.BUCKET, title, lore, 0, false, false);
-		addItem(4, shopItem);
-	}
-
-	protected boolean hasEnoughGold()
-	{
-		return getPlayerGold() >= getGoldPerHour();
-	}
-
-	protected int getGoldPerHour()
-	{
-		return getPlugin().convertEnergyToGold(getEnergyPerHour());
-	}
-
-	protected int getEnergyPerHour()
-	{
-		return _clanInfo.getEnergyCostPerMinute() * 60;
-	}
-
-	protected int getPlayerGold()
-	{
-		return getDonationManager().Get(getPlayer()).getGold();
-	}
-
-	public void showLoading()
-	{
-		ItemStack is = ItemStackFactory.Instance.CreateStack(Material.WOOL, (byte) 11, 1, C.cAqua + C.Bold + "Please Wait..");
-		setItem(4, is);
-	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShop.java
index 4a8a5df1b..0305725bb 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShop.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShop.java
@@ -6,18 +6,18 @@ import mineplex.core.account.CoreClientManager;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.shop.ShopBase;
 import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.ClanEnergyManager;
 import mineplex.game.clans.clans.ClansManager;
 
-public class EnergyShop extends ShopBase<ClansManager>
+public class EnergyShop extends ShopBase<ClanEnergyManager>
 {
-
-	public EnergyShop(ClansManager plugin, CoreClientManager clientManager, DonationManager donationManager)
+	public EnergyShop(ClanEnergyManager plugin, CoreClientManager clientManager, DonationManager donationManager)
 	{
 		super(plugin, clientManager, donationManager, "Energy Shop");
 	}
-
+	
 	@Override
-	protected ShopPageBase<ClansManager, ? extends ShopBase<ClansManager>> buildPagesFor(Player player)
+	protected ShopPageBase<ClanEnergyManager, ? extends ShopBase<ClanEnergyManager>> buildPagesFor(Player player)
 	{
 		return new EnergyPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
 	}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShopButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShopButton.java
index 5398daf50..cd548e9fe 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShopButton.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShopButton.java
@@ -1,57 +1,66 @@
 package mineplex.game.clans.shop.energy;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
+import mineplex.core.common.CurrencyType;
 import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilTime;
 import mineplex.core.donation.DonationManager;
+import mineplex.core.energy.Energy;
+import mineplex.core.shop.ShopBase;
 import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.page.ConfirmationPage;
+import mineplex.game.clans.clans.ClanEnergyManager;
 import mineplex.game.clans.clans.ClanInfo;
 import mineplex.game.clans.clans.ClansManager;
 
 public class EnergyShopButton implements IButton
 {
-	private Player _player;
-	private ClansManager _clansManager;
+	private ClanEnergyManager _energyManager;
 	private EnergyPage _page;
+	private int _energyToPurchase;
 	private ClanInfo _clanInfo;
-	private boolean _canPurchaseEnergy;
-	private DonationManager _donationManager;
+	private int _cost;
 
-	public EnergyShopButton(Player player, ClansManager clansManager, EnergyPage page, ClanInfo clanInfo, boolean canPurchaseEnergy, DonationManager donationManager)
+	public EnergyShopButton(ClanEnergyManager energyManager, EnergyPage page, int energyToPurchase, ClanInfo clanInfo, int cost)
 	{
-		_player = player;
-		_clansManager = clansManager;
+		_energyManager = energyManager;
 		_clanInfo = clanInfo;
-		_canPurchaseEnergy = canPurchaseEnergy;
-		_donationManager = donationManager;
+		_energyToPurchase = energyToPurchase;
 		_page = page;
+		_cost = cost;
 	}
 
-
 	@Override
 	public void onClick(final Player player, ClickType clickType)
 	{
-		if (_page.hasEnoughGold())
+		_page.getShop().openPageForPlayer(player, new ConfirmationPage<ClanEnergyManager, EnergyShop>(
+				_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), new Runnable()
 		{
-			int playerGold = _page.getPlayerGold();
-			final int energy = _page.getEnergyPerHour();
-			int goldCost = _page.getGoldPerHour();
-
-			_page.clearPage();
-			_page.showLoading();
-			_donationManager.RewardGold(new Callback<Boolean>()
+			public void run()
 			{
-				@Override
-				public void run(Boolean data)
+				_clanInfo.adjustEnergy(_energyToPurchase);
+				_page.refresh();
+
+				_energyManager.runAsync(new Runnable()
 				{
-					player.playSound(player.getEyeLocation(), Sound.ANVIL_USE, 1, 1);
-					_clanInfo.adjustEnergy(energy);
-					_page.refresh();
-				}
-			}, "Energy Purchase", player.getName(), _page.getClientManager().Get(player).getAccountId(), -goldCost, true);
-		}
+					@Override
+					public void run()
+					{
+						_energyManager.getClansManager().getClanDataAccess().updateEnergy(_clanInfo);
+					}
+				});
+
+				// Notify
+				_energyManager.getClansManager().messageClan(_clanInfo, F.main("Energy", F.name(player.getName()) + " purchased " + F.elem(_energyToPurchase + " Energy") + " for the clan"));
+			}
+		}, _page, new EnergyPackage(_energyToPurchase + " Energy", _cost), CurrencyType.Gold, player));
+
+
 	}
 
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/farming/FarmingPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/farming/FarmingPage.java
new file mode 100644
index 000000000..f21e3053a
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/farming/FarmingPage.java
@@ -0,0 +1,37 @@
+package mineplex.game.clans.shop.farming;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.donation.DonationManager;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.shop.ClansShopPage;
+import mineplex.game.clans.shop.ClansShopItem;
+
+public class FarmingPage  extends ClansShopPage<FarmingShop>
+{
+	public FarmingPage(ClansManager plugin, FarmingShop shop, CoreClientManager clientManager, DonationManager donationManager, org.bukkit.entity.Player player)
+	{
+		super(plugin, shop, clientManager, donationManager, "Organic Produce", player, 18);
+		
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+		addShopItem(1, ClansShopItem.POTATO_ITEM);
+		addShopItem(2, ClansShopItem.MELON);
+		addShopItem(3, ClansShopItem.BREAD);
+		addShopItem(4, ClansShopItem.COOKED_BEEF);
+		addShopItem(5, ClansShopItem.GRILLED_PORK);
+		addShopItem(6, ClansShopItem.COOKED_CHICKEN);
+		addShopItem(7, ClansShopItem.FEATHER);
+		addShopItem(8, ClansShopItem.CARROT_ITEM);
+		addShopItem(10, ClansShopItem.MUSHROOM_SOUP);
+		addShopItem(11, ClansShopItem.SUGAR_CANE);
+		addShopItem(12, ClansShopItem.PUMPKIN);
+		addShopItem(13, ClansShopItem.STRING);
+		addShopItem(14, ClansShopItem.BONE);
+		addShopItem(15, ClansShopItem.ROTTEN_FLESH);
+		addShopItem(16, ClansShopItem.SPIDER_EYE);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/farming/FarmingShop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/farming/FarmingShop.java
new file mode 100644
index 000000000..375dff0af
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/farming/FarmingShop.java
@@ -0,0 +1,27 @@
+package mineplex.game.clans.shop.farming;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.ClansManager;
+
+public class FarmingShop extends ShopBase<ClansManager>
+{
+	public FarmingShop(ClansManager plugin, CoreClientManager clientManager, mineplex.core.donation.DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager, "Organic Produce");
+	}
+
+	@Override
+	protected ShopPageBase<ClansManager, ? extends ShopBase<ClansManager>> buildPagesFor(Player player)
+	{
+		return new FarmingPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/mining/MiningPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/mining/MiningPage.java
new file mode 100644
index 000000000..aa6a4d859
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/mining/MiningPage.java
@@ -0,0 +1,29 @@
+package mineplex.game.clans.shop.mining;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.donation.DonationManager;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.shop.ClansShopPage;
+import mineplex.game.clans.shop.ClansShopItem;
+
+public class MiningPage extends ClansShopPage<MiningShop>
+{
+	public MiningPage(ClansManager plugin, MiningShop shop, CoreClientManager clientManager, DonationManager donationManager, org.bukkit.entity.Player player)
+	{
+		super(plugin, shop, clientManager, donationManager, "Mining Shop", player, 9);
+
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+		addShopItem(1, ClansShopItem.IRON_INGOT);
+		addShopItem(2, ClansShopItem.GOLD_INGOT);
+		addShopItem(3, ClansShopItem.DIAMOND);
+		addShopItem(4, ClansShopItem.LEATHER);
+		addShopItem(5, ClansShopItem.COAL);
+		addShopItem(6, ClansShopItem.REDSTONE);
+		addShopItem(7, ClansShopItem.LAPIS_BLOCK);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/mining/MiningShop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/mining/MiningShop.java
new file mode 100644
index 000000000..1af0cf15f
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/mining/MiningShop.java
@@ -0,0 +1,28 @@
+package mineplex.game.clans.shop.mining;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.shop.mining.MiningPage;
+
+public class MiningShop extends ShopBase<ClansManager>
+{
+	public MiningShop(ClansManager plugin, CoreClientManager clientManager, mineplex.core.donation.DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager, "Mining Shop");
+	}
+
+	@Override
+	protected ShopPageBase<ClansManager, ? extends ShopBase<ClansManager>> buildPagesFor(Player player)
+	{
+		return new MiningPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpPage.java
index d71a34a11..f06045627 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpPage.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpPage.java
@@ -1,15 +1,12 @@
 package mineplex.game.clans.shop.pvp;
 
-import org.bukkit.Material;
-
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.donation.DonationManager;
-import mineplex.core.shop.page.ShopPageBase;
 import mineplex.game.clans.clans.ClansManager;
-import mineplex.game.clans.shop.PvpItem;
-import mineplex.game.clans.shop.PvpShopButton;
+import mineplex.game.clans.shop.ClansShopPage;
+import mineplex.game.clans.shop.ClansShopItem;
 
-public class PvpPage extends ShopPageBase<ClansManager, PvpShop>
+public class PvpPage extends ClansShopPage<PvpShop>
 {
 	public PvpPage(ClansManager plugin, PvpShop shop, CoreClientManager clientManager, DonationManager donationManager, org.bukkit.entity.Player player)
 	{
@@ -17,53 +14,49 @@ public class PvpPage extends ShopPageBase<ClansManager, PvpShop>
 		
 		buildPage();
 	}
-
+	
 	@Override
 	protected void buildPage()
 	{
-		addPvpItem(9, new PvpItem(Material.GOLD_HELMET, (byte)0, 1, "Mage Helmet", 200, 4));
-		addPvpItem(18, new PvpItem(Material.GOLD_CHESTPLATE, (byte)0, 1, "Mage Chestplate", 200, 4));
-		addPvpItem(27, new PvpItem(Material.GOLD_LEGGINGS, (byte)0, 1, "Mage Leggings", 200, 4));
-		addPvpItem(36, new PvpItem(Material.GOLD_BOOTS, (byte)0, 1, "Mage Boots", 200, 4));
+		addShopItem(9, ClansShopItem.GOLD_HELMET, "Mage Helmet");
+		addShopItem(18, ClansShopItem.GOLD_CHESTPLATE, "Mage Chestplate");
+		addShopItem(27, ClansShopItem.GOLD_LEGGINGS, "Mage Leggings");
+		addShopItem(36, ClansShopItem.GOLD_BOOTS, "Mage Boots");
 		
-		addPvpItem(10, new PvpItem(Material.LEATHER_HELMET, (byte)0, 1, "Assassin Helmet", 200, 4));
-		addPvpItem(19, new PvpItem(Material.LEATHER_CHESTPLATE, (byte)0, 1, "Assassin Chestplate", 200, 4));
-		addPvpItem(28, new PvpItem(Material.LEATHER_LEGGINGS, (byte)0, 1, "Assassin Leggings", 200, 4));
-		addPvpItem(37, new PvpItem(Material.LEATHER_BOOTS, (byte)0, 1, "Assassin Boots", 200, 4));
+		addShopItem(10, ClansShopItem.LEATHER_HELMET, "Assassin Helmet");
+		addShopItem(19, ClansShopItem.LEATHER_CHESTPLATE, "Assassin Chestplate");
+		addShopItem(28, ClansShopItem.LEATHER_LEGGINGS, "Assassin Leggings");
+		addShopItem(37, ClansShopItem.LEATHER_BOOTS, "Assassin Boots");
 		
-		addPvpItem(11, new PvpItem(Material.CHAINMAIL_HELMET, (byte)0, 1, "Ranger Helmet", 200, 4));
-		addPvpItem(20, new PvpItem(Material.CHAINMAIL_CHESTPLATE, (byte)0, 1, "Ranger Chestplate", 200, 4));
-		addPvpItem(29, new PvpItem(Material.CHAINMAIL_LEGGINGS, (byte)0, 1, "Ranger Leggings", 200, 4));
-		addPvpItem(38, new PvpItem(Material.CHAINMAIL_BOOTS, (byte)0, 1, "Ranger Boots", 200, 4));
-
-		addPvpItem(12, new PvpItem(Material.IRON_HELMET, (byte)0, 1, "Knight Helmet", 200, 4));
-		addPvpItem(21, new PvpItem(Material.IRON_CHESTPLATE, (byte)0, 1, "Knight Chestplate", 200, 4));
-		addPvpItem(30, new PvpItem(Material.IRON_LEGGINGS, (byte)0, 1, "Knight Leggings", 200, 4));
-		addPvpItem(39, new PvpItem(Material.IRON_BOOTS, (byte)0, 1, "Knight Boots", 200, 4));
-
-		addPvpItem(13, new PvpItem(Material.DIAMOND_HELMET, (byte)0, 1, "Brute Helmet", 200, 4));
-		addPvpItem(22, new PvpItem(Material.DIAMOND_CHESTPLATE, (byte)0, 1, "Brute Chestplate", 200, 4));
-		addPvpItem(31, new PvpItem(Material.DIAMOND_LEGGINGS, (byte)0, 1, "Brute Leggings", 200, 4));
-		addPvpItem(40, new PvpItem(Material.DIAMOND_BOOTS, (byte)0, 1, "Brute Boots", 200, 4));
+		addShopItem(11, ClansShopItem.CHAINMAIL_HELMET, "Ranger Helmet");
+		addShopItem(20, ClansShopItem.CHAINMAIL_CHESTPLATE, "Ranger Chestplate");
+		addShopItem(29, ClansShopItem.CHAINMAIL_LEGGINGS, "Ranger Leggings");
+		addShopItem(38, ClansShopItem.CHAINMAIL_BOOTS, "Ranger Boots");
 		
-		addPvpItem(15, new PvpItem(Material.IRON_SWORD, (byte)0, 1, "Iron Sword", 100, 4));
-		addPvpItem(16, new PvpItem(Material.DIAMOND_SWORD, (byte)0, 1, "Power Sword", 800, 4));
-		addPvpItem(17, new PvpItem(Material.GOLD_SWORD, (byte)0, 1, "Booster Sword", 800, 4));
+		addShopItem(12, ClansShopItem.IRON_HELMET, "Knight Helmet");
+		addShopItem(21, ClansShopItem.IRON_CHESTPLATE, "Knight Chestplate");
+		addShopItem(30, ClansShopItem.IRON_LEGGINGS, "Knight Leggings");
+		addShopItem(39, ClansShopItem.IRON_BOOTS, "Knight Boots");
 		
-		addPvpItem(24, new PvpItem(Material.IRON_AXE, (byte)0, 1, "Iron Axe", 100, 4));
-		addPvpItem(25, new PvpItem(Material.DIAMOND_AXE, (byte)0, 1, "Power Axe", 800, 4));
-		addPvpItem(26, new PvpItem(Material.GOLD_AXE, (byte)0, 1, "Booster Axe", 800, 4));
+		addShopItem(13, ClansShopItem.DIAMOND_HELMET, "Brute Helmet");
+		addShopItem(22, ClansShopItem.DIAMOND_CHESTPLATE, "Brute Chestplate");
+		addShopItem(31, ClansShopItem.DIAMOND_LEGGINGS, "Brute Leggings");
+		addShopItem(40, ClansShopItem.DIAMOND_BOOTS, "Brute Boots");
 		
-		addPvpItem(33, new PvpItem(Material.BOW, (byte)0, 1, "Standard Bow", 100, 4));
-		addPvpItem(34, new PvpItem(Material.ARROW, (byte)0, 16, "Arrows", 50, 4));
-
-		addPvpItem(51, new PvpItem(Material.TNT, (byte)0, 1, "TNT", 500, 16));
-		addPvpItem(52, new PvpItem(Material.BREWING_STAND_ITEM, (byte)0, 1, "TNT Generator", 5000));
-		addPvpItem(53, new PvpItem(Material.ENCHANTMENT_TABLE, (byte)0, 1, "Class Shop", 10000));
+		addShopItem(15, ClansShopItem.IRON_SWORD, "Iron Sword");
+		addShopItem(16, ClansShopItem.DIAMOND_SWORD, "Power Sword");
+		addShopItem(17, ClansShopItem.GOLD_SWORD,  "Booster Sword");
+		
+		addShopItem(24, ClansShopItem.IRON_AXE, "Iron Axe");
+		addShopItem(25, ClansShopItem.DIAMOND_AXE,  "Power Axe");
+		addShopItem(26, ClansShopItem.GOLD_AXE, "Booster Axe");
+		
+		addShopItem(33, ClansShopItem.BOW,  "Standard Bow");
+		addShopItem(34, ClansShopItem.ARROW, (byte) 0, "Arrows", 16);
+		
+		addShopItem(51, ClansShopItem.ENCHANTMENT_TABLE, "Class Shop");
+		addShopItem(52, ClansShopItem.TNT, "TNT");
+		addShopItem(53, ClansShopItem.TNT_GENERATOR,  "TNT Generator");
 	}
 	
-	public void addPvpItem(int slot, PvpItem item)
-	{
-		addButton(slot, item, new PvpShopButton<PvpPage>(this, item));
-	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java
new file mode 100644
index 000000000..dfca12bb5
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java
@@ -0,0 +1,506 @@
+package mineplex.game.clans.spawn;
+
+import java.util.Set;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Effect;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Monster;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntitySpawnEvent;
+import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.hanging.HangingBreakByEntityEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.items.generation.WeightSet;
+import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
+import mineplex.minecraft.game.classcombat.item.event.ItemTriggerEvent;
+import mineplex.minecraft.game.classcombat.item.event.WebTossEvent;
+import mineplex.minecraft.game.core.condition.Condition.ConditionType;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class Spawn extends MiniPlugin
+{
+	public static final int SPAWN_RADIUS = 32;
+	public static final int SHOP_RADIUS = 48;
+	public static final String COMBAT_TAG_NAME = "Unsafe";
+	public static final long COMBAT_TAG_DURATION = 15000;
+	
+	private static Spawn _instance;
+	public static Spawn getInstance() { return _instance; }
+	
+	private WeightSet<Location> _spawns;
+	private WeightSet<Location> _shops;
+	private ClansManager _clansManager;
+	
+	private long _songEastLast = 0;
+	private long _songWestLast = 0;
+	
+	private long _songEastLength = 345000; //Blocks
+	private long _songWestLength = 185000; //Chirp
+	 
+	public Spawn(JavaPlugin plugin, ClansManager clansManager) 
+	{
+		super("Clan Spawn Zones", plugin);
+		
+		_instance = this;
+		_spawns = new WeightSet<Location>(getEastSpawn(), getWestSpawn());
+		_shops = new WeightSet<Location>(getNorthTown(), getSouthTown());
+		_clansManager = clansManager;
+	}
+	
+	/**
+	 * Cancel most fire-spread mechanics to prevent mass destruction and uncontrollable fires.
+	 * @param event
+	 */
+	@EventHandler
+	public void onBlockIgnite(BlockIgniteEvent event)
+	{
+		if (event.getCause() != IgniteCause.FLINT_AND_STEEL)
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	/**
+	 * Prevent liquids from flowing into Safe Zone areas.
+	 * @param event
+	 */
+	@EventHandler
+	public void onWaterFlow(BlockFromToEvent event)
+	{
+		Block block = event.getToBlock();
+		
+		if (block.isLiquid() && isInSpawn(block.getLocation()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	/**
+	 * Prevent players from tossing Webs into spawn or from spawn.
+	 * @param event
+	 */
+	@EventHandler
+	public void onWebToss(WebTossEvent event)
+	{
+		if (isInSpawn(event.getLocation()))
+		{
+			event.setCancelled(true);
+		}
+		else if (event.getThrower() instanceof Player)
+		{
+			Player thrower = (Player) event.getThrower();
+			
+			if (isInSpawn(thrower))
+			{
+				event.setCancelled(true);
+				attemptNotify(thrower, "You cannot throw webs while in a safe zone!");
+			}
+		}
+	}
+	
+	/**
+	 * Prevent Spawn blocks from burning
+	 * @param event
+	 */
+	@EventHandler
+	public void onBlockBurn(BlockBurnEvent event)
+	{
+		if (isInSpawn(event.getBlock().getLocation()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	/**
+	 * Prevent {@link ItemFrame}s from being broken inside Spawn.
+	 * @param event
+	 */
+	@EventHandler
+	public void onItemFrameDestroyed(HangingBreakByEntityEvent event)
+	{
+		if (event.getEntity() instanceof ItemFrame)
+		{
+			if (isInSpawn(event.getEntity().getLocation()))
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+	
+	@EventHandler
+	public void onItemFrameDamage(CustomDamageEvent event)
+	{
+		if (event.GetDamageeEntity() instanceof ItemFrame)
+		{
+			if (isInSpawn(event.GetDamageeEntity().getLocation()))
+			{
+				event.SetCancelled("Item Frame Cancel");
+			}
+		}
+	}
+	
+	@EventHandler
+	public void onItemFrameDamage(EntityDamageEvent event)
+	{
+		if (event.getEntity() instanceof ItemFrame)
+		{
+			if (isInSpawn(event.getEntity().getLocation()))
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+	
+	@EventHandler
+	public void Update(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+		
+		for (Player cur : UtilServer.getPlayers())
+		{
+			if (isInSpawn(cur.getLocation()))
+			{
+				long lastDamager = _clansManager.getCombatManager().Get(cur).GetLastCombat();
+				long duration = System.currentTimeMillis() - lastDamager;
+				
+				if (!UtilTime.elapsed(lastDamager, COMBAT_TAG_DURATION))
+				{
+					String message = ChatColor.RED + "Unsafe for "
+									+ ChatColor.YELLOW + F.time(UtilTime.convertString(COMBAT_TAG_DURATION - duration, 1, TimeUnit.FIT));
+					
+					UtilTextMiddle.display(null, message, 0, 20, 0, cur);
+					_clansManager.getCondition().Factory().Custom(COMBAT_TAG_NAME, cur, cur, ConditionType.CUSTOM, 1, 0, false, Material.FIRE, (byte)0, true);
+					playUnsafeParticles(cur);
+				}
+				else if (!UtilTime.elapsed(lastDamager, COMBAT_TAG_DURATION + 600))
+				{
+					UtilTextMiddle.display(null, ChatColor.GREEN + "Safe!", 0, 60, 20, cur);
+				}
+			}
+		}
+	}
+	
+	private void playUnsafeParticles(Player player)
+	{
+		UtilParticle.PlayParticle(UtilParticle.ParticleType.CRIT, player.getEyeLocation().add(0, 0.75d, 0), 0, 0, 0, 0.2f, 35, UtilParticle.ViewDist.NORMAL);
+	}
+	
+	/**
+	 * Prevent players from targetting spawn protected players using skills
+	 * @param event
+	 */
+	@EventHandler
+	public void onSkillTriggered(SkillTriggerEvent event)
+	{
+		if (event.GetTargets() == null) return;
+		
+		for (Entity entity : event.GetTargets())
+		{
+			if (isInSpawn(entity))
+			{
+				event.SetCancelled(true);
+			}
+		} 
+	}
+	
+	/**
+	 * Prevent players from activating skills while in Spawn
+	 * @param event
+	 */
+	@EventHandler
+	public void onSkillTriggeredInSpawn(SkillTriggerEvent event)
+	{
+		Player player = event.GetPlayer();
+		
+		if (isInSpawn(player))
+		{
+			UtilPlayer.message(event.GetPlayer(), F.main("Safe Zone", "You cannot use " + F.skill(event.GetSkillName() + " in " + F.elem("Safe Zone") + ".")));
+			event.SetCancelled(true);
+		}
+	}
+
+	/**
+	 * Ensure players respawn in Spawn locations.
+	 * @param event
+	 */
+	@EventHandler
+	public void onRespawn(PlayerRespawnEvent event)
+	{
+		event.setRespawnLocation(getSpawnLocation());
+	}
+	
+	/**
+	 * Ensure player spawns into a Spawn location if it's their first time on the server.
+	 * @param event
+	 */
+	@EventHandler
+	public void onPlayerFirstJoin(PlayerJoinEvent event)
+	{
+		if (!event.getPlayer().hasPlayedBefore())	// First time playing on server, teleport to a spawn
+		{
+			teleport(event.getPlayer(), getSpawnLocation(), 2);	// Teleport player to spawn after 2-tick delay to prevent on-join bug
+		}
+	}
+	
+	/**
+	 * Prevent creatures from spawning inside Spawn
+	 * @param event
+	 */
+	@EventHandler
+	public void onEntitySpawn(CreatureSpawnEvent event)
+	{
+		if (event.getSpawnReason() != CreatureSpawnEvent.SpawnReason.CUSTOM && isInSpawn(event.getLocation()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	/**
+	 * Despawns any monsters within a spawn zone every two seconds.
+	 * @param event
+	 */
+	@EventHandler
+	public void onUpdateTick(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TWOSEC) return;
+		
+		for (LivingEntity entity : getSpawnWorld().getLivingEntities())
+		{
+			if (entity instanceof Monster)
+			{
+				Monster monster = (Monster) entity;
+				
+				if (isInSpawn(monster))
+				{
+					monster.setHealth(0);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Prevent entities from dying and dropping items inside spawn.
+	 * @param event
+	 */
+	@EventHandler
+	public void onEntityDeath(EntityDeathEvent event)
+	{
+		if (event.getEntity() instanceof Monster)
+		{
+			Monster monster = (Monster) event.getEntity();
+			
+			if (isInSpawn(monster))
+			{
+				int size = event.getDrops().size();
+				event.getDrops().clear();
+			}
+		}
+	}
+	
+	/**
+	 * Prevent creatures from targetting players who are in Spawn
+	 * @param event
+	 */
+	@EventHandler
+	public void onEntityTarget(EntityTargetEvent event)
+	{
+		if (event.getTarget() != null && isInSpawn(event.getTarget().getLocation()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	/**
+	 * Prevent players from breaking blocks in spawn
+	 * @param event
+	 */
+	@EventHandler
+	public void onBlockBreak(BlockBreakEvent event)
+	{
+		if (event.getPlayer().getGameMode() == GameMode.CREATIVE) return;
+		
+		if (isInSpawn(event.getBlock().getLocation()) || isInSpawn(event.getPlayer()))
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	/**
+	 * Prevent players from atacking others while in spawn
+	 * @param event
+	 */
+	@EventHandler
+	public void onPlayerAttack(CustomDamageEvent event)
+	{
+		Player defender = event.GetDamageePlayer();
+		Player attacker = event.GetDamagerPlayer(true);	// Get (potentially ranged) attacker
+		
+		if (defender != null && !isCombatTagged(defender))
+		{
+			if (isInSpawn(defender))
+			{
+				event.SetCancelled("Safe Zone");
+				attemptNotify(attacker, "You cannot attack players who are in spawn!");
+			}
+			else if (isInSpawn(attacker))
+			{
+				event.SetCancelled("Safe Zone");
+				attemptNotify(attacker, "You cannot attack untagged players while in spawn!");
+			}
+		}
+	}
+	
+	public Location getSpawnLocation()
+	{
+		Location spawn = _spawns.generateRandom().clone();
+		spawn.setWorld(getSpawnWorld());
+		return spawn;
+	}
+	
+	public Set<Location> getSpawnLocations()
+	{
+		return _spawns.elements();
+	}
+	
+	public Set<Location> getShopLocations()
+	{
+		return _shops.elements();
+	}
+	
+	public boolean isInSpawn(Location location)
+	{
+		return _clansManager.getClanUtility().isSafe(location);	// Check to see if location is in a SafeZone chunk
+	}
+	
+	private static boolean isInRadius(Location origin, Location location, int radius)
+	{
+		int xOffset = Math.abs(location.getBlockX() - origin.getBlockX());
+		int zOffset = Math.abs(location.getBlockZ() - origin.getBlockZ());
+		
+		return xOffset <= radius && zOffset <= radius;
+	}
+	
+	public boolean isInSpawn(Entity entity)
+	{
+		return entity != null && isInSpawn(entity.getLocation());
+	}
+	
+	public static World getSpawnWorld()
+	{
+		return Bukkit.getWorld("world");
+	}
+
+	public static Location getSouthTown()
+	{
+		return new Location(getSpawnWorld(), -6, 70, 295);
+	}
+
+	public static Location getSouthTownCenter()
+	{
+		return new Location(getSpawnWorld(), -6, 70, 312);
+	}
+
+	public static Location getNorthTown()
+	{
+		return new Location(getSpawnWorld(), 2, 66, -325);
+	}
+
+	public static Location getNorthTownCenter()
+	{
+		return new Location(getSpawnWorld(), 7, 75, -311);
+	}
+
+	public static Location getEastSpawn()
+	{
+		return new Location(getSpawnWorld(), 304.5, 210, 6.5);
+	}
+
+	public static Location getWestSpawn()
+	{
+		return new Location(getSpawnWorld(), -295.5, 207, 6.5);
+	}
+
+	public boolean isCombatTagged(Player player)
+	{
+		return _clansManager.getCondition().HasCondition(player, ConditionType.CUSTOM, COMBAT_TAG_NAME);
+	}
+
+	private void teleport(final Player player, final Location location, int delay)
+	{
+		Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() {
+		    @Override
+		    public void run() {
+		        player.teleport(location);
+		    }
+		}, delay);
+	}
+
+	/**
+	 * Attempts to send a {@code message} to {@code entity} if they are a {@link Player}.
+	 * @param entity
+	 * @param message
+	 */
+	private static void attemptNotify(Entity entity, String message)
+	{
+		if (entity instanceof Player)
+		{
+			Player player = (Player) entity;
+			UtilPlayer.message(player, F.main("Clans", message));
+		}
+	}
+	
+	@EventHandler
+	public void playDatMusicALLDAYLONG(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+		
+		if (UtilTime.elapsed(_songEastLast, _songEastLength))
+		{
+			getEastSpawn().getWorld().playEffect(getEastSpawn(), Effect.RECORD_PLAY, 2258);	//Blocks
+			
+			_songEastLast = System.currentTimeMillis();
+		}
+		
+		if (UtilTime.elapsed(_songWestLast, _songWestLength))
+		{
+			getWestSpawn().getWorld().playEffect(getWestSpawn(), Effect.RECORD_PLAY, 2259);	//Chirp
+			
+			_songWestLast = System.currentTimeMillis();
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/travel/TravelButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/travel/TravelButton.java
new file mode 100644
index 000000000..27e0e51b0
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/travel/TravelButton.java
@@ -0,0 +1,104 @@
+package mineplex.game.clans.spawn.travel;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.InventoryUtil;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.economy.GoldManager;
+import mineplex.game.clans.items.CustomItem;
+import mineplex.game.clans.items.GearManager;
+import mineplex.game.clans.items.economy.GoldToken;
+import mineplex.game.clans.shop.PvpItem;
+import mineplex.game.clans.spawn.Spawn;
+
+public class TravelButton implements IButton
+{
+
+	private static final String LEFT_CLICK_TRAVEL = C.cYellow + "Left-Click" + C.cWhite + " to Warp";
+	
+	private TravelPage _page;
+	private Location _location;
+	private Material _iconMaterial;
+	private String _name;
+	private String[] _lore;
+	private byte _data;
+	
+	public TravelButton(TravelPage page, Location location, Material material, String name, String[] lore, byte data)
+	{
+		_data =data;
+		_page = page;
+		_location = location;
+		_iconMaterial = material;
+		_name = name;
+		_lore = lore;
+	}
+	
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		if (clickType != ClickType.LEFT)
+		{
+			return;
+		}
+		
+		if (player.getLocation().distance(_location) <= 64)
+		{
+			return;
+		}
+		
+		transportPlayer(player);
+	}
+	
+	public ItemStack generateButtonItem()
+	{
+		Object[] lore =
+				{
+					C.cWhite + " ",
+					LEFT_CLICK_TRAVEL,
+					C.cWhite + " ",
+					
+				};
+		
+		
+		if (_lore != null)
+		{
+			lore = ArrayUtils.addAll(lore, _lore);
+		}
+		
+		String[] strLore = new String[lore.length];
+		
+		int index = 0;
+		for (Object obj : lore)
+		{
+			strLore[index] = obj.toString();
+			index++;
+		}
+		
+		ShopItem item = new ShopItem(_iconMaterial, (byte)_data, _name, strLore, 0, false, false);
+		return item;
+	}
+	
+	private void transportPlayer(Player player)
+	{
+		player.teleport(_location);
+		_page.playAcceptSound(player);
+		// TODO: Notify player? Effects here?
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/travel/TravelPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/travel/TravelPage.java
new file mode 100644
index 000000000..d6babf2a1
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/travel/TravelPage.java
@@ -0,0 +1,147 @@
+package mineplex.game.clans.spawn.travel;
+
+import java.util.Arrays;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.itemstack.ItemBuilder;
+import mineplex.core.portal.Portal;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.ClanInfo;
+import mineplex.game.clans.clans.ClanRole;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.gui.ClanIcon;
+import mineplex.game.clans.spawn.Spawn;
+
+public class TravelPage extends ShopPageBase<ClansManager, TravelShop>
+{
+	public TravelPage(ClansManager plugin, TravelShop shop, CoreClientManager clientManager, DonationManager donationManager, org.bukkit.entity.Player player)
+	{
+		super(plugin, shop, clientManager, donationManager, "Travel", player, 45);
+		
+		buildPage();
+	}
+	
+	@Override
+	protected void buildPage()
+	{
+		addTravelLocation(Spawn.getEastSpawn(), getPlayer().getLocation().distance(Spawn.getEastSpawn()) <= 64 ? Material.SKULL_ITEM : Material.IRON_SWORD, (getPlayer().getLocation().distance(Spawn.getEastSpawn()) <= 64 ? C.cRedB : C.cGreenB) + "East Spawn", new String[] {
+				C.cWhite + "Spawns are locations where",
+				C.cWhite + "you respawn after dying.",
+				" ",
+				C.cWhite + "You cannot be attacked here,",
+				C.cWhite + "as they are Safe Zones.",
+				getPlayer().getLocation().distance(Spawn.getWestSpawn()) <= 64 ? " " : "",
+				getPlayer().getLocation().distance(Spawn.getEastSpawn()) <= 64 ? C.cRed + "You are already here." : "",
+		}, 14 + 10, getPlayer().getLocation().distance(Spawn.getEastSpawn()) <= 64 ? (byte) 3 : (byte) 0);
+		
+		addTravelLocation(Spawn.getWestSpawn(), getPlayer().getLocation().distance(Spawn.getWestSpawn()) <= 64 ? Material.SKULL_ITEM : Material.IRON_SWORD, (getPlayer().getLocation().distance(Spawn.getWestSpawn()) <= 64 ? C.cRedB : C.cGreenB) + "West Spawn", new String[] {
+				C.cWhite + "Spawns are locations where",
+				C.cWhite + "you respawn after dying.",
+				" ",
+				C.cWhite + "You cannot be attacked here,",
+				C.cWhite + "as they are Safe Zones.",
+				getPlayer().getLocation().distance(Spawn.getWestSpawn()) <= 64 ? " " : "",
+				getPlayer().getLocation().distance(Spawn.getWestSpawn()) <= 64 ? C.cRed + "You are already here." : "",
+		}, 12 + 8, getPlayer().getLocation().distance(Spawn.getWestSpawn()) <= 64 ? (byte) 3 : (byte) 0);
+		
+		addTravelLocation(Spawn.getNorthTown(), ClanIcon.CASTLE.getMaterial(), C.cDGreenB + "North Shop", new String[] {
+				C.cWhite + "Shops are locations where you",
+				C.cWhite + "can buy and sell all sorts of goods.",
+				" ",
+				C.cWhite + "You cannot be attacked here,",
+				C.cWhite + "as they are Safe Zones.",
+		}, 4, ClanIcon.CASTLE.getData());
+		
+		addTravelLocation(Spawn.getSouthTown(), ClanIcon.CASTLE.getMaterial(), C.cDGreenB + "South Shop", new String[] {
+				C.cWhite + "Shops are locations where you",
+				C.cWhite + "can buy and sell all sorts of goods.",
+				" ",
+				C.cWhite + "You cannot be attacked here,",
+				C.cWhite + "as they are Safe Zones.",
+		}, 22 + 9 + 9, ClanIcon.CASTLE.getData());
+		
+		
+		
+		final ClanInfo clan = getPlugin().getClan(getPlayer());
+		
+		final ItemStack item = new ItemStack(Material.BED, 1);
+		ItemMeta meta = item.getItemMeta();
+		
+		if (meta == null)
+		{
+			meta = Bukkit.getItemFactory().getItemMeta(item.getType());
+		}
+		
+		if (clan == null)
+		{
+			meta.setDisplayName(C.cRedB + "Clan Home");
+			meta.setLore(Arrays.asList(" ", C.cWhite + "You are not in a Clan."));
+		}
+		else if (clan.getHome() == null)
+		{
+			meta.setDisplayName(C.cRedB + "Clan Home");
+			meta.setLore(Arrays.asList(" ", C.cWhite + "Your Clan does not have a Home. ", (clan.getMembers().get(getPlayer().getUniqueId()).getRole().equals(ClanRole.ADMIN) || clan.getMembers().get(getPlayer().getUniqueId()).getRole().equals(ClanRole.LEADER) ? C.cWhite + "Type " + C.cYellow + "/c sethome" + C.cWhite + " to set a home" : "Ask your Clan's Leader to set a home.")));
+		}
+		else
+		{
+			if (UtilBlock.isValidBed(clan.getHome()) && clan.getHome().clone().add(0, 1, 0).getBlock().getType().equals(Material.AIR) && clan.getHome().clone().add(0, 2, 0).getBlock().getType().equals(Material.AIR))
+			{
+				meta.setDisplayName(C.cGreenB + "Clan Home");
+				meta.setLore(Arrays.asList(" ", C.cWhite + "Teleport to your Clan Home."));
+			}
+			else
+			{
+				meta.setDisplayName(C.cRedB + "Clan Home");
+				meta.setLore(Arrays.asList(" ", C.cWhite + "Your Clan's Home Bed has been",
+										   C.cWhite + "destroyed, or is obstructed."));
+			}
+		}
+		
+		item.setItemMeta(meta);
+		
+		addButton(22, item, new IButton()
+		{
+			public void onClick(Player player, ClickType clickType)
+			{
+				if (item.getItemMeta().getDisplayName().startsWith(C.cGreen))
+				{
+					player.closeInventory();
+					player.teleport(clan.getHome().clone().add(0, 1, 0));
+				}
+			}
+		});
+		
+		addButton(44, new ItemBuilder(new ItemStack(Material.WATCH, 1)).setTitle(C.cGoldB + "Mineplex Lobby").addLore(" ", C.cYellow + "Left-Click" + C.cWhite + " to Warp", " ", C.cWhite + "Return to the main Mineplex Lobby", " ", C.cWhite + "You can do this at any time by", C.cWhite + "typing " + C.cYellow + "/lobby" + C.cWhite + ".").build(), new IButton()
+		{
+			public void onClick(Player player, ClickType clickType)
+			{
+				Portal.getInstance().sendPlayerToServer(player, "Lobby");
+			}
+		});
+	}
+	
+	public void addTravelLocation(Location location, Material material, String name, String[] lore, int slot)
+	{
+		TravelButton button = new TravelButton(this, location, material, name, lore, (byte) 0);
+		addButton(slot, button.generateButtonItem(), button);
+	}
+	
+	public void addTravelLocation(Location location, Material material, String name, String[] lore, int slot, byte data)
+	{
+		TravelButton button = new TravelButton(this, location, material, name, lore, data);
+		addButton(slot, button.generateButtonItem(), button);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/travel/TravelShop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/travel/TravelShop.java
new file mode 100644
index 000000000..34e98535e
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/travel/TravelShop.java
@@ -0,0 +1,75 @@
+package mineplex.game.clans.spawn.travel;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.inventory.ItemStack;
+
+import com.google.common.collect.Sets;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.spawn.Spawn;
+
+public class TravelShop extends ShopBase<ClansManager>
+{
+	public static final String[] TRAVEL_LOCATIONS = { "North Shop", "South Shop", "East Spawn", "West Spawn" };
+	
+	public TravelShop(ClansManager plugin, CoreClientManager clientManager, mineplex.core.donation.DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager, "Travel Hub");
+	}
+	
+	@Override
+	protected ShopPageBase<ClansManager, ? extends ShopBase<ClansManager>> buildPagesFor(Player player)
+	{
+		return new TravelPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
+	}
+	
+	@Override
+	public boolean attemptShopOpen(Player player)
+	{
+		if (Spawn.getInstance().isCombatTagged(player))
+		{
+			notify(player, "You cannot use the Travel Hub while combat tagged!");
+			return false;
+		}
+		
+		return super.attemptShopOpen(player);
+	}
+	
+	/**
+	 * Destroy lone instances of Travel buttons that are fetched into a non-shop
+	 * inventory (via lag)
+	 * 
+	 * @param event
+	 */
+	@EventHandler
+	public void onInventoryClickedd(InventoryClickEvent event)
+	{
+		ItemStack item = event.getCurrentItem();
+		if (item == null || item.getItemMeta() == null || item.getItemMeta().getDisplayName() == null)
+			return;
+		else if (isPlayerInShop(event.getWhoClicked())) return;
+		
+		String displayName = event.getCurrentItem().getItemMeta().getDisplayName();
+		for (String travelLocation : TRAVEL_LOCATIONS)
+		{
+			if (displayName.contains(travelLocation))
+			{
+				event.setCurrentItem(null);
+			}
+		}
+	}
+	
+	private static void notify(Player player, String message)
+	{
+		UtilPlayer.message(player, F.main("Travel Hub", message));
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/Tutorial.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/Tutorial.java
new file mode 100644
index 000000000..166dbc6e8
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/Tutorial.java
@@ -0,0 +1,560 @@
+package mineplex.game.clans.tutorials;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.bukkit.Color;
+import org.bukkit.FireworkEffect.Type;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.jsonchat.ClickEvent;
+import mineplex.core.common.jsonchat.JsonMessage;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilFirework;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.packethandler.IPacketHandler;
+import mineplex.core.packethandler.PacketHandler;
+import mineplex.core.packethandler.PacketInfo;
+import mineplex.core.scoreboard.ScoreboardManager;
+import mineplex.core.scoreboard.elements.ScoreboardElement;
+import mineplex.core.task.TaskManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.event.ClanTipEvent;
+import mineplex.game.clans.economy.GoldManager;
+import net.minecraft.server.v1_8_R3.PacketPlayOutChat;
+
+/**
+ * 
+ * I call this a tutorial, even though it is more accurately, "a set of
+ * achievements or goals, that are in some-what of a tutorial fashion." But that
+ * would be too long of a class name, so I'll stick with "Tutorial" for now.
+ * 
+ */
+public abstract class Tutorial implements ScoreboardElement, Listener
+{
+	public static String TASK_COMPLETE_TASK = "tttatatta%sTask%s";
+	public static String TUTORIAL_COMPLETE_TASK = "tatatatatat%sDone"; //do not change
+	public static String TUTORIAL_REWARD_TASK = "tatatatatat%sRewardGiven"; //do not change
+	public static String SKIPPED_TASK = "tatatatata%sSkip";
+	
+	public static String AllowedMessage = C.cGold + "TutorialAllowedMessage" + C.Reset;
+	
+	protected final TutorialManager _manager;
+	protected final GoldManager _goldManager;
+	protected final ClansManager _clansManager;
+	protected final TaskManager _taskManager;
+	protected final DonationManager _donationManager;
+	
+	protected final LinkedHashMap<Integer, TutorialTask<?>> _tasks;
+	protected final LinkedHashMap<String, TutorialTask<?>> _nameToTask;
+	protected final LinkedHashMap<String, TutorialClient> _inTutorial;
+	
+	protected boolean _doScoreboard;
+	protected boolean _ghostMode;
+	
+	protected boolean _startOnJoin;
+	
+	protected String _technicalName;
+	protected String _displayName;
+	
+	protected int _goldReward = -1;
+	protected int _gemReward = -1;
+	protected int _coinReward = -1;
+	
+	public Tutorial(final GoldManager goldManager, final TaskManager taskManager, final ClansManager clansManager, final DonationManager donationManager, final TutorialManager manager, final PacketHandler packetHandler)
+	{
+		_clansManager = clansManager;
+		_goldManager = goldManager;
+		_donationManager = donationManager;
+		_taskManager = taskManager;
+		_manager = manager;
+		_tasks = new LinkedHashMap<>();
+		_inTutorial = new LinkedHashMap<>();
+		_nameToTask = new LinkedHashMap<>();
+		
+		_manager.getPluginManager().registerEvents(this, _manager.getPlugin());
+	}
+	
+	@Override
+	public List<String> getLines(final ScoreboardManager manager, final Player player, final List<String> out)
+	{
+		final List<String> lines = new ArrayList<>();
+		
+		if (!isInTutorial(player))
+		{
+			return lines;
+		}
+		
+		if (!_doScoreboard)
+		{
+			return lines;
+		}
+		
+		if (get(player).CurrentTask == null)
+		{
+			return lines;
+		}
+		
+		out.clear();
+		
+		final TutorialClient client = _inTutorial.get(player.getName());
+		
+		lines.add(C.cAqua + "Tutorial");
+		
+		for (final TutorialTask<?> task : _tasks.values())
+		{
+			if (get(player).CurrentTask.equals(task))
+			{
+				lines.add(C.cDAqua + task.getID() + ". " + task.getDisplayName());
+			}
+			else if (client.CurrentTask.getID() > task.getID())
+			{
+				lines.add(C.cGreen + task.getID() + ". " + task.getDisplayName());
+			}
+			else
+			{
+				lines.add(C.cRed + task.getID() + ". " + task.getDisplayName());
+			}
+		}
+		
+		lines.add(C.cYellow + "To skip, type: /skiptutorial");
+		
+		return lines;
+	}
+	
+	protected void addTask(TutorialTask<?> task)
+	{
+		_tasks.put(_tasks.size() + 1, task);
+		_nameToTask.put(task.getTechnicalName(), task);
+	}
+	
+	protected boolean hasFinishedTask(Player player, TutorialTask<?> task)
+	{
+		if (get(player).QueuedFinish)
+		{
+			return true;
+		}
+		
+		return get(player).CurrentTask.getID() < task.getID();
+	}
+	
+	protected void finishTask(final Player player, final TutorialTask<?> task)
+	{
+		if (player == null)
+		{
+			return;
+		}
+		
+		get(player).LastDescriptionSentTime = 0;
+		get(player).CurrentTask.visibleFinish(player);
+		
+		// 6 Seconds for player to read the finish message (sent by the line above)
+		// (will be instant if get(player).CurrentTask.getFinishMessage() is null).
+		_manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable()
+		{
+			public void run()
+			{
+				// Cycle to next task, or null if last task.
+				get(player).CurrentTask = task.equals(_tasks.get(_tasks.size())) ? null : _tasks.get(task.getID() + 1);
+				
+				if (!_taskManager.hasCompletedTask(player, String.format(TASK_COMPLETE_TASK, _technicalName, task.getTechnicalName())))
+				{
+					_taskManager.completedTask(new Callback<Boolean>()
+					{
+						public void run(final Boolean completed)
+						{
+							// If last task, end tutorial.
+							if (task.equals(_tasks.get(_tasks.size())))
+							{
+								finishFor(player);
+							}
+							else
+							{
+								// Start next task in 1.5 Seconds (just to give a more smooth feel to the tutorial)
+								_manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable()
+								{
+									public void run()
+									{
+										get(player).CurrentTask.startFor(player);
+									}
+								}, 30L);
+							}
+							
+							player.playSound(player.getLocation(), Sound.LEVEL_UP, 2f, 1.5f);
+						}
+					}, player, String.format(TASK_COMPLETE_TASK, _technicalName, task.getTechnicalName()));
+				}
+			}
+		}, get(player).CurrentTask._finishMessage == null ? 1L : 6 * 20L);
+	}
+	
+	public TutorialTask<?> getTask(final String technicalName)
+	{
+		return _nameToTask.get(technicalName);
+	}
+	
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+	public void onPickupItem(final PlayerPickupItemEvent event)
+	{
+		if (_ghostMode && isInTutorial(event.getPlayer()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+	public void onDropItem(final PlayerDropItemEvent event)
+	{
+		if (_ghostMode && isInTutorial(event.getPlayer()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+	public void onBreakBlock(final BlockBreakEvent event)
+	{
+		if (_ghostMode && isInTutorial(event.getPlayer()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+	public void onPlaceBlock(final BlockPlaceEvent event)
+	{
+		if (_ghostMode && isInTutorial(event.getPlayer()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	private void finishFor(final Player player)
+	{
+		if (player.getOpenInventory() != null)
+		{
+			_inTutorial.get(player.getName()).QueuedFinish = true;
+			return;
+		}
+		
+		_inTutorial.remove(player.getName());
+		
+		UtilTextMiddle.display(C.cWhite + "Clans Tutorial", C.cGreen + "You have completed the Clans Tutorial!", 20, 20 * 3, 20);
+		
+		_manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable()
+		{
+			public void run()
+			{
+				// Custom Finish Method (usually messages)
+				onFinished(player);
+				
+				// Do Reward
+				if (!_taskManager.hasCompletedTask(player, String.format(TUTORIAL_REWARD_TASK, _technicalName)))
+				{
+					_taskManager.completedTask(new Callback<Boolean>()
+					{
+						@Override
+						public void run(Boolean data)
+						{
+							if (_goldReward != -1)
+							{
+								_goldManager.addGold(player, _goldReward);
+								_manager.sendTutorialMsg(player, F.main("Tutorials", "You have been awarded " + F.elem(_goldReward + " Gold") + "."));
+							}
+		
+							if (_gemReward != -1)
+							{
+								_donationManager.RewardGems(new Callback<Boolean>() {
+									public void run(Boolean data)
+									{
+										_manager.sendTutorialMsg(player, F.main("Tutorials", "You have been awarded " + F.elem(_goldReward + " Gems") + "."));
+									}
+								}, "Clans", player.getName(), player.getUniqueId(), _gemReward);
+							}
+		
+							if (_coinReward != -1)
+							{
+								_donationManager.RewardCoins(new Callback<Boolean>() {
+									public void run(Boolean data)
+									{
+										_manager.sendTutorialMsg(player, F.main("Tutorials", "You have been awarded " + F.elem(_coinReward + " Coins") + "."));
+									}
+								}, "Clans", player.getName(), _clansManager.getClientManager().getAccountId(player), _coinReward);
+							}
+						}
+					}, player, String.format(TUTORIAL_REWARD_TASK, _technicalName));
+				}
+				
+				_manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable()
+				{
+					public void run()
+					{
+						// Sets the tutorial as complete in the TaskManager and effects.
+						_taskManager.completedTask(new Callback<Boolean>()
+						{
+							public void run(final Boolean completed)
+							{
+								if (_ghostMode)
+								{
+									for (Player other : UtilServer.getPlayers())
+									{
+										other.showPlayer(player);
+										player.showPlayer(other);
+									}
+								}
+								
+								for (int i = 0; i < 8; i++)
+								{
+									final int index = i;
+									_manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable()
+									{
+										public void run()
+										{
+											UtilFirework.launchFirework(player.getLocation(), Type.BALL_LARGE, (index % 2 == 0) ? Color.RED : Color.LIME, false, false, new Vector(0, 0, 0), 0);
+										}
+									}, i * 10);
+								}
+							}
+						}, player, String.format(TUTORIAL_COMPLETE_TASK, _technicalName));
+					}
+				}, 20 * 2);
+			}
+		}, 20 * 4);
+	}
+	
+	// Implementation left to sub classes.
+	protected void onFinished(final Player player)
+	{
+	}
+	
+	// Implementation left to sub classes.
+	protected void onBegin(final Player player)
+	{
+	}
+	
+	public void startFor(final Player player)
+	{
+		if (!_manager.isInTutorial(player))
+		{
+			_manager._playerTutorials.put(player.getName(), this);
+		}
+			
+		_inTutorial.put(player.getName(), new TutorialClient(player, this));
+		
+		get(player).CurrentTask.startFor(player);
+		
+		player.playSound(player.getLocation(), Sound.LEVEL_UP, 2f, 1.5f);
+		
+		if (_ghostMode)
+		{
+			for (Player other : UtilServer.getPlayers())
+			{
+				other.hidePlayer(player);
+				player.hidePlayer(other);
+			}
+		}
+		
+		onBegin(player);
+	}
+	
+	public void cancelFor(final Player player)
+	{
+		_inTutorial.remove(player.getName());
+		
+		if (_ghostMode)
+		{
+			for (Player other : UtilServer.getPlayers())
+			{
+				if (!isInTutorial(other)) other.showPlayer(player);
+				player.showPlayer(other);
+			}
+		}
+	}
+	
+	public boolean isInTutorial(final Player player)
+	{
+		return _inTutorial.containsKey(player.getName());
+	}
+	
+	public boolean isInTutorial(final String player)
+	{
+		return _inTutorial.containsKey(player);
+	}
+	
+	public Map<Integer, TutorialTask<?>> getTasks()
+	{
+		return _tasks;
+	}
+	
+	public boolean hasCompleted(final Player player)
+	{
+		return _taskManager.hasCompletedTask(player, String.format(TUTORIAL_COMPLETE_TASK, _technicalName));
+	}
+	
+	public boolean hasSkipped(final Player player)
+	{
+		return _taskManager.hasCompletedTask(player, String.format(SKIPPED_TASK, _technicalName));
+	}
+	
+	public void skip(final Player player)
+	{
+		new JsonMessage(
+				AllowedMessage
+			)
+				.extra(
+				F.main(
+						"Tutorial",
+						"Are you sure you want to skip the tutorial? We "
+				))
+				.extra("strongly")
+					.color("gold")
+				.extra(" advise you do complete it. You will be rewarded with armor, weapons and")
+					.color("gray")
+				.extra(" 30000 Gold")
+					.color("yellow")
+				.extra("!")
+					.color("gray")
+		.sendToPlayer(player);
+		
+		new JsonMessage(
+				F.main(
+						"Tutorial",
+						"Click "
+				))
+				.extra("here")
+					.color("aqua")
+					.click(ClickEvent.RUN_COMMAND, "/yesiconfirmiwanttoskip")
+				.extra(" here to confirm you want to skip the tutorial!")
+					.color("gray")
+				
+		.sendToPlayer(player);
+	}
+	
+	public void doSkip(final Player player)
+	{
+		_taskManager.completedTask(new Callback<Boolean>()
+		{
+			public void run(Boolean data)
+			{
+				cancelFor(player);
+			}
+		}, player, String.format(SKIPPED_TASK, _technicalName));
+	}
+	
+	public String getTechnicalName()
+	{
+		return _technicalName;
+	}
+	
+	public TutorialClient get(final Player player)
+	{
+		return _inTutorial.get(player.getName());
+	}
+	
+	@EventHandler
+	public void onClanTip(ClanTipEvent event)
+	{
+		if (isInTutorial(event.getPlayer()))
+		{
+			event.setCancelled(true);
+		}
+	}
+	
+	@EventHandler
+	public void taskInfo(final UpdateEvent evt)
+	{
+		if (evt.getType() != UpdateType.SEC)
+		{
+			return;
+		}
+		
+		for (Player player : UtilServer.getPlayers())
+		{
+			if (isInTutorial(player))
+			{
+				if (get(player).QueuedFinish)
+				{
+					if (player.getOpenInventory() == null)
+					{
+						get(player).QueuedFinish = false;
+						finishFor(player);
+					}
+					else
+					{
+						continue;
+					}
+				}
+				
+				get(player).CurrentTask.trySendDescription(player);
+			}
+		}
+	}
+	
+	@EventHandler
+	public void chat(final AsyncPlayerChatEvent evt)
+	{
+		if (!isInTutorial(evt.getPlayer()))
+		{
+			return;
+		}
+		
+		Iterator<Player> iterator = evt.getRecipients().iterator();
+		
+		while (iterator.hasNext())
+		{
+			if (isInTutorial(iterator.next()))
+			{
+				iterator.remove();
+			}
+		}
+		
+		evt.setCancelled(true);
+	}
+
+	@EventHandler
+	public void onPlayerJoin(final PlayerJoinEvent evt)
+	{
+		if (!hasSkipped(evt.getPlayer()) && _startOnJoin)
+		{
+			UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable()
+			{
+				public void run()
+				{
+					if (!hasCompleted(evt.getPlayer()))
+					{
+						startFor(evt.getPlayer());
+					}
+				}
+			}, 40L);
+		}
+	}
+
+	public void cleanup(Player player)
+	{
+		if (get(player) != null && get(player).CurrentTask != null) 
+			get(player).CurrentTask.cleanup(player);
+		
+		_inTutorial.remove(player.getName());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialClient.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialClient.java
new file mode 100644
index 000000000..043647117
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialClient.java
@@ -0,0 +1,38 @@
+package mineplex.game.clans.tutorials;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.task.TaskManager;
+
+public class TutorialClient
+{
+	public Player Player;
+	public TutorialTask<?> CurrentTask;
+	public long LastDescriptionSentTime = System.currentTimeMillis() - 3000;
+	public boolean InClanOnStart;
+	public boolean QueuedFinish;
+	
+	public TutorialClient(Player player, Tutorial tutorial)
+	{
+		Player = player;
+		
+		CurrentTask = tutorial._tasks.get(1);
+		
+		InClanOnStart = tutorial._clansManager.isInClan(player);
+		
+		for (TutorialTask<?> task : tutorial._tasks.values())
+		{
+			if (TaskManager.Instance.hasCompletedTask(player, String.format(
+																		Tutorial.TASK_COMPLETE_TASK,
+																		task.getTutorial().getTechnicalName(),
+																		task.getTechnicalName()
+															)))
+			{
+				if (CurrentTask.getID() <= task.getID())
+				{
+					CurrentTask = task.getTutorial().getTasks().get(Math.min(task.getTutorial().getTasks().size(), task.getID() + 1));
+				}
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialManager.java
new file mode 100644
index 000000000..7a637f7ba
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialManager.java
@@ -0,0 +1,174 @@
+package mineplex.game.clans.tutorials;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.packethandler.IPacketHandler;
+import mineplex.core.packethandler.PacketHandler;
+import mineplex.core.packethandler.PacketInfo;
+import mineplex.core.preferences.PreferencesManager;
+import mineplex.core.task.TaskManager;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.commands.RestartTutCommand;
+import mineplex.game.clans.economy.GoldManager;
+import mineplex.game.clans.tutorials.commands.DoSkipTutorialCommand;
+import mineplex.game.clans.tutorials.commands.SkipTutorialCommand;
+import mineplex.game.clans.tutorials.gettingstarted.TutorialGettingStarted;
+import net.md_5.bungee.api.ChatColor;
+import net.minecraft.server.v1_8_R3.PacketPlayOutChat;
+
+public class TutorialManager extends MiniPlugin
+{
+	public static TutorialManager Instance;
+	
+	private final Map<Class<? extends Tutorial>, Tutorial> _tutorials = new HashMap<>();
+	protected final Map<String, Tutorial> _playerTutorials = new HashMap<>();
+	
+	private final TaskManager _taskManager;
+	
+	public TutorialManager(final JavaPlugin plugin, final GoldManager goldManager, final TaskManager taskManager, final DonationManager donationManager, final PreferencesManager preferencesManager, final ClansManager clansManager, final PacketHandler packetHandler)
+	{
+		super("Tutorials", plugin);
+		
+		Instance = this;
+		
+		_taskManager = taskManager;
+		
+		_tutorials.put(TutorialGettingStarted.class, new TutorialGettingStarted(this, clansManager, donationManager, goldManager, taskManager, packetHandler));
+		
+		packetHandler.addPacketHandler(new IPacketHandler() {
+			public void handle(PacketInfo packet)
+			{
+				if (packet.getPacket() instanceof PacketPlayOutChat)
+				{
+					PacketPlayOutChat chat = (PacketPlayOutChat) packet.getPacket();
+					
+					if (chat.b == 1)
+					{
+						if (chat.a.a().isEmpty())
+						{
+							return;
+						}
+						
+						if (chat.a.a().get(0).c().equals(ChatColor.stripColor(Tutorial.AllowedMessage)))
+						{
+							chat.a.a().remove(0);
+						}
+						else
+						{
+							if (isInTutorial(packet.getPlayer()))
+							{
+								packet.setCancelled(true);
+							}
+						}
+					}
+				}
+			}
+		}, PacketPlayOutChat.class);
+	}
+	
+	public void addCommands()
+	{
+		addCommand(new SkipTutorialCommand(this));
+		addCommand(new DoSkipTutorialCommand(this));
+		addCommand(new RestartTutCommand(this));
+	}
+	
+	public boolean startTutorial(final Class<? extends Tutorial> tutorial, final Player player)
+	{
+		if (isInTutorial(player))
+		{
+			cancelTutorial(player);
+		}
+		
+		if (_tutorials.containsKey(tutorial))
+		{
+			_tutorials.get(tutorial).startFor(player);
+			
+			return isInTutorial(player);
+		}
+		
+		return false;
+	}
+	
+	public boolean isInTutorial(final Player player)
+	{
+		return _playerTutorials.containsKey(player.getName());
+	}
+	
+	public void cancelTutorial(final Player player)
+	{
+		if (isInTutorial(player))
+		{
+			getTutorial(player).cancelFor(player);
+			
+			
+			sendTutorialMsg(player, F.main("Tutorials", "You have cancelled the " + F.elem(getTutorial(player)._displayName + " Tutorial") + "."));
+			_playerTutorials.remove(player.getName()); 
+		}
+	}
+	
+	public void skipTutorial(final Player player)
+	{
+		if (isInTutorial(player))
+		{
+			getTutorial(player).skip(player);
+		}
+	}
+	
+	public void doSkip(final Player player)
+	{
+		if (isInTutorial(player))
+		{
+			sendTutorialMsg(player, F.main("Tutorials", "You have skipped the " + F.elem(getTutorial(player)._displayName + " Tutorial") + "."));
+			getTutorial(player).doSkip(player);
+		}
+	}
+	
+	@EventHandler
+	public void quit(PlayerQuitEvent event)
+	{
+		if (!isInTutorial(event.getPlayer())) 
+			return;
+		
+		getTutorial(event.getPlayer()).cleanup(event.getPlayer());
+	}
+	
+	public void sendTutorialMsg(Player player, String message)
+	{
+		player.sendMessage(Tutorial.AllowedMessage + message);
+	}
+	
+	public void sendTutorialMsg(Player player, LinkedList<String> messages)
+	{
+		for (String message : messages)
+		{
+			sendTutorialMsg(player, message);
+		}
+	}
+	
+	public Tutorial getTutorial(final Player player)
+	{
+		return _playerTutorials.get(player.getName());
+	}
+	
+	public Map<Class<? extends Tutorial>, Tutorial> getTutorials()
+	{
+		return _tutorials;
+	}
+	
+	public TaskManager getTaskManager()
+	{
+		return _taskManager;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialTask.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialTask.java
new file mode 100644
index 000000000..0934fff08
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialTask.java
@@ -0,0 +1,216 @@
+package mineplex.game.clans.tutorials;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.NautArrayList;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.game.clans.clans.ClansManager;
+
+public class TutorialTask<T extends Tutorial> implements Listener
+{
+	protected T _tutorial;
+	
+	protected long _autoCompleteTime = -1;
+	
+	protected String _displayName;
+	protected String _technicalName;
+	
+	protected String _description;
+	protected String _finishMessage;
+	
+	protected Location _taskPos;
+	
+	// How much time after the beginning the task/last teleport it should take to teleport back to _taskPos.
+	protected int _taskTpDelay = 2 * 60 * 20;
+	
+	protected long _descriptionWaitTime = 30000;
+	
+	protected NautArrayList<String> _playersFinished = new NautArrayList<>();
+	protected NautArrayList<String> _inTask = new NautArrayList<>();
+	
+	private long _lastTaskTp;
+	private int _id;
+	
+	public TutorialTask(T tutorial, int id)
+	{
+		_tutorial = tutorial;
+		_id = id;
+
+		UtilServer.getServer().getPluginManager().registerEvents(this, _tutorial._manager.getPlugin());
+	}
+	
+	protected void customStartFor(final Player player)
+	{
+	}
+	
+	protected void customEndFor(final Player player)
+	{
+	}
+	
+	protected final void startFor(final Player player)
+	{
+		_inTask.add(player.getName());
+		
+		trySendDescription(player);
+		
+		customStartFor(player);
+		
+		if (_taskPos != null)
+		{
+			player.teleport(_taskPos);
+			_lastTaskTp = System.currentTimeMillis();
+			if (_taskTpDelay != -1)
+			{
+				UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(_tutorial._manager.getPlugin(), new Runnable(){
+					public void run()
+					{
+						if (isDoing(player))
+						{
+							player.teleport(_taskPos);
+							_lastTaskTp = System.currentTimeMillis();
+						}
+					}
+				}, _taskTpDelay);
+			}
+		}
+		
+		if (_autoCompleteTime != -1)
+		{
+			UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(_tutorial._manager.getPlugin(), new Runnable(){
+				public void run()
+				{
+					if (isDoing(player))
+					{
+						finishFor(player);
+					}
+				}
+			}, _autoCompleteTime);
+		}
+	}
+	
+	public boolean isDoing(Player player)
+	{
+		return _inTask != null && player != null && _inTask.contains(player.getName());
+	}
+	
+	public void trySendDescription(Player player)
+	{
+		if (!_tutorial.isInTutorial(player))
+		{
+			return;
+		}
+		
+		TutorialClient client = _tutorial.get(player);
+		
+		if (client.QueuedFinish)
+		{
+			return;
+		}
+		
+		if (System.currentTimeMillis() - client.LastDescriptionSentTime > client.CurrentTask.getDescriptionWaitTime())
+		{
+			_tutorial._manager.sendTutorialMsg(player, " ");
+			_tutorial._manager.sendTutorialMsg(player, " ");
+			_tutorial._manager.sendTutorialMsg(player, " ");
+			_tutorial._manager.sendTutorialMsg(player, C.cDGreenB + C.Strike + "---------------------------------------------");
+			_tutorial._manager.sendTutorialMsg(player, " ");
+			_tutorial._manager.sendTutorialMsg(player, C.cYellowB + "Part " + _id + ": " + _displayName);
+			_tutorial._manager.sendTutorialMsg(player, C.cWhite + " " + _description.replace("{", C.cAqua).replace("}", C.cWhite));
+			_tutorial._manager.sendTutorialMsg(player, " ");
+			_tutorial._manager.sendTutorialMsg(player, C.cDGreenB + C.Strike + "---------------------------------------------");
+			
+			UtilTextMiddle.display("", getDisplayName());
+			
+			client.LastDescriptionSentTime = System.currentTimeMillis();
+		}
+	}
+	
+	public final boolean hasFinished(final Player player)
+	{
+		if (_tutorial.get(player).QueuedFinish)
+		{
+			return true;
+		}
+		
+		// CurrentTask will be null if player has finished tutorial
+		return _tutorial.get(player).CurrentTask == null || _tutorial.get(player).CurrentTask.getID() < getID();
+	}
+	
+	public String getDisplayName()
+	{
+		return _displayName;
+	}
+	
+	public String getDescription()
+	{
+		return _description;
+	}
+	
+	public String getFinishMessage()
+	{
+		return _finishMessage;
+	}
+	
+	public String getTechnicalName()
+	{
+		return _technicalName;
+	}
+	
+	public TutorialManager getManager()
+	{
+		return _tutorial._manager;
+	}
+	
+	public ClansManager getClans()
+	{
+		return _tutorial._clansManager;
+	}
+	
+	public int getID()
+	{
+		return _id;
+	}
+
+	public void finishFor(Player player)
+	{
+		customEndFor(player);
+		_tutorial.finishTask(player, this);
+	}
+	
+	public void visibleFinish(Player player)
+	{
+		_inTask.remove(player.getName());
+		
+		if (_finishMessage != null)
+		{
+			_tutorial._manager.sendTutorialMsg(player, " ");
+			_tutorial._manager.sendTutorialMsg(player, " ");
+			_tutorial._manager.sendTutorialMsg(player, " ");
+			_tutorial._manager.sendTutorialMsg(player, C.cDGreenB + C.Strike + "---------------------------------------------");
+			_tutorial._manager.sendTutorialMsg(player, " ");
+			_tutorial._manager.sendTutorialMsg(player, C.cWhite + _finishMessage.replace("{", C.cAqua).replace("}", C.cWhite));
+			_tutorial._manager.sendTutorialMsg(player, " ");
+			_tutorial._manager.sendTutorialMsg(player, C.cDGreenB + C.Strike + "---------------------------------------------");
+		}
+	}
+	
+	public void cleanup(Player player)
+	{
+		_inTask.remove(player.getName());
+		_playersFinished.remove(player.getName());
+	}
+
+	public long getDescriptionWaitTime()
+	{
+		return _descriptionWaitTime;
+	}
+
+	public T getTutorial()
+	{
+		return _tutorial;
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/DoSkipTutorialCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/DoSkipTutorialCommand.java
new file mode 100644
index 000000000..2d9025081
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/DoSkipTutorialCommand.java
@@ -0,0 +1,31 @@
+package mineplex.game.clans.tutorials.commands;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.game.clans.tutorials.TutorialManager;
+
+public class DoSkipTutorialCommand extends CommandBase<TutorialManager>
+{
+	public DoSkipTutorialCommand(final TutorialManager plugin)
+	{
+		super(plugin, Rank.ALL, "yesiconfirmiwanttoskip");
+	}
+	
+	@Override
+	public void Execute(final Player caller, final String[] args)
+	{
+		if (Plugin.isInTutorial(caller))
+		{
+			Plugin.doSkip(caller);
+		}
+		else
+		{
+			UtilPlayer.message(caller, F.main("Tutorials", "You are not currently in a tutorial."));
+		}
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/SkipTutorialCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/SkipTutorialCommand.java
new file mode 100644
index 000000000..87caf4ce3
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/SkipTutorialCommand.java
@@ -0,0 +1,31 @@
+package mineplex.game.clans.tutorials.commands;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.game.clans.tutorials.TutorialManager;
+
+public class SkipTutorialCommand extends CommandBase<TutorialManager>
+{
+	public SkipTutorialCommand(final TutorialManager plugin)
+	{
+		super(plugin, Rank.ALL, "skiptutorial", "skiptut", "st");
+	}
+	
+	@Override
+	public void Execute(final Player caller, final String[] args)
+	{
+		if (Plugin.isInTutorial(caller))
+		{
+			Plugin.skipTutorial(caller);
+		}
+		else
+		{
+			Plugin.sendTutorialMsg(caller, F.main("Tutorials", "You are not currently in a tutorial."));
+		}
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskClaim.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskClaim.java
new file mode 100644
index 000000000..a3c936754
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskClaim.java
@@ -0,0 +1,43 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
+import mineplex.game.clans.clans.event.PlayerPreClaimTerritoryEvent;
+import mineplex.game.clans.tutorials.TutorialTask;
+
+public class TaskClaim extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskClaim(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_displayName = "Claim some Territory";
+		_technicalName = "ClaimTerr";
+		
+		_description = "Clans can claim 16x16 areas of Territory! "
+				     + "Once claimed, only your Clan can break/place blocks here. "
+				     + "This is the perfect place to build a base and stash your items! "
+				     + "You can only claim in the Wilderness, and not next to other Clan's Territory. "
+				     + "To claim some territory, go into the Clans GUI by typing {/c} and {Left-Clicking}";
+	}
+	
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onClansCommand(PlayerPreClaimTerritoryEvent event)
+	{
+		if (!isDoing(event.getClaimer()))
+		{
+			return;
+		}
+		
+		if (!ClansManager.getInstance().isInClan(event.getClaimer()))
+		{
+			return;
+		}
+		
+		finishFor(event.getClaimer());
+		event.setCancelled(true);
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCreateClan.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCreateClan.java
new file mode 100644
index 000000000..26cb07f65
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCreateClan.java
@@ -0,0 +1,52 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+import mineplex.core.common.util.UtilServer;
+import mineplex.game.clans.clans.event.ClanCreatedEvent;
+import mineplex.game.clans.tutorials.TutorialTask;
+
+public class TaskCreateClan extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskCreateClan(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_displayName = "Create a Clan";
+		_technicalName = "ClanCreation";
+		
+		_description = "Before beginning, use the {/c create <ClanName>} command to start up your own Clan! "
+				     + "If you are already in a Clan, don't worry, you will automatically skip this part.";
+	}
+	
+	@Override
+	public void customStartFor(final Player player)
+	{
+		if (_tutorial.get(player).InClanOnStart)
+		{
+			UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(getManager().getPlugin(), new Runnable(){
+				public void run()
+				{
+					if (isDoing(player))
+					{
+						finishFor(player);
+					}
+				}
+			}, 6 * 20);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onClanCreated(ClanCreatedEvent event)
+	{
+		if (!isDoing(event.getFounder()))
+		{
+			return;
+		}
+		
+		finishFor(event.getFounder());
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCustomizeClass.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCustomizeClass.java
new file mode 100644
index 000000000..ea7d0c3a6
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCustomizeClass.java
@@ -0,0 +1,54 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import java.util.Iterator;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.spawn.Spawn;
+import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.minecraft.game.classcombat.Class.ClientClass;
+
+public class TaskCustomizeClass extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskCustomizeClass(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_displayName = "Customize Class";
+		_technicalName = "CustomizeKlass";
+		
+		_description = "Now that you have equipped a class, use this enchantment table to customize your class builds. "
+				     + "Click on the enchantment table, and click the edit build button. "
+				     + "Make sure to select an axe ability to try out in the next task!";
+		
+		_taskPos = new Location(Spawn.getSpawnWorld(), 6, 66, -300, -180f, 0f);
+	}
+	
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onUpdate(final UpdateEvent event)
+	{
+		if (!event.getType().equals(UpdateType.SEC))
+		{
+			return;
+		}
+		
+		Iterator<String> iterator = _inTask.iterator();
+		while (iterator.hasNext())
+		{
+			Player player = Bukkit.getPlayer(iterator.next());
+			final ClientClass clientclass = ClansManager.getInstance().getClassManager().Get(player);
+			
+			if (clientclass != null && clientclass.GetSavingCustomBuild() != null && clientclass.GetSavingCustomBuild().AxeSkill != null)
+			{
+				finishFor(player);
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskDisbandClan.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskDisbandClan.java
new file mode 100644
index 000000000..69ca5de33
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskDisbandClan.java
@@ -0,0 +1,52 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import mineplex.core.common.util.UtilServer;
+import mineplex.game.clans.clans.event.ClanDisbandedEvent;
+import mineplex.game.clans.tutorials.TutorialTask;
+
+public class TaskDisbandClan extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskDisbandClan(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_displayName = "Disband your Clan";
+		_technicalName = "DisbandClan";
+		
+		_description = "Finally, let's disband your Clan to end the Tutorial. "
+				     + "Simply type {/c disband} to do this. "
+				     + "This will delete your Clan, and you'll be able to create or join a new one! "
+				     + "If you were already in a Clan before you originally begun the Tutorial, you will automatically skip this part.";
+	}
+	
+	@Override
+	public void customStartFor(final Player player)
+	{
+		if (_tutorial.get(player).InClanOnStart)
+		{
+			UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(getManager().getPlugin(), new Runnable(){
+				public void run()
+				{
+					if (isDoing(player))
+					{
+						finishFor(player);
+					}
+				}
+			}, 6 * 20);
+		}
+	}
+	
+	@EventHandler
+	public void sell(ClanDisbandedEvent event)
+	{
+		if (!isDoing(event.getDisbander()))
+		{
+			return;
+		}
+		
+		finishFor(event.getDisbander());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskEquipClass.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskEquipClass.java
new file mode 100644
index 000000000..01584fd32
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskEquipClass.java
@@ -0,0 +1,109 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.NautArrayList;
+import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilItem;
+import mineplex.core.task.TaskManager;
+import mineplex.game.clans.clans.event.ClansPlayerBuyItemEvent;
+import mineplex.game.clans.clans.event.ClansShopAddButtonEvent;
+import mineplex.game.clans.spawn.Spawn;
+import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.minecraft.game.classcombat.Class.event.ClassEquipEvent;
+
+public class TaskEquipClass extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskEquipClass(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_displayName = "Equip a Class";
+		_technicalName = "AuszustattenKlasse";
+		
+		_description = "Use the PvP Gear shop, and right-click the Villager. "
+				     + "Purchase Iron Armor from the PvP Shop. "
+				     + "Then put on your armor to equip the Knight Class.";
+		
+		_taskPos = new Location(Spawn.getSpawnWorld(), 19, 66, -305.844, -100f, 0f);
+	}
+	
+	private NautHashMap<String, NautArrayList<Material>> _bought = new NautHashMap<>();
+		
+	@EventHandler
+	public void onClassEquipped(ClassEquipEvent event)
+	{
+		if (!isDoing(event.getUser()))
+		{
+			return;
+		}
+		
+		finishFor(event.getUser());
+	}
+	
+	@Override
+	public void customEndFor(Player player)
+	{
+		_bought.get(player.getName()).clear();
+		_bought.remove(player.getName());
+	}
+	
+	@Override
+	public void customStartFor(Player player)
+	{
+		_bought.put(player.getName(), new NautArrayList<Material>());
+	}
+	
+	@EventHandler
+	public void button(ClansShopAddButtonEvent event)
+	{
+		if (!isDoing(event.getPlayer()))
+		{
+			return;
+		}
+	
+		if (!(UtilItem.isArmor(event.getMaterial()) && UtilItem.isIronProduct(event.getMaterial())))
+		{
+			return;
+		}
+		
+		if (!TaskManager.Instance.hasCompletedTask(event.getPlayer(), "tuttoooooe" + event.getMaterial().name()) && !_bought.get(event.getPlayer().getName()).contains(event.getMaterial()))
+		{
+			event.setBuyPrice(0);
+			event.setSellPrice(0);
+		}
+	}
+	
+	@EventHandler
+	public void buy(final ClansPlayerBuyItemEvent event)
+	{
+		if (!isDoing(event.getPlayer()))
+		{
+			return;
+		}
+		
+		if (!(UtilItem.isArmor(event.getItem().getType()) && UtilItem.isIronProduct(event.getItem().getType())))
+		{
+			return;
+		}
+		
+		if (event.getCost() == 0 && _bought.get(event.getPlayer().getName()).contains(event.getItem().getType()))
+		{
+			event.setCancelled(true);
+			return;
+		}
+		
+		TaskManager.Instance.completedTask(new Callback<Boolean>() {
+			@Override
+			public void run(Boolean data)
+			{
+			}	
+		}, event.getPlayer(), "tuttoooooe" + event.getItem().getType().name());
+		
+		_bought.get(event.getPlayer().getName()).add(event.getItem().getType());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskExploreShops.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskExploreShops.java
new file mode 100644
index 000000000..39ddfd126
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskExploreShops.java
@@ -0,0 +1,84 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import java.util.Iterator;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.event.EnergyPageBuildEvent;
+import mineplex.game.clans.spawn.Spawn;
+import mineplex.game.clans.tutorials.TutorialTask;
+
+public class TaskExploreShops extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskExploreShops(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_displayName = "Welcome to the Shops";
+		_technicalName = "WillkommenZumGeschaft";
+		
+		_description = "Welcome to the Shops! Here you can buy all kinds of things that you may require during your adventure. "
+				     + "You can also sell certain items to the Villagers to make a bit of extra Gold. "
+				     + "Clan Energy is required to maintain the clan, without it, you will lose all claimed Territory! "
+				     + "Go to the Energy Shop and buy {Max Energy}. (FREE)";
+		
+		_finishMessage = "Great! "
+			       + "Clans use energy to control Territory. "
+			       + "More territory will cause your energy to drain faster, so make sure you remember to refill it regularly!";
+	}
+	
+	@Override
+	public void customStartFor(Player player)
+	{
+		player.teleport(new Location(Spawn.getSpawnWorld(), 17, 66.5, -330, -180f, 0f));
+		
+		ClansManager.getInstance().getClan(player).adjustEnergy(-(ClansManager.getInstance().getClan(player).getEnergyCostPerMinute() * 60));
+	}
+	
+	@EventHandler
+	public void onItemPut(EnergyPageBuildEvent event)
+	{
+		if (!isDoing(event.getPlayer()))
+		{
+			return;
+		}
+		
+		if (!ClansManager.getInstance().isInClan(event.getPlayer()))
+		{
+			return;
+		}
+		
+		if (ClansManager.getInstance().getClan(event.getPlayer()).getEnergyPurchasable() == 0)
+		{
+			finishFor(event.getPlayer());
+			return;
+		}
+		
+		event.setFree(true);
+	}
+	
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TWOSEC)
+		{
+			return;
+		}
+		
+		Iterator<String> iterator = _inTask.iterator();
+		while (iterator.hasNext())
+		{
+			Player player = Bukkit.getPlayer(iterator.next());
+			if (ClansManager.getInstance().getClan(player).getEnergy() == ClansManager.getInstance().getClan(player).getEnergyMax())
+			{
+				finishFor(player);
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskLeaveSpawn.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskLeaveSpawn.java
new file mode 100644
index 000000000..71a8155da
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskLeaveSpawn.java
@@ -0,0 +1,56 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import java.util.Iterator;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.tutorials.TutorialTask;
+
+public class TaskLeaveSpawn extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskLeaveSpawn(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_displayName = "Leave Spawn Islands";
+		_technicalName = "LeaveSpawn";
+		
+		_description = "Now you can leave the Spawn Island. "
+				     + "Don't worry, you won't get hurt from the fall! "
+				     + "Once you're down there, run out a couple of blocks to get to the Wilderness. "
+				     + "When you finish the tutorial, you will be vulnerable to player attacks out there, so be careful!";
+	}
+	
+	@Override
+	public void customStartFor(Player player)
+	{
+		if (player.getLocation().getY() < 100)
+		{
+			finishFor(player);
+		}
+	}
+	
+	@EventHandler
+	public void update(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+		{
+			return;
+		}
+		
+		Iterator<String> iterator = _inTask.iterator();
+		while (iterator.hasNext())
+		{
+			Player player = Bukkit.getPlayer(iterator.next());
+			
+			if (player.getLocation().getY() < 100 && getClans().getClanUtility().getClaim(player.getLocation()) == null)
+			{
+				finishFor(player);
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskMakingMoney.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskMakingMoney.java
new file mode 100644
index 000000000..3aefb2ab7
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskMakingMoney.java
@@ -0,0 +1,76 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerItemConsumeEvent;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.event.ClansPlayerSellItemEvent;
+import mineplex.game.clans.spawn.Spawn;
+import mineplex.game.clans.tutorials.TutorialTask;
+
+public class TaskMakingMoney extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskMakingMoney(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_displayName = "Making Money (Farming)";
+		_technicalName = "ImAFarmer";
+		
+		_description = "We have given you a carrot to sell in the Organic Produce Shop. "
+					 + "Click on the Villager, and {Right-Click} the carrot to sell your carrots in exchange for Gold.";
+		
+		_finishMessage = "Good job! "
+				       + "Farming and selling foods like carrots and potatoes are great ways to make money. "
+				       + "You can also sell blocks, ores, and many other items that a Shop may be interested in buying.";
+		
+		_taskPos = new Location(Spawn.getSpawnWorld(), 25.536, 66, -316.844, -100f, 0f);
+	}
+	
+	@Override
+	public void customStartFor(Player player)
+	{
+		player.getInventory().addItem(new ItemStack(Material.CARROT, 1));
+	}
+	
+	@EventHandler
+	public void eat(PlayerItemConsumeEvent event)
+	{
+		if (!isDoing(event.getPlayer()))
+		{
+			return;
+		}
+		
+		if (!event.getItem().getType().equals(Material.CARROT))
+		{
+			return;
+		}
+		
+		event.setCancelled(true);
+	}
+	
+	@EventHandler
+	public void button(ClansPlayerSellItemEvent event)
+	{
+		if (!isDoing(event.getPlayer()))
+		{
+			return;
+		}
+		
+		if (!ClansManager.getInstance().isInClan(event.getPlayer()))
+		{
+			return;
+		}
+	
+		if (!event.getItem().getType().equals(Material.CARROT_ITEM))
+		{
+			return;
+		}
+		
+		finishFor(event.getPlayer());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskSetHome.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskSetHome.java
new file mode 100644
index 000000000..ca14eaf8c
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskSetHome.java
@@ -0,0 +1,44 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
+import mineplex.game.clans.tutorials.TutorialTask;
+
+public class TaskSetHome extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskSetHome(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_displayName = "Set Clan Home";
+		_technicalName = "SetClanHome";
+		
+		_description = "You are now ready to set a Clan Home. "
+				     + "To do this, use the {/c sethome} command. "
+				     + "After you set a Clan Home, you or any of your Clan mates will be able to teleport back to the Clan Home by typing {/c home} whenever they are at Spawn.";
+	}
+	
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onSetHome(ClansCommandExecutedEvent event)
+	{
+		if (!isDoing(event.getPlayer()))
+		{
+			return;
+		}
+		
+		if (!ClansManager.getInstance().isInClan(event.getPlayer()))
+		{
+			return;
+		}
+		
+		if (!event.getCommand().equals("homeset"))
+		{
+			return;
+		}
+		
+		finishFor(event.getPlayer());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskUseAbility.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskUseAbility.java
new file mode 100644
index 000000000..58c9bb58d
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskUseAbility.java
@@ -0,0 +1,140 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.CraftingInventory;
+import org.bukkit.inventory.PlayerInventory;
+
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.NautArrayList;
+import mineplex.core.common.util.NautHashMap;
+import mineplex.core.task.TaskManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.event.ClansPlayerBuyItemEvent;
+import mineplex.game.clans.clans.event.ClansShopAddButtonEvent;
+import mineplex.game.clans.spawn.Spawn;
+import mineplex.game.clans.tutorials.TutorialTask;
+import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
+
+public class TaskUseAbility extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskUseAbility(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_displayName = "Use a Class Ability";
+		_technicalName = "KlassAbilityUsage";
+		
+		_description = "Now that you have equipped a class, you can start using abilities. "
+				     + "Purchase an Iron Axe from the PvP Shop. "
+				     + "Right-Click with your Iron Axe to use your Axe Ability!";
+		
+		_taskPos = new Location(Spawn.getSpawnWorld(), 19, 66, -305.844, -100f, 0f);
+	}
+	
+	private NautHashMap<String, NautArrayList<Material>> _bought = new NautHashMap<>();
+	private NautHashMap<String, Boolean> _teleported = new NautHashMap<>();
+
+	@Override
+	public void customStartFor(Player player)
+	{
+		_bought.put(player.getName(), new NautArrayList<Material>());
+		_teleported.put(player.getName(), false);
+	}
+	
+	@Override
+	public void customEndFor(Player player)
+	{
+		_bought.get(player.getName()).clear();
+		_bought.remove(player.getName());
+		_teleported.remove(player.getName());
+	}
+	
+	@EventHandler
+	public void teleportPlayer(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC) return;
+		
+		Iterator<String> iterator = _inTask.iterator();
+		while (iterator.hasNext())
+		{
+			Player _player = Bukkit.getPlayer(iterator.next());
+			
+			if (!_teleported.get(_player.getName()) && _player != null && _player.isOnline() && _player.getOpenInventory().getType() == InventoryType.CRAFTING)
+			{
+				_player.teleport(new Location(Spawn.getSpawnWorld(), 19, 66, -305.844, -100f, 0f));
+				_teleported.put(_player.getName(), true);
+			}
+		}
+	}
+
+	@EventHandler
+	public void onAbilityUesd(SkillTriggerEvent event)
+	{
+		if (!isDoing(event.GetPlayer()))
+		{
+			return;
+		}
+		
+		finishFor(event.GetPlayer());
+	}
+	
+	@EventHandler
+	public void button(ClansShopAddButtonEvent event)
+	{
+		if (!isDoing(event.getPlayer()))
+		{
+			return;
+		}
+		
+		if (!event.getMaterial().equals(Material.IRON_AXE))
+		{
+			return;
+		}
+		
+		if (!TaskManager.Instance.hasCompletedTask(event.getPlayer(), "tuttoooooe" + event.getMaterial().name())
+		&&  !_bought.get(event.getPlayer().getName()).contains(event.getMaterial()))
+		{
+			event.setBuyPrice(0);
+			event.setSellPrice(0);
+		}
+	}
+	
+	@EventHandler
+	public void buy(final ClansPlayerBuyItemEvent event)
+	{
+		if (!isDoing(event.getPlayer()))
+		{
+			return;
+		}
+		
+		if (!event.getItem().getType().equals(Material.IRON_AXE))
+		{
+			return;
+		}
+		
+		if (event.getCost() == 0 && _bought.get(event.getPlayer().getName()).contains(event.getItem().getType()))
+		{
+			event.setCancelled(true);
+			return;
+		}
+		
+		TaskManager.Instance.completedTask(new Callback<Boolean>() {
+			@Override
+			public void run(Boolean data)
+			{
+			}	
+		}, event.getPlayer(), "tuttoooooe" + event.getItem().getType().name());
+		_bought.get(event.getPlayer().getName()).add(event.getItem().getType());
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskViewClanDetails.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskViewClanDetails.java
new file mode 100644
index 000000000..60e732340
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskViewClanDetails.java
@@ -0,0 +1,38 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
+import mineplex.game.clans.tutorials.TutorialTask;
+
+public class TaskViewClanDetails extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskViewClanDetails(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_displayName = "Viewing Clan Details";
+		_technicalName = "CommandClanX";
+		
+		_description = "Now you can view information about your clan. "
+				     + "To do this type {/c [clan name]}! "
+				     + "You can also use any clan's name to get some information about them as well.";
+	}
+	
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onClansCommand(ClansCommandExecutedEvent event)
+	{
+		if (!isDoing(event.getPlayer()))
+		{
+			return;
+		}
+		
+		System.out.println(event.getCommand());
+		
+		if (event.getCommand().equals("info"))
+		{
+			finishFor(event.getPlayer());
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskWelcome.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskWelcome.java
new file mode 100644
index 000000000..9b058b619
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskWelcome.java
@@ -0,0 +1,21 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import mineplex.game.clans.tutorials.TutorialTask;
+
+public class TaskWelcome extends TutorialTask<TutorialGettingStarted>
+{
+	public TaskWelcome(TutorialGettingStarted tutorial, int id)
+	{
+		super(tutorial, id);
+		
+		_autoCompleteTime = 20 * 10;
+		
+		_displayName = "Welcome";
+		_technicalName = "Welcome";
+		
+		_description = "Welcome to Clans! "
+				     + "In this game mode, you are able to create a Clan, invite your friends to the Clan, build a base, claim it to protect, and fight others with your new powerful Clan!"
+				     + "You can also join a friend's Clan if they invite you to it!"
+				     + "When you finish the tutorial, you will be awarded {30,000 Gold}";
+	}
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TutorialGettingStarted.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TutorialGettingStarted.java
new file mode 100644
index 000000000..0fe1fc7fd
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TutorialGettingStarted.java
@@ -0,0 +1,102 @@
+package mineplex.game.clans.tutorials.gettingstarted;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.packethandler.PacketHandler;
+import mineplex.core.task.TaskManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+import mineplex.game.clans.economy.GoldManager;
+import mineplex.game.clans.spawn.Spawn;
+import mineplex.game.clans.tutorials.Tutorial;
+import mineplex.game.clans.tutorials.TutorialManager;
+
+public class TutorialGettingStarted extends Tutorial
+{
+	public TutorialGettingStarted(final TutorialManager manager, final ClansManager clansManager, final DonationManager donationManager, final GoldManager goldManager, final TaskManager taskManager, final PacketHandler packetHandler)
+	{
+		super(goldManager, taskManager, clansManager, donationManager, manager, packetHandler);
+		
+//		addTask(new TaskWelcome(this, 1));
+		
+		int id = 0;
+		addTask(new TaskCreateClan(this, ++id));
+		addTask(new TaskViewClanDetails(this, ++id));
+		addTask(new TaskLeaveSpawn(this, ++id));
+		addTask(new TaskClaim(this, ++id));
+		addTask(new TaskSetHome(this, ++id));
+		addTask(new TaskExploreShops(this, ++id));
+		addTask(new TaskEquipClass(this, ++id));
+		addTask(new TaskCustomizeClass(this, ++id));
+		addTask(new TaskUseAbility(this, ++id));
+		addTask(new TaskMakingMoney(this, ++id));
+		addTask(new TaskDisbandClan(this, ++id));
+		
+		_doScoreboard = true;
+		_ghostMode = true;
+		_startOnJoin = true;
+		_goldReward = 30000;
+				
+		_technicalName = "GettingStartedTutorial";
+		_displayName = "Getting Started";
+	}
+
+	@Override
+	public void onFinished(final Player player)
+	{
+		_manager.sendTutorialMsg(player, C.cDGreenB + C.Strike + "---------------------------------------------");
+		_manager.sendTutorialMsg(player, C.cYellowB + "CONGRATULATIONS");
+		_manager.sendTutorialMsg(player, " ");
+		_manager.sendTutorialMsg(player, C.cWhite + "You have completed the Clans basic tutorial and have been awarded " + C.cAqua + "30,000 Gold");
+		_manager.sendTutorialMsg(player, C.cWhite + "You can now begin your adventure, but do take a moment to read the signs around spawn for more information!");
+		_manager.sendTutorialMsg(player, C.cDGreenB + C.Strike + "---------------------------------------------");
+		
+		player.resetPlayerTime();
+		player.teleport(Spawn.getEastSpawn());
+	}
+	
+	@Override
+	public void onBegin(final Player player)
+	{
+		_manager.sendTutorialMsg(player, " ");
+		_manager.sendTutorialMsg(player, " ");
+		_manager.sendTutorialMsg(player, " ");
+		_manager.sendTutorialMsg(player, C.cDGreenB + C.Strike + "---------------------------------------------");
+		_manager.sendTutorialMsg(player, " ");
+		_manager.sendTutorialMsg(player, C.cYellowB + "Getting Started");
+		_manager.sendTutorialMsg(player, C.cWhite + " Welcome to Clans! "
+										   + "In this game mode you are able to create a clan, invite your friends to play with you, build a base, and wage war against others! "
+										   + "When you finish the tutorial, you will be awarded " + C.cAqua + "30,000 Gold");
+		_manager.sendTutorialMsg(player, " ");
+		_manager.sendTutorialMsg(player, C.cDGreenB + C.Strike + "---------------------------------------------");
+	}
+	
+	
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onUpdate(final UpdateEvent event)
+	{
+		if (!event.getType().equals(UpdateType.SEC))
+		{
+			return;
+		}
+		
+		for (Player player : UtilServer.getPlayers())
+		{
+			if (isInTutorial(player))
+			{
+				for (Player other : UtilServer.getPlayers())
+				{
+					other.hidePlayer(player.getPlayer());
+				    player.hidePlayer(other);
+				}
+			}
+		}
+	}
+	
+}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/world/WorldManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/world/WorldManager.java
new file mode 100644
index 000000000..f2761bab3
--- /dev/null
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/world/WorldManager.java
@@ -0,0 +1,150 @@
+package mineplex.game.clans.world;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.game.clans.clans.ClansManager;
+
+public class WorldManager extends MiniPlugin
+{	
+	public WorldManager(JavaPlugin plugin) 
+	{
+		super("Clan World Manager", plugin);
+	}
+	
+	@EventHandler
+	public void cullMobs(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SLOW)
+			return;
+		
+		for (World world : getPlugin().getServer().getWorlds())
+		{
+			HashMap<EntityType, ArrayList<Entity>> _ents = new HashMap<EntityType, ArrayList<Entity>>();
+			
+			for (EntityType type : EntityType.values())
+				_ents.put(type, new ArrayList<Entity>());
+			
+			for (Entity ent : world.getEntities())
+			{
+				if (ent.getCustomName() == null)
+				{
+					boolean cull = true;
+					
+					for (Player player : world.getPlayers())
+					{
+						if (player.getLocation().distance(ent.getLocation()) <= 64)
+						{
+							cull = false;
+							break;
+						}
+					}
+					
+					if (cull)
+					{
+						_ents.get(ent.getType()).add(ent);
+					}
+				}
+			}
+				
+			for (EntityType type : _ents.keySet())
+			{
+				ArrayList<Entity> ents = _ents.get(type);
+				
+				//Clean Old Arrows
+				if (type == EntityType.ARROW)
+				{
+					for (Entity ent : ents)
+						if (ent.getTicksLived() > 800)
+							ent.remove();
+				}
+				
+				//Clean Old Items
+				if (type == EntityType.DROPPED_ITEM)
+				{
+					for (Entity ent : ents)
+						if (ent.getTicksLived() > 2400)
+							ent.remove();
+				}
+				
+				//Animals
+				else if (type == EntityType.BAT)			cull(ents, 50);
+				else if (type == EntityType.CHICKEN)		cull(ents, 150);
+				else if (type == EntityType.COW)			cull(ents, 150);
+				else if (type == EntityType.HORSE)			cull(ents, 50);
+				else if (type == EntityType.IRON_GOLEM)		cull(ents, 50);
+				else if (type == EntityType.MUSHROOM_COW)	cull(ents, 50);
+				else if (type == EntityType.OCELOT)			cull(ents, 50);
+				else if (type == EntityType.PIG)			cull(ents, 150);
+				else if (type == EntityType.RABBIT)			cull(ents, 50);
+				else if (type == EntityType.SHEEP)			cull(ents, 150);
+				else if (type == EntityType.WOLF)			cull(ents, 150);
+				
+				//Monster
+				else if (type == EntityType.CAVE_SPIDER)	cull(ents, 100);
+				else if (type == EntityType.CREEPER)		cull(ents, 100);
+				else if (type == EntityType.ENDERMAN)		cull(ents, 50);
+				else if (type == EntityType.ENDERMITE)		cull(ents, 50);
+				else if (type == EntityType.SILVERFISH)		cull(ents, 50);
+				else if (type == EntityType.SKELETON)		cull(ents, 100);
+				else if (type == EntityType.SLIME)			cull(ents, 50);
+				else if (type == EntityType.SPIDER)			cull(ents, 100);
+				else if (type == EntityType.ZOMBIE)			cull(ents, 100);
+				
+				//Nether
+				else if (type == EntityType.BLAZE)			cull(ents, 50);
+				else if (type == EntityType.GHAST)			cull(ents, 50);
+				else if (type == EntityType.MAGMA_CUBE)		cull(ents, 50);
+				else if (type == EntityType.PIG_ZOMBIE)		cull(ents, 50);
+				
+				//Clean Old Minecarts
+				if (type == EntityType.MINECART ||
+						type == EntityType.MINECART_CHEST ||
+						type == EntityType.MINECART_COMMAND ||
+						type == EntityType.MINECART_FURNACE ||
+						type == EntityType.MINECART_HOPPER ||
+						type == EntityType.MINECART_MOB_SPAWNER ||
+						type == EntityType.MINECART_TNT)
+				{
+					for (Entity ent : ents)
+						if (ent.getTicksLived() > 800)
+							ent.remove();
+				}
+			}
+		}
+	}
+	
+	public void cull(ArrayList<Entity> ents, int limit)
+	{
+		int culled = 0;
+		EntityType type = null;
+		while (ents.size() > limit)
+		{
+			Entity ent = ents.remove(UtilMath.r(ents.size()));
+			
+			type = ent.getType();
+
+			ent.remove();
+			
+			culled++;
+		}
+		
+		if (type != null)
+		{
+			System.out.println("Culled " + culled + " " + type);
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Hub/.classpath b/Plugins/Mineplex.Hub/.classpath
index f8c70de6c..92e1e93d4 100644
--- a/Plugins/Mineplex.Hub/.classpath
+++ b/Plugins/Mineplex.Hub/.classpath
@@ -11,6 +11,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.ServerData"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jooq-3.5.2.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Database"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Game.Clans.Core"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-codec-1.6.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Plugins/Mineplex.Hub/Mineplex.Hub.iml b/Plugins/Mineplex.Hub/Mineplex.Hub.iml
index 5c4477b27..474bfecac 100644
--- a/Plugins/Mineplex.Hub/Mineplex.Hub.iml
+++ b/Plugins/Mineplex.Hub/Mineplex.Hub.iml
@@ -21,5 +21,6 @@
     <orderEntry type="module" module-name="Mineplex.Database" />
     <orderEntry type="library" name="jooq" level="project" />
     <orderEntry type="library" name="jedis" level="project" />
+    <orderEntry type="module" module-name="Mineplex.Game.Clans.Core" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
index 864300244..f52155acb 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
@@ -92,6 +92,7 @@ public class Hub extends JavaPlugin implements IRelation
 		CoreClientManager clientManager = new CoreClientManager(this, webServerAddress);
 		CommandCenter.Instance.setClientManager(clientManager);
 
+//		new ProfileCacheManager(this);
 		ItemStackFactory.Initialize(this, false);
 		Recharge.Initialize(this);
 		VisibilityManager.Initialize(this);		Give.Initialize(this);
@@ -130,8 +131,10 @@ public class Hub extends JavaPlugin implements IRelation
 
 		PartyManager partyManager = new PartyManager(this, portal, clientManager, preferenceManager);
 
+		SkillConditionManager conditionManager = new SkillConditionManager(this);
+		
 		PersonalServerManager personalServerManager = new PersonalServerManager(this, clientManager);
-		HubManager hubManager = new HubManager(this, blockRestore, clientManager, donationManager, inventoryManager, new ConditionManager(this), disguiseManager, new TaskManager(this, clientManager, webServerAddress), portal, partyManager, preferenceManager, petManager, pollManager, statsManager, achievementManager, new HologramManager(this), npcManager, personalServerManager, packetHandler, punish, serverStatusManager, giveawayManager);
+		HubManager hubManager = new HubManager(this, blockRestore, clientManager, donationManager, inventoryManager, conditionManager, disguiseManager, new TaskManager(this, clientManager, webServerAddress), portal, partyManager, preferenceManager, petManager, pollManager, statsManager, achievementManager, new HologramManager(this, packetHandler), npcManager, personalServerManager, packetHandler, punish, serverStatusManager, giveawayManager);
 
 		QueueManager queueManager = new QueueManager(this, clientManager, donationManager, new EloManager(this, clientManager), partyManager);
 
@@ -149,7 +152,7 @@ public class Hub extends JavaPlugin implements IRelation
 				return true;
 			}
 		});
-		new GlobalPacketManager(this, clientManager, serverStatusManager);
+		new GlobalPacketManager(this, clientManager, serverStatusManager, inventoryManager, donationManager, petManager, statsManager, giveawayManager);
 		//new Replay(this, packetHandler);
 
 		AprilFoolsManager.Initialize(this, clientManager, disguiseManager);
@@ -157,11 +160,13 @@ public class Hub extends JavaPlugin implements IRelation
 		CombatManager combatManager = new CombatManager(this);
 
 		ProjectileManager throwManager = new ProjectileManager(this);
-		SkillConditionManager conditionManager = new SkillConditionManager(this);
+		
 
 		DamageManager damage = new DamageManager(this, combatManager, npcManager, disguiseManager, conditionManager);
+		conditionManager.setDamageManager(damage);
+		
 		Fire fire = new Fire(this, conditionManager, damage);
-		Teleport teleport = new Teleport(this);
+		Teleport teleport = new Teleport(this, clientManager);
 		Energy energy = new Energy(this);
 		energy.setEnabled(false);
 
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
index 1c774a995..4e16d3376 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
@@ -28,14 +28,12 @@ import mineplex.core.disguise.DisguiseManager;
 import mineplex.core.disguise.disguises.DisguiseSlime;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.event.GadgetActivateEvent;
 import mineplex.core.gadget.event.GadgetCollideEntityEvent;
 import mineplex.core.giveaway.GiveawayManager;
 import mineplex.core.hologram.HologramManager;
 import mineplex.core.inventory.InventoryManager;
 import mineplex.core.message.PrivateMessageEvent;
 import mineplex.core.mount.MountManager;
-import mineplex.core.mount.event.MountActivateEvent;
 import mineplex.core.notifier.NotificationManager;
 import mineplex.core.npc.NpcManager;
 import mineplex.core.packethandler.PacketHandler;
@@ -67,7 +65,6 @@ import mineplex.hub.modules.NewsManager;
 import mineplex.hub.modules.ParkourManager;
 import mineplex.hub.modules.SoccerManager;
 import mineplex.hub.modules.TextManager;
-import mineplex.hub.modules.TrickOrTreatManager;
 import mineplex.hub.modules.WorldManager;
 import mineplex.hub.profile.gui.GUIProfile;
 import mineplex.hub.tutorial.TutorialManager;
@@ -120,7 +117,7 @@ import org.bukkit.scoreboard.Scoreboard;
 public class HubManager extends MiniClientPlugin<HubClient>
 {
 	// ☃❅ Snowman!
-	public HubType Type = HubType.Normal;
+	public HubType Type = HubType.Christmas;
 
 	private BlockRestore _blockRestore;
 	private CoreClientManager _clientManager;
@@ -162,9 +159,6 @@ public class HubManager extends MiniClientPlugin<HubClient>
 
 	private HashMap<String, ArrayList<String>> _creativeAdmin = new HashMap<String, ArrayList<String>>();
 
-	//Admin
-	private boolean _gadgetsEnabled = true;
-
 	public HubManager(JavaPlugin plugin, BlockRestore blockRestore, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager, ConditionManager conditionManager, DisguiseManager disguiseManager, TaskManager taskManager, Portal portal, PartyManager partyManager, PreferencesManager preferences, PetManager petManager, PollManager pollManager, StatsManager statsManager, AchievementManager achievementManager, HologramManager hologramManager, NpcManager npcManager, PersonalServerManager personalServerManager, PacketHandler packetHandler, Punish punish, ServerStatusManager serverStatusManager, GiveawayManager giveawayManager)
 	{
 		super("Hub Manager", plugin);
@@ -268,50 +262,6 @@ public class HubManager extends MiniClientPlugin<HubClient>
 		return true;
 	}
 
-
-	@EventHandler
-	public void SnowballPickup(BlockDamageEvent event)
-	{
-		if (Type != HubType.Christmas)
-			return;
-
-		if (event.getBlock().getType() != Material.SNOW)
-			return;
-
-		Player player = event.getPlayer();
-
-		_gadgetManager.RemoveItem(player);
-
-		player.getInventory().setItem(3, new ItemStack(Material.SNOW_BALL, 16));
-	}
-
-	@EventHandler
-	public void SnowballHit(CustomDamageEvent event)
-	{
-		if (Type != HubType.Christmas)
-			return;
-
-		Projectile proj = event.GetProjectile();
-		if (proj == null)	return;
-
-		if (!(proj instanceof Snowball))
-			return;
-
-		event.SetCancelled("Snowball Cancel");
-
-		if (BumpDisabled(event.GetDamageeEntity()))
-			return;
-
-		if (BumpDisabled(event.GetDamagerEntity(true)))
-			return;
-
-		UtilAction.velocity(event.GetDamageeEntity(), UtilAlg.getTrajectory2d(event.GetDamagerEntity(true), event.GetDamageeEntity()),
-				0.4, false, 0, 0.2, 1, false);
-
-		//No Portal
-		SetPortalDelay(event.GetDamageeEntity());
-	}
-
 	@EventHandler
 	public void redirectStopCommand(PlayerCommandPreprocessEvent event)
 	{
@@ -664,39 +614,6 @@ public class HubManager extends MiniClientPlugin<HubClient>
 		if (_scoreboardTick != 0)
 			return;
 
-//		int bestPig = 0;
-//		for (Player player : UtilServer.getPlayers())
-//		{
-//			if (player.getVehicle() != null)
-//				continue;
-//
-//			int count = 0;
-//
-//			Entity ent = player;
-//			while (ent.getPassenger() != null)
-//			{
-//				ent = ent.getPassenger();
-//				count++;
-//			}
-//
-//			if (count > bestPig)
-//			{
-//				_pigStacker = player.getName();
-//				bestPig = count;
-//			}
-//		}
-//		if (bestPig == 0)
-//		{
-//			_pigStacker = "0 - Nobody";
-//		}
-//		else
-//		{
-//			_pigStacker = bestPig + " - " + _pigStacker;
-//
-//			if (_pigStacker.length() > 16)
-//				_pigStacker = _pigStacker.substring(0, 16);
-//		}
-
 		for (Player player : UtilServer.getPlayers())
 		{
 			//Dont Waste Time
@@ -914,12 +831,6 @@ public class HubManager extends MiniClientPlugin<HubClient>
 		event.SetCancelled(true);
 	}
 
-	public boolean IsGadgetEnabled()
-	{
-		return _gadgetsEnabled;
-	}
-
-
 	public NewsManager GetNewsManager()
 	{
 		return _news;
@@ -936,30 +847,15 @@ public class HubManager extends MiniClientPlugin<HubClient>
 
 	public void ToggleGadget(Player caller)
 	{
-		_gadgetsEnabled = !_gadgetsEnabled;
+		toggleGadget();
+	}
 
-		if (!_gadgetsEnabled)
-		{
-			GetMount().DisableAll();
-			GetGadget().DisableAll();
-		}
+	public void toggleGadget()
+	{
+		GetGadget().toggleGadgetEnabled();
 
 		for (Player player : UtilServer.getPlayers())
-			player.sendMessage(C.cWhite + C.Bold + "Gadgets/Mounts are now " + F.elem(_gadgetsEnabled ? C.cGreen + C.Bold + "Enabled" : C.cRed + C.Bold + "Disabled"));
-	}
-
-	@EventHandler
-	public void GadgetActivate(GadgetActivateEvent event)
-	{
-		if (!_gadgetsEnabled)
-			event.setCancelled(true);
-	}
-
-	@EventHandler
-	public void MountActivate(MountActivateEvent event)
-	{
-		if (!_gadgetsEnabled)
-			event.setCancelled(true);
+			player.sendMessage(C.cWhite + C.Bold + "Gadgets/Mounts are now " + F.elem(GetGadget().isGadgetEnabled() ? C.cGreen + C.Bold + "Enabled" : C.cRed + C.Bold + "Disabled"));
 	}
 
 	public void addGameMode(Player caller, Player target)
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubType.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubType.java
index 961a5bfee..4b058b45f 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubType.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubType.java
@@ -2,7 +2,7 @@ package mineplex.hub;
 
 public enum HubType
 {
-	Normal,
+	Normal, 
 	Halloween,
 	Christmas
 }
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java
index e86d2e3c6..fb2c0090e 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java
@@ -1,5 +1,6 @@
 package mineplex.hub.modules;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Effect;
 import org.bukkit.GameMode;
 import org.bukkit.block.BlockFace;
@@ -18,6 +19,7 @@ import mineplex.core.disguise.disguises.DisguiseBat;
 import mineplex.core.disguise.disguises.DisguiseChicken;
 import mineplex.core.disguise.disguises.DisguiseEnderman;
 import mineplex.core.disguise.disguises.DisguiseWither;
+import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.hub.HubManager;
@@ -66,6 +68,8 @@ public class JumpManager extends MiniPlugin
 
 		//Sound
 		player.playEffect(player.getLocation(), Effect.BLAZE_SHOOT, 0);
+		
+		Recharge.Instance.useForce(player, "Double Jump", 500);
 	}
 
 	@EventHandler
@@ -94,8 +98,11 @@ public class JumpManager extends MiniPlugin
 			
 			if (UtilEnt.isGrounded(player) || UtilBlock.solid(player.getLocation().getBlock().getRelative(BlockFace.DOWN)))
 			{
-				player.setAllowFlight(true);
-				player.setFlying(false);
+				if(!player.getAllowFlight() && Recharge.Instance.usable(player, "Double Jump"))
+				{
+					player.setAllowFlight(true);
+					player.setFlying(false);
+				}
 			}
 		}
 	}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/SoccerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/SoccerManager.java
index 1d55d9f03..6fbe6ccec 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/SoccerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/SoccerManager.java
@@ -238,7 +238,6 @@ public class SoccerManager extends MiniPlugin
 		if (UtilAlg.inBoundingBox(_ball.getLocation(), _cornerRedGoalA, _cornerRedGoalB) &&
 				!UtilAlg.inBoundingBox(_ball.getLocation(), _cornerFieldA, _cornerFieldB))
 		{
-
 			_insideGoalTicks++;
 
 			if (_insideGoalTicks > 3)
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
index 2ac87ef75..bf5b654ea 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
@@ -14,7 +14,7 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Wither;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.util.Vector;
 
@@ -24,9 +24,9 @@ import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilGear;
 import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.event.StackerEvent;
 import mineplex.core.gadget.gadgets.MorphBlock;
 import mineplex.core.gadget.types.GadgetType;
@@ -54,7 +54,7 @@ public class StackerManager extends MiniPlugin implements IThrown
 	} 
 	
 	@EventHandler
-	public void GrabEntity(PlayerInteractEntityEvent event)
+	public void GrabEntity(PlayerInteractAtEntityEvent event)
 	{
 		if (event.isCancelled())
 			return;
@@ -62,7 +62,10 @@ public class StackerManager extends MiniPlugin implements IThrown
 		Entity stackee = event.getRightClicked();
 		if (stackee == null)
 			return;
-
+		
+		if(Manager.GetMount().isMount(stackee))
+			return;
+		
 		if (!(stackee instanceof LivingEntity))
 			return;
 		
@@ -224,6 +227,8 @@ public class StackerManager extends MiniPlugin implements IThrown
 		UtilPlayer.message(thrower, F.main("Stacker", "You threw " + F.name(UtilEnt.getName(throwee))));
 		UtilPlayer.message(throwee, F.main("Stacker", "You were thrown by " + F.name(thrower.getName())));
 
+		System.out.println("Stacker throw.");
+		
 		UtilAction.velocity(throwee, thrower.getLocation().getDirection(), 1.8, false, 0, 0.3, 2, false);
 
 		_projectileManager.AddThrow(throwee, thrower, this, 4000, true, false, true, false, 0.5f);
@@ -244,7 +249,9 @@ public class StackerManager extends MiniPlugin implements IThrown
 		
 		if (!Manager.hasPlayerStackingEnabled(target))
 			return;
-
+		
+		System.out.println("Stacker collide.");
+		
 		//Velocity
 		UtilAction.velocity(target, UtilAlg.getTrajectory2d(data.GetThrown(), target), 1, true, 0.8, 0, 10, true);
 
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
index 8729a6e55..1644f91ee 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
@@ -294,7 +294,7 @@ public class WorldManager extends MiniPlugin
 			for (Block block : UtilBlock.getInRadius(player.getLocation(), 3d).keySet())
 			{
 				if (block.getType() == Material.PUMPKIN)
-					Manager.GetBlockRestore().Add(block, 91, block.getData(), 2000);
+					Manager.GetBlockRestore().add(block, 91, block.getData(), 2000);
 			}
 		}
 
@@ -363,4 +363,4 @@ public class WorldManager extends MiniPlugin
 			event.setCancelled(true);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
index f65dfb6d3..10f889fce 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
@@ -56,6 +56,7 @@ import mineplex.hub.server.ui.LobbyShop;
 import mineplex.hub.server.ui.QuickShop;
 import mineplex.hub.server.ui.ServerCountSorter;
 import mineplex.hub.server.ui.ServerNpcShop;
+import mineplex.hub.server.ui.clans.ClansServerShop;
 import mineplex.serverdata.Region;
 import mineplex.serverdata.data.MinecraftServer;
 import mineplex.serverdata.data.ServerGroup;
@@ -118,6 +119,9 @@ public class ServerManager extends MiniPlugin
 		_quickShop = new QuickShop(this, clientManager, donationManager, "Quick Menu");
 		_lobbyShop = new LobbyShop(this, clientManager, donationManager, "Lobby Menu");
 		//_domShop = new new QueueShop(_queueManager, clientManager, donationManager, "Dominate");
+		
+		// TODO: Find more appropriate place to initialize Clans server shop?
+		new ClansServerShop(this, _clientManager, _donationManager);
 	}
 	
 	@EventHandler(priority = EventPriority.LOW)
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java
index e59ae2667..63d49220f 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java
@@ -32,7 +32,7 @@ public class LobbyMenu extends ShopPageBase<ServerManager, LobbyShop> implements
 		buildPage();
 	}
 
-	@Override
+	@Override 
 	protected void buildPage()
 	{
 		List<ServerInfo> serverList = new ArrayList<ServerInfo>(getPlugin().getServerList(_serverGroup));
@@ -77,7 +77,7 @@ public class LobbyMenu extends ShopPageBase<ServerManager, LobbyShop> implements
 				lore.add(ChatColor.RESET + C.Line + "Click to join!");
 			
 			if (status != Material.EMERALD_BLOCK)
-				addButton(slot, new ShopItem(status, ChatColor.UNDERLINE + "" + ChatColor.BOLD + "" + ChatColor.WHITE + "Server " + serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1), lore.toArray(new String[lore.size()]), Integer.parseInt(serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1)), false), new JoinServerButton(this, serverInfo));
+				addButton(slot, new ShopItem(status, ChatColor.UNDERLINE + "" + ChatColor.BOLD + "" + ChatColor.WHITE + "Server " + serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1), lore.toArray(new String[lore.size()]), Integer.parseInt(serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1)), false), new JoinServerButton(this, getPlugin(), serverInfo, getPlayer()));
 			else
 				addItem(slot, new ShopItem(status, ChatColor.UNDERLINE + "" + ChatColor.BOLD + "" + ChatColor.WHITE + "Server " + serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1), lore.toArray(new String[lore.size()]), Integer.parseInt(serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1)), false));
 		}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java
index dc7f9477e..0f72b00b7 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java
@@ -24,11 +24,11 @@ public class LobbyShop extends ShopBase<ServerManager>
 		return new LobbyMenu(getPlugin(), this, getClientManager(), getDonationManager(), "          " + ChatColor.UNDERLINE + "Lobby Selector", player, "Lobby");
 	}
 
-	public void UpdatePages()
+	public void UpdatePages() 
 	{
 		for (ShopPageBase<ServerManager, ? extends ShopBase<ServerManager>> page : getPlayerPageMap().values())
 		{
-			if (page instanceof LobbyMenu)
+			if (page instanceof LobbyMenu) 
 			{
 				((LobbyMenu)page).Update();
 			}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
index 17f606598..3cafbb8bf 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
@@ -14,15 +14,12 @@ import mineplex.core.donation.DonationManager;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.shop.page.ShopPageBase;
 import mineplex.hub.server.ServerManager;
-import mineplex.hub.server.ui.button.SelectBETAButton;
-import mineplex.hub.server.ui.button.SelectBHButton;
 import mineplex.hub.server.ui.button.SelectBLDButton;
 import mineplex.hub.server.ui.button.SelectBRButton;
 import mineplex.hub.server.ui.button.SelectCSButton;
 import mineplex.hub.server.ui.button.SelectDMTButton;
 import mineplex.hub.server.ui.button.SelectDOMButton;
 import mineplex.hub.server.ui.button.SelectMINButton;
-import mineplex.hub.server.ui.button.SelectMSButton;
 import mineplex.hub.server.ui.button.SelectPLAYERButton;
 import mineplex.hub.server.ui.button.SelectSGButton;
 import mineplex.hub.server.ui.button.SelectSKYButton;
@@ -196,9 +193,9 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 		getButtonMap().put(8, new SelectWIZButton(this));
 				
 		getButtonMap().put(18, new SelectCSButton(this));
-		getButtonMap().put(20, new SelectBHButton(this));
+//		getButtonMap().put(20, new SelectBHButton(this));
 		getButtonMap().put(22, new SelectSSMButton(this));
-		getButtonMap().put(24, new SelectMSButton(this));
+//		getButtonMap().put(24, new SelectMSButton(this));
 		getButtonMap().put(26, new SelectDMTButton(this));
 		getButtonMap().put(36, new SelectDOMButton(this));
 		getButtonMap().put(38, new SelectTDMButton(this));
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
index 34b527fa9..8208dcba5 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
@@ -246,12 +246,15 @@ public class ServerNpcPage extends ShopPageInventory<ServerManager, ServerNpcSho
 
 				if (serverInfo.HostedByStaff && staffSlot < 9)
 				{
-					addButton(staffSlot, getPrivateItem(serverInfo), new JoinServerButton(this, serverInfo));
+					addButton(staffSlot, getPrivateItem(serverInfo), new JoinServerButton(this, getPlugin(), serverInfo, getPlayer()));
 					staffSlot++;
 				}
 				else
 				{
-					addButton(slot, getPrivateItem(serverInfo), new JoinServerButton(this, serverInfo));
+					if (slot >= 54)
+						continue;
+
+					addButton(slot, getPrivateItem(serverInfo), new JoinServerButton(this, getPlugin(), serverInfo, getPlayer()));
 					slot++;
 				}
 			}
@@ -281,7 +284,7 @@ public class ServerNpcPage extends ShopPageInventory<ServerManager, ServerNpcSho
 						addItemStack(slot, shopItem);
 					else
 					{
-						addButton(slot, shopItem, new JoinServerButton(this, serverInfo));
+						addButton(slot, shopItem, new JoinServerButton(this, getPlugin(), serverInfo, getPlayer()));
 					}
 					
 					if (full)
@@ -411,6 +414,9 @@ public class ServerNpcPage extends ShopPageInventory<ServerManager, ServerNpcSho
 		{
 			if (isInProgress(serverInfo))
 			{
+				ShopItem shopItem = buildShopItem(serverInfo, slotsNeeded);
+
+				addButton(slot, shopItem, new JoinServerButton(this, getPlugin(), serverInfo, getPlayer()));
 				inProgress.add(serverInfo);
 			}
 		}
@@ -425,7 +431,7 @@ public class ServerNpcPage extends ShopPageInventory<ServerManager, ServerNpcSho
 
 			ShopItem shopItem = buildShopItem(serverInfo, slotsNeeded);
 
-			addButton(slot, shopItem, new JoinServerButton(this, serverInfo));
+			addButton(slot, shopItem, new JoinServerButton(this, getPlugin(), serverInfo, getPlayer()));
 
 			slot++;
 		}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
index 16e3ccfa7..100a4689d 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
@@ -31,12 +31,12 @@ public class ServerNpcShop extends ShopBase<ServerManager>
 		{
 			return new ServerTypePage(getPlugin(), this, getClientManager(), getDonationManager(), player, _serverGroup);
 		}
-		else
+		else 
 		{
 			return new ServerNpcPage(getPlugin(), this, getClientManager(), getDonationManager(), _serverGroup.getServerNpcName(), player, _serverGroup.getPrefix());
 		}
 		
-	}
+	} 
 
 	@Override
 	protected boolean canOpenShop(Player player)
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/JoinServerButton.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/JoinServerButton.java
index d0a57ec41..01a981c63 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/JoinServerButton.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/JoinServerButton.java
@@ -3,24 +3,54 @@ package mineplex.hub.server.ui.button;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
+import mineplex.core.common.Rank;
 import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.page.ShopPageBase;
 import mineplex.hub.server.ServerInfo;
+import mineplex.hub.server.ServerManager;
 import mineplex.hub.server.ui.IServerPage;
 
 public class JoinServerButton implements IButton
 {
-	private IServerPage _page;
+	private ShopPageBase<?, ?> _page;
+	private ServerManager _serverManager;
 	private ServerInfo _serverInfo;
+	private Player _player;
 	
-	public JoinServerButton(IServerPage page, ServerInfo serverInfo)
+	public JoinServerButton(ShopPageBase<?, ?> page, ServerManager serverManager, ServerInfo serverInfo, Player player)
 	{
 		_page = page;
+		_serverManager = serverManager;
 		_serverInfo = serverInfo;
+		_player = player;
 	}
 
 	@Override
 	public void onClick(Player player, ClickType clickType)
 	{
-		_page.SelectServer(player, _serverInfo);
+		selectServer(player, _serverInfo);
+	}
+	
+	public void selectServer(Player player, ServerInfo serverInfo)
+	{
+		if (serverInfo != null)
+		{
+			System.out.println("Selecting server :" + serverInfo.Name);
+			int slots = _serverManager.getRequiredSlots(player, serverInfo.ServerType);
+		
+			if (serverInfo.getAvailableSlots() < slots && !(_page.getDonationManager().Get(_player.getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA") || _page.getClient().GetRank().has(Rank.ULTRA)))
+			{
+				_page.playDenySound(player);
+				
+			}
+			else
+			{
+				_serverManager.selectServer(player, serverInfo);		
+			}
+		}
+		else
+		{
+			_page.playDenySound(player);
+		}
 	}
 }
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectBHButton.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectBHButton.java
deleted file mode 100644
index fea9423b6..000000000
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectBHButton.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package mineplex.hub.server.ui.button;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
-
-import mineplex.core.shop.item.IButton;
-import mineplex.hub.server.ui.ServerGameMenu;
-
-public class SelectBHButton implements IButton
-{
-	private ServerGameMenu _menu;
-
-	public SelectBHButton(ServerGameMenu menu)
-	{
-		_menu = menu;
-	}
-
-	@Override
-	public void onClick(Player player, ClickType clickType)
-	{
-		_menu.OpenBH(player);
-	}
-}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectMSButton.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectMSButton.java
deleted file mode 100644
index ca500cb25..000000000
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectMSButton.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package mineplex.hub.server.ui.button;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
-
-import mineplex.core.shop.item.IButton;
-import mineplex.hub.server.ui.ServerGameMenu;
-
-public class SelectMSButton implements IButton
-{
-	private ServerGameMenu _menu;
-
-	public SelectMSButton(ServerGameMenu menu)
-	{
-		_menu = menu;
-	}
-
-	@Override
-	public void onClick(Player player, ClickType clickType)
-	{
-		_menu.openMS(player);
-	}
-}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerButton.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerButton.java
new file mode 100644
index 000000000..0bfe8b938
--- /dev/null
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerButton.java
@@ -0,0 +1,57 @@
+package mineplex.hub.server.ui.clans;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.shop.item.IButton;
+import mineplex.game.clans.core.ClanDeleteCommand;
+import mineplex.game.clans.core.ClanLoadCommand;
+import mineplex.game.clans.core.repository.ClanRepository;
+import mineplex.game.clans.core.repository.tokens.SimpleClanToken;
+
+public class ClanMoveServerButton implements IButton
+{
+
+	private ClanRepository _repository;
+	private SimpleClanToken _clan;
+	private String _serverName;
+	
+	public ClanMoveServerButton(ClanRepository repository, SimpleClanToken clan, String serverName)
+	{
+		_repository = repository;
+		_clan = clan;
+		_serverName = serverName; 
+	}
+	
+	@Override
+	public void onClick(final Player player, ClickType clickType) 
+	{
+		_repository.moveClanServer(_clan.getClanId(), _serverName, new Callback<Boolean>()
+				{
+					@Override
+					public void run(Boolean success)
+					{
+						if (success)
+						{
+							ClanDeleteCommand deleteCommand = new ClanDeleteCommand(_clan);
+							ClanLoadCommand loadCommand = new ClanLoadCommand(_serverName, _clan.getClanName());
+							
+							deleteCommand.publish();
+							loadCommand.publish();
+							
+							player.closeInventory();
+							UtilPlayer.message(player, F.main("Clans", "You have successfully transferred your clan!"));
+							System.out.println("Successfully finished moving clan '" + _clan.getClanName() + "' to new home server!");
+						}
+						else
+						{
+							System.out.println("ERROR: Unable to successfully move clan to new home server!");
+						}
+					}
+				});
+	}
+
+}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerPage.java
new file mode 100644
index 000000000..a3ec73492
--- /dev/null
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerPage.java
@@ -0,0 +1,68 @@
+package mineplex.hub.server.ui.clans;
+
+import java.util.Collection;
+import java.util.List;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.DisplayButton;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.core.repository.ClanRepository;
+import mineplex.game.clans.core.repository.tokens.SimpleClanToken;
+import mineplex.hub.server.ServerInfo;
+import mineplex.hub.server.ServerManager;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+public class ClanMoveServerPage extends ShopPageBase<ServerManager, ClanMoveServerShop>
+{
+
+	//private DataRepository<PlayerServerInfo> _repository;	// Stores the name of the last Clans server a player was on
+	private ClanRepository _repository;
+	private SimpleClanToken _clan;
+	private int _accountId;
+	
+	public ClanMoveServerPage(ServerManager plugin, ClanMoveServerShop shop, CoreClientManager clientManager, 
+							DonationManager donationManager, Player player, ClanRepository repository, SimpleClanToken clan)
+	{
+		super(plugin, shop, clientManager, donationManager, "Clans Server Change", player, 27);
+
+		_repository = repository; 
+		_clan = clan;
+		_accountId = clientManager.getAccountId(player);
+		
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+		Collection<ServerInfo> servers = getPlugin().getServerList("Clans");
+		
+		int currentSlot = 9;
+		for (ServerInfo server : servers)
+		{
+			if (!server.Name.equalsIgnoreCase(_clan.getHomeServer()))
+			{
+				buildServerButton(currentSlot, server);
+				currentSlot++;
+			}
+		}
+		// TODO: Build a button for each available clans server to move clan to
+		// clicking the button should move the clan to the new server
+	}
+	
+	private void buildServerButton(int slot, ServerInfo server)
+	{
+		ClanMoveServerButton button = new ClanMoveServerButton(_repository, _clan, server.Name);
+		String title = C.Bold + C.cGold + "Move Clan To Server!";
+		String desc1 = C.cGold + "Server: " + C.cAqua + server.Name;
+		String desc2 = C.cGold + "Players: " + C.cAqua + server.CurrentPlayers + "/" + server.MaxPlayers;
+		ShopItem shopItem = new ShopItem(Material.DIAMOND_BLOCK, title, new String[] {" ", desc1, desc2, " "}, 0, true, true);
+		addButton(slot, shopItem, button);
+	}
+}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerShop.java
new file mode 100644
index 000000000..d8fb30e91
--- /dev/null
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerShop.java
@@ -0,0 +1,62 @@
+package mineplex.hub.server.ui.clans;
+
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.party.Party;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.core.repository.ClanRepository;
+import mineplex.game.clans.core.repository.tokens.SimpleClanToken;
+import mineplex.hub.server.ServerManager;
+
+public class ClanMoveServerShop extends ShopBase<ServerManager>
+{	
+
+	private ClanRepository _repository;
+	private SimpleClanToken _clan;
+	
+	public ClanMoveServerShop(ServerManager plugin, CoreClientManager clientManager, DonationManager donationManager,
+								SimpleClanToken clan)
+	{
+		super(plugin, clientManager, donationManager, "Move Clans Server");
+		
+		_repository = new ClanRepository(plugin.getPlugin(), plugin.getStatusManager().getCurrentServerName());
+		_clan = clan;
+	}
+ 
+	@Override
+	protected ShopPageBase<ServerManager, ? extends ShopBase<ServerManager>> buildPagesFor(Player player)
+	{
+		return new ClanMoveServerPage(getPlugin(), this, getClientManager(), getDonationManager(), player, _repository, _clan);
+	}
+
+	@Override
+	protected boolean canOpenShop(Player player)
+	{
+		Party party = getPlugin().getPartyManager().GetParty(player);
+		 
+		if (party != null) 
+		{  
+			player.playSound(player.getLocation(), Sound.ITEM_BREAK, 1, .6f);
+			player.sendMessage(F.main("Party", "You cannot join Clans while in a party."));
+			return false;
+		}
+		
+		return true;
+	}
+	
+	protected void openShopForPlayer(Player player)
+	{ 
+		getPlugin().getHubManager().GetVisibility().addHiddenPlayer(player);
+	}
+	
+	protected void closeShopForPlayer(Player player)
+	{ 
+		getPlugin().getHubManager().GetVisibility().removeHiddenPlayer(player);
+	}
+}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerPage.java
new file mode 100644
index 000000000..137fa6322
--- /dev/null
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerPage.java
@@ -0,0 +1,153 @@
+package mineplex.hub.server.ui.clans;
+
+import java.util.Collection;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.DisplayButton;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.core.repository.ClanRepository;
+import mineplex.game.clans.core.repository.tokens.SimpleClanToken;
+import mineplex.hub.server.ServerInfo;
+import mineplex.hub.server.ServerManager;
+import mineplex.hub.server.ui.button.JoinServerButton;
+import mineplex.serverdata.data.DataRepository;
+
+public class ClansServerPage extends ShopPageBase<ServerManager, ClansServerShop>
+{
+
+	//private DataRepository<PlayerServerInfo> _repository;	// Stores the name of the last Clans server a player was on
+	private ClanRepository _repository;
+	private int _accountId;
+	
+	public ClansServerPage(ServerManager plugin, ClansServerShop shop, CoreClientManager clientManager, 
+							DonationManager donationManager, Player player, ClanRepository repository)
+	{
+		super(plugin, shop, clientManager, donationManager, "Clans Alpha", player, 27);
+
+		_repository = repository;
+		_accountId = clientManager.getAccountId(player);
+		
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+		_repository.retrievePlayersClan(_accountId, new Callback<SimpleClanToken>()
+				{
+					@Override
+					public void run(SimpleClanToken data) 
+					{
+						if (data != null)
+						{
+							buildClanPage(data);
+						}
+						else
+						{
+							buildNoClanPage();
+						}
+					}
+				});
+	}
+	
+	private void buildClanPage(SimpleClanToken clan)
+	{
+		buildJoinHomeServer(clan);
+		
+//		if (isLeader(clan))
+//		{
+//			buildMoveClan(clan);
+//		}
+	}
+	
+	private void buildNoClanPage()
+	{
+		Collection<ServerInfo> servers = getPlugin().getServerList("Clans");
+
+		int currentSlot = 9;
+		for (ServerInfo server : servers)
+		{
+			buildJoinServer(currentSlot, server);
+			currentSlot++;
+		}
+	}
+	
+	private boolean isLeader(SimpleClanToken clan)
+	{
+		return clan.getClanRole().equalsIgnoreCase("Leader");
+	}
+	
+	private void buildJoinHomeServer(SimpleClanToken clan)
+	{
+		ServerInfo serverInfo = getServerInfo(clan.getHomeServer());
+		boolean serverOnline = (serverInfo != null);
+		String serverStatus = serverOnline ? C.cGreen + "Online" : C.cRed + "Offline";
+		
+		String title = (serverOnline ? C.cGreen : C.cRed) + C.Bold + "Join Home Server!";
+//		String description = C.cGold + "Join your home server, " + C.cAqua + clan.getHomeServer() + C.cGold + "!";
+		String serverName = C.cYellow + "Server Name: " + C.cWhite + clan.getHomeServer();
+		String serverDesc = C.cYellow + "Server Status: " + C.cWhite + serverStatus;
+		String players = (serverOnline ? C.cYellow + "Players: " + C.cWhite +  serverInfo.CurrentPlayers + "/" + serverInfo.MaxPlayers : "" );
+		String change = C.cRed + "Note: " + C.cWhite + "You must leave your Clan to ";
+		String change2 = C.cWhite + "play on a different Clans Server!";
+		ShopItem shopItem = new ShopItem(Material.EMERALD_BLOCK, title, new String[] {" ", serverName, serverDesc, players, " ", change, change2, " "}, 0, true, true);
+		addButton(13, shopItem, new JoinServerButton(this, getPlugin(), getServerInfo(clan.getHomeServer()), getPlayer()));
+	}
+	
+	private void buildJoinServer(int slot, ServerInfo server)
+	{
+		String title = C.cGreen + C.Bold + "Join Clans Server!";
+		String desc1 = C.cYellow + "Server Name " + C.cWhite + server.Name;
+		String desc2 = C.cYellow + "Players " + C.cWhite + server.CurrentPlayers + "/" + server.MaxPlayers;
+		String desc3 = C.cRed + "Note: " + C.cWhite + "Creating or Joining a clan on this";
+		String desc4 = C.cWhite + "server will set your Home Server!";
+
+		ShopItem shopItem = new ShopItem(Material.GOLD_BLOCK, title, new String[] {" ", desc1, desc2, " ", desc3, desc4}, 0, true, true);
+		addButton(slot, shopItem, new JoinServerButton(this, getPlugin(), server, getPlayer()));
+	}
+
+	/*
+	private void buildMoveClan(final SimpleClanToken clan)
+	{
+		// Build button for moving clan to another server
+		String title = C.cRed + C.Bold + "Change Clan's Home Server!";
+		String description = C.cGold + "Move your clan to another server!";
+		String desc2 = C.Bold + C.cRed + "Warning: " + ChatColor.RESET + C.cGold + "Changing your clan's";
+		String desc3 = C.cGold + "home server will permanently unclaim";
+		String desc4 = C.cGold + "your land and prevent you from";
+		String desc5 = C.cGold + "joining the original server.";
+		ShopItem shopItem = new ShopItem(Material.BOOK_AND_QUILL, title, new String[] {" ", description, desc2, desc3, desc4, desc5, " "}, 0, true, true);
+		
+		IButton button = new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType) 
+			{
+				ClanMoveServerShop shop = new ClanMoveServerShop(getPlugin(), getClientManager(), getDonationManager(), clan);
+				
+				if (!shop.attemptShopOpen(player))
+				{
+					playDenySound(player);
+				}
+			}
+		};
+		
+		addButton(26, shopItem, button);
+	}
+	*/
+	 
+	private ServerInfo getServerInfo(String serverName)
+	{
+		return getPlugin().getServerInfo(serverName);
+	}
+}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java
new file mode 100644
index 000000000..a3241e2cc
--- /dev/null
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java
@@ -0,0 +1,62 @@
+package mineplex.hub.server.ui.clans;
+
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.party.Party;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.game.clans.core.repository.ClanRepository;
+import mineplex.game.clans.core.repository.tokens.SimpleClanToken;
+import mineplex.hub.server.ServerManager;
+
+public class ClansServerShop extends ShopBase<ServerManager>
+{	
+
+	private ClanRepository _repository;
+	
+	public ClansServerShop(ServerManager plugin, CoreClientManager clientManager, DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager, "Clans Alpha");
+
+		_repository = new ClanRepository(plugin.getPlugin(), plugin.getStatusManager().getCurrentServerName());
+	}
+
+	@Override
+	protected ShopPageBase<ServerManager, ? extends ShopBase<ServerManager>> buildPagesFor(Player player)
+	{
+		return new ClansServerPage(getPlugin(), this, getClientManager(), getDonationManager(), player, _repository);
+	}
+
+	@Override
+	protected boolean canOpenShop(Player player)
+	{
+		Party party = getPlugin().getPartyManager().GetParty(player);
+		 
+		if (party != null) 
+		{  
+			player.playSound(player.getLocation(), Sound.ITEM_BREAK, 1, .6f);
+			player.sendMessage(F.main("Party", "You cannot join Clans while in a party."));
+			return false;
+		}
+		
+		return true;
+	}
+	
+	protected void openShopForPlayer(Player player)
+	{ 
+		getPlugin().getHubManager().GetVisibility().addHiddenPlayer(player);
+	}
+	
+	protected void closeShopForPlayer(Player player)
+	{ 
+		getPlugin().getHubManager().GetVisibility().removeHiddenPlayer(player);
+	}
+}
diff --git a/Plugins/Mineplex.MapParser/src/mineplex/mapparser/GameType.java b/Plugins/Mineplex.MapParser/src/mineplex/mapparser/GameType.java
index 5e71459e5..a6a4c2880 100644
--- a/Plugins/Mineplex.MapParser/src/mineplex/mapparser/GameType.java
+++ b/Plugins/Mineplex.MapParser/src/mineplex/mapparser/GameType.java
@@ -27,6 +27,7 @@ public enum GameType
 	Draw("Draw My Thing"),
 	Evolution("Evolution"),
 	FlappyBird("Flappy Bird"),
+	Gladiators("Gladiators"),
 	Gravity("Gravity"),
 	Halloween("Halloween Horror"),
 	HideSeek("Block Hunt"),
@@ -38,6 +39,7 @@ public enum GameType
 	MineStrike("MineStrike"),
 	MineWare("MineWare"),
 	MilkCow("Milk the Cow"),
+	MonsterLeague("MonsterLeague"),
 	MonsterMaze("Monster Maze"),
 	Paintball("Super Paintball"),
 	Quiver("One in the Quiver"),
diff --git a/Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java b/Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
index a33e9f6d7..88522f513 100644
--- a/Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
+++ b/Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
@@ -160,6 +160,7 @@ public class MapParser extends JavaPlugin implements Listener
 				player.addAttachment(plugin, "worldedit.*", hasPermission);
 				player.addAttachment(plugin, "voxelsniper.sniper", hasPermission);
 				player.addAttachment(plugin, "voxelsniper.brush.*", hasPermission);
+				player.addAttachment(plugin, "coloredsigns.format", hasPermission);
 			}
 
 			_permissionMap.put(player, hasPermission);
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClassManager.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClassManager.java
index c2b817e81..da87fc2da 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClassManager.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClassManager.java
@@ -315,6 +315,11 @@ public class ClassManager extends MiniClientPlugin<ClientClass> implements IClas
 	{
 		return _skillFactory;
 	}
+	
+	public ItemFactory GetItemFactory()
+	{
+		return _itemFactory;
+	}
 
 	@Override
 	protected ClientClass AddPlayer(String player)
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
index 57c9f51a6..74e19ca6d 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
@@ -17,9 +17,11 @@ import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
 import mineplex.core.donation.Donor;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
+import mineplex.minecraft.game.classcombat.Class.event.ClassEquipEvent;
 import mineplex.minecraft.game.classcombat.Class.repository.token.ClientClassToken;
 import mineplex.minecraft.game.classcombat.Class.repository.token.CustomBuildToken;
 import mineplex.minecraft.game.classcombat.Class.repository.token.SlotToken;
@@ -141,6 +143,9 @@ public class ClientClass
 	    	{
 	    		if (slotToken == null)
 	    			continue;
+
+				if (slotToken.Name == null)
+					continue;
 	    		
 	    		if (slotToken.Material == null)
 	    			continue;
@@ -148,7 +153,10 @@ public class ClientClass
 	    		if (slotToken.Material.isEmpty())
 	    			continue;
 	    		
-	    		itemTokenUsage += _itemFactory.GetItem(slotToken.Name.equalsIgnoreCase("Cobweb") ? "Web" : slotToken.Name).getTokenCost();
+	    		if (_itemFactory.GetItem("Cobweb".equalsIgnoreCase(slotToken.Name) ? "Web" : slotToken.Name) != null)
+	    		{
+	    			itemTokenUsage += _itemFactory.GetItem("Cobweb".equalsIgnoreCase(slotToken.Name) ? "Web" : slotToken.Name).getTokenCost();
+	    		}
 	    	}
 	    	
 	    	itemTokenUsage += buildToken.ItemTokens;
@@ -337,7 +345,16 @@ public class ClientClass
 		}
 		
 		ResetToDefaults(!skillsOnly, !skillsOnly);
-
+		
+		// Event
+		ClassEquipEvent event = new ClassEquipEvent(this, customBuild, _client.GetPlayer());
+		UtilServer.getServer().getPluginManager().callEvent(event);
+		
+		if (event.isCancelled())
+		{
+			return;
+		}
+		
 		if (notify)
 		{
 			ListSkills(_client.GetPlayer());
@@ -461,13 +478,21 @@ public class ClientClass
 	{
 		return _gameClass;
 	}
-    
-	public boolean IsGameClass(ClassType type) 
+
+	public boolean IsGameClass(ClassType... types)
 	{
 		if (GetGameClass() == null)
 			return false;
 
-		return GetGameClass().GetType() == type;
+		for (ClassType type : types)
+		{
+			if (type == GetGameClass().GetType())
+			{
+				return true;
+			}
+		}
+
+		return false;
 	}
 	
 	public Collection<ISkill> GetSkills() 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/PvpClass.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/PvpClass.java
index 8be18e9d1..488942a3e 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/PvpClass.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/PvpClass.java
@@ -5,8 +5,10 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import mineplex.core.common.util.Callback;
 import mineplex.core.common.util.UtilGear;
+import mineplex.core.common.util.UtilServer;
 import mineplex.core.gadget.types.GadgetType;
 import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.minecraft.game.classcombat.Class.event.ClassEquipEvent;
 import mineplex.minecraft.game.classcombat.Class.repository.token.CustomBuildToken;
 import mineplex.minecraft.game.classcombat.Skill.ISkill;
 
@@ -196,11 +198,12 @@ public class PvpClass implements IPvpClass
 						continue;
 				}
 				
-				if (_classes.getGadgetManager().getActive(cur, GadgetType.Costume) != null)
+				if (_classes.getGadgetManager() != null && _classes.getGadgetManager().getActive(cur, GadgetType.Costume) != null)
 					continue;
 			
 				Equip(cur, _classes.getMessageSuppressedCallback(cur.getName()) == null);
-				_classes.getMessageSuppressedCallback(cur.getName()).run(cur.getName());
+				Callback<String> callback = _classes.getMessageSuppressedCallback(cur.getName());
+				if (callback != null) callback.run(cur.getName());
 			}
 		}
 	}
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/event/ClassEquipEvent.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/event/ClassEquipEvent.java
new file mode 100644
index 000000000..70d64a1b6
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/event/ClassEquipEvent.java
@@ -0,0 +1,62 @@
+package mineplex.minecraft.game.classcombat.Class.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.minecraft.game.classcombat.Class.ClientClass;
+import mineplex.minecraft.game.classcombat.Class.repository.token.CustomBuildToken;
+
+public class ClassEquipEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+	
+	private ClientClass _client;
+	private Player _user;
+	private CustomBuildToken _build;
+	
+	private boolean _cancelled;
+	
+	public ClassEquipEvent(ClientClass client, CustomBuildToken build, Player user)
+	{
+		_client = client;
+		_build = build;
+		_user = user;
+	}
+	
+	public ClientClass getPlayer()
+	{
+		return _client;
+	}
+	
+	public CustomBuildToken getBuild()
+	{
+		return _build;
+	}
+	
+	public Player getUser()
+	{
+		return _user;
+	}
+	
+	public void setCancelled(boolean cancelled)
+	{
+		_cancelled = cancelled;
+	}
+	
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+	
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Condition/SkillConditionEffect.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Condition/SkillConditionEffect.java
index 732ffb15a..b5dcbc455 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Condition/SkillConditionEffect.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Condition/SkillConditionEffect.java
@@ -1,8 +1,11 @@
 package mineplex.minecraft.game.classcombat.Condition;
 
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.condition.ConditionEffect;
 import mineplex.minecraft.game.core.condition.ConditionManager;
 import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Assassin.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Assassin.java
index 62dc3852b..ce716640a 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Assassin.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Assassin.java
@@ -90,6 +90,13 @@ public class Assassin extends Skill
 		event.AddMod(null, GetName(), -1.5, false);
 	}
 	
+	@EventHandler
+	public void CancelEnergy(EnergyEvent event)
+	{
+		if (getLevel(event.GetPlayer()) > 0)
+			event.setCancelled(true);
+	}
+	
 	@Override
 	public void Reset(Player player) 
 	{
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java
index d4e2ffb3d..7aecaade1 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java
@@ -2,6 +2,7 @@ package mineplex.minecraft.game.classcombat.Skill.Assassin;
 
 import java.util.HashMap;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -26,6 +27,7 @@ import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.minecraft.game.classcombat.Skill.SkillActive;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.classcombat.Skill.event.SkillTeleportEvent;
 
 public class Blink extends SkillActive
 {
@@ -65,12 +67,18 @@ public class Blink extends SkillActive
 			UtilPlayer.message(player, F.main(GetClassType().name(), "You cannot use " + F.skill(GetName()) + " while Slowed."));
 			return false;
 		}
-
-		if (player.getLocation().getBlock().getTypeId() == 8 || player.getLocation().getBlock().getTypeId() == 9)
+		else if (player.getLocation().getBlock().getTypeId() == 8 || player.getLocation().getBlock().getTypeId() == 9)
 		{
 			UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water."));
 			return false;
 		}
+		
+		// Check to see if teleporting event is valid
+		Location destination = getDestination(player, getMaxRange(player));
+		SkillTeleportEvent teleportEvent = new SkillTeleportEvent(player, destination);
+		Bukkit.getPluginManager().callEvent(teleportEvent);
+		
+		if (teleportEvent.isCancelled()) return false;	// Teleport cancelled
 
 		//Deblink
 		if (_loc.containsKey(player) && _blinkTime.containsKey(player))
@@ -92,7 +100,7 @@ public class Blink extends SkillActive
 		//Smoke Trail
 		Block lastSmoke = player.getLocation().getBlock();
 
-		double maxRange = 9 + (level*3);
+		double maxRange = getMaxRange(player);
 		double curRange = 0;
 		while (curRange <= maxRange)
 		{
@@ -138,7 +146,7 @@ public class Blink extends SkillActive
 			curRange = 0;
 
 		//Destination
-		Location loc = player.getLocation().add(player.getLocation().getDirection().multiply(curRange).add(new Vector(0, 0.4, 0)));
+		Location loc = getDestination(player, curRange);
 		_loc.put(player, player.getLocation());
 
 		//Action
@@ -212,4 +220,14 @@ public class Blink extends SkillActive
 		_loc.remove(player);
 		_blinkTime.remove(player);
 	}
+	
+	private double getMaxRange(Player player)
+	{
+		return 9 + (getLevel(player) * 3);
+	}
+	
+	private Location getDestination(Player player, double range)
+	{
+		return player.getLocation().add(player.getLocation().getDirection().multiply(range).add(new Vector(0, 0.4, 0)));
+	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java
index 4bbff3d67..c00d10c69 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java
@@ -1,6 +1,8 @@
 package mineplex.minecraft.game.classcombat.Skill.Assassin;
 
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 
 import org.bukkit.Effect;
 import org.bukkit.Location;
@@ -24,6 +26,7 @@ import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.minecraft.game.classcombat.Skill.SkillActive;
@@ -31,7 +34,7 @@ import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
 
 public class Evade extends SkillActive
 {
-	private HashSet<Player> _active = new HashSet<Player>();
+	private HashMap<Player, Long> _active = new HashMap<Player, Long>();
 
 	public Evade(SkillFactory skills, String name, ClassType classType, SkillType skillType, 
 			int cost, int levels, 
@@ -56,12 +59,6 @@ public class Evade extends SkillActive
 				});
 	}
 	
-	@Override
-	public String GetEnergyString()
-	{
-		return "Energy: #26#-2 and #18#-2 per Second";
-	}
-
 	@Override
 	public boolean CustomCheck(Player player, int level) 
 	{
@@ -77,36 +74,12 @@ public class Evade extends SkillActive
 	@Override
 	public void Skill(Player player, int level) 
 	{
-		_active.add(player);
+		_active.put(player, System.currentTimeMillis());
 
 		//Inform
 		UtilPlayer.message(player, F.main(GetClassType().name(), "You prepared to " + F.skill(GetName()) + "."));
 	}
 
-	@EventHandler
-	public void Energy(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.TICK)
-			return;
-
-		for (Player cur : GetUsers())
-		{
-			if (!_active.contains(cur))
-				continue;
-
-			if (!cur.isBlocking())
-			{
-				_active.remove(cur);
-				continue;
-			}
-
-			if (!Factory.Energy().Use(cur, GetName(), 0.9 - (getLevel(cur) * 0.1), true, true))
-			{
-				_active.remove(cur);
-			}
-		}
-	}
-
 	@EventHandler(priority = EventPriority.NORMAL)
 	public void Damage(CustomDamageEvent event)
 	{
@@ -125,7 +98,7 @@ public class Evade extends SkillActive
 			return;
 
 		//Active
-		if (!_active.contains(damagee))
+		if (!_active.containsKey(damagee))
 			return;
 
 		//Damager
@@ -136,9 +109,6 @@ public class Evade extends SkillActive
 		int level = getLevel(damagee);
 		if (level == 0)			return;
 
-		if (!mineplex.core.recharge.Recharge.Instance.use(damagee, GetName(), 500, false, false))
-			return;
-
 		//Cancel
 		event.SetCancelled(GetName());
 		
@@ -230,4 +200,24 @@ public class Evade extends SkillActive
 	{
 		_active.remove(player);
 	}
+	
+	@EventHandler
+	public void clean(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		Iterator<Player> activeIter = _active.keySet().iterator();
+		
+		while (activeIter.hasNext())
+		{
+			Player player = activeIter.next();
+			
+			if (!player.isOnline() || !player.isBlocking() || UtilTime.elapsed(_active.get(player), 750))
+			{
+				activeIter.remove();
+				UtilPlayer.message(player, F.main(GetClassType().name(), "You failed to " + F.skill(GetName()) + "."));
+			}
+		}
+	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java
index dbad68ca0..0496fe670 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java
@@ -2,6 +2,7 @@ package mineplex.minecraft.game.classcombat.Skill.Assassin;
 
 import java.util.HashMap;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -25,6 +26,7 @@ import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.minecraft.game.classcombat.Skill.SkillActive;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.classcombat.Skill.event.SkillTeleportEvent;
 
 public class Flash extends SkillActive
 {
@@ -72,6 +74,13 @@ public class Flash extends SkillActive
 			UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water."));
 			return false;
 		}
+		
+		// Check to see if teleporting event is valid
+		Location destination = getDestination(player, getMaxRange(player));
+		SkillTeleportEvent teleportEvent = new SkillTeleportEvent(player, destination);
+		Bukkit.getPluginManager().callEvent(teleportEvent);
+		
+		if (teleportEvent.isCancelled()) return false;	// Teleport cancelled
 
 		//No Flash
 		if (!_flash.containsKey(player) || _flash.get(player) == 0)
@@ -120,7 +129,7 @@ public class Flash extends SkillActive
 
 		_flash.put(player, _flash.get(player) - 1);
 
-		double maxRange = 6;
+		double maxRange = getMaxRange(player);
 		double curRange = 0;
 		while (curRange <= maxRange)
 		{
@@ -144,7 +153,7 @@ public class Flash extends SkillActive
 			curRange = 0;
 
 		//Destination
-		Location loc = player.getLocation().add(player.getLocation().getDirection().multiply(curRange).add(new Vector(0, 0.4, 0)));
+		Location loc = getDestination(player, curRange);
 
 		if (curRange > 0)
 			player.teleport(loc);
@@ -165,4 +174,14 @@ public class Flash extends SkillActive
 	{
 		_flash.remove(player);
 	}
+	
+	private double getMaxRange(Player player)
+	{
+		return 6;
+	}
+	
+	private Location getDestination(Player player, double range)
+	{
+		return player.getLocation().add(player.getLocation().getDirection().multiply(range).add(new Vector(0, 0.4, 0)));
+	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
index 2d687d6dc..82cd557fd 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
@@ -15,16 +15,14 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.metadata.FixedMetadataValue;
 
 import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAction;
-import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilMath;
@@ -33,8 +31,6 @@ import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
-import mineplex.core.common.util.UtilWorld;
-import mineplex.core.disguise.disguises.DisguisePig;
 import mineplex.core.disguise.disguises.DisguisePlayer;
 import mineplex.minecraft.game.classcombat.Skill.SkillActive;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
@@ -77,12 +73,6 @@ public class Illusion extends SkillActive
 		setAchievementSkill(true);
 	}
 	
-	@Override
-	public String GetEnergyString()
-	{
-		return "Energy: #40#-3 and #12.5#-0.5 per Second";
-	}
-
 	@Override
 	public boolean CustomCheck(Player player, int level) 
 	{
@@ -107,8 +97,8 @@ public class Illusion extends SkillActive
 		UtilEnt.Vegetate(skel);
 		UtilEnt.silence(skel, true);
 		
-		skel.setMaxHealth(7);
-		skel.setHealth(7);
+		skel.setMaxHealth(14);
+		skel.setHealth(14);
 		
 		ClassCombatCreatureAllowSpawnEvent disableEvent = new ClassCombatCreatureAllowSpawnEvent(false);
 		UtilServer.getServer().getPluginManager().callEvent(disableEvent);
@@ -152,8 +142,8 @@ public class Illusion extends SkillActive
 			Skeleton skel = _active.get(cur);
 			
 			if (Factory.Condition().GetActiveCondition(cur, ConditionType.CLOAK) == null || 
-				!cur.isBlocking() || 
-				!Factory.Energy().Use(cur, GetName(), 0.625 - (getLevel(cur) * 0.025), true, true) ||
+				!UtilPlayer.isBlocking(cur) || 
+				//!Factory.Energy().Use(cur, GetName(), 0.625 - (getLevel(cur) * 0.025), true, true) ||
 				skel == null ||
 				!skel.isValid())
 			{
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Leap.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Leap.java
index fc7e830f3..37dc508e6 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Leap.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Leap.java
@@ -39,8 +39,8 @@ public class Leap extends SkillActive
 				"Take a great leap forwards.",
 				"",	
 				"Wall Kick by using Leap with your",
-				"back against a wall. This uses no",
-				"Energy or Recharge.",
+				"back against a wall. This doesn't",
+				"trigger Leaps Recharge.",
 				"",
 				"Cannot be used while Slowed."
 				});
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java
index 615508a77..e2ec6e686 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java
@@ -197,6 +197,30 @@ public class MarkedForDeath extends SkillActive
 			if (arrow.isDead() || !arrow.isValid() || arrow.isOnGround())
 				arrowIterator.remove();
 		}
+		
+		for (Iterator<Player> activeIterator = _active.iterator(); activeIterator.hasNext();) 
+		{
+			Player player = activeIterator.next();
+			
+			if (!player.isOnline())
+				activeIterator.remove();
+		}
+		
+		for (Iterator<LivingEntity> markedTimeIterator = _markedTime.keySet().iterator(); markedTimeIterator.hasNext();) 
+		{
+			LivingEntity markedTime = markedTimeIterator.next();
+			
+			if (markedTime.isDead() || !markedTime.isValid())
+				markedTimeIterator.remove();
+		}
+		
+		for (Iterator<LivingEntity> markedDamageIterator = _markedDamage.keySet().iterator(); markedDamageIterator.hasNext();) 
+		{
+			LivingEntity markedDamage = markedDamageIterator.next();
+			
+			if (markedDamage.isDead() || !markedDamage.isValid())
+				markedDamageIterator.remove();
+		}
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java
index a59cee5da..7aa2a2253 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java
@@ -41,8 +41,9 @@ public class Recall extends Skill
 				{
 				"Drop Axe/Sword to Use.",
 				"",
-				"Instantly teleport back to where",
-				"you were #2#2 seconds ago.",
+				"Go back in time #2#2 seconds,",
+				"restoring your location and",
+				"up to #3#1 health."
 				});
 	}
 
@@ -85,7 +86,8 @@ public class Recall extends Skill
 			return;
 		
 		//Heal
-		player.setHealth(health.getLast());
+		double newHealth = Math.min(health.getLast(), player.getHealth() + 3 + level);
+		player.setHealth(newHealth);
 		
 		//Effect
 		player.getWorld().playSound(player.getLocation(), Sound.ZOMBIE_UNFECT, 2f, 2f);
@@ -144,5 +146,6 @@ public class Recall extends Skill
 	public void Reset(Player player) 
 	{
 		_locMap.remove(player);
+		_healthMap.remove(player);
 	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/ViperStrikes.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/ViperStrikes.java
index 4aa671db0..7cac7e593 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/ViperStrikes.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/ViperStrikes.java
@@ -22,7 +22,8 @@ public class ViperStrikes extends Skill
 		SetDesc(new String[] 
 				{
 				"Your attacks give enemies",
-				"Poison 1 for #1#2 seconds."
+				"Shock, Slow 1 and Poison 1",
+				"for #0#1 seconds."
 				});
 	}
 
@@ -48,10 +49,8 @@ public class ViperStrikes extends Skill
 		if (damagee == null)	return;
 
 		//Confuse
-		Factory.Condition().Factory().Poison(GetName(), damagee, damager, 1 + 2*level, 0, false, false, false);
-
-		//Damage
-		//event.AddMod(damager.getName(), GetName(), -1 - level, true);
+		Factory.Condition().Factory().PoisonShock(GetName(), damagee, damager, level, false);
+		Factory.Condition().Factory().Slow(GetName(), damagee, damager, level, 0, false, false, true, false);
 		
 		//Sound
 		damager.getWorld().playSound(damager.getLocation(), Sound.SPIDER_IDLE, 1f, 2f);
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
index 6332794e1..e7fcc5bd5 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
@@ -37,6 +37,8 @@ import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.minecraft.game.classcombat.Skill.SkillCharge;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.classcombat.Skill.event.BlockTossExpireEvent;
+import mineplex.minecraft.game.classcombat.Skill.event.BlockTossLandEvent;
 import mineplex.minecraft.game.classcombat.Skill.event.SkillEvent;
 import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
@@ -46,6 +48,22 @@ public class BlockToss extends SkillCharge implements IThrown
 	private HashMap<Player, FallingBlock> _holding = new HashMap<Player, FallingBlock>();
 	private HashMap<FallingBlock, Player> _falling = new HashMap<FallingBlock, Player>();
 
+	private Material[] _blacklist = new Material[]
+			{
+				Material.TNT,
+				Material.IRON_DOOR,
+				Material.IRON_DOOR_BLOCK,
+				Material.WOOD_DOOR,
+				Material.WOODEN_DOOR,
+				Material.ENCHANTMENT_TABLE,
+				Material.CHEST,
+				Material.FURNACE,
+				Material.BURNING_FURNACE,
+				Material.WORKBENCH,
+				Material.WATER,
+				Material.LAVA
+			};
+
 	public BlockToss(SkillFactory skills, String name, ClassType classType, SkillType skillType, int cost, int levels) 
 	{
 		super(skills, name, classType, skillType, cost, levels,
@@ -64,7 +82,7 @@ public class BlockToss extends SkillCharge implements IThrown
 	@Override
 	public String GetRechargeString()
 	{
-		return "Recharge: " + "#" + UtilMath.trim(1, 4000/1000d) + "#" + UtilMath.trim(1, -500/1000d) + " Seconds";
+		return "Recharge: " + "#4#-0.5 Seconds";
 	}
 
 	@EventHandler
@@ -92,6 +110,10 @@ public class BlockToss extends SkillCharge implements IThrown
 		int level = getLevel(player);
 		if (level == 0)		return;
 		
+		//Recharge
+		if (!Recharge.Instance.usable(player, GetName()))
+			return;
+		
 		//Water
 		if (player.getLocation().getBlock().getTypeId() == 8 || player.getLocation().getBlock().getTypeId() == 9)
 		{
@@ -100,11 +122,16 @@ public class BlockToss extends SkillCharge implements IThrown
 		}
 	
 		Block grab = event.getClickedBlock();
-	
-		//Recharge
-		if (!Recharge.Instance.use(player, GetName(), 1000, false, false))
+
+		//Blacklist
+		for (Material mat : _blacklist)
+			if (mat == grab.getType())
+				return;
+
+		//Usable
+		if (UtilBlock.usable(grab))
 			return;
-		
+
 		//Door and Banner
 		if (grab.getRelative(BlockFace.UP).getTypeId() == 64 || grab.getRelative(BlockFace.UP).getTypeId() == 71 || grab.getRelative(BlockFace.UP).getType() == Material.STANDING_BANNER)
 		{
@@ -137,7 +164,7 @@ public class BlockToss extends SkillCharge implements IThrown
 		    }
 		}
 		
-		if (Factory.BlockRestore().Contains(grab))
+		if (Factory.BlockRestore().contains(grab))
 		{
 			UtilPlayer.message(player, F.main(GetName(), "You cannot grab this block."));
 			return;
@@ -145,6 +172,7 @@ public class BlockToss extends SkillCharge implements IThrown
 
 		//Block to Item
 		FallingBlock block  = player.getWorld().spawnFallingBlock(player.getEyeLocation(), event.getClickedBlock().getType(), event.getClickedBlock().getData());
+		block.setDropItem(false);
 
 		//Action
 		player.eject();
@@ -202,6 +230,9 @@ public class BlockToss extends SkillCharge implements IThrown
 
 		for (Player cur : throwSet)
 		{
+			Recharge.Instance.recharge(cur, GetName());
+			Recharge.Instance.use(cur, GetName(), 4000 - (500 * getLevel(cur)), false, true);
+			
 			FallingBlock block = _holding.remove(cur);
 			float charge = _charge.remove(cur);
 			
@@ -250,6 +281,7 @@ public class BlockToss extends SkillCharge implements IThrown
 			FallingBlock thrown = (FallingBlock) data.GetThrown();
 
 			FallingBlock newThrown  = data.GetThrown().getWorld().spawnFallingBlock(data.GetThrown().getLocation(), thrown.getMaterial(), thrown.getBlockData());
+			newThrown.setDropItem(false);
 
 			//Remove Old
 			_falling.remove(thrown);
@@ -303,7 +335,13 @@ public class BlockToss extends SkillCharge implements IThrown
 			
 			fallIter.remove();
 
-			createBlock(fall, fall.getLocation().getBlock());
+			Block block = fall.getLocation().getBlock();
+
+			// Call and trigger block expiry event
+			BlockTossExpireEvent expireEvent = new BlockTossExpireEvent(block);
+			Bukkit.getServer().getPluginManager().callEvent(expireEvent);
+
+			if (!expireEvent.isCancelled()) createBlock(fall, block);
 		}
 	}
 	
@@ -318,12 +356,30 @@ public class BlockToss extends SkillCharge implements IThrown
 		if (id == 13)	id = Material.STONE.getId();
 		
 		//Block Replace
-		Factory.BlockRestore().Add(block, id, (byte)0, 10000);
+		Factory.BlockRestore().add(block, id, (byte)0, 10000);
 
 		//Effect
 		block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, block.getTypeId());
 	}
 
+	@EventHandler
+	public void onBlockLand(EntityChangeBlockEvent event)
+	{
+		if (event.getEntity() instanceof FallingBlock)
+		{
+			if (!event.getBlock().getType().isSolid())	// Falling block is landing and turning block from air to type
+			{
+				BlockTossLandEvent landEvent = new BlockTossLandEvent(event.getBlock());
+				Bukkit.getServer().getPluginManager().callEvent(landEvent);
+
+				if (landEvent.isCancelled())
+				{
+					event.setCancelled(true);
+				}
+			}
+		}
+	}
+
 	@EventHandler
 	public void ItemSpawn(ItemSpawnEvent event)
 	{
@@ -331,17 +387,17 @@ public class BlockToss extends SkillCharge implements IThrown
 
 		if (
 				id != 1 &&
-				id != 2 &&
-				id != 3 &&
-				id != 4 &&
-				id != 12 &&
-				id != 13 &&
-				id != 80) 
+						id != 2 &&
+						id != 3 &&
+						id != 4 &&
+						id != 12 &&
+						id != 13 &&
+						id != 80)
 			return;
 
 		for (FallingBlock block : _falling.keySet())
 			if (UtilMath.offset(event.getEntity().getLocation(), block.getLocation()) < 1)
-				event.setCancelled(true);	
+				event.setCancelled(true);
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Brute.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Brute.java
index 573fa3ff8..63a98526a 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Brute.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Brute.java
@@ -10,8 +10,9 @@ import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import mineplex.minecraft.game.classcombat.Skill.Skill;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.classcombat.Skill.Global.BowDeficiencySkill;
 
-public class Brute extends Skill
+public class Brute extends BowDeficiencySkill
 {
 	public Brute(SkillFactory skills, String name, ClassType classType, SkillType skillType, int cost, int levels) 
 	{
@@ -43,25 +44,10 @@ public class Brute extends Skill
 		event.SetBrute();
 	}
 	
-	@EventHandler
-	public void BowShoot(EntityShootBowEvent event)
-	{
-		if (getLevel(event.getEntity()) == 0)
-			return;
-		
-		event.getProjectile().setVelocity(event.getProjectile().getVelocity().multiply(0.75));
-	}
-	
 	@EventHandler
 	public void CancelEnergy(EnergyEvent event)
 	{
 		if (getLevel(event.GetPlayer()) > 0)
 			event.setCancelled(true);
 	}
-	
-	@Override
-	public void Reset(Player player) 
-	{
-
-	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Colossus.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Colossus.java
index 8b8ead16e..4a358dfde 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Colossus.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Colossus.java
@@ -36,7 +36,7 @@ public class Colossus extends Skill
 
 		//Damage
 		event.AddMod(damagee.getName(), GetName(), 0, false);
-		event.AddKnockback(GetName(), 0.35);
+		event.AddKnockback(GetName(), 0.65);
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java
index 7421e96c6..915c78b7a 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java
@@ -14,6 +14,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.vehicle.VehicleExitEvent;
+import org.spigotmc.event.entity.EntityDismountEvent;
 
 import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
@@ -115,19 +116,23 @@ public class DwarfToss extends SkillActive
 		return true;
 	}
 	
+	//getEntity is the vehicle
 	@EventHandler
-	public void PreventDismount(VehicleExitEvent event)
+	public void PreventDismount(EntityDismountEvent event)
 	{
 		if (event.isCancelled())
 			return;
 		
-		if (!(event.getExited() instanceof Player))
+		System.out.println(UtilEnt.getName(event.getDismounted()));
+		System.out.println(UtilEnt.getName(event.getEntity()));
+		
+		if (!(event.getDismounted() instanceof Player))
 			return;
 		
-		if (!(event.getVehicle() instanceof Player))
+		if (!(event.getEntity() instanceof Player))
 			return;
 		
-		if (_holding.containsKey((Player)event.getVehicle()) && _holding.get((Player)event.getVehicle()) == event.getExited())
+		if (_holding.containsKey((Player)event.getEntity()) && _holding.get((Player)event.getEntity()) == event.getDismounted())
 			event.setCancelled(true);
 	}
 
@@ -293,7 +298,7 @@ public class DwarfToss extends SkillActive
 			}
 
 			//Expire 
-			if (!cur.isBlocking() || System.currentTimeMillis() - _time.get(cur) > 5000)
+			if (!UtilPlayer.isBlocking(cur) || System.currentTimeMillis() - _time.get(cur) > 5000)
 			{
 				throwSet.add(cur);
 			}			
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/FleshHook.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/FleshHook.java
index 2c1d7a8b3..ca77c5908 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/FleshHook.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/FleshHook.java
@@ -3,6 +3,7 @@ package mineplex.minecraft.game.classcombat.Skill.Brute;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -25,6 +26,7 @@ import mineplex.core.common.util.UtilServer;
 import mineplex.minecraft.game.classcombat.Skill.SkillActiveCharge;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
 import mineplex.minecraft.game.classcombat.Skill.event.SkillEvent;
+import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
 
 public class FleshHook extends SkillActiveCharge implements IThrown
 {
@@ -92,7 +94,7 @@ public class FleshHook extends SkillActiveCharge implements IThrown
 			if (level == 0)			return;
 
 			//Add Charge
-			if (cur.isBlocking())
+			if (UtilPlayer.isBlocking(cur))
 			{
 				Charge(cur);
 			}
@@ -138,6 +140,11 @@ public class FleshHook extends SkillActiveCharge implements IThrown
 
 		if (target == null)
 			return;
+		
+		SkillTriggerEvent triggerEvent = new SkillTriggerEvent(player , GetName(), GetClassType(), target);
+		UtilServer.getServer().getPluginManager().callEvent(triggerEvent);
+		
+		if (triggerEvent.IsCancelled()) return;
 
 		//Pull
 		UtilAction.velocity(target, 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Global/BowDeficiencySkill.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Global/BowDeficiencySkill.java
new file mode 100644
index 000000000..9f5978423
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Global/BowDeficiencySkill.java
@@ -0,0 +1,57 @@
+package mineplex.minecraft.game.classcombat.Skill.Global;
+
+import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
+import mineplex.minecraft.game.classcombat.Skill.Skill;
+import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityShootBowEvent;
+
+/**
+ * The BowDeficiencySkill provides a reduction in overall arrow velocity and damage to owners.
+ * @author MrTwiggy
+ *
+ */
+public class BowDeficiencySkill extends Skill
+{
+
+	public BowDeficiencySkill(SkillFactory skills, String name, ClassType classType, SkillType skillType, int cost, int maxLevel) 
+	{
+		super(skills, name, classType, skillType, cost, maxLevel);
+	}
+
+	/**
+	 * Reduce outgoing arrow velocity by bow deficiency owners.
+	 * @param event
+	 */
+	@EventHandler
+	public void BowShoot(EntityShootBowEvent event)
+	{
+		if (getLevel(event.getEntity()) == 0)
+			return;
+		
+		event.getProjectile().setVelocity(event.getProjectile().getVelocity().multiply(0.75));
+	}
+	
+	/**
+	 * Reduce damage output of arrows shot by bow deficiency owners.
+	 * @param event
+	 */
+	@EventHandler
+	public void onArrowDamage(CustomDamageEvent event)
+	{
+		// Check to see if arrow was shot by owner of this Skill.
+		if (event.GetProjectile() == null || getLevel(event.GetDamagerEntity(true)) == 0)
+			return;
+		
+		event.AddMod("BowDeficiencySkill", -2.0d);
+	}
+
+	@Override
+	public void Reset(Player player)
+	{
+		
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/BullsCharge.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/BullsCharge.java
index e74fee18b..80d60b3ca 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/BullsCharge.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/BullsCharge.java
@@ -3,7 +3,6 @@ package mineplex.minecraft.game.classcombat.Skill.Knight;
 import org.bukkit.Effect;
 import org.bukkit.Material;
 import org.bukkit.Sound;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HoldPosition.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HoldPosition.java
index 7eeb4d866..c60df3d8f 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HoldPosition.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HoldPosition.java
@@ -7,8 +7,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
 
 import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
@@ -44,7 +42,7 @@ public class HoldPosition extends SkillActive
 		SetDesc(new String[] 
 				{
 				"Hold your position, gaining",
-				"Protection 3, Slow 4 and no",
+				"Protection 3, Slow 3 and no",
 				"knockback for #3#1 seconds."
 				});
 	}
@@ -69,7 +67,7 @@ public class HoldPosition extends SkillActive
 		//Action
 		Factory.Condition().Factory().Slow(GetName(), player, player, duration, 2, false, true, false, true);
 		Factory.Condition().Factory().Protection(GetName(), player, player, duration, 2, false, false, true);
-		Factory.Condition().Factory().Jump(GetName(), player, player, duration, 250, false, false, true);
+		Factory.Condition().Factory().ArcadeHungerDisable(GetName(), player, player, duration, false);
 
 		//Inform
 		UtilPlayer.message(player, F.main(GetClassType().name(), "You used " + F.skill(GetName(level)) + "."));
@@ -119,6 +117,9 @@ public class HoldPosition extends SkillActive
 			UtilParticle.PlayParticle(ParticleType.MOB_SPELL, player.getLocation(), 
 					(float)(Math.random() - 0.5), 0.2f + (float)(Math.random() * 1), (float)(Math.random() - 0.5), 0, 3 + getLevel(player),
 					ViewDist.NORMAL, UtilServer.getPlayers());
+			
+			player.setFoodLevel(2);
+			player.setSprinting(false);
 		}
 	}
 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Knight.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Knight.java
index eff3aec2f..d837b2732 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Knight.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Knight.java
@@ -8,8 +8,9 @@ import mineplex.core.energy.event.EnergyEvent;
 import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
 import mineplex.minecraft.game.classcombat.Skill.Skill;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.classcombat.Skill.Global.BowDeficiencySkill;
 
-public class Knight extends Skill
+public class Knight extends BowDeficiencySkill
 {
 	public Knight(SkillFactory skills, String name, ClassType classType, SkillType skillType, int cost, int levels) 
 	{
@@ -20,15 +21,6 @@ public class Knight extends Skill
 				"25% reduction in Arrow Velocity."
 				});
 	}
-	
-	@EventHandler
-	public void BowShoot(EntityShootBowEvent event)
-	{
-		if (getLevel(event.getEntity()) == 0)
-			return;
-		
-		event.getProjectile().setVelocity(event.getProjectile().getVelocity().multiply(0.75));
-	}
 
 	@EventHandler
 	public void CancelEnergy(EnergyEvent event)
@@ -36,10 +28,4 @@ public class Knight extends Skill
 		if (getLevel(event.GetPlayer()) > 0)
 			event.setCancelled(true);
 	}
-	
-	@Override
-	public void Reset(Player player)
-	{
-
-	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Riposte.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Riposte.java
index 5aa4ce028..50cdc4b7e 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Riposte.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Riposte.java
@@ -119,7 +119,7 @@ public class Riposte extends SkillActive
 			//Effect
 			damager.getWorld().playSound(damager.getLocation(), Sound.ZOMBIE_METAL, 0.5f, 1.6f);
 			
-			Factory.Condition().Factory().Invulnerable(GetName(), damagee, damagee, 0.4, false, false);
+			Factory.Condition().Factory().Invulnerable(GetName(), damagee, damagee, 0.3, false, false);
 
 			//Inform
 			UtilPlayer.message(damagee, F.main(GetClassType().name(), "You parried with " + F.skill(GetName(level)) + "."));
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java
index bec32ab2e..be5217843 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java
@@ -3,8 +3,6 @@ package mineplex.minecraft.game.classcombat.Skill.Mage;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
@@ -27,7 +25,6 @@ import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
-import mineplex.minecraft.game.core.condition.Condition.ConditionType;
 import mineplex.minecraft.game.classcombat.Skill.Skill;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
 import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
@@ -159,10 +156,10 @@ public class ArcticArmor extends Skill
 				if (!block.getRelative(BlockFace.UP).isLiquid())
 					if (block.getLocation().getY() <= cur.getLocation().getY())
 						if (block.getTypeId() == 8 || block.getTypeId() == 9 || block.getTypeId() == 79)
-							Factory.BlockRestore().Add(block, 79, (byte)0, (long)(duration * (1 + blocks.get(block))));
+							Factory.BlockRestore().add(block, 79, (byte) 0, (long) (duration * (1 + blocks.get(block))));
 
 				//Snow
-				Factory.BlockRestore().Snow(block, (byte)0, (byte)0, (long)(duration * (1 + blocks.get(block))), 250, 0);
+				Factory.BlockRestore().snow(block, (byte) 0, (byte) 0, (long) (duration * (1 + blocks.get(block))), 250, 0);
 			}
 		}
 	}
@@ -195,7 +192,7 @@ public class ArcticArmor extends Skill
 			
 			if (cur.getEyeLocation().getBlock().getType() == Material.ICE)
 			{
-				if (!Factory.BlockRestore().Contains(cur.getEyeLocation().getBlock()))
+				if (!Factory.BlockRestore().contains(cur.getEyeLocation().getBlock()))
 					continue;
 				
 				Player damager = null;
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FireBlast.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FireBlast.java
index 6d237c4ec..46ec2eaba 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FireBlast.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FireBlast.java
@@ -1,10 +1,12 @@
 package mineplex.minecraft.game.classcombat.Skill.Mage;
 
 import java.util.HashMap;
+
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.LargeFireball;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
@@ -17,6 +19,7 @@ import mineplex.core.common.util.F;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.minecraft.game.classcombat.Skill.SkillActive;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
@@ -98,8 +101,8 @@ public class FireBlast extends SkillActive
 		if (level == 0)				return;
 
 		//Velocity Players
-		HashMap<Player,Double> hitMap = UtilPlayer.getInRadius(proj.getLocation(), 5.5 + (0.5 * level));
-		for (Player cur : hitMap.keySet())
+		HashMap<LivingEntity, Double> hitMap = UtilEnt.getInRadius(proj.getLocation(), 5.5 + (0.5 * level));
+		for (LivingEntity cur : hitMap.keySet())
 		{	
 			double range = hitMap.get(cur);
 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FissureData.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FissureData.java
index 6f4353598..2ab969bac 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FissureData.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FissureData.java
@@ -111,14 +111,19 @@ public class FissureData
 
 		Block block = _path.get(_handled);
 
-		//Cannot raise
-		if (block.getTypeId() == 46)
+		//Cannot raise TNT/ICE/WATER
+		if (block.getTypeId() == 46
+				|| block.getTypeId() == 79
+				|| block.getTypeId() == 8
+				|| block.getTypeId() == 9)
+		{
 			return false;
+		}
 		if (block.getType().toString().contains("BANNER"))
 			return false;
 		if (block.getRelative(BlockFace.UP).getType().toString().contains("BANNER"))
 			return false;
-		
+
 		Block up = block.getRelative(0, _height + 1, 0);
 
 		//Done Column
@@ -131,11 +136,10 @@ public class FissureData
 		}
 
 		//Boost Column
-		if (block.getTypeId() == 1)		Host.Factory.BlockRestore().Add(block, 4, block.getData(), 14000);
-		if (block.getTypeId() == 2)		Host.Factory.BlockRestore().Add(block, 3, block.getData(), 14000);
-		if (block.getTypeId() == 98)	Host.Factory.BlockRestore().Add(block, 98, (byte)2, 14000);
-
-		Host.Factory.BlockRestore().Add(up, block.getTypeId(), block.getData(), 10000 - (1000 * _height));
+		if (block.getTypeId() == 1)		Host.Factory.BlockRestore().add(block, 4, block.getData(), 14000);
+		if (block.getTypeId() == 2)		Host.Factory.BlockRestore().add(block, 3, block.getData(), 14000);
+		if (block.getTypeId() == 98)	Host.Factory.BlockRestore().add(block, 98, (byte) 0, 14000);
+		Host.Factory.BlockRestore().add(up, block.getTypeId(), block.getData(), 10000 - (1000 * _height));
 		_height++;
 
 		//Effect
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FreezingBlast.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FreezingBlast.java
index b911be595..b78b0c96e 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FreezingBlast.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FreezingBlast.java
@@ -121,7 +121,7 @@ public class FreezingBlast extends SkillActive implements IThrown
 		{
 			if (UtilBlock.airFoliage(cur) && UtilBlock.solid(cur.getRelative(BlockFace.DOWN)))
 			{
-				Factory.BlockRestore().Snow(cur, (byte)(7 * blocks.get(cur)), (byte)7, (long)(15000 * (1 + blocks.get(cur))), 1000, 0);
+				Factory.BlockRestore().snow(cur, (byte) (7 * blocks.get(cur)), (byte) 7, (long) (15000 * (1 + blocks.get(cur))), 1000, 0);
 				cur.getWorld().playEffect(cur.getLocation(), Effect.STEP_SOUND, 80);
 			}
 		}
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/IcePrison.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/IcePrison.java
index ae7a7331c..fcfd35c26 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/IcePrison.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/IcePrison.java
@@ -3,11 +3,9 @@ package mineplex.minecraft.game.classcombat.Skill.Mage;
 import java.util.HashMap;
 
 import org.bukkit.Effect;
-import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -154,7 +152,7 @@ public class IcePrison extends SkillActive implements IThrown
 		
 		time -= yDiff * 1000 - Math.random() * 1000;
 
-		Factory.BlockRestore().Add(freeze, 79, (byte)0, time);
+		Factory.BlockRestore().add(freeze, 79, (byte) 0, time);
 		freeze.getWorld().playEffect(freeze.getLocation(), Effect.STEP_SOUND, 79);
 	}
 	
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Immolate.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Immolate.java
index 54b7cffef..043333409 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Immolate.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Immolate.java
@@ -214,7 +214,7 @@ public class Immolate extends Skill
 			
 			Item fire = cur.getWorld().dropItem(cur.getLocation().add(0, 0.5, 0), itemStack);
 			fire.setVelocity(new Vector((Math.random() - 0.5)/3,Math.random()/3,(Math.random() - 0.5)/3));
-			Factory.Fire().Add(fire, cur, 2, 0, 0.25 + (level * 0.25), 0, GetName());
+			Factory.Fire().Add(fire, cur, 2, 0, 0.25 + (level * 0.25), 0, GetName(), false);
 
 			//Sound
 			cur.getWorld().playSound(cur.getLocation(), Sound.FIZZ, 0.2f, 1f);
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Inferno.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Inferno.java
index cced308da..9ef227c18 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Inferno.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Inferno.java
@@ -85,7 +85,7 @@ public class Inferno extends SkillActive
 			if (!_active.contains(cur))
 				continue;
 			
-			if (!cur.isBlocking())
+			if (!UtilPlayer.isBlocking(cur))
 			{
 				_active.remove(cur);
 				continue;
@@ -113,7 +113,7 @@ public class Inferno extends SkillActive
 			itemStack.setItemMeta(meta);
 			
 			Item fire = cur.getWorld().dropItem(cur.getEyeLocation().add(cur.getLocation().getDirection()), itemStack);
-			Factory.Fire().Add(fire, cur, 0.7, 0, 0.3 + (0.1 * level), 1, GetName());
+			Factory.Fire().Add(fire, cur, 0.7, 0, 0.3 + (0.1 * level), 1, GetName(), false);
 
 			fire.teleport(cur.getEyeLocation());
 			double x = 0.07 - (UtilMath.r(14)/100d);
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LifeBonds.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LifeBonds.java
index cad743670..837fb8ada 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LifeBonds.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LifeBonds.java
@@ -1,11 +1,8 @@
 package mineplex.minecraft.game.classcombat.Skill.Mage;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 
-import org.bukkit.Effect;
-import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Item;
@@ -22,14 +19,10 @@ import mineplex.core.common.util.F;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.core.updater.UpdateType;
-import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilGear;
-import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.minecraft.game.classcombat.Skill.Skill;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
 import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
@@ -297,7 +290,7 @@ public class LifeBonds extends Skill
 					if (cur.getItemStack().getData() != null)
 						data = cur.getItemStack().getData().getData();
 
-					Factory.BlockRestore().Add(block, cur.getItemStack().getTypeId(), data, 2000);
+					Factory.BlockRestore().add(block, cur.getItemStack().getTypeId(), data, 2000);
 				}
 			}
 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LightningOrb.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LightningOrb.java
index dbf235d74..17cea9ff8 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LightningOrb.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LightningOrb.java
@@ -18,17 +18,12 @@ import mineplex.core.common.util.F;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.projectile.IThrown;
 import mineplex.core.projectile.ProjectileUser;
-import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
-import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.minecraft.game.classcombat.Skill.SkillActive;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
-import mineplex.minecraft.game.core.condition.Condition;
-import mineplex.minecraft.game.core.condition.Condition.ConditionType;
-import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 
 import org.bukkit.event.player.*;
 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Mage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Mage.java
index 38c119541..96afcc79a 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Mage.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Mage.java
@@ -1,14 +1,20 @@
 package mineplex.minecraft.game.classcombat.Skill.Mage;
 
+import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.EntityShootBowEvent;
+import org.bukkit.metadata.FixedMetadataValue;
+import org.bukkit.metadata.MetadataValue;
 
 import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
 import mineplex.minecraft.game.classcombat.Skill.Skill;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
+import mineplex.minecraft.game.classcombat.Skill.Global.BowDeficiencySkill;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 
-public class Mage extends Skill
+public class Mage extends BowDeficiencySkill
 {
 	public Mage(SkillFactory skills, String name, ClassType classType, SkillType skillType, int cost, int levels) 
 	{
@@ -20,18 +26,5 @@ public class Mage extends Skill
 				});
 	}
 	
-	@EventHandler
-	public void BowShoot(EntityShootBowEvent event)
-	{
-		if (getLevel(event.getEntity()) == 0)
-			return;
-		
-		event.getProjectile().setVelocity(event.getProjectile().getVelocity().multiply(0.75));
-	}
-
-	@Override
-	public void Reset(Player player)
-	{
-		
-	}
+	
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Magnetize.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Magnetize.java
index 3ea170216..0c2b1da8e 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Magnetize.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Magnetize.java
@@ -75,7 +75,7 @@ public class Magnetize extends SkillActive
 			if (!_active.contains(cur))
 				continue;
 
-			if (!cur.isBlocking())
+			if (!UtilPlayer.isBlocking(cur))
 			{
 				_active.remove(cur);
 				continue;
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java
index 0dbd6161f..1ddd9560b 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java
@@ -146,7 +146,7 @@ public class Rupture extends SkillActiveCharge
 			if (level == 0)			return;
 
 			//Add Charge
-			if (!cur.isBlocking())
+			if (!UtilPlayer.isBlocking(cur))
 				DoRupture(cur);
 
 			else
@@ -167,7 +167,7 @@ public class Rupture extends SkillActiveCharge
 
 	public void MoveRupture(Player cur) 
 	{
-		Block targetBlock = cur.getTargetBlock((HashSet<Byte>)null, 0);
+		Block targetBlock = cur.getTargetBlock((HashSet<Byte>)null, 150);
 		if (targetBlock == null)	return;
 
 		//Aiming at sky
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
index f3b1b406a..f8e4155cc 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
@@ -36,7 +36,7 @@ public class StaticLazer extends SkillChargeSword
 	{
 		super(skills, name, classType, skillType, cost, maxLevel, 
 				0.012f, 0.004f, 
-				16000, -1000, true, true,
+				15000, -1000, true, true,
 				false, true);
 
 		SetDesc(new String[] 
@@ -48,25 +48,24 @@ public class StaticLazer extends SkillChargeSword
 				"Taking damage cancels charge.",
 				"",
 				"Deals #6#1 damage and travels up to",
-				"#20#10 blocks, but loses 1 damage",
-				"per 20 blocks travelled.",
+				"#20#10 blocks.",
 				});
 		
 		_fireOnFull = false;
-		_energyPerCharge = 2.4f;
+		_energyPerCharge = 1.2f;
 		setAchievementSkill(true);
 	}
 	
 	@Override
 	public String GetRechargeString() 
 	{
-		return "Recharge: " + "#16#-1 Seconds";
+		return "Recharge: " + "#12#-1 Seconds";
 	}
 	
 	@Override
 	public String GetEnergyString() 
 	{
-		return "Energy: " + "48 per Second";
+		return "Energy: " + "24 per Second";
 	}
 
 	@Override
@@ -78,12 +77,13 @@ public class StaticLazer extends SkillChargeSword
 		
 		//Action
 		double curRange = 0;
-		while (curRange <= 20 + 10 * level)
+		double maxRange = 10 + 5 * level;
+		while (curRange <= maxRange)
 		{
 			Location newTarget = player.getEyeLocation().add(player.getLocation().getDirection().multiply(curRange));
 
 			//Hit Player
-			HashMap<LivingEntity, Double> hits = UtilEnt.getInRadius(newTarget, 1.25);
+			HashMap<LivingEntity, Double> hits = UtilEnt.getInRadius(newTarget, 1);
 			hits.remove(player);
 			if (!hits.isEmpty())
 				break;
@@ -115,9 +115,10 @@ public class StaticLazer extends SkillChargeSword
 			if (other.equals(player))
 				continue;
 
+			double damage = 7 + 1*level;
 			//Damage Event
 			Factory.Damage().NewDamageEvent(other, player, null, 
-					DamageCause.CUSTOM, 2 + ((4 + level) * charge) - (curRange * 0.05), true, true, false,
+					DamageCause.CUSTOM, damage * charge, true, true, false,
 					player.getName(), GetName());	
 			
 		}
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Disengage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Disengage.java
index e8c899905..614b3461d 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Disengage.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Disengage.java
@@ -128,7 +128,7 @@ public class Disengage extends SkillActive
 
 		//Condition
 		Factory.Condition().Factory().Slow(GetName(), damager, damagee, 2.5 + (0.5 * level), 3, false, true, true, true);
-		Factory.Condition().Factory().Invulnerable(GetName(), damagee, damagee, 1, false, false);
+		Factory.Condition().Factory().Invulnerable(GetName(), damagee, damagee, 0.3, false, false);
 
 		_fall.put(damagee, System.currentTimeMillis());
 		
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java
index b265a710d..dbc584655 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java
@@ -6,11 +6,14 @@ import java.util.Iterator;
 
 
 
+
+
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
@@ -24,6 +27,7 @@ import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.updater.event.UpdateEvent;
@@ -213,8 +217,8 @@ public class ExplosiveShot extends SkillActive
 			return;
 
 		//Velocity Players
-		HashMap<Player,Double> hitMap = UtilPlayer.getInRadius(loc, 4.5 + (level * 0.5));
-		for (Player cur : hitMap.keySet())
+		HashMap<LivingEntity,Double> hitMap = UtilEnt.getInRadius(loc, 4.5 + (level * 0.5));
+		for (LivingEntity cur : hitMap.keySet())
 		{	
 			double range = hitMap.get(cur);
 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HealingShot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HealingShot.java
index 2d08a12a9..6d411db5b 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HealingShot.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HealingShot.java
@@ -61,7 +61,9 @@ public class HealingShot extends SkillActive
 				"Regeneration 3 for #3#1 seconds,",
 				"and remove all negative effects.",
 				"",
-				"Gives Nausea to enemies for #5#1 seconds."
+				"Self hits give Regeneration 2.",
+				"",
+				"Gives Nausea to enemies for #5#1 seconds.",
 				});
 	}
 
@@ -153,9 +155,9 @@ public class HealingShot extends SkillActive
 		projectile.remove();
 
 		//Regen
-		if (Factory.Relation().canHurt(damager, damagee))
+		if (!Factory.Relation().canHurt(damager, damagee) || damager.equals(damagee))
 		{
-			Factory.Condition().Factory().Regen(GetName(), damagee, damager, 3 + level, 2, false, false, false);
+			Factory.Condition().Factory().Regen(GetName(), damagee, damager, 3 + level, damager.equals(damagee) ? 1 : 2, false, false, false);
 			
 			//Remove Bad
 			damagee.setFireTicks(0);
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HeavyArrows.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HeavyArrows.java
index 429d86e16..3c8a0dcf0 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HeavyArrows.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HeavyArrows.java
@@ -40,8 +40,9 @@ public class HeavyArrows extends Skill
 				"an additional #10#10 % knockback",
 				"as well as #1#1 additional damage.",
 				"",
-				"You also receive #10#10 % knockback",
-				"when firing arrows if not sneaking.",
+				"You also receive #12#6 % reversed",
+				"velocity of your arrows while not",
+				"sneaking.",
 				});
 	}
 	
@@ -63,7 +64,7 @@ public class HeavyArrows extends Skill
 		//Backboost
 		if (!player.isSneaking() && Recharge.Instance.use(player, GetName(), 750, false, false))	
 		{
-			double vel = (event.getProjectile().getVelocity().length() * (0.1 + 0.1 * level));
+			double vel = (event.getProjectile().getVelocity().length() * (0.12 + 0.06 * level));
 			UtilAction.velocity(player, player.getLocation().getDirection().multiply(-1), vel, 
 					false, 0, 0.3, 0.6, true);
 		}
@@ -100,7 +101,7 @@ public class HeavyArrows extends Skill
 		if (level == 0)			return;
 
 		//Knockback
-		event.AddKnockback(GetName(), 1.1 + (0.1 * level));
+		event.AddKnockback(GetName(), 0.55d + (0.1 * level));
 		event.AddMod(GetName(), GetName(), 1 + level, true);
 	}
 	
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Longshot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Longshot.java
index fc8b497d9..3c8eefa85 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Longshot.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Longshot.java
@@ -25,7 +25,7 @@ public class Longshot extends Skill
         SetDesc(new String[]
             {
                     "Arrows do an additional 1 damage", 
-                    "for every #4#-0.5 Blocks they travelled,",
+                    "for every #4.5#-0.5 Blocks they travelled,",
                     "however, their base damage is", 
                     "reduced by 5.", 
                     "", 
@@ -74,7 +74,7 @@ public class Longshot extends Skill
         double length = UtilMath.offset(loc, projectile.getLocation());
 
         // Damage
-        double damage = Math.min(6 + 6 * level, (length / (4 - 0.5 * level)) - 5);
+        double damage = Math.min(6 + 6 * level, (length / (4.5 - 0.5 * level)) - 5);
 
         if (damage < 0)
         	damage = 0;
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java
index ecd747510..28ed24435 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java
@@ -144,19 +144,19 @@ public class NapalmShot extends SkillActive
 		//Damage
 		event.AddMod(damager.getName(), GetName(), 0, true);
 
-		//Effect
+		//Effect 
 		damagee.getWorld().playSound(damagee.getLocation(), Sound.FIZZ, 2f, 1.5f);
 		
 		//Remove
 		projectile.remove();
 	}
 	
-	@EventHandler
+	@EventHandler(priority=EventPriority.MONITOR)	//make it happen after the damage event ^
 	public void projectileHit(ProjectileHitEvent event)
 	{
 		Projectile proj = event.getEntity();
 
-		if (!_arrows.remove(proj))
+		if (!_arrows.contains(proj))
 			return;
 
 		if (proj.getShooter() == null)
@@ -179,7 +179,7 @@ public class NapalmShot extends SkillActive
 			itemStack.setItemMeta(meta);
 			
 			Item fire = proj.getWorld().dropItemNaturally(proj.getLocation(), itemStack);
-			Factory.Fire().Add(fire, damager, 16, 0.25, 2, 0, GetName());
+			Factory.Fire().Add(fire, damager, 16, 0.25, 2, 0.25, GetName(), true);
 			fire.setVelocity(fire.getVelocity().multiply(1 + (0.15 * level)));
 		}
 		
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Overcharge.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Overcharge.java
index df55695ec..385d8a5d8 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Overcharge.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Overcharge.java
@@ -49,7 +49,7 @@ public class Overcharge extends SkillChargeBow
 	@Override
 	public void DoSkillCustom(Player player, float charge, Arrow arrow)
 	{
-		double damage = charge * (getLevel(player));
+		double damage =  charge * (1.5 + 1.5 * getLevel(player));
 		_arrows.put(arrow, damage);
 	}
 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Shadowmeld.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Shadowmeld.java
index 2b8879f75..4f7fabdb6 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Shadowmeld.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Shadowmeld.java
@@ -7,12 +7,10 @@ import mineplex.core.updater.event.UpdateEvent;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.common.util.UtilMath;
 import mineplex.minecraft.game.core.condition.Condition.ConditionType;
-import mineplex.minecraft.game.classcombat.Skill.SkillCharge;
 import mineplex.minecraft.game.classcombat.Skill.SkillChargeSword;
 import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 
-import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java
index 56c12b9d5..363173009 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java
@@ -9,6 +9,7 @@ import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilTextMiddle;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.core.updater.UpdateType;
@@ -78,25 +79,26 @@ public class Sharpshooter extends Skill
 		if (event.GetDamagerEntity(true) != null && event.GetDamagerEntity(true).equals(event.GetDamageeEntity()))
 			return;
 		
-		int bonus = 1;
+		int bonus = 0;
 		if (_hitCount.containsKey(player))
 			bonus = _hitCount.get(player);
 		
+		//Increase
+		bonus = Math.min(bonus + 1, 2 * level);
+		_hitCount.put(player, bonus);
+		
 		//Damage
 		event.AddMod(player.getName(), GetName(), bonus, true);
 	
-		//Increase
-		bonus = Math.min(bonus + 1, 2 * level);
-	
-		_hitCount.put(player, bonus);
-		
 		//Inform
-		UtilPlayer.message((Entity)projectile.getShooter(), F.main(GetClassType().name(), GetName() + ": " + 
-				F.elem(bonus + " Consecutive Hits") + C.cGray + " (" + F.skill("+" + bonus + "Damage" ) + C.cGray + ")" ) );
-
+		UtilPlayer.message(event.GetDamagerPlayer(true), F.main(GetClassType().name(), GetName() + ": " + 
+				F.elem(bonus + " Consecutive Hits") + C.cGray + " (" + F.skill("+" + bonus + " Damage" ) + C.cGray + ")" ) );
+	
 		player.playSound(player.getLocation(), Sound.NOTE_PLING, 1f, 0.8f + (float)(bonus * 0.2));
 
 		projectile.remove();
+		
+		Recharge.Instance.useForce(player, GetName() + " Timer", 5000);
 	}
 	
 	@EventHandler
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/VitalitySpores.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/VitalitySpores.java
index fb174c112..db7e4e34c 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/VitalitySpores.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/VitalitySpores.java
@@ -38,7 +38,7 @@ public class VitalitySpores extends Skill
 	@EventHandler
 	public void playerMove(PlayerMoveEvent event)
 	{
-		if (UtilMath.offset(event.getFrom(), event.getTo()) > 0)
+		if (doesUserHaveSkill(event.getPlayer()) && UtilMath.offset(event.getFrom(), event.getTo()) > 0)
 			_lastMove.put(event.getPlayer(), System.currentTimeMillis());
 	}
 	
@@ -71,6 +71,6 @@ public class VitalitySpores extends Skill
 	@Override
 	public void Reset(Player player) 
 	{
-
+		_lastMove.remove(player);
 	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/WolfsPounce.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/WolfsPounce.java
index 277bf1da1..51e412beb 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/WolfsPounce.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/WolfsPounce.java
@@ -45,7 +45,7 @@ public class WolfsPounce extends SkillChargeSword
 				"Taking damage cancels charge.",
 				"",
 				"Colliding with another player",
-				"mid-air deals up to 6 damage",
+				"mid-air deals up to #4#1 damage",
 				"and Slow 2 for 3 seconds."
 				
 				});
@@ -61,7 +61,7 @@ public class WolfsPounce extends SkillChargeSword
 	public void DoSkillCustom(Player player, float charge)
 	{
 		//Action
-		UtilAction.velocity(player, 0.4 + (1.4*charge), 0.2, 0.3 + (0.8*charge), true);
+		UtilAction.velocity(player, 0.4 + (1.4*charge), 0.2, 0.4 + (0.9*charge), true);
 		_live.put(player, System.currentTimeMillis());
 
 		//Inform
@@ -128,7 +128,7 @@ public class WolfsPounce extends SkillChargeSword
 		if (_chargeStore.containsKey(damager))
 			charge = _chargeStore.remove(damager);
 		
-		int damage = (int)(6 * charge);
+		int damage = (int)((4 + getLevel(damager)) * charge);
 
 		//Damage Event
 		Factory.Damage().NewDamageEvent(damagee, damager, null, 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
index bfed3327b..ac73feaa2 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
@@ -6,8 +6,8 @@ import java.util.Set;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.NautHashMap;
-
 import mineplex.core.common.util.UtilGear;
+import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilTextBottom;
 import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
 import mineplex.minecraft.game.classcombat.Skill.repository.token.SkillToken;
@@ -20,6 +20,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 public abstract class Skill implements ISkill, Listener
@@ -257,6 +258,11 @@ public abstract class Skill implements ISkill, Listener
 		return null;
 	}
 
+	protected boolean doesUserHaveSkill(Player player)
+	{
+		return _users.containsKey(player);
+	}
+	
 	@Override
 	public Set<Player> GetUsers()
 	{
@@ -292,6 +298,17 @@ public abstract class Skill implements ISkill, Listener
 	{
 		Reset(event.getEntity());
 	}
+	
+	/**
+	 * Trigger {@link UtilPlayer#onHotbarChange(Player)} to appropriately check
+	 * if players are blocking.
+	 * @param event
+	 */
+	@EventHandler
+	public void onHotbarChange(PlayerItemHeldEvent event)
+	{
+		UtilPlayer.onHotbarChange(event.getPlayer()); 
+	} 
 
 	@EventHandler
 	public final void Quit(PlayerQuitEvent event)
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillChargeSword.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillChargeSword.java
index 0e9ccaccd..809d0001c 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillChargeSword.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillChargeSword.java
@@ -1,6 +1,7 @@
 package mineplex.minecraft.game.classcombat.Skill;
 
 import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
@@ -51,8 +52,8 @@ public abstract class SkillChargeSword extends SkillCharge implements Listener
 		for (Player cur : GetUsers())
 		{	
 			//Charge
-			if (cur.isBlocking())
-			{
+			if (UtilPlayer.isBlocking(cur))
+			{ 
 				//Flags
 				if (!_canChargeInAir && !UtilEnt.isGrounded(cur))
 					continue;
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java
index 768154f44..7fd52db63 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java
@@ -8,7 +8,6 @@ import java.util.List;
 
 import mineplex.core.MiniPlugin;
 import mineplex.core.blockrestore.BlockRestore;
-import mineplex.minecraft.game.core.condition.ConditionManager;
 import mineplex.core.disguise.DisguiseManager;
 import mineplex.core.donation.repository.GameSalesPackageToken;
 import mineplex.core.energy.Energy;
@@ -18,17 +17,91 @@ import mineplex.core.teleport.Teleport;
 import mineplex.minecraft.game.classcombat.Class.IPvpClass;
 import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
 import mineplex.minecraft.game.classcombat.Skill.ISkill.SkillType;
-import mineplex.minecraft.game.classcombat.Skill.Brute.*;
-import mineplex.minecraft.game.classcombat.Skill.Assassin.*;
-import mineplex.minecraft.game.classcombat.Skill.Global.*;
-import mineplex.minecraft.game.classcombat.Skill.Knight.*;
-import mineplex.minecraft.game.classcombat.Skill.Mage.*;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.Assassin;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.BackStab;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.Blink;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.ComboAttack;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.Evade;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.Flash;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.Illusion;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.Leap;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.MarkedForDeath;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.Recall;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.ShockingStrikes;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.SilencingArrow;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.SmokeArrow;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.SmokeBomb;
+import mineplex.minecraft.game.classcombat.Skill.Assassin.ViperStrikes;
+import mineplex.minecraft.game.classcombat.Skill.Brute.BlockToss;
+import mineplex.minecraft.game.classcombat.Skill.Brute.Bloodlust;
+import mineplex.minecraft.game.classcombat.Skill.Brute.Brute;
+import mineplex.minecraft.game.classcombat.Skill.Brute.Colossus;
+import mineplex.minecraft.game.classcombat.Skill.Brute.CripplingBlow;
+import mineplex.minecraft.game.classcombat.Skill.Brute.DwarfToss;
+import mineplex.minecraft.game.classcombat.Skill.Brute.FleshHook;
+import mineplex.minecraft.game.classcombat.Skill.Brute.Intimidation;
+import mineplex.minecraft.game.classcombat.Skill.Brute.Overwhelm;
+import mineplex.minecraft.game.classcombat.Skill.Brute.SeismicSlam;
+import mineplex.minecraft.game.classcombat.Skill.Brute.Stampede;
+import mineplex.minecraft.game.classcombat.Skill.Brute.Takedown;
+import mineplex.minecraft.game.classcombat.Skill.Brute.WhirlwindAxe;
+import mineplex.minecraft.game.classcombat.Skill.Global.BreakFall;
+import mineplex.minecraft.game.classcombat.Skill.Global.Fitness;
+import mineplex.minecraft.game.classcombat.Skill.Global.Recharge;
+import mineplex.minecraft.game.classcombat.Skill.Global.Resistance;
+import mineplex.minecraft.game.classcombat.Skill.Knight.AxeThrow;
+import mineplex.minecraft.game.classcombat.Skill.Knight.BullsCharge;
+import mineplex.minecraft.game.classcombat.Skill.Knight.Cleave;
+import mineplex.minecraft.game.classcombat.Skill.Knight.DefensiveStance;
+import mineplex.minecraft.game.classcombat.Skill.Knight.Deflection;
+import mineplex.minecraft.game.classcombat.Skill.Knight.Fortitude;
+import mineplex.minecraft.game.classcombat.Skill.Knight.HiltSmash;
+import mineplex.minecraft.game.classcombat.Skill.Knight.HoldPosition;
+import mineplex.minecraft.game.classcombat.Skill.Knight.Knight;
+import mineplex.minecraft.game.classcombat.Skill.Knight.LevelField;
+import mineplex.minecraft.game.classcombat.Skill.Knight.Riposte;
+import mineplex.minecraft.game.classcombat.Skill.Knight.ShieldSmash;
+import mineplex.minecraft.game.classcombat.Skill.Knight.Swordsmanship;
+import mineplex.minecraft.game.classcombat.Skill.Knight.Vengeance;
+import mineplex.minecraft.game.classcombat.Skill.Mage.ArcticArmor;
+import mineplex.minecraft.game.classcombat.Skill.Mage.Blizzard;
+import mineplex.minecraft.game.classcombat.Skill.Mage.FireBlast;
+import mineplex.minecraft.game.classcombat.Skill.Mage.Fissure;
+import mineplex.minecraft.game.classcombat.Skill.Mage.GlacialBlade;
+import mineplex.minecraft.game.classcombat.Skill.Mage.IcePrison;
+import mineplex.minecraft.game.classcombat.Skill.Mage.Immolate;
+import mineplex.minecraft.game.classcombat.Skill.Mage.Inferno;
+import mineplex.minecraft.game.classcombat.Skill.Mage.LifeBonds;
+import mineplex.minecraft.game.classcombat.Skill.Mage.LightningOrb;
+import mineplex.minecraft.game.classcombat.Skill.Mage.Mage;
+import mineplex.minecraft.game.classcombat.Skill.Mage.MagmaBlade;
+import mineplex.minecraft.game.classcombat.Skill.Mage.NullBlade;
+import mineplex.minecraft.game.classcombat.Skill.Mage.Rupture;
+import mineplex.minecraft.game.classcombat.Skill.Mage.StaticLazer;
 import mineplex.minecraft.game.classcombat.Skill.Mage.Void;
-import mineplex.minecraft.game.classcombat.Skill.Ranger.*;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.Agility;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.BarbedArrows;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.Barrage;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.Disengage;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.ExplosiveShot;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.HealingShot;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.HeavyArrows;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.Longshot;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.NapalmShot;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.Overcharge;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.PinDown;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.Ranger;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.RopedArrow;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.Sharpshooter;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.VitalitySpores;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.WolfsFury;
+import mineplex.minecraft.game.classcombat.Skill.Ranger.WolfsPounce;
 import mineplex.minecraft.game.classcombat.Skill.repository.SkillRepository;
 import mineplex.minecraft.game.classcombat.Skill.repository.token.SkillToken;
+import mineplex.minecraft.game.classcombat.item.Throwable.ProximityManager;
 import mineplex.minecraft.game.core.IRelation;
 import mineplex.minecraft.game.core.combat.CombatManager;
+import mineplex.minecraft.game.core.condition.ConditionManager;
 import mineplex.minecraft.game.core.damage.DamageManager;
 import mineplex.minecraft.game.core.fire.Fire;
 
@@ -163,14 +236,14 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory
 		//Sword
 		AddSkill(new Evade(this, "Evade", ClassType.Assassin, SkillType.Sword, 
 				1, 4, 
-				26, -2, 
-				0, 0, true,
+				0, 0, 
+				6500, -500, true,
 				new Material[] {Material.IRON_SWORD, Material.GOLD_SWORD, Material.DIAMOND_SWORD}, 
 				new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK}));
 		
 		AddSkill(new Illusion(this, "Illusion", ClassType.Assassin, SkillType.Sword, 
 				1, 4, 
-				50, -4, 
+				0, 0, 
 				17000, -1000, true,
 				new Material[] {Material.IRON_SWORD, Material.GOLD_SWORD, Material.DIAMOND_SWORD}, 
 				new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK}));
@@ -178,21 +251,21 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory
 		//Axe
 		AddSkill(new Blink(this, "Blink", ClassType.Assassin, SkillType.Axe, 
 				1, 4, 
-				64, -4, 
+				0, 0, 
 				12000, 0, true,
 				new Material[] {Material.IRON_AXE, Material.GOLD_AXE, Material.DIAMOND_AXE}, 
 				new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK}));
 
 		AddSkill(new Flash(this, "Flash", ClassType.Assassin, SkillType.Axe, 
 				1, 4, 
-				30, -2, 
+				0, 0, 
 				0, 0, true,
 				new Material[] {Material.IRON_AXE, Material.GOLD_AXE, Material.DIAMOND_AXE}, 
 				new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK}));
 
 		AddSkill(new Leap(this, "Leap", ClassType.Assassin, SkillType.Axe, 
 				1, 4,
-				36, -3, 
+				0, 0, 
 				10500, -1500, true,
 				new Material[] {Material.IRON_AXE, Material.GOLD_AXE, Material.DIAMOND_AXE}, 
 				new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK}));
@@ -200,21 +273,21 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory
 		//Bow
 		AddSkill(new MarkedForDeath(this, "Marked for Death", ClassType.Assassin, SkillType.Bow, 
 				1, 4,
-				40, 0, 
+				0, 0, 
 				20000, -2000, true,
 				new Material[] {Material.BOW}, 
 				new Action[] {Action.LEFT_CLICK_AIR, Action.LEFT_CLICK_BLOCK}));
 
 		AddSkill(new SmokeArrow(this, "Smoke Arrow", ClassType.Assassin, SkillType.Bow, 
 				1, 4,
-				40, 0, 
+				0, 0, 
 				20000, -2000, true,
 				new Material[] {Material.BOW}, 
 				new Action[] {Action.LEFT_CLICK_AIR, Action.LEFT_CLICK_BLOCK}));
 
 		AddSkill(new SilencingArrow(this, "Silencing Arrow", ClassType.Assassin, SkillType.Bow, 	
 				1, 4,
-				40, 0,
+				0, 0,
 				20000, -2000, true,
 				new Material[] {Material.BOW}, 
 				new Action[] {Action.LEFT_CLICK_AIR, Action.LEFT_CLICK_BLOCK}));
@@ -257,21 +330,21 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory
 		AddSkill(new SeismicSlam(this, "Seismic Slam", ClassType.Brute, SkillType.Axe, 
 				1, 5,
 				0, 0, 
-				24000, -2000, true,
+				21000, -1000, true,
 				new Material[] {Material.IRON_AXE, Material.GOLD_AXE, Material.DIAMOND_AXE}, 
 				new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK}));
 
 		AddSkill(new Takedown(this, "Takedown", ClassType.Brute, SkillType.Axe, 
 				1, 5,
 				0, 0, 
-				24000, -2000, true,
+				21000, -1000, true,
 				new Material[] {Material.IRON_AXE, Material.GOLD_AXE, Material.DIAMOND_AXE}, 
 				new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK}));
 		
 		AddSkill(new WhirlwindAxe(this, "Whirlwind Axe", ClassType.Brute, SkillType.Axe, 
 				1, 5,
 				0, 0, 
-				24000, -2000, true,
+				21000, -1000, true,
 				new Material[] {Material.IRON_AXE, Material.GOLD_AXE, Material.DIAMOND_AXE}, 
 				new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK}));
 
@@ -338,7 +411,7 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory
 		AddSkill(new AxeThrow(this, "Roped Axe Throw", ClassType.Knight, SkillType.Axe, 
 				1, 5,
 				0, 0, 
-				2200, -200, true,
+				3300, -300, true,
 				new Material[] {Material.IRON_AXE, Material.GOLD_AXE, Material.DIAMOND_AXE}, 
 				new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK}));
 
@@ -581,6 +654,11 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory
 		System.out.println("Skill Factory: Removed " + remove.GetName() + " from SkillMap.");
 	}
 
+	public void removeSkill(String skillName)
+	{
+		RemoveSkill(skillName, null);
+	}
+
 	@Override
 	public List<ISkill> GetGlobalSkillsFor(IPvpClass gameClass) 
 	{
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/BlockTossEvent.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/BlockTossEvent.java
new file mode 100644
index 000000000..ca4a79dc0
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/BlockTossEvent.java
@@ -0,0 +1,27 @@
+package mineplex.minecraft.game.classcombat.Skill.event;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class BlockTossEvent extends Event implements Cancellable
+{
+	private static final HandlerList handlers = new HandlerList();
+	public static HandlerList getHandlerList() { return handlers; }
+	public HandlerList getHandlers() { return handlers; }
+	
+	private boolean _cancelled;
+	public boolean isCancelled() { return _cancelled; }
+	public void setCancelled(boolean cancelled) { _cancelled = cancelled; }
+	
+	private Block _block;
+	public Block getBlock() { return _block; }
+	public Location getLocation() { return _block.getLocation(); }
+
+    public BlockTossEvent(Block block)
+    {
+    	_block = block;
+    }
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/BlockTossExpireEvent.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/BlockTossExpireEvent.java
new file mode 100644
index 000000000..165834486
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/BlockTossExpireEvent.java
@@ -0,0 +1,12 @@
+package mineplex.minecraft.game.classcombat.Skill.event;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+
+public class BlockTossExpireEvent extends BlockTossEvent
+{
+    public BlockTossExpireEvent(Block block)
+    {
+    	super(block);
+    }
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/BlockTossLandEvent.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/BlockTossLandEvent.java
new file mode 100644
index 000000000..4cc50dd18
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/BlockTossLandEvent.java
@@ -0,0 +1,17 @@
+package mineplex.minecraft.game.classcombat.Skill.event;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class BlockTossLandEvent extends BlockTossEvent
+{
+
+    public BlockTossLandEvent(Block block)
+    {
+    	super(block);
+    }
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/SkillTeleportEvent.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/SkillTeleportEvent.java
new file mode 100644
index 000000000..4707c1f53
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/event/SkillTeleportEvent.java
@@ -0,0 +1,31 @@
+package mineplex.minecraft.game.classcombat.Skill.event;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class SkillTeleportEvent extends Event implements Cancellable
+{
+	private static final HandlerList handlers = new HandlerList();
+	public static HandlerList getHandlerList() { return handlers; }
+	public HandlerList getHandlers() { return handlers; }
+	
+	private boolean _cancelled;
+	public boolean isCancelled() { return _cancelled; }
+	public void setCancelled(boolean cancelled) { _cancelled = cancelled; }
+	
+	private Player _player;
+	public Player getPlayer() { return _player; }
+	
+	private Location _destination;
+	public Location getDestination() { return _destination; }
+
+    public SkillTeleportEvent(Player player, Location destination)
+    {
+    	_player = player;
+    	_destination = destination;
+    }
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
index 97ee02a87..d6c49bf34 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
@@ -28,6 +28,7 @@ public class ItemFactory extends MiniPlugin implements IItemFactory
 	private Energy _energy;
 	private Fire _fire;
 	private ProjectileManager _projectileManager;
+	private ProximityManager _proxyManager;
     private java.lang.reflect.Field _itemMaxDurability;
 	private HashMap<String, Item> _items;
 	private HashSet<String> _ignore;
@@ -47,6 +48,7 @@ public class ItemFactory extends MiniPlugin implements IItemFactory
 		_energy = energy;
 		_fire = fire;
 		_projectileManager = projectileManager;
+		_proxyManager = new ProximityManager();
 		
 		_items = new HashMap<String, Item>();
 		_ignore = ignore;
@@ -92,7 +94,7 @@ public class ItemFactory extends MiniPlugin implements IItemFactory
 				-1, true, true, true, false));
 		*/
 		AddItem(new Soup(this, Material.MUSHROOM_SOUP, 1, true, 0, 1,
-				ActionType.R, true, 500, 0, 
+				ActionType.ANY, true, 500, 0, 
 				null, false, 0, 0, 0f, 
 				-1, true, true, true, false));
 	}
@@ -125,7 +127,7 @@ public class ItemFactory extends MiniPlugin implements IItemFactory
 		
 		AddItem(new Web(this, Material.WEB, 3, false, 500, 1,
 				null, true, 0, 0, 
-				ActionType.L, true, 250, 0, 1f, 
+				ActionType.L, true, 1500, 0, 1f, 
 				-1, true, true, true, false));
 		
 		/*
@@ -187,20 +189,20 @@ public class ItemFactory extends MiniPlugin implements IItemFactory
 			return;
 		}
 		
-	    try
-        {
-            _itemMaxDurability.setInt(net.minecraft.server.v1_8_R3.Item.getById(newItem.GetType().getId()), 56);
-        }
-        catch (IllegalArgumentException e)
-        {
-            e.printStackTrace();
-        }
-        catch (IllegalAccessException e)
-        {
-            e.printStackTrace();
-        }
+	    //try
+        //{
+            //_itemMaxDurability.setInt(net.minecraft.server.v1_8_R3.Item.getById(newItem.GetType().getId()), 56);
+        //}
+        //catch (IllegalArgumentException e)
+        //{
+           //e.printStackTrace();
+        //}
+        //catch (IllegalAccessException e)
+        //{
+           //e.printStackTrace();
+        //}
 	    
-	    _items.put(newItem.GetName(), newItem);
+		_items.put(newItem.GetName(), newItem);
 	}
 
 	public BlockRestore BlockRestore()
@@ -240,6 +242,8 @@ public class ItemFactory extends MiniPlugin implements IItemFactory
 		
 		for (Item item : _items.values())
 			registerEvents(item);
+		
+		registerEvents(_proxyManager);
 	}
 	
 	@Override
@@ -249,5 +253,12 @@ public class ItemFactory extends MiniPlugin implements IItemFactory
 		
 		for (Item item : _items.values())
 			HandlerList.unregisterAll(item);
+		
+		HandlerList.unregisterAll(_proxyManager);
+	}
+	
+	public ProximityManager getProximityManager()
+	{
+		return _proxyManager;
 	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemUsable.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemUsable.java
index c86940077..4ebc47b56 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemUsable.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemUsable.java
@@ -1,5 +1,17 @@
 package mineplex.minecraft.game.classcombat.item;
 
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilEvent.ActionType;
+import mineplex.core.common.util.UtilGear;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.projectile.IThrown;
+import mineplex.core.projectile.ProjectileUser;
+import mineplex.core.recharge.Recharge;
+import mineplex.minecraft.game.classcombat.item.event.ItemTriggerEvent;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -9,21 +21,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerInteractEvent;
 
-import mineplex.core.common.util.UtilAction;
-import mineplex.core.common.util.UtilBlock;
-import mineplex.core.common.util.UtilEvent;
-import mineplex.core.common.util.UtilGear;
-import mineplex.core.common.util.UtilInv;
-import mineplex.core.common.util.UtilEvent.ActionType;
-import mineplex.core.itemstack.ItemStackFactory;
-import mineplex.core.projectile.IThrown;
-import mineplex.core.projectile.ProjectileUser;
-import mineplex.core.recharge.Recharge;
-import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
-import mineplex.minecraft.game.classcombat.item.Item;
-import mineplex.minecraft.game.classcombat.item.ItemFactory;
-import mineplex.minecraft.game.classcombat.item.event.ItemTriggerEvent;
-
 public abstract class ItemUsable extends Item implements IThrown
 {	
 	private ActionType _useAction;
@@ -161,7 +158,7 @@ public abstract class ItemUsable extends Item implements IThrown
 		org.bukkit.entity.Item ent = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(GetType()));
 		UtilAction.velocity(ent, player.getLocation().getDirection(), _throwPower, false, 0, 0.2, 10, false);
 		Factory.Throw().AddThrow(ent, player, this, expire, _throwPlayer, _throwPlayer, _throwBlock, _throwIdle, _throwPickup, 0.5f);
-
+		
 		ThrowCustom(event, ent);
 	}
 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityExplosive.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityExplosive.java
index 0768e5b2d..a6895deda 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityExplosive.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityExplosive.java
@@ -2,9 +2,10 @@ package mineplex.minecraft.game.classcombat.item.Throwable;
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Effect;
-import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
@@ -34,6 +35,7 @@ import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.minecraft.game.classcombat.item.ItemFactory;
 import mineplex.minecraft.game.classcombat.item.ItemUsable;
+import mineplex.minecraft.game.classcombat.item.event.ProximityUseEvent;
 
 public class ProximityExplosive extends ItemUsable
 {
@@ -63,7 +65,14 @@ public class ProximityExplosive extends ItemUsable
 	@Override
 	public void UseAction(PlayerInteractEvent event) 
 	{
-
+		
+	}
+	
+	@Override
+	public void ThrowCustom(PlayerInteractEvent event, org.bukkit.entity.Item ent) 
+	{
+		ProximityUseEvent useEvent = new ProximityUseEvent(event.getPlayer(), this, ent);
+		Bukkit.getServer().getPluginManager().callEvent(useEvent);
 	}
 
 	@Override
@@ -160,19 +169,22 @@ public class ProximityExplosive extends ItemUsable
 	{
 		if (event.getType() != UpdateType.FAST)
 			return;
+
+		Iterator<Entity> armedIter = _armed.keySet().iterator();
 		
-		HashSet<Entity> expired = new HashSet<Entity>();
-		
-		for (Entity ent : _armed.keySet())
+		while (armedIter.hasNext())
 		{
+			Entity ent = armedIter.next();
+			
 			if (ent.isDead() || !ent.isValid() || ent.getTicksLived() >= 3600)
-				expired.add(ent);
-		}
-		
-		for (Entity ent : expired)
-		{
-			Detonate(ent);
-		}		
+			{
+				UtilParticle.PlayParticle(ParticleType.EXPLODE, ent.getLocation(), 0.1f, 0.1f, 0.1f, 0, 10,
+						ViewDist.MAX, UtilServer.getPlayers());
+				
+				ent.remove();
+				armedIter.remove();
+			}
+		}	
 	}
 }
 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityManager.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityManager.java
new file mode 100644
index 000000000..9e70eba21
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityManager.java
@@ -0,0 +1,104 @@
+package mineplex.minecraft.game.classcombat.item.Throwable;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.classcombat.item.event.ProximityUseEvent;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+public class ProximityManager implements Listener
+{
+	private int _proxyLimit = 6;
+
+	private HashMap<Player, ArrayList<Entry<String, Entity>>> _proxyMap = new HashMap<Player, ArrayList<Entry<String, Entity>>>();
+	
+	public void setProxyLimit(int limit)
+	{
+		_proxyLimit = limit;
+	}
+	
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void proximityThrownEvent(ProximityUseEvent event)
+	{
+		//Don't bother if the proxy has been disallowed
+		if (!event.getEntity().isValid())
+			return;
+		
+		if (!_proxyMap.containsKey(event.getPlayer()))
+			_proxyMap.put(event.getPlayer(), new ArrayList<Entry<String,Entity>>());
+		
+		ArrayList<Entry<String, Entity>> proxies = _proxyMap.get(event.getPlayer());
+		
+		//Store New
+		proxies.add(new AbstractMap.SimpleEntry<String, Entity>(event.getItemType().GetName(), event.getEntity()));
+		
+		//Clean Excess
+		while (proxies.size() > _proxyLimit)
+		{
+			Entry<String, Entity> entry = proxies.remove(0);
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "Your old " + entry.getKey() + " was removed. Limit of " + _proxyLimit + "."));	
+			entry.getValue().remove();
+		}
+	}
+
+	@EventHandler
+	public void clean(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+		
+		clean(null, 0);
+	}
+
+	public void clean(Location loc, int radius) 
+	{
+		Iterator<Player> playerIter = _proxyMap.keySet().iterator();
+		
+		while (playerIter.hasNext())
+		{
+			Player player = playerIter.next();
+			
+			//Clean Offline Players
+			if (!player.isOnline())
+			{
+				playerIter.remove();
+				continue;
+			}
+			
+			ArrayList<Entry<String,Entity>> proxies = _proxyMap.get(player);
+			
+			Iterator<Entry<String,Entity>> proxyIter = proxies.iterator();
+			
+			//Clean Dead Proxies
+			while (proxyIter.hasNext())
+			{
+				Entry<String,Entity> proxy = proxyIter.next();
+				
+				if (!proxy.getValue().isValid() ||													//Dead
+				(loc != null && UtilMath.offset(proxy.getValue().getLocation(), loc) < radius))		//Around Radius
+				{
+					proxy.getValue().remove();
+					proxyIter.remove();
+				}
+			}
+			
+			//Clean Empty Entries
+			if (proxies.isEmpty())
+				playerIter.remove();
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityZapper.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityZapper.java
index 230168163..3a3c22886 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityZapper.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityZapper.java
@@ -2,7 +2,9 @@ package mineplex.minecraft.game.classcombat.item.Throwable;
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Effect;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
@@ -31,6 +33,7 @@ import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.minecraft.game.classcombat.item.ItemFactory;
 import mineplex.minecraft.game.classcombat.item.ItemUsable;
+import mineplex.minecraft.game.classcombat.item.event.ProximityUseEvent;
 
 public class ProximityZapper extends ItemUsable
 {
@@ -62,6 +65,13 @@ public class ProximityZapper extends ItemUsable
 	{
 
 	}
+	
+	@Override
+	public void ThrowCustom(PlayerInteractEvent event, org.bukkit.entity.Item ent) 
+	{
+		ProximityUseEvent useEvent = new ProximityUseEvent(event.getPlayer(), this, ent);
+		Bukkit.getServer().getPluginManager().callEvent(useEvent);
+	}
 
 	@Override
 	public void Collide(LivingEntity target, Block block, ProjectileUser data) 
@@ -154,18 +164,21 @@ public class ProximityZapper extends ItemUsable
 		if (event.getType() != UpdateType.FAST)
 			return;
 
-		HashSet<Entity> expired = new HashSet<Entity>();
-
-		for (Entity ent : _armed.keySet())
+		Iterator<Entity> armedIter = _armed.keySet().iterator();
+		
+		while (armedIter.hasNext())
 		{
+			Entity ent = armedIter.next();
+			
 			if (ent.isDead() || !ent.isValid() || ent.getTicksLived() >= 3600)
-				expired.add(ent);
-		}
-
-		for (Entity ent : expired)
-		{
-			Detonate(ent, null);
-		}		
+			{
+				UtilParticle.PlayParticle(ParticleType.EXPLODE, ent.getLocation(), 0.1f, 0.1f, 0.1f, 0, 10,
+						ViewDist.MAX, UtilServer.getPlayers());
+				
+				ent.remove();
+				armedIter.remove();
+			}
+		}	
 	}
 }
 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java
index c8540af14..a765748d7 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java
@@ -1,10 +1,13 @@
 package mineplex.minecraft.game.classcombat.item.Throwable;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Effect;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.util.Vector;
 
@@ -14,6 +17,7 @@ import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.projectile.ProjectileUser;
 import mineplex.minecraft.game.classcombat.item.ItemFactory;
 import mineplex.minecraft.game.classcombat.item.ItemUsable;
+import mineplex.minecraft.game.classcombat.item.event.WebTossEvent;
 
 public class Web extends ItemUsable
 {
@@ -68,14 +72,23 @@ public class Web extends ItemUsable
 	
 	public void CreateWeb(Entity ent)
 	{
+		LivingEntity thrower = Factory.Throw().getThrower(ent);
+		
 		//Effect
 		ent.getWorld().playEffect(ent.getLocation(), Effect.STEP_SOUND, 30);
-		
-		if (!UtilBlock.airFoliage(ent.getLocation().getBlock()))
-			return;
-		
-		Factory.BlockRestore().Add(ent.getLocation().getBlock(), 30, (byte)0, 6000);
-		
 		ent.remove();
+		
+		if (canWeb(thrower, ent.getLocation()))
+		{
+			Factory.BlockRestore().add(ent.getLocation().getBlock(), 30, (byte) 0, 6000);
+		}		
+	}
+	
+	private boolean canWeb(LivingEntity thrower, Location location)
+	{
+		WebTossEvent webEvent = new WebTossEvent(thrower, location);
+		Bukkit.getPluginManager().callEvent(webEvent);
+		
+		return !webEvent.isCancelled() && UtilBlock.airFoliage(location.getBlock());
 	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/event/ProximityUseEvent.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/event/ProximityUseEvent.java
new file mode 100644
index 000000000..30f78ba40
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/event/ProximityUseEvent.java
@@ -0,0 +1,48 @@
+package mineplex.minecraft.game.classcombat.item.event;
+
+import mineplex.minecraft.game.classcombat.item.Item;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class ProximityUseEvent extends Event 
+{
+    private static final HandlerList handlers = new HandlerList();
+    
+    private Player _player;
+    private Item _item;
+    private org.bukkit.entity.Item _entity;
+
+    public ProximityUseEvent(Player player,  Item item, org.bukkit.entity.Item ent) 
+    {
+    	_player = player;
+    	_item = item;
+    	_entity = ent;
+    }
+
+	public HandlerList getHandlers() 
+    {
+        return handlers;
+    }
+ 
+    public static HandlerList getHandlerList() 
+    {
+        return handlers;
+    }
+
+	public Player getPlayer()
+	{
+		return _player;
+	}
+
+	public Item getItemType() 
+	{
+		return _item;
+	}
+	
+	public org.bukkit.entity.Item getEntity()
+	{
+		return _entity;
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/event/WebTossEvent.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/event/WebTossEvent.java
new file mode 100644
index 000000000..46eb0d0e0
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/event/WebTossEvent.java
@@ -0,0 +1,32 @@
+package mineplex.minecraft.game.classcombat.item.event;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class WebTossEvent extends Event implements Cancellable
+{
+	private static final HandlerList handlers = new HandlerList();
+	public static HandlerList getHandlerList() { return handlers; }
+	public HandlerList getHandlers() { return handlers; }
+	
+	private boolean _cancelled;
+	public boolean isCancelled() { return _cancelled; }
+	public void setCancelled(boolean cancelled) { _cancelled = cancelled; }
+	
+	private Location _location;
+	public Location getLocation() { return _location; }
+	
+	private LivingEntity _thrower;
+	public LivingEntity getThrower() { return _thrower; }
+
+    public WebTossEvent(LivingEntity thrower, Location location)
+    {
+    	_location = location;
+    	_thrower = thrower;
+    }
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java
index 920a138d2..5c3d5e13a 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java
@@ -61,7 +61,8 @@ public class ClassShopManager extends MiniPlugin
 				Achievement.CHAMPIONS_THE_LONGEST_SHOT,
 				Achievement.CHAMPIONS_WINS,
 				Achievement.CHAMPIONS_CAPTURES,
-				Achievement.CHAMPIONS_CLUTCH
+				Achievement.CHAMPIONS_CLUTCH,
+				Achievement.CHAMPIONS_SPECIAL_WIN
 		});
 	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/BossAbility.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/BossAbility.java
new file mode 100644
index 000000000..b1c19528d
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/BossAbility.java
@@ -0,0 +1,113 @@
+package mineplex.minecraft.game.core.boss;
+
+import java.util.HashMap;
+import java.util.UUID;
+
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public abstract class BossAbility<T extends EventCreature, Y extends Entity> implements Listener
+{
+	private T _creature;
+	private HashMap<UUID, Long> _damaged = new HashMap<UUID, Long>();
+
+	public boolean canDamage(Entity player)
+	{
+		if (_damaged.containsKey(player.getUniqueId()))
+		{
+
+			if (!UtilTime.elapsed(_damaged.get(player.getUniqueId()), 400))
+			{
+				return false;
+			}
+		}
+
+		_damaged.put(player.getUniqueId(), System.currentTimeMillis());
+		return true;
+	}
+
+	public BossAbility(T creature)
+	{
+		_creature = creature;
+	}
+
+	public abstract boolean canMove();
+
+	public abstract boolean inProgress();
+
+	public int getCooldown()
+	{
+		return 3;
+	}
+
+	public Y getEntity()
+	{
+		return (Y) getBoss().getEntity();
+	}
+
+	public T getBoss()
+	{
+		return _creature;
+	}
+
+	public Location getLocation()
+	{
+		return getEntity().getLocation();
+	}
+
+	public Player getTarget()
+	{
+		return getTarget(30);
+	}
+
+	public Player getTarget(double minDistance, double maxDistance)
+	{
+		Player target = null;
+		double dist = 0;
+
+		for (Player player : UtilPlayer.getNearby(getLocation(), maxDistance, true))
+		{
+			if (!player.hasLineOfSight(getEntity()))
+			{
+				continue;
+			}
+
+			double d = player.getLocation().distance(getLocation());
+
+			if (d < minDistance)
+			{
+				continue;
+			}
+
+			if (target == null || dist > d)
+			{
+				target = player;
+				dist = d;
+			}
+		}
+
+		return target;
+	}
+
+	public Player getTarget(double maxDistance)
+	{
+		return getTarget(0, maxDistance);
+	}
+
+	public abstract boolean hasFinished();
+
+	public abstract void setFinished();
+
+	public abstract void tick();
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventCreature.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventCreature.java
new file mode 100644
index 000000000..f0ba4026a
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventCreature.java
@@ -0,0 +1,324 @@
+package mineplex.minecraft.game.core.boss;
+
+import java.util.UUID;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.disguise.disguises.DisguiseBase;
+import mineplex.core.disguise.disguises.DisguiseInsentient;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.condition.Condition.ConditionType;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.Location;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityCombustEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.world.ChunkUnloadEvent;
+
+public abstract class EventCreature<T extends LivingEntity> implements Listener
+{
+	private WorldEvent _event;
+
+	// Spawn Data
+	private T _entity;
+	private Class<? extends T> _entityClass;
+	private Location _spawnLocation;
+
+	// Creature Data
+	private String _name;
+	private String _displayName;
+	private boolean _useName;
+	private double _health;
+	private double _maxHealth;
+	private boolean _showHealthName;
+
+	// Fight Data
+	private long _lastDamaged;
+	private UUID _lastDamager;
+
+	public EventCreature(WorldEvent event, Location spawnLocation, String name, boolean useName, double health, Class<T> entityClass)
+	{
+		_event = event;
+
+		_entityClass = entityClass;
+		_spawnLocation = spawnLocation;
+
+		_name = name;
+		_displayName = name;
+		_useName = useName;
+		_health = health;
+		_maxHealth = health;
+		_showHealthName = true;
+	}
+	
+	public double getDifficulty()
+	{
+		return getEvent().getDifficulty();
+	}
+
+	protected void spawnEntity()
+	{
+		Location spawnLocation = _entity == null ? _spawnLocation : _entity.getLocation();
+		T entity = _spawnLocation.getWorld().spawn(spawnLocation, getEntityClass());
+
+		setEntity(entity);
+		updateEntityHealth();
+		entity.setRemoveWhenFarAway(false);
+		spawnCustom();
+		updateName();
+	}
+
+	protected abstract void spawnCustom();
+
+	protected void updateEntityHealth()
+	{
+		_entity.setMaxHealth(500d);
+		_entity.setHealth(500d);
+	}
+
+	protected void updateName()
+	{
+		String name = _displayName;
+
+		if (_showHealthName)
+		{
+			String healthString = (int) _health + "/" + (int) _maxHealth;
+			double per =_health / _maxHealth;
+			if (per > 0.5)	healthString = C.cGreen + healthString;
+			if (per > 0.2)	healthString = C.cYellow + healthString;
+			else			healthString = C.cRed + healthString;
+
+			name += " " + C.cWhite + "(" + healthString + C.cWhite + ")";
+		}
+
+		DisguiseBase disguise = getEvent().getDisguiseManager().getDisguise(getEntity());
+
+		if (disguise != null && disguise instanceof DisguiseInsentient)
+		{
+			((DisguiseInsentient) disguise).setName(name);
+			((DisguiseInsentient) disguise).setCustomNameVisible(_useName);
+		}
+
+		_entity.setCustomName(name);
+		_entity.setCustomNameVisible(_useName);
+	}
+
+	public void remove()
+	{
+		remove(true);
+	}
+
+	public void remove(boolean removeFromEvent)
+	{
+		if (_entity != null)
+		{
+			if (getHealth() > 0)
+			{
+				_entity.remove();
+			}
+			else
+			{
+				_entity.setHealth(0);
+				_entity.setCustomName("");
+				_entity.setCustomNameVisible(false);
+			}
+		}
+
+		if (removeFromEvent)
+			_event.removeCreature(this);
+	}
+
+	protected final void die()
+	{
+		dieCustom();
+		remove();
+	}
+
+	public abstract void dieCustom();
+
+	public WorldEvent getEvent()
+	{
+		return _event;
+	}
+
+	public void setEvent(WorldEvent event)
+	{
+		_event = event;
+	}
+
+	public T getEntity()
+	{
+		return _entity;
+	}
+
+	public void setEntity(T entity)
+	{
+		if (_entity != null) _entity.remove();
+
+		_entity = entity;
+	}
+
+	public Class<? extends T> getEntityClass()
+	{
+		return _entityClass;
+	}
+
+	public void setEntityClass(Class<? extends T> clazz)
+	{
+		_entityClass = clazz;
+	}
+
+	public double getHealthPercent()
+	{
+		return getHealth() / getMaxHealth();
+	}
+
+	public Location getSpawnLocation()
+	{
+		return _spawnLocation;
+	}
+
+	public void setSpawnLocation(Location spawnLocation)
+	{
+		_spawnLocation = spawnLocation;
+	}
+
+	public String getDisplayName()
+	{
+		return _displayName;
+	}
+
+	public String getName()
+	{
+		return _name;
+	}
+
+	public void setName(String name)
+	{
+		_displayName = name == null ? _name : name;
+		updateName();
+	}
+
+	public boolean isUseName()
+	{
+		return _useName;
+	}
+
+	public void setUseName(boolean useName)
+	{
+		_useName = useName;
+		updateName();
+	}
+
+	public void applyDamage(double damage)
+	{
+		setHealth(getHealth() - damage);
+	}
+
+	public double getHealth()
+	{
+		return _health;
+	}
+
+	public void setHealth(double health)
+	{
+		_health = health;
+
+		if (_health <= 0)
+			die();
+		else
+			updateName();
+	}
+
+	public double getMaxHealth()
+	{
+		return _maxHealth;
+	}
+
+	public void setMaxHealth(double maxHealth)
+	{
+		_maxHealth = maxHealth;
+	}
+
+	public void setShowHealthName(boolean showHealthName)
+	{
+		_showHealthName = showHealthName;
+		updateName();
+	}
+
+	/**
+	 * Events
+	 */
+
+	@EventHandler
+	public void onChunkUnload(ChunkUnloadEvent event)
+	{
+		if (_entity.getLocation().getChunk().equals(event.getChunk()))
+			event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void update(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		if (_entity == null || _entity.isDead() || !_entity.isValid())
+		{
+			System.out.println("Respawning " + getName() + " because it is null or dead");
+			spawnEntity();
+		}
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onDamage(CustomDamageEvent event)
+	{
+		if (_entity == null)
+			return;
+
+		if (!event.GetDamageeEntity().equals(_entity))
+			return;
+
+		updateEntityHealth();
+
+		applyDamage(event.GetDamage());
+		updateName();
+
+		_event.updateLastActive();
+	}
+
+	@EventHandler
+	public void damageType(CustomDamageEvent event)
+	{
+		if (_entity == null)
+			return;
+
+		if (!event.GetDamageeEntity().equals(_entity))
+			return;
+
+		DamageCause cause = event.GetCause();
+
+		if (cause == DamageCause.FALL && !getEvent().getCondition().HasCondition(_entity, ConditionType.FALLING, null))
+			event.SetCancelled("Cancel");
+
+		if (cause == DamageCause.DROWNING || cause == DamageCause.SUFFOCATION)
+			event.SetCancelled("Cancel");
+	}
+
+	@EventHandler
+	public void cancelCombust(EntityCombustEvent event)
+	{
+		if (_entity == null)
+			return;
+
+		if (!event.getEntity().equals(_entity))
+			return;
+
+		event.setCancelled(true);
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventMap.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventMap.java
new file mode 100644
index 000000000..308dee9af
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventMap.java
@@ -0,0 +1,53 @@
+package mineplex.minecraft.game.core.boss;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+
+import mineplex.core.common.block.schematic.Schematic;
+
+public class EventMap
+{
+	private Schematic _schematic;
+	private Location _centerLocation;
+	private double _xDiff;
+	private double _yDiff;
+	private double _zDiff;
+	private double _xLength;
+	private double _yLength;
+	private double _zLength;
+	
+	public EventMap(Schematic schematic, Location cornerLocation)
+	{
+		_schematic = schematic;
+		_xLength = schematic.getWidth();
+		_yLength = schematic.getHeight();
+		_zLength = schematic.getLength();
+		_xDiff = _xLength / 2D;
+		_yDiff = _yLength / 2D;
+		_zDiff = _zLength / 2D;
+		
+		_centerLocation = cornerLocation.clone().add(_xDiff, _yDiff, _zDiff);
+	}
+	
+	public Location getCenterLocation()
+	{
+		return _centerLocation;
+	}
+	
+	public boolean isInMap(Location checkLocation)
+	{
+		Location center = getCenterLocation();
+		
+		double x = Math.abs(center.getX() - checkLocation.getX());
+		double y = Math.abs(center.getY() - checkLocation.getY());
+		double z = Math.abs(center.getZ() - checkLocation.getZ());
+		
+		return x <= _xDiff && y <= _yDiff && z <= _zDiff;
+	}
+	
+	public Schematic getSchematic()
+	{
+		return _schematic;
+	}
+	
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventState.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventState.java
new file mode 100644
index 000000000..751f9e0cf
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventState.java
@@ -0,0 +1,10 @@
+package mineplex.minecraft.game.core.boss;
+
+public enum EventState
+{
+	PREPARE,
+	LIVE,
+	UNLOADING,
+	COMPLETE,
+	CANCELLED
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/WorldEvent.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/WorldEvent.java
new file mode 100644
index 000000000..0ec29781a
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/WorldEvent.java
@@ -0,0 +1,411 @@
+ package mineplex.minecraft.game.core.boss;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import mineplex.core.blockrestore.BlockRestore;
+import mineplex.core.blockrestore.BlockRestoreMap;
+import mineplex.core.common.block.BlockData;
+import mineplex.core.common.block.schematic.Schematic;
+import mineplex.core.common.block.schematic.SchematicRunnable;
+import mineplex.core.common.block.schematic.UtilSchematic;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.disguise.DisguiseManager;
+import mineplex.core.projectile.ProjectileManager;
+import mineplex.core.scoreboard.ScoreboardManager;
+import mineplex.core.scoreboard.elements.ScoreboardElement;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.condition.ConditionManager;
+import mineplex.minecraft.game.core.damage.DamageManager;
+
+public abstract class WorldEvent implements Listener, ScoreboardElement
+{
+	// 20 Minutes
+	private static final int ACTIVE_TIMEOUT = 1200000;
+	
+	private DamageManager _damageManager;
+	private ConditionManager _conditionManager;
+	private DisguiseManager _disguiseManager;
+	private ProjectileManager _projectileManager;
+	
+	private String _name;
+	private EventState _state;
+	private Location _cornerLocation;
+	private EventMap _map;
+	private Random _random;
+	private long _timeStarted = System.currentTimeMillis();
+	private long _lastActive;
+	private Schematic _schematic;
+	
+	// Creatures
+	private List<EventCreature<?>> _creatures;
+	// Block Restore
+	private BlockRestoreMap _blocks;
+	private boolean _isArcade;
+	private double _difficulty = 1;
+	
+	public WorldEvent(DisguiseManager disguiseManager, ProjectileManager projectileManager, DamageManager damageManager, BlockRestore blockRestore, ConditionManager conditionManager, String name, Location cornerLocation)
+	{
+		this(disguiseManager, projectileManager, damageManager, blockRestore, conditionManager, name, cornerLocation, null);
+	}
+	
+	public WorldEvent(DisguiseManager disguiseManager, ProjectileManager projectileManager, DamageManager damageManager, BlockRestore blockRestore, ConditionManager conditionManager, String name, Location cornerLocation, String schematicName)
+	{
+		_disguiseManager = disguiseManager;
+		_projectileManager = projectileManager;
+		_damageManager = damageManager;
+		_conditionManager = conditionManager;
+		
+		_name = name;
+		_state = EventState.PREPARE;
+		_cornerLocation = cornerLocation;
+		_random = new Random();
+		
+		_creatures = new ArrayList<>();
+		_blocks = blockRestore.createMap();
+		_lastActive = System.currentTimeMillis();
+		
+		if (schematicName != null)
+		{
+			try
+			{
+				_schematic = UtilSchematic.loadSchematic(new File(schematicName));
+				
+				_cornerLocation.subtract(_schematic.getWidth() / 2, 0, _schematic.getLength() / 2);
+			}
+			catch (IOException e)
+			{
+				e.printStackTrace();
+				setState(EventState.COMPLETE);
+			}
+		}
+	}
+	
+	public DisguiseManager getDisguiseManager()
+	{
+		return _disguiseManager;
+	}
+	
+	public ProjectileManager getProjectileManager()
+	{
+		return _projectileManager;
+	}
+	
+	public void setDifficulty(double difficulty)
+	{
+		_difficulty = difficulty;
+	}
+	
+	public void setArcadeGame(boolean isArcade)
+	{
+		_isArcade = isArcade;
+	}
+	
+	public void loadMap()
+	{
+		loadMap(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				System.out.println("Runnable on complete");
+			}
+		});
+	}
+	
+	public double getDifficulty()
+	{
+		return _difficulty;
+	}
+	
+	public void loadMap(Runnable runnable)
+	{
+		if (_schematic == null)
+		{
+			return;
+		}
+		
+		EventMap map = new EventMap(_schematic, _cornerLocation);
+		setMap(map, runnable);
+	}
+	
+	public Schematic getSchematic()
+	{
+		return _schematic;
+	}
+	
+	public ConditionManager getCondition()
+	{
+		return _conditionManager;
+	}
+	
+	public final void start()
+	{
+		customStart();
+	}
+	
+	@Override
+	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
+	{
+		return null;
+	}
+	
+	protected abstract void customStart();
+	
+	public final void cleanup()
+	{
+		clearCreatures();
+		restoreBlocks();
+		customCleanup();
+	}
+	
+	public void customCleanup()
+	{
+	
+	}
+	
+	public final void cancel()
+	{
+		cleanup();
+		setState(EventState.CANCELLED);
+		customCancel();
+	}
+	
+	protected final void triggerEnd()
+	{
+		setState(EventState.COMPLETE);
+	}
+	
+	protected void customCancel()
+	{
+	
+	}
+	
+	protected void customTick()
+	{
+	
+	}
+	
+	protected void setState(EventState state)
+	{
+		_state = state;
+	}
+	
+	public EventState getState()
+	{
+		return _state;
+	}
+	
+	public long getTimeRunning()
+	{
+		return System.currentTimeMillis() - _timeStarted;
+	}
+	
+	public DamageManager getDamageManager()
+	{
+		return _damageManager;
+	}
+	
+	public String getName()
+	{
+		return _name;
+	}
+	
+	public void setName(String name)
+	{
+		_name = name;
+	}
+	
+	protected Random getRandom()
+	{
+		return _random;
+	}
+	
+	public Location getCenterLocation()
+	{
+		return _map == null ? _cornerLocation : _map.getCenterLocation();
+	}
+	
+	public List<EventCreature<?>> getCreatures()
+	{
+		return _creatures;
+	}
+	
+	public void registerCreature(EventCreature<?> creature)
+	{
+		UtilServer.getServer().getPluginManager().registerEvents(creature, _damageManager.getPlugin());
+		_creatures.add(creature);
+	}
+	
+	public void removeCreature(EventCreature<?> creature)
+	{
+		HandlerList.unregisterAll(creature);
+		_creatures.remove(creature);
+	}
+	
+	public void announceStart()
+	{
+		UtilTextMiddle.display(C.cGreen + getName(), UtilWorld.locToStrClean(getCenterLocation()), 10, 100, 40);
+		
+		Bukkit.broadcastMessage(F.main("Event", F.elem(getName()) + " has started at coordinates " + F.elem(UtilWorld.locToStrClean(getCenterLocation()))));
+	}
+	
+	public void clearCreatures()
+	{
+		for (EventCreature<?> creature : _creatures)
+		{
+			creature.remove(false);
+			HandlerList.unregisterAll(creature);
+		}
+		
+		_creatures.clear();
+	}
+	
+	public JavaPlugin getPlugin()
+	{
+		return _damageManager.getPlugin();
+	}
+	
+	public void restoreBlocks()
+	{
+		_blocks.restore();
+	}
+	
+	public long getLastActive()
+	{
+		return _lastActive;
+	}
+	
+	public void updateLastActive()
+	{
+		_lastActive = System.currentTimeMillis();
+	}
+	
+	public EventMap getEventMap()
+	{
+		return _map;
+	}
+	
+	public void setMap(EventMap map, final Runnable onComplete)
+	{
+		_map = map;
+		
+		SchematicRunnable task = new SchematicRunnable(_damageManager.getPlugin(), map.getSchematic(), _cornerLocation.getBlock(), new Callback<List<BlockData>>()
+		{
+			@Override
+			public void run(List<BlockData> data)
+			{
+				if (!_isArcade)
+				{
+					for (BlockData blockData : data)
+					{
+						_blocks.addBlockData(blockData);
+					}
+				}
+				
+				if (onComplete != null)
+				{
+					onComplete.run();
+				}
+				
+			}
+		});
+		
+		task.setBlocksPerTick(_isArcade ? 2000000 : 1000); // TODO: CHANGE THIS
+															// BACK
+		task.start();
+	}
+	
+	protected BlockRestoreMap getBlocks()
+	{
+		return _blocks;
+	}
+	
+	public void setBlock(Block block, Material material)
+	{
+		setBlock(block, material, (byte) 0);
+	}
+	
+	public void setBlock(Block block, Material material, byte data)
+	{
+		setBlock(block, material.getId(), data);
+	}
+	
+	public void setBlock(Block block, int id, byte data)
+	{
+		_blocks.set(block, id, data);
+	}
+	
+	public int getRandomRange(int min, int max)
+	{
+		return min + _random.nextInt(UtilMath.clamp(max - min, min, max));
+	}
+	
+	@EventHandler
+	public void tick(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+		
+		customTick();
+	}
+	
+	@EventHandler
+	public void endInactive(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+		{
+			return;
+		}
+		
+		long diff = System.currentTimeMillis() - getLastActive();
+		if (diff > ACTIVE_TIMEOUT)
+		{
+			setState(EventState.COMPLETE);
+		}
+	}
+	
+	@EventHandler
+	public void prepareTimeout(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+		{
+			return;
+		}
+		
+		if (getState() != EventState.PREPARE)
+		{
+			return;
+		}
+		
+		// Event was preparing for more than 5 minutes
+		if (getTimeRunning() > 1000 * 60 * 5)
+		{
+			cancel();
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/GolemBoss.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/GolemBoss.java
new file mode 100644
index 000000000..2bb55096e
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/GolemBoss.java
@@ -0,0 +1,63 @@
+package mineplex.minecraft.game.core.boss.ironwizard;
+
+import mineplex.core.blockrestore.BlockRestore;
+import mineplex.core.disguise.DisguiseManager;
+import mineplex.core.projectile.ProjectileManager;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.EventState;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+import mineplex.minecraft.game.core.condition.ConditionManager;
+import mineplex.minecraft.game.core.damage.DamageManager;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+
+public class GolemBoss extends WorldEvent
+{
+
+	public GolemBoss(DisguiseManager disguiseManager, ProjectileManager projectileManager, DamageManager damageManager,
+			BlockRestore blockRestore, ConditionManager conditionManager, Location cornerLocation)
+	{
+		super(disguiseManager, projectileManager, damageManager, blockRestore, conditionManager, "Iron Wizard", cornerLocation, "schematic/Golem.schematic");
+	}
+
+	@Override
+	protected void customStart()
+	{
+		Bukkit.broadcastMessage("Custom Start");
+		spawnGolem(getCenterLocation());
+		setState(EventState.LIVE);
+		announceStart();
+	}
+
+	/**
+	 * Check if this slime boss has been defeated
+	 */
+	private void checkDeath()
+	{
+		if (getCreatures().size() == 0)
+		{
+			setState(EventState.COMPLETE);
+			Bukkit.broadcastMessage("FINISHED!");
+		}
+	}
+
+	@Override
+	public void removeCreature(EventCreature creature)
+	{
+		super.removeCreature(creature);
+
+		if (creature instanceof GolemCreature)
+		{
+			checkDeath();
+		}
+	}
+
+	private GolemCreature spawnGolem(Location location)
+	{
+		GolemCreature slimeCreature = new GolemCreature(this, location, 2500);
+		registerCreature(slimeCreature);
+		return slimeCreature;
+	}
+
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/GolemCreature.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/GolemCreature.java
new file mode 100644
index 000000000..06f1dc23d
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/GolemCreature.java
@@ -0,0 +1,573 @@
+package mineplex.minecraft.game.core.boss.ironwizard;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.ironwizard.abilities.GolemBlockHail;
+import mineplex.minecraft.game.core.boss.ironwizard.abilities.GolemBlockShot;
+import mineplex.minecraft.game.core.boss.ironwizard.abilities.GolemCaveIn;
+import mineplex.minecraft.game.core.boss.ironwizard.abilities.GolemEarthquake;
+import mineplex.minecraft.game.core.boss.ironwizard.abilities.GolemExplodingAura;
+import mineplex.minecraft.game.core.boss.ironwizard.abilities.GolemMeleeAttack;
+import mineplex.minecraft.game.core.boss.ironwizard.abilities.GolemRupture;
+import mineplex.minecraft.game.core.boss.ironwizard.abilities.GolemSlam;
+import mineplex.minecraft.game.core.boss.ironwizard.abilities.GolemWallExplode;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+public class GolemCreature extends EventCreature<IronGolem>
+{
+	private GolemBoss _boss;
+	// private GolemAbility _currentAbility;
+	private int _lastAbility;
+	private long _lastWalked;
+	private Location _standing;
+	private long _spawnDelay = System.currentTimeMillis();
+	private long _reverseWalk;
+	private HashMap<Class, Class[]> _preferedCombos = new HashMap<Class, Class[]>();
+	private Class _lastAttack;
+	private boolean _usedFinalAttack;
+	private ArrayList<BossAbility> _currentAbilities = new ArrayList<BossAbility>();
+	private double _canCaveIn = 450;
+	private Vector _afkWalk = new Vector();
+	private long _lastSlam;
+
+	public GolemCreature(GolemBoss boss, Location location, double maxHealth)
+	{
+		super(boss, location, "Iron Wizard", true, maxHealth, IronGolem.class);
+		_boss = boss;
+
+		spawnEntity();
+
+		_preferedCombos.put(GolemEarthquake.class, new Class[]
+			{
+					GolemBlockHail.class, GolemRupture.class
+			});
+		_preferedCombos.put(GolemMeleeAttack.class, new Class[]
+			{
+					GolemEarthquake.class, GolemRupture.class
+			});
+		_preferedCombos.put(GolemCaveIn.class, new Class[]
+			{
+					GolemMeleeAttack.class
+			});
+		_preferedCombos.put(GolemBlockShot.class, new Class[]
+			{
+					GolemEarthquake.class
+			});
+		_preferedCombos.put(GolemRupture.class, new Class[]
+			{
+					GolemBlockShot.class
+			});
+	}
+
+	@Override
+	protected void spawnCustom()
+	{
+		UtilEnt.Vegetate(getEntity());
+		// EntityInsentient creature = (EntityInsentient) ((CraftEntity) getEntity()).getHandle();
+
+		// creature.Vegetated = false;
+
+		_standing = getEntity().getLocation();
+	}
+
+	@EventHandler
+	public void abilityTick(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		if (!UtilTime.elapsed(_spawnDelay, 5000))
+		{
+			_standing = getEntity().getLocation();
+			return;
+		}
+
+		// if (_currentAbility == null || _currentAbility.hasFinished())
+		// {
+		Iterator<BossAbility> itel = _currentAbilities.iterator();
+		boolean canDoNew = _currentAbilities.size() < 3;
+
+		while (itel.hasNext())
+		{
+			BossAbility ability = itel.next();
+
+			if (ability.hasFinished())
+			{
+				itel.remove();
+				ability.setFinished();
+				_lastAbility = 20;// _currentAbility.getCooldown();
+
+				HandlerList.unregisterAll(ability);
+				System.out.print("Unregistered golem ability " + ability.getClass().getSimpleName());
+			}
+			else if (!ability.inProgress())
+			{
+				canDoNew = false;
+			}
+		}
+
+		if (_lastAbility-- <= 0 && canDoNew && UtilBlock.solid(getEntity().getLocation().getBlock().getRelative(BlockFace.DOWN)))
+		{
+			HashMap<Class, Integer> weight = new HashMap<Class, Integer>();
+			HashMap<Player, Double> dist = new HashMap<Player, Double>();
+
+			for (Player player : UtilPlayer.getNearby(getEntity().getLocation(), 50, true))
+			{
+				if (player.hasLineOfSight(getEntity()))
+				{
+					dist.put(player, player.getLocation().distance(getEntity().getLocation()));
+				}
+			}
+
+			if (!dist.isEmpty())
+			{
+				double hp = getHealthPercent();
+
+				{ // Melee
+					ArrayList<Player> players = getPlayers(dist, UtilMath.r(10) == 0 ? 4 : 3);
+
+					if (!players.isEmpty())
+					{
+						weight.put(GolemMeleeAttack.class, 999);
+					}
+				}
+
+				if (hp < 0.7)
+				{ // Earthquake
+					ArrayList<Player> players = getPlayers(dist, 10);
+
+					double score = 0;
+
+					for (Player player : players)
+					{
+						score += (8 - dist.get(player)) / 2;
+					}
+
+					if (players.size() >= 3)
+					{
+						score += 7;
+					}
+
+					if (score > 0)
+					{
+						weight.put(GolemEarthquake.class, (int) Math.ceil(score));
+					}
+				}
+
+				{ // Wall explode
+					if (!getPlayers(dist, 13).isEmpty() && getPlayers(dist, 4).isEmpty())
+					{
+						weight.put(GolemWallExplode.class, 8);
+					}
+				}
+
+				{ // Block Shot
+					ArrayList<Player> players = getPlayers(dist, 30);
+
+					for (Player player : players)
+					{
+						if (dist.get(player) > 4)
+						{
+							weight.put(GolemBlockShot.class, 6);
+							break;
+						}
+					}
+				}
+
+				{ // Rupture
+					ArrayList<Player> players = getPlayers(dist, 30);
+
+					if (!players.isEmpty())
+					{
+						weight.put(GolemRupture.class, (int) Math.min(5, dist.get(players.get(0))));
+					}
+				}
+
+				{ // Slam
+					ArrayList<Player> players = getPlayers(dist, 30);
+
+					if (!players.isEmpty() && UtilTime.elapsed(_lastSlam, 20000))
+					{
+						weight.put(GolemSlam.class, 6);
+					}
+				}
+
+				if (_canCaveIn <= 0) // Cave in
+				{
+					ArrayList<Player> players = getPlayers(dist, 30);
+
+					for (BossAbility ability : _currentAbilities)
+					{
+						if (ability instanceof GolemExplodingAura)
+						{
+							players.clear();
+						}
+					}
+
+					if (!players.isEmpty())
+					{
+						// weight.put(GolemCaveIn.class, (int) Math.min(players.size() * 2, 7));
+						weight.put(GolemCaveIn.class, (int) 30);
+					}
+				}
+
+				{// Block Hail
+					ArrayList<Player> players = getPlayers(dist, 30);
+
+					if (!players.isEmpty())
+					{
+						int we = _lastAttack == GolemEarthquake.class ? 5 : UtilMath.r(4) - 2;
+
+						if (we > 0)
+						{
+							weight.put(GolemBlockHail.class, we);
+						}
+					}
+				}
+
+				if (!_usedFinalAttack && getHealth() < 90)
+				{
+					_usedFinalAttack = true;
+					weight.clear();
+
+					weight.put(GolemExplodingAura.class, 999);
+				}
+
+				if (_lastAttack != null && _preferedCombos.containsKey(_lastAttack))
+				{
+					weight.remove(_lastAttack);
+
+					for (Class c : _preferedCombos.get(_lastAttack))
+					{
+						if (weight.containsKey(c))
+						{
+							weight.put(c, weight.get(c) * 4);
+						}
+					}
+				}
+
+				for (BossAbility ability : _currentAbilities)
+				{
+					weight.remove(ability.getClass());
+				}
+
+				BossAbility ability = null;
+
+				if (!weight.isEmpty())
+				{
+					int i = 0;
+
+					for (Integer entry : weight.values())
+					{
+						i += entry;
+					}
+
+					for (int a = 0; a < 10; a++)
+					{
+						int luckyNumber = UtilMath.r(i);
+
+						for (Entry<Class, Integer> entry : weight.entrySet())
+						{
+							luckyNumber -= entry.getValue();
+
+							if (luckyNumber <= 0)
+							{
+								try
+								{
+									ability = (BossAbility) entry.getKey().getConstructor(GolemCreature.class).newInstance(this);
+
+									if (ability.getTarget() == null)
+									{
+										ability = null;
+									}
+									else
+									{
+										break;
+									}
+								}
+								catch (Exception ex)
+								{
+									ex.printStackTrace();
+								}
+
+								break;
+							}
+						}
+					}
+				}
+
+				if (ability != null && ability.getTarget() != null)
+				{
+					_lastAttack = ability.getClass();
+
+					if (ability instanceof GolemCaveIn)
+					{
+						_canCaveIn = 450;
+					}
+					else if (ability instanceof GolemSlam)
+					{
+						_lastSlam = System.currentTimeMillis();
+					}
+
+					Bukkit.getPluginManager().registerEvents(ability, _boss.getPlugin());
+
+					// Bukkit.broadcastMessage("Prepare fair maidens for " + ability.getClass().getSimpleName() + "!");
+
+					System.out.print("Golem boss is using " + ability.getClass().getSimpleName());
+
+					_currentAbilities.add(ability);
+				}
+
+				_lastAbility = 10;
+			}
+
+			_lastAttack = null;
+		}
+
+		boolean canMove = true;
+
+		for (BossAbility ability : _currentAbilities)
+		{
+			ability.tick();
+
+			if (!ability.canMove())
+			{
+				canMove = false;
+			}
+		}
+
+		if (canMove)
+		{
+			Player target = null;
+			double dist = 0;
+
+			for (Player player : UtilPlayer.getNearby(getEntity().getLocation(), 50, true))
+			{
+				if (!player.hasLineOfSight(getEntity()))
+				{
+					continue;
+				}
+
+				double d = player.getLocation().distance(getEntity().getLocation());
+
+				if (d > 1.5 && (d < 7 || d > 15) && (target == null || (d < 50 && dist > d)))
+				{
+					target = player;
+					dist = d;
+				}
+			}
+
+			Vector vec = null;
+			boolean superWalk = false;
+
+			if (target != null)
+			{
+				vec = target.getLocation().subtract(getEntity().getLocation()).toVector();
+				vec.setY(getEntity().getLocation().getY());
+
+				double len = vec.length();
+
+				vec.setX(vec.getX() * (UtilMath.random.nextDouble() / 3D));
+				vec.setZ(vec.getZ() * (UtilMath.random.nextDouble() / 3D));
+
+				vec.multiply(len);
+
+				if (target != null && dist < 8)
+				{
+					vec.multiply(-1);
+					superWalk = true;
+				}
+
+				if (!UtilAlg.HasSight(getEntity().getLocation(),
+						getEntity().getLocation().add(vec.clone().normalize().multiply(2))))
+				{
+					_reverseWalk = System.currentTimeMillis();
+				}
+
+				if (!UtilTime.elapsed(_reverseWalk, 4000))
+				{
+					vec.multiply(-1);
+				}
+
+			}
+			else if (!UtilTime.elapsed(_lastWalked, 7000))
+			{
+				vec = _afkWalk;
+			}
+			else if (UtilTime.elapsed(_lastWalked, 12000))
+			{
+				_afkWalk = new Vector();
+
+				for (int i = 0; i < 10; i++)
+				{
+					Vector vector = new Vector(UtilMath.r(20) - 10, 0, UtilMath.r(20) - 10);
+
+					if (UtilAlg.HasSight(getEntity().getLocation(),
+							getEntity().getLocation().add(vector.clone().normalize().multiply(2))))
+					{
+						vec = _afkWalk = vector;
+						break;
+					}
+				}
+
+				_lastWalked = System.currentTimeMillis();
+			}
+
+			if (vec != null)
+			{
+				// if (vec.length() > 1)
+				{
+					UtilEnt.CreatureMoveFast(getEntity(), getEntity().getLocation().add(vec),
+							(target != null ? 1.8F : 1.1F) + (superWalk ? 0.4F : 0));
+				}
+			}
+
+			_standing = getEntity().getLocation();
+		}
+		else
+		{
+			Location l = getEntity().getLocation();
+
+			_standing.setYaw(l.getYaw());
+			_standing.setPitch(l.getPitch());
+			_standing.setY(l.getY());
+
+			getEntity().teleport(_standing);
+		}
+	}
+
+	private ArrayList<Player> getPlayers(final HashMap<Player, Double> map, double maxDist)
+	{
+		ArrayList<Player> list = new ArrayList<Player>();
+
+		for (Player p : map.keySet())
+		{
+			if (map.get(p) <= maxDist)
+			{
+				list.add(p);
+			}
+		}
+
+		Collections.sort(list, new Comparator<Player>()
+		{
+
+			@Override
+			public int compare(Player o1, Player o2)
+			{
+				return Double.compare(map.get(o2), map.get(o1));
+			}
+		});
+
+		return list;
+	}
+
+	@EventHandler
+	public void onGolemDamage(CustomDamageEvent event)
+	{
+		if (event.GetDamageeEntity().equals(getEntity()))
+		{
+			event.AddKnockback("Heavy Golem", 0.3);
+		}
+	}
+
+	@EventHandler
+	public void onRangedAttack(CustomDamageEvent event)
+	{
+		if (event.GetDamageeEntity().equals(getEntity()))
+		{
+			if (event.GetDamageePlayer() != null)
+			{
+				double dist = event.GetDamageePlayer().getLocation().distance(getEntity().getLocation());
+
+				double maxRange = _usedFinalAttack ? 20 : 45;
+
+				double modifier = (maxRange - dist) / maxRange;
+
+				if (modifier > 0)
+				{
+					event.AddMod("Ranged Resistance", 1 - modifier);
+				}
+				else
+				{
+					event.SetCancelled("Range too far");
+				}
+			}
+		}
+	}
+
+	@Override
+	public void dieCustom()
+	{
+		endAbility();
+	}
+
+	private void endAbility()
+	{
+		for (BossAbility ability : _currentAbilities)
+		{
+			ability.setFinished();
+			HandlerList.unregisterAll(ability);
+		}
+
+		_currentAbilities.clear();
+	}
+
+	@Override
+	public void setHealth(double health)
+	{
+		_canCaveIn -= getHealth() - health;
+
+		super.setHealth(health);
+
+		if (getHealth() <= 100 && !_usedFinalAttack)
+		{
+			endAbility();
+		}
+	}
+
+	@EventHandler
+	public void onPlayerDamage(CustomDamageEvent event)
+	{
+		if (!(event.GetDamageeEntity() instanceof Player))
+		{
+			return;
+		}
+
+		if (event.GetCause() != DamageCause.FALL)
+		{
+			return;
+		}
+
+		if (!getEvent().getEventMap().isInMap(event.GetDamageeEntity().getLocation()))
+		{
+			return;
+		}
+
+		event.AddMod("Fall negation", 0.5);
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/BlockHailBlock.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/BlockHailBlock.java
new file mode 100644
index 000000000..07e23702c
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/BlockHailBlock.java
@@ -0,0 +1,86 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import mineplex.core.common.util.UtilEnt;
+import net.minecraft.server.v1_8_R3.DataWatcher;
+import net.minecraft.server.v1_8_R3.Packet;
+import net.minecraft.server.v1_8_R3.PacketPlayOutAttachEntity;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy;
+import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntity;
+import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntityLiving;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.IronGolem;
+
+public class BlockHailBlock
+{
+	private int _block = UtilEnt.getNewEntityId();
+	private int _silverfish = UtilEnt.getNewEntityId();
+	private Location _location;
+	private Material _mat;
+
+	public BlockHailBlock(Location loc, Material mat)
+	{
+		_location = loc;
+		_mat = mat;
+	}
+
+	public Packet getDestroyPacket()
+	{
+		return new PacketPlayOutEntityDestroy(new int[]
+			{
+					_silverfish, _block
+			});
+	}
+
+	public Location getLocation()
+	{
+		return _location;
+	}
+
+	public Material getMaterial()
+	{
+		return _mat;
+	}
+
+	public Packet[] getSpawnPackets(IronGolem entity)
+	{
+		Packet[] packets = new Packet[3];
+
+		PacketPlayOutSpawnEntityLiving packet1 = new PacketPlayOutSpawnEntityLiving();
+
+		DataWatcher watcher = new DataWatcher(null);
+		watcher.a(0, (byte) 32);
+		watcher.a(1, 0);
+
+		packet1.a = _silverfish;
+		packet1.b = EntityType.SILVERFISH.getTypeId();
+		packet1.c = (int) Math.floor(_location.getX() * 32);
+		packet1.d = (int) Math.floor(_location.getY() * 32);
+		packet1.e = (int) Math.floor(_location.getZ() * 32);
+		packet1.l = watcher;
+
+		packets[0] = packet1;
+
+		PacketPlayOutSpawnEntity packet2 = new PacketPlayOutSpawnEntity(((CraftEntity) entity).getHandle(), 70, _mat.getId());
+
+		packet2.a = _block;
+
+		packet2.b = (int) Math.floor(_location.getX() * 32);
+		packet2.c = (int) Math.floor(entity.getLocation().getY() * 32);
+		packet2.d = (int) Math.floor(_location.getZ() * 32);
+
+		packets[1] = packet2;
+
+		PacketPlayOutAttachEntity packet3 = new PacketPlayOutAttachEntity();
+
+		packet3.b = _block;
+		packet3.c = _silverfish;
+
+		packets[2] = packet3;
+
+		return packets;
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemBlockHail.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemBlockHail.java
new file mode 100644
index 000000000..4a32cb525
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemBlockHail.java
@@ -0,0 +1,477 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilShapes;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import net.minecraft.server.v1_8_R3.AxisAlignedBB;
+import net.minecraft.server.v1_8_R3.EntityIronGolem;
+import net.minecraft.server.v1_8_R3.MathHelper;
+import net.minecraft.server.v1_8_R3.MovingObjectPosition;
+import net.minecraft.server.v1_8_R3.Packet;
+import net.minecraft.server.v1_8_R3.Vec3D;
+
+import org.bukkit.Effect;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftIronGolem;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+/**
+ * Rumble is where the golem picks a target then starts playing a animation for a second where its obviously preparing to use it.
+ * Copy this from Wizards
+ */
+public class GolemBlockHail extends BossAbility<GolemCreature, IronGolem>
+{
+	private int _currentBlock;
+	private int _currentLevel;
+	private ArrayList<FallingBlock> _fallingBlocks = new ArrayList<FallingBlock>();
+	private HashMap<Integer, ArrayList<BlockHailBlock>> _floatingBlocks = new HashMap<Integer, ArrayList<BlockHailBlock>>();
+	private HashMap<String, Integer> _blocks = new HashMap<String, Integer>();
+	private int _levelToReach;
+	private boolean _spawned;
+	private ArrayList<Location> _spawnLocs = new ArrayList<Location>();
+	private Player _target;
+	private Location _center;
+	private int _ticks;
+
+	public GolemBlockHail(GolemCreature creature)
+	{
+		super(creature);
+
+		_center = getLocation();
+
+		if (creature.getHealthPercent() > 0.75)
+		{
+			_levelToReach = 1;
+		}
+		else if (creature.getHealthPercent() > 0.5)
+		{
+			_levelToReach = 2;
+		}
+		else
+		{
+			_levelToReach = 3;
+		}
+
+		_target = getTarget();
+	}
+
+	@Override
+	public Player getTarget()
+	{
+		Player target = null;
+		double dist = 0;
+
+		if (inProgress())
+		{
+			for (Player player : UtilPlayer.getNearby(_center, 40, true))
+			{
+				if (!player.hasLineOfSight(getEntity()))
+				{
+					continue;
+				}
+
+				if (target != null && _blocks.containsKey(player.getName()) && _blocks.get(player.getName()) > 8)
+				{
+					continue;
+				}
+
+				double d = player.getLocation().distance(_center);
+
+				if (target == null || dist > d)
+				{
+					target = player;
+					dist = d;
+				}
+			}
+		}
+
+		return target;
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return _spawned && _floatingBlocks.isEmpty();
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _target == null || !_target.isValid() || ((_fallingBlocks.isEmpty() && _spawned) && _ticks >= 8 * 9)
+				|| _center.distance(_target.getLocation()) > 100;
+	}
+
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		Iterator<FallingBlock> fallingIterator = _fallingBlocks.iterator();
+
+		while (fallingIterator.hasNext())
+		{
+			FallingBlock cur = fallingIterator.next();
+
+			if (cur.isDead() || !cur.isValid() || cur.getTicksLived() > 400
+					|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+			{
+				fallingIterator.remove();
+
+				Block block = cur.getLocation().getBlock();
+				block.setTypeIdAndData(0, (byte) 0, true);
+				cur.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, cur.getBlockId());
+
+				// Expire
+				if (cur.getTicksLived() > 400
+						|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+				{
+					cur.remove();
+					continue;
+				}
+
+				cur.remove();
+				continue;
+			}
+
+			double distanceToEntity = 0.0D;
+			LivingEntity victim = null;
+
+			net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) cur).getHandle();
+			Vec3D vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			Vec3D vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY,
+					nmsEntity.locZ + nmsEntity.motZ);
+
+			MovingObjectPosition finalObjectPosition = nmsEntity.world.rayTrace(vec3d, vec3d1, false, true, false);
+			vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY, nmsEntity.locZ + nmsEntity.motZ);
+
+			if (finalObjectPosition != null)
+			{
+				vec3d1 = new Vec3D(finalObjectPosition.pos.a, finalObjectPosition.pos.b, finalObjectPosition.pos.c);
+			}
+
+			for (Object entity : ((CraftWorld) cur.getWorld()).getHandle().getEntities(((CraftEntity) cur).getHandle(),
+					((CraftEntity) cur).getHandle().getBoundingBox().a(((CraftEntity) cur).getHandle().motX,
+							((CraftEntity) cur).getHandle().motY, ((CraftEntity) cur).getHandle().motZ).grow(2, 2, 2)))
+			{
+				Entity bukkitEntity = ((net.minecraft.server.v1_8_R3.Entity) entity).getBukkitEntity();
+
+				if (bukkitEntity instanceof LivingEntity)
+				{
+					LivingEntity ent = (LivingEntity) bukkitEntity;
+
+					// Avoid Self
+					if (ent.equals(getEntity()))
+						continue;
+
+					// Creative or Spec
+					if (ent instanceof Player)
+						if (((Player) ent).getGameMode() == GameMode.CREATIVE || UtilPlayer.isSpectator(ent))
+							continue;
+
+					// float f1 = (float)(nmsEntity.boundingBox.a() * 0.6f);
+					AxisAlignedBB axisalignedbb1 = ((CraftEntity) ent).getHandle().getBoundingBox().grow(1F, 1F, 1F);
+					MovingObjectPosition entityCollisionPosition = axisalignedbb1.a(vec3d, vec3d1);
+
+					if (entityCollisionPosition != null)
+					{
+						double d1 = vec3d.distanceSquared(entityCollisionPosition.pos);
+						if ((d1 < distanceToEntity) || (distanceToEntity == 0.0D))
+						{
+							victim = ent;
+							distanceToEntity = d1;
+						}
+					}
+				}
+			}
+
+			if (victim != null)
+			{
+				cur.getWorld().playEffect(victim.getEyeLocation().subtract(0, 0.5, 0), Effect.STEP_SOUND, cur.getBlockId());
+
+				// if (canDamage(victim))
+				{
+					getBoss().getEvent().getDamageManager().NewDamageEvent((LivingEntity) victim, getEntity(), null,
+							DamageCause.CONTACT, 10 * getBoss().getDifficulty(), true, true, false, "Iron Wizard Block Hail",
+							"Iron Wizard Block Hail");
+				}
+
+				if (victim instanceof Player)
+				{
+					getBoss().getEvent().getCondition().Factory().Slow("Iron Wizard Block Hail", (LivingEntity) victim,
+							getEntity(), 3, 2, false, false, false, false);
+				}
+
+				fallingIterator.remove();
+				cur.remove();
+			}
+			else if (finalObjectPosition != null)
+			{
+				Block block = cur.getWorld().getBlockAt(((int) finalObjectPosition.pos.a), ((int) finalObjectPosition.pos.b), ((int) finalObjectPosition.pos.c));
+
+				if (!UtilBlock.airFoliage(block) && !block.isLiquid())
+				{
+					nmsEntity.motX = ((float) (finalObjectPosition.pos.a - nmsEntity.locX));
+					nmsEntity.motY = ((float) (finalObjectPosition.pos.b - nmsEntity.locY));
+					nmsEntity.motZ = ((float) (finalObjectPosition.pos.c - nmsEntity.locZ));
+					float f2 = MathHelper.sqrt(
+							nmsEntity.motX * nmsEntity.motX + nmsEntity.motY * nmsEntity.motY + nmsEntity.motZ * nmsEntity.motZ);
+					nmsEntity.locX -= nmsEntity.motX / f2 * 0.0500000007450581D;
+					nmsEntity.locY -= nmsEntity.motY / f2 * 0.0500000007450581D;
+					nmsEntity.locZ -= nmsEntity.motZ / f2 * 0.0500000007450581D;
+
+					cur.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, cur.getBlockId());
+
+					fallingIterator.remove();
+					cur.remove();
+				}
+			}
+			else
+			{
+				UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.STONE, 0),
+						cur.getLocation().add(0, 0.5, 0), 0.3F, 0.3F, 0.3F, 0, 2, UtilParticle.ViewDist.NORMAL,
+						UtilServer.getPlayers());
+			}
+		}
+	}
+
+	@Override
+	public void setFinished()
+	{
+		for (ArrayList<BlockHailBlock> floatingBlocks : _floatingBlocks.values())
+		{
+			for (BlockHailBlock falling : floatingBlocks)
+			{
+				Packet packet = falling.getDestroyPacket();
+
+				for (Player player : UtilServer.getPlayers())
+				{
+					UtilPlayer.sendPacket(player, packet);
+				}
+			}
+		}
+
+		for (FallingBlock block : _fallingBlocks)
+		{
+			block.remove();
+		}
+	}
+
+	@Override
+	public void tick()
+	{
+		if (inProgress())
+		{
+			for (Player player : UtilPlayer.getNearby(_center, 5, true))
+			{
+				Location loc = player.getLocation();
+
+				if (Math.abs(loc.getY() - (_center.getY() + 1)) <= 1)
+				{
+					loc.setY(_center.getY());
+
+					if (loc.distance(_center) < 2.8 + (_currentLevel * 0.75))
+					{
+						if (canDamage(player))
+						{
+							getBoss().getEvent().getDamageManager().NewDamageEvent(player, getEntity(), null,
+									DamageCause.CONTACT, 10 * getBoss().getDifficulty(), true, true, false,
+									"Iron Wizard Protection", "Iron Wizard Protection");
+
+							loc.getWorld().playEffect(player.getLocation(), Effect.STEP_SOUND, Material.OBSIDIAN.getId());
+							loc.getWorld().playEffect(player.getEyeLocation(), Effect.STEP_SOUND, Material.OBSIDIAN.getId());
+						}
+					}
+				}
+			}
+		}
+
+		if (!_spawned)
+		{
+			if (_currentBlock >= _spawnLocs.size())
+			{
+
+				if (_currentLevel + 1 <= _levelToReach)
+				{
+					_currentLevel++;
+					_currentBlock = 0;
+
+					_spawnLocs = UtilShapes.getDistancedCircle(_center.clone().add(0, 2.8 + (_currentLevel * 0.75), 0), 1.3,
+							1 + (_currentLevel * 1.3));
+
+					for (int i = UtilMath.r(_spawnLocs.size()); i > 0; i--)
+					{
+						_spawnLocs.add(_spawnLocs.remove(0));
+					}
+				}
+			}
+
+			if (_currentBlock < _spawnLocs.size())
+			{
+				if (_ticks % 2 == 0)
+				{
+					IronGolem entity = getEntity();
+
+					Location loc = _spawnLocs.get(_currentBlock++);
+
+					ArrayList<BlockHailBlock> floatingBlocks = new ArrayList<BlockHailBlock>();
+
+					if (_floatingBlocks.containsKey(_currentLevel))
+					{
+						floatingBlocks = _floatingBlocks.get(_currentLevel);
+					}
+					else
+					{
+						_floatingBlocks.put(_currentLevel, floatingBlocks);
+					}
+
+					if (loc.getBlock().getType() == Material.AIR && UtilAlg.HasSight(entity.getLocation(), loc))
+					{
+
+						BlockHailBlock floating = new BlockHailBlock(loc, Material.STONE);
+						UtilEnt.CreatureLook(entity, _target);
+
+						floatingBlocks.add(floating);
+
+						Packet[] packets = floating.getSpawnPackets(entity);
+
+						for (Player player : UtilPlayer.getNearby(loc, 100))
+						{
+							UtilPlayer.sendPacket(player, packets);
+						}
+
+						entity.getWorld().playSound(entity.getLocation(), Sound.DIG_GRASS, 3, 0.9F);
+					}
+
+					if (_floatingBlocks.size() % 2 == 0)
+					{
+						Collections.reverse(floatingBlocks);
+					}
+				}
+			}
+			else
+			{
+				_spawned = true;
+				_ticks = -20;
+			}
+		}
+		else if (_ticks > 0 && _ticks % 2 == 0 && !_floatingBlocks.isEmpty())
+		{
+			IronGolem entity = getEntity();
+
+			if (_ticks % 16 == 0)
+			{
+				_target = getTarget();
+
+				if (_target == null)
+					return;
+			}
+
+			EntityIronGolem golem = ((CraftIronGolem) entity).getHandle();
+
+			golem.world.broadcastEntityEffect(golem, (byte) 4);
+			UtilEnt.CreatureLook(entity, _target);
+
+			BlockHailBlock floatingBlock = null;
+
+			for (int i = 1; i <= _currentLevel; i++)
+			{
+				if (_floatingBlocks.containsKey(i))
+				{
+					floatingBlock = _floatingBlocks.get(i).remove(0);
+
+					if (_floatingBlocks.get(i).isEmpty())
+					{
+						_floatingBlocks.remove(i);
+					}
+
+					break;
+				}
+			}
+
+			Packet packet = floatingBlock.getDestroyPacket();
+
+			for (Player player : UtilServer.getPlayers())
+			{
+				UtilPlayer.sendPacket(player, packet);
+			}
+
+			Location loc = floatingBlock.getLocation();
+
+			FallingBlock b = loc.getWorld().spawnFallingBlock(loc, floatingBlock.getMaterial(), (byte) 0);
+			b.setDropItem(false);
+
+			Vector vec = UtilAlg.calculateVelocity(loc.toVector(),
+					_target.getLocation().toVector().add(new Vector(UtilMath.r(6 + (_currentLevel * 2)) - (2 + _currentLevel), 0,
+							UtilMath.r(6 + (_currentLevel * 2)) - (2 + _currentLevel))),
+					6);
+
+			b.setVelocity(vec);
+
+			_fallingBlocks.add(b);
+
+			entity.getWorld().playSound(entity.getLocation(), Sound.IRONGOLEM_THROW, 3, 0.9F);
+
+			_blocks.put(_target.getName(), _blocks.containsKey(_target.getName()) ? _blocks.get(_target.getName()) + 1 : 1);
+		}
+
+		ArrayList<Location> points = new ArrayList<Location>();
+
+		for (int i = _currentLevel; i <= _currentLevel; i++)
+		{
+			points.addAll(UtilShapes.getDistancedCircle(_center.clone().add(0, 3.3 + (i * 0.75), 0), 0.3, 1 + (i * 1.3)));
+		}
+
+		for (int i = 0; i < points.size(); i++)
+		{
+			if (_spawned || i < _ticks)
+			{
+				Location loc = points.get(i);
+
+				UtilParticle.PlayParticle(
+						ParticleType.BLOCK_DUST.getParticle(_spawned && i < _ticks ? Material.STONE : Material.DIRT, 0), loc, 0,
+						0, 0, 0, 0, UtilParticle.ViewDist.LONG, UtilServer.getPlayers());
+			}
+		}
+
+		_ticks++;
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return !_spawned || !_floatingBlocks.isEmpty();
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemBlockShot.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemBlockShot.java
new file mode 100644
index 000000000..2007c1220
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemBlockShot.java
@@ -0,0 +1,442 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.UUID;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import net.minecraft.server.v1_8_R3.AxisAlignedBB;
+import net.minecraft.server.v1_8_R3.EntityIronGolem;
+import net.minecraft.server.v1_8_R3.MathHelper;
+import net.minecraft.server.v1_8_R3.MovingObjectPosition;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntityVelocity;
+import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntity;
+import net.minecraft.server.v1_8_R3.Vec3D;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Effect;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftIronGolem;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+public class GolemBlockShot extends BossAbility<GolemCreature, IronGolem>
+{
+	private HashMap<Integer, Location> _blockLoc = new HashMap<Integer, Location>();
+	private HashMap<Integer, Material> _blockType = new HashMap<Integer, Material>();
+	private ArrayList<FallingBlock> _current = new ArrayList<FallingBlock>();
+	private HashMap<Integer, Long> _preshoot = new HashMap<Integer, Long>();
+	private Player _target;
+	private HashMap<Integer, Player> _targetBlock = new HashMap<Integer, Player>();
+	private HashMap<UUID, Integer> _shotAt = new HashMap<UUID, Integer>();
+	private int _thrown;
+	private int _tick;
+	private int _toThrow;
+
+	public GolemBlockShot(GolemCreature creature)
+	{
+		super(creature);
+
+		if (creature.getHealthPercent() > 0.75)
+		{
+			_toThrow = 3;
+		}
+		else if (creature.getHealthPercent() > 0.5)
+		{
+			_toThrow = 6;
+		}
+		else
+		{
+			_toThrow = 9;
+		}
+
+		_target = getTarget();
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return _current.isEmpty() && _thrown == _toThrow;
+	}
+
+	@Override
+	public Player getTarget()
+	{
+		Player target = null;
+		double dist = 0;
+
+		Location loc1 = getLocation();
+		Location loc2 = loc1.clone().add(loc1.getDirection().setY(0).normalize());
+
+		List<Player> players = UtilPlayer.getNearby(getLocation(), 40, true);
+
+		for (Player player : players)
+		{
+			if (_shotAt.containsKey(player.getUniqueId()) && _shotAt.get(player.getUniqueId()) >= 3)
+			{
+				continue;
+			}
+
+			double dist1 = player.getLocation().distance(loc1);
+			double dist2 = player.getLocation().distance(loc2);
+
+			double dist3 = dist1 - dist2;
+
+			if (dist3 < 0.6 || dist1 > 30 || (target != null && dist3 < dist))
+			{
+				continue;
+			}
+
+			if (!player.hasLineOfSight(getEntity()))
+			{
+				continue;
+			}
+
+			target = player;
+			dist = dist3;
+		}
+
+		return target;
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _current.isEmpty() && _preshoot.isEmpty() && (_target == null || _thrown >= _toThrow);
+	}
+
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		Iterator<FallingBlock> fallingIterator = _current.iterator();
+
+		while (fallingIterator.hasNext())
+		{
+			FallingBlock cur = fallingIterator.next();
+
+			if (cur.isDead() || !cur.isValid() || cur.getTicksLived() > 400
+					|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+			{
+				fallingIterator.remove();
+
+				Block block = cur.getLocation().getBlock();
+				block.setTypeIdAndData(0, (byte) 0, true);
+				cur.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, cur.getBlockId());
+
+				// Expire
+				if (cur.getTicksLived() > 400
+						|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+				{
+					cur.remove();
+					continue;
+				}
+
+				cur.remove();
+				continue;
+			}
+
+			double distanceToEntity = 0.0D;
+			LivingEntity victim = null;
+
+			net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) cur).getHandle();
+			Vec3D vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			Vec3D vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY,
+					nmsEntity.locZ + nmsEntity.motZ);
+
+			MovingObjectPosition finalObjectPosition = nmsEntity.world.rayTrace(vec3d, vec3d1, false, true, false);
+			vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY, nmsEntity.locZ + nmsEntity.motZ);
+
+			if (finalObjectPosition != null)
+			{
+				vec3d1 = new Vec3D(finalObjectPosition.pos.a, finalObjectPosition.pos.b, finalObjectPosition.pos.c);
+			}
+
+			for (Object entity : ((CraftWorld) cur.getWorld()).getHandle().getEntities(((CraftEntity) cur).getHandle(),
+					((CraftEntity) cur).getHandle().getBoundingBox().a(((CraftEntity) cur).getHandle().motX,
+							((CraftEntity) cur).getHandle().motY, ((CraftEntity) cur).getHandle().motZ).grow(2, 2, 2)))
+			{
+				Entity bukkitEntity = ((net.minecraft.server.v1_8_R3.Entity) entity).getBukkitEntity();
+
+				if (bukkitEntity instanceof LivingEntity)
+				{
+					LivingEntity ent = (LivingEntity) bukkitEntity;
+
+					// Avoid Self
+					if (ent.equals(getEntity()))
+						continue;
+
+					// Creative or Spec
+					if (ent instanceof Player)
+						if (((Player) ent).getGameMode() == GameMode.CREATIVE || UtilPlayer.isSpectator(ent))
+							continue;
+
+					// float f1 = (float)(nmsEntity.boundingBox.a() * 0.6f);
+					AxisAlignedBB axisalignedbb1 = ((CraftEntity) ent).getHandle().getBoundingBox().grow(1F, 1F, 1F);
+					MovingObjectPosition entityCollisionPosition = axisalignedbb1.a(vec3d, vec3d1);
+
+					if (entityCollisionPosition != null)
+					{
+						double d1 = vec3d.distanceSquared(entityCollisionPosition.pos);
+						if ((d1 < distanceToEntity) || (distanceToEntity == 0.0D))
+						{
+							victim = ent;
+							distanceToEntity = d1;
+						}
+					}
+				}
+			}
+
+			if (victim != null)
+			{
+				cur.getWorld().playEffect(victim.getEyeLocation().subtract(0, 0.5, 0), Effect.STEP_SOUND, cur.getBlockId());
+
+				getBoss().getEvent().getDamageManager().NewDamageEvent((LivingEntity) victim, getEntity(), null,
+						DamageCause.CONTACT, 10 * getBoss().getDifficulty(), true, true, false, "Iron Wizard Block Shot",
+						"Iron Wizard Block Shot");
+
+				cur.remove();
+				fallingIterator.remove();
+
+				Vector vec = UtilAlg.getTrajectory(getEntity(), victim);
+				vec.setY(0).normalize();
+
+				double strength = 1;
+
+				if (!(victim instanceof Player) || !((Player) victim).isBlocking())
+				{
+					strength = 1.3;
+				}
+
+				UtilAction.velocity(victim, vec, strength, true, 0, 0.2, 1, true);
+			}
+			else if (finalObjectPosition != null)
+			{
+				Block block = cur.getWorld().getBlockAt(((int) finalObjectPosition.pos.a), ((int) finalObjectPosition.pos.b), ((int) finalObjectPosition.pos.c));
+
+				if (!UtilBlock.airFoliage(block) && !block.isLiquid())
+				{
+					nmsEntity.motX = ((float) (finalObjectPosition.pos.a - nmsEntity.locX));
+					nmsEntity.motY = ((float) (finalObjectPosition.pos.b - nmsEntity.locY));
+					nmsEntity.motZ = ((float) (finalObjectPosition.pos.c - nmsEntity.locZ));
+					float f2 = MathHelper.sqrt(
+							nmsEntity.motX * nmsEntity.motX + nmsEntity.motY * nmsEntity.motY + nmsEntity.motZ * nmsEntity.motZ);
+					nmsEntity.locX -= nmsEntity.motX / f2 * 0.0500000007450581D;
+					nmsEntity.locY -= nmsEntity.motY / f2 * 0.0500000007450581D;
+					nmsEntity.locZ -= nmsEntity.motZ / f2 * 0.0500000007450581D;
+
+					cur.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, cur.getBlockId());
+					cur.remove();
+					fallingIterator.remove();
+				}
+			}
+			else
+			{
+				UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.STONE, 0),
+						cur.getLocation().add(0, 0.5, 0), 0.3F, 0.3F, 0.3F, 0, 2, UtilParticle.ViewDist.NORMAL,
+						UtilServer.getPlayers());
+			}
+		}
+	}
+
+	@Override
+	public void setFinished()
+	{
+		for (FallingBlock falling : _current)
+		{
+			falling.remove();
+		}
+
+		int[] ids = new int[_preshoot.size()];
+
+		int a = 0;
+		for (int id : _preshoot.keySet())
+		{
+			ids[a++] = id;
+		}
+
+		PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(ids);
+
+		for (Player player : Bukkit.getOnlinePlayers())
+		{
+			UtilPlayer.sendPacket(player, packet);
+		}
+	}
+
+	@Override
+	public void tick()
+	{
+		if (_target == null || _target.getLocation().distance(getLocation()) > 30 || !_target.hasLineOfSight(getEntity()))
+		{
+			_target = getTarget();
+		}
+
+		Entity entity = getEntity();
+
+		if (_tick++ % 16 == 0 && _target != null && _thrown < _toThrow)
+		{
+			_thrown++;
+
+			UtilEnt.CreatureLook(entity, _target);
+			EntityIronGolem golem = ((CraftIronGolem) entity).getHandle();
+
+			golem.world.broadcastEntityEffect(golem, (byte) 4);
+
+			entity.getWorld().playSound(entity.getLocation(), Sound.IRONGOLEM_THROW, 2, 1);
+
+			Location loc = entity.getLocation();
+			loc.setYaw(loc.getYaw() + (UtilMath.r(150) - 75));
+			loc.add(loc.getDirection().setY(0).normalize());
+
+			Block block = loc.getBlock();
+
+			if (block.getType() == Material.AIR)
+			{
+				block = block.getRelative(BlockFace.DOWN);
+			}
+
+			Material mat = block.getType();
+
+			if (!UtilBlock.solid(block))
+			{
+				mat = Material.STONE;
+			}
+
+			int id = UtilEnt.getNewEntityId();
+
+			_preshoot.put(id, System.currentTimeMillis());
+			_blockType.put(id, mat);
+			_blockLoc.put(id, loc.clone().add(0, 0.6, 0));
+			_targetBlock.put(id, _target);
+
+			PacketPlayOutSpawnEntity packet = new PacketPlayOutSpawnEntity(((CraftEntity) entity).getHandle(), 70, mat.getId());
+
+			packet.a = id;
+
+			packet.b = (int) Math.floor(loc.getX() * 32);
+			packet.c = (int) Math.floor(loc.getY() * 32);
+			packet.d = (int) Math.floor(loc.getZ() * 32);
+
+			packet.g = (int) ((0.45) * 8000);
+
+			PacketPlayOutEntityVelocity packet2 = new PacketPlayOutEntityVelocity(id, 0, 0.45D, 0);
+
+			for (Player player : UtilPlayer.getNearby(loc, 70))
+			{
+				UtilPlayer.sendPacket(player, packet, packet2);
+			}
+
+			_shotAt.put(_target.getUniqueId(),
+					(_shotAt.containsKey(_target.getUniqueId()) ? _shotAt.get(_target.getUniqueId()) : 0) + 1);
+
+			_target = getTarget();
+		}
+		else
+		{
+			Iterator<Entry<Integer, Long>> itel = _preshoot.entrySet().iterator();
+
+			while (itel.hasNext())
+			{
+				Entry<Integer, Long> entry = itel.next();
+
+				if (UtilTime.elapsed(entry.getValue(), 920))
+				{
+					itel.remove();
+
+					int id = entry.getKey();
+
+					PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(new int[]
+						{
+								id
+						});
+
+					for (Player player : Bukkit.getOnlinePlayers())
+					{
+						UtilPlayer.sendPacket(player, packet);
+					}
+
+					Location loc = _blockLoc.get(id);
+					FallingBlock falling = loc.getWorld().spawnFallingBlock(loc, _blockType.get(id), (byte) 0);
+					falling.setDropItem(false);
+
+					_current.add(falling);
+
+					Player target = _targetBlock.get(id);
+
+					UtilEnt.CreatureLook(entity, target);
+					EntityIronGolem golem = ((CraftIronGolem) entity).getHandle();
+
+					golem.world.broadcastEntityEffect(golem, (byte) 4);
+
+					entity.getWorld().playSound(entity.getLocation(), Sound.IRONGOLEM_THROW, 2, 1.2F);
+					entity.getWorld().playEffect(falling.getLocation(), Effect.STEP_SOUND, falling.getBlockId());
+
+					Location l = falling.getLocation();
+					l.setY(entity.getLocation().getY());
+
+					Location loc1 = target.getEyeLocation();
+
+					if (loc1.getY() - l.getY() > 1)
+					{
+						loc1.setY(l.getY() + 1);
+					}
+
+					int dist = (int) Math.ceil(loc1.toVector().setY(0).distance(l.toVector().setY(0)));
+
+					Vector vector = UtilAlg.calculateVelocity(l.toVector(), loc1.toVector(), dist / 13);
+
+					falling.setVelocity(vector);// .multiply(0.5 + (l.distance(target.getEyeLocation()) / 10)).multiply(0.7));
+				}
+			}
+		}
+
+		if (_thrown >= 3 && !UtilPlayer.getNearby(
+
+		getLocation(), 10, true).isEmpty())
+		{
+			_thrown = 99;
+		}
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return _thrown < _toThrow || !_current.isEmpty();
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemCaveIn.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemCaveIn.java
new file mode 100644
index 000000000..5f57bd4c9
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemCaveIn.java
@@ -0,0 +1,337 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilShapes;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import net.minecraft.server.v1_8_R3.AxisAlignedBB;
+import net.minecraft.server.v1_8_R3.MathHelper;
+import net.minecraft.server.v1_8_R3.MovingObjectPosition;
+import net.minecraft.server.v1_8_R3.Vec3D;
+
+import org.bukkit.Effect;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+public class GolemCaveIn extends BossAbility<GolemCreature, IronGolem>
+{
+	private ArrayList<Block> _blocks = new ArrayList<Block>();
+	private ArrayList<FallingBlock> _fallingBlocks = new ArrayList<FallingBlock>();
+	private int _tick;
+
+	public GolemCaveIn(GolemCreature creature)
+	{
+		super(creature);
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return false;
+	}
+
+	@Override
+	public Player getTarget()
+	{
+		if (getTarget(4) == null)
+		{
+			return getTarget(40);
+		}
+
+		return null;
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _tick > 60 && _fallingBlocks.isEmpty();
+	}
+
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		Iterator<FallingBlock> fallingIterator = _fallingBlocks.iterator();
+
+		while (fallingIterator.hasNext())
+		{
+			FallingBlock cur = fallingIterator.next();
+
+			if (cur.isDead() || !cur.isValid() || cur.getTicksLived() > 400
+					|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+			{
+				fallingIterator.remove();
+
+				Block block = cur.getLocation().getBlock();
+				block.setTypeIdAndData(0, (byte) 0, true);
+				cur.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, cur.getBlockId());
+
+				// Expire
+				if (cur.getTicksLived() > 400
+						|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+				{
+					cur.remove();
+					continue;
+				}
+
+				cur.remove();
+				continue;
+			}
+
+			double distanceToEntity = 0.0D;
+			LivingEntity victim = null;
+
+			net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) cur).getHandle();
+			Vec3D vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			Vec3D vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY,
+					nmsEntity.locZ + nmsEntity.motZ);
+
+			MovingObjectPosition finalObjectPosition = nmsEntity.world.rayTrace(vec3d, vec3d1, false, true, false);
+			vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY, nmsEntity.locZ + nmsEntity.motZ);
+
+			if (finalObjectPosition != null)
+			{
+				vec3d1 = new Vec3D(finalObjectPosition.pos.a, finalObjectPosition.pos.b, finalObjectPosition.pos.c);
+			}
+
+			for (Object entity : ((CraftWorld) cur.getWorld()).getHandle().getEntities(((CraftEntity) cur).getHandle(),
+					((CraftEntity) cur).getHandle().getBoundingBox().a(((CraftEntity) cur).getHandle().motX,
+							((CraftEntity) cur).getHandle().motY, ((CraftEntity) cur).getHandle().motZ).grow(2, 2, 2)))
+			{
+				Entity bukkitEntity = ((net.minecraft.server.v1_8_R3.Entity) entity).getBukkitEntity();
+
+				if (bukkitEntity instanceof LivingEntity)
+				{
+					LivingEntity ent = (LivingEntity) bukkitEntity;
+
+					// Avoid Self
+					if (ent.equals(getEntity()))
+						continue;
+
+					// Creative or Spec
+					if (ent instanceof Player)
+						if (((Player) ent).getGameMode() == GameMode.CREATIVE || UtilPlayer.isSpectator(ent))
+							continue;
+
+					// float f1 = (float)(nmsEntity.boundingBox.a() * 0.6f);
+					AxisAlignedBB axisalignedbb1 = ((CraftEntity) ent).getHandle().getBoundingBox().grow(1F, 1F, 1F);
+					MovingObjectPosition entityCollisionPosition = axisalignedbb1.a(vec3d, vec3d1);
+
+					if (entityCollisionPosition != null)
+					{
+						double d1 = vec3d.distanceSquared(entityCollisionPosition.pos);
+						if ((d1 < distanceToEntity) || (distanceToEntity == 0.0D))
+						{
+							victim = ent;
+							distanceToEntity = d1;
+						}
+					}
+				}
+			}
+
+			if (victim != null)
+			{
+				cur.getWorld().playEffect(victim.getEyeLocation().subtract(0, 0.5, 0), Effect.STEP_SOUND, cur.getBlockId());
+
+				if (canDamage(victim))
+				{
+					getBoss().getEvent().getDamageManager().NewDamageEvent((LivingEntity) victim, getEntity(), null,
+							DamageCause.CONTACT, 10 * getBoss().getDifficulty(), true, true, false, "Iron Wizard Cave In",
+							"Iron Wizard Cave In");
+				}
+
+				cur.remove();
+				fallingIterator.remove();
+			}
+			else if (finalObjectPosition != null)
+			{
+				Block block = cur.getWorld().getBlockAt(((int) finalObjectPosition.pos.a), ((int) finalObjectPosition.pos.b), ((int) finalObjectPosition.pos.c));
+
+				if (!UtilBlock.airFoliage(block) && !block.isLiquid())
+				{
+					nmsEntity.motX = ((float) (finalObjectPosition.pos.a - nmsEntity.locX));
+					nmsEntity.motY = ((float) (finalObjectPosition.pos.b - nmsEntity.locY));
+					nmsEntity.motZ = ((float) (finalObjectPosition.pos.c - nmsEntity.locZ));
+					float f2 = MathHelper.sqrt(
+							nmsEntity.motX * nmsEntity.motX + nmsEntity.motY * nmsEntity.motY + nmsEntity.motZ * nmsEntity.motZ);
+					nmsEntity.locX -= nmsEntity.motX / f2 * 0.0500000007450581D;
+					nmsEntity.locY -= nmsEntity.motY / f2 * 0.0500000007450581D;
+					nmsEntity.locZ -= nmsEntity.motZ / f2 * 0.0500000007450581D;
+
+					cur.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, cur.getBlockId());
+					cur.remove();
+					fallingIterator.remove();
+				}
+			}
+			else
+			{
+				UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.STONE, 0),
+						cur.getLocation().add(0, 0.5, 0), 0.3F, 0.3F, 0.3F, 0, 2, UtilParticle.ViewDist.NORMAL,
+						UtilServer.getPlayers());
+			}
+		}
+	}
+
+	@Override
+	public void setFinished()
+	{
+		for (FallingBlock block : _fallingBlocks)
+		{
+			block.remove();
+		}
+
+		for (Block block : _blocks)
+		{
+			block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, block.getTypeId());
+			block.setType(Material.AIR);
+		}
+	}
+
+	@Override
+	public void tick()
+	{
+		if (_tick++ == 0)
+		{
+			Location l = getLocation();
+
+			ArrayList<Location> blocks = UtilShapes.getSphereBlocks(l, 3, 3, true);
+
+			for (Location loc : blocks)
+			{
+				if (loc.getBlockY() >= l.getBlockY())
+				{
+					Block b = loc.getBlock();
+
+					if (b.getType() == Material.AIR)
+					{
+						_blocks.add(b);
+
+						loc.setY(l.getY() - 1);
+
+						b.setType(loc.getBlock().getType());
+
+						b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, loc.getBlock().getTypeId());
+					}
+				}
+			}
+		}
+
+		if (_tick % 5 == 0)
+
+		{
+			for (Player player : UtilPlayer.getNearby(getLocation(), 2.5, true))
+			{
+				player.teleport(player.getLocation().add(0, 4, 0));
+				UtilAction.velocity(player, new Vector(UtilMath.r(10) - 5, 3, UtilMath.r(10) - 5).normalize());
+			}
+		}
+
+		if (_tick < 200)
+
+		{
+			Location loc = getLocation();
+			loc.setY(loc.getY() + 4);
+
+			for (int i = 0; i < 30; i++)
+			{
+				loc.setY(loc.getY() + 1);
+				Block b = loc.getBlock();
+
+				if (UtilBlock.solid(b))
+				{
+					break;
+				}
+			}
+
+			if (!UtilBlock.solid(loc.getBlock()))
+			{
+				return;
+			}
+
+			List<Player> players = UtilPlayer.getNearby(getLocation(), 50, true);
+
+			for (int i = 0; i < players.size() * 4; i++)
+			{
+				int dist = UtilMath.r(10);
+
+				if (dist < 3)
+				{
+					dist = 2;
+				}
+				else if (dist < 5)
+				{
+					dist = 5;
+				}
+				else
+				{
+					dist = 10;
+				}
+
+				Location l = players.get(UtilMath.r(players.size())).getLocation().add(UtilMath.r(dist * 2) - dist, 0,
+						UtilMath.r(dist * 2) - dist);
+				l.setY(loc.getY());
+
+				Block b = l.getBlock();
+				l.subtract(0, 1, 0);
+
+				if (UtilBlock.solid(b))
+				{
+					if (l.getBlock().getType() == Material.AIR)
+					{
+						if (UtilAlg.HasSight(l, getLocation().add(0, 4, 0)))
+						{
+							FallingBlock block = b.getWorld().spawnFallingBlock(b.getLocation().add(0.5, -1, 0.5), b.getTypeId(),
+									b.getData());
+
+							block.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, block.getBlockId());
+							block.setDropItem(false);
+
+							_fallingBlocks.add(block);
+						}
+					}
+				}
+			}
+		}
+
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return true;
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemEarthquake.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemEarthquake.java
new file mode 100644
index 000000000..1d06110c2
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemEarthquake.java
@@ -0,0 +1,167 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.UUID;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilServer;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+public class GolemEarthquake extends BossAbility<GolemCreature, IronGolem>
+{
+	private Location _center;
+	private float _range;
+	private int _tick;
+	private ArrayList<UUID> _damaged = new ArrayList<UUID>();
+	private boolean _earthquake;
+
+	public GolemEarthquake(GolemCreature creature)
+	{
+		super(creature);
+		_center = getLocation();
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return !UtilEnt.isGrounded(getEntity()) && _tick > 1;
+	}
+
+	@Override
+	public Player getTarget()
+	{
+		return getTarget(7);
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _range > 19;
+	}
+
+	@Override
+	public void setFinished()
+	{
+	}
+
+	@Override
+	public void tick()
+	{
+		Entity entity = getEntity();
+
+		if (_tick == 0)
+		{
+			entity.getWorld().playSound(entity.getLocation(), Sound.IRONGOLEM_THROW, 4, 0);
+
+			entity.setVelocity(new Vector(0, 1, 0));
+		}
+		else if (!_earthquake)
+		{
+			_earthquake = _tick > 10 && UtilEnt.isGrounded(entity);
+		}
+
+		if (_earthquake)
+		{
+			_range += 0.7;
+
+			for (float range = _range - 2; range <= _range; range++)
+			{
+				if (range <= 0)
+				{
+					continue;
+				}
+
+				for (int x = -1; x <= 1; x++)
+				{
+					for (int z = -1; z <= 1; z++)
+					{
+						if ((x != 0) == (z != 0))
+						{
+							continue;
+						}
+
+						UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.DIRT, 0),
+								_center.clone().add(x * range, 0.1, z * range), (x != 0) ? 0 : (range / 2), 0.1F,
+								(z != 0) ? 0 : (range / 2), 0, (int) (range * 4), UtilParticle.ViewDist.NORMAL,
+								UtilServer.getPlayers());
+					}
+				}
+			}
+
+			_center.getWorld().playSound(_center, Sound.DIG_GRASS, 2, 0.8F);
+
+			HashSet<Player> toDamage = new HashSet<Player>();
+
+			Location cornerA = _center.clone().add(-_range, -1, -_range);
+			Location cornerB = _center.clone().add(_range, 1, _range);
+			Location cornerA1 = _center.clone().add(-(_range - 1.5), -1, -(_range - 1.5));
+			Location cornerB1 = _center.clone().add(_range - 1.5, 1, _range - 1.5);
+
+			for (Player player : Bukkit.getOnlinePlayers())
+			{
+				Location pLoc = player.getLocation();
+
+				if (_damaged.contains(player.getUniqueId()))
+				{
+					continue;
+				}
+
+				if (!UtilAlg.inBoundingBox(pLoc, cornerA, cornerB))
+				{
+					continue;
+				}
+
+				if (UtilAlg.inBoundingBox(pLoc, cornerA1, cornerB1))
+				{
+					continue;
+				}
+
+				toDamage.add(player);
+			}
+
+			for (Player player : toDamage)
+			{
+				_damaged.add(player.getUniqueId());
+
+				getBoss().getEvent().getDamageManager().NewDamageEvent((LivingEntity) player, getEntity(), null,
+						DamageCause.CONTACT, 14 * getBoss().getDifficulty(), false, true, false, "Iron Wizard Earthquake",
+						"Iron Wizard Earthquake");
+
+				getBoss().getEvent().getCondition().Factory().Slow("Earthquake", (LivingEntity) player, getEntity(), 3, 1, false,
+						false, false, false);
+
+				// Velocity
+				UtilAction.velocity(player, UtilAlg.getTrajectory2d(getLocation().toVector(), player.getLocation().toVector()),
+						1.8, true, 0, 0.5, 0.5, true);
+
+				// Condition
+				getBoss().getEvent().getCondition().Factory().Falling("Earthquake", player, getEntity(), 10, false, true);
+			}
+		}
+
+		_tick++;
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return !_earthquake;
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemExplodingAura.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemExplodingAura.java
new file mode 100644
index 000000000..8ac030a5e
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemExplodingAura.java
@@ -0,0 +1,406 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import net.minecraft.server.v1_8_R3.AxisAlignedBB;
+import net.minecraft.server.v1_8_R3.DataWatcher;
+import net.minecraft.server.v1_8_R3.MathHelper;
+import net.minecraft.server.v1_8_R3.MovingObjectPosition;
+import net.minecraft.server.v1_8_R3.Packet;
+import net.minecraft.server.v1_8_R3.PacketPlayOutAttachEntity;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy;
+import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntity;
+import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntityLiving;
+import net.minecraft.server.v1_8_R3.Vec3D;
+
+import org.bukkit.Effect;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class GolemExplodingAura extends BossAbility<GolemCreature, IronGolem>
+{
+
+	private HashMap<Integer, Integer> _blocks = new HashMap<Integer, Integer>();
+	private HashMap<Integer, Location> _blocksLoc = new HashMap<Integer, Location>();
+	private ArrayList<FallingBlock> _fallingBlocks = new ArrayList<FallingBlock>();
+	// private HashMap<Integer, Long> _blocksExplode = new HashMap<Integer, Long>();
+	private HashMap<Integer, Material> _blockMaterial = new HashMap<Integer, Material>();
+	private int _tick;
+
+	public GolemExplodingAura(GolemCreature creature)
+	{
+		super(creature);
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _tick > 20 * 30 && _blocks.isEmpty() && _fallingBlocks.isEmpty();
+	}
+
+	@Override
+	public void setFinished()
+	{
+		for (FallingBlock block : _fallingBlocks)
+		{
+			block.remove();
+		}
+
+		int[] ids = new int[_blocks.size() * 2];
+
+		int i = 0;
+
+		for (Entry<Integer, Integer> id : _blocks.entrySet())
+		{
+			ids[i] = id.getKey();
+			ids[i + 1] = id.getValue();
+
+			i += 2;
+		}
+
+		PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(ids);
+
+		for (Player player : UtilServer.getPlayers())
+		{
+			UtilPlayer.sendPacket(player, packet);
+		}
+	}
+
+	@Override
+	public void tick()
+	{
+		if (_tick < 25 * 25 && getBoss().getHealth() > 30)
+		{
+			double angle = (2 * Math.PI) / UtilMath.random.nextDouble();
+			double x = 1.7 * Math.cos(angle);
+			double z = 1.7 * Math.sin(angle);
+
+			Location loc = getLocation().add(x, 1 + (UtilMath.random.nextDouble() * 1.6), z);
+
+			loc.getWorld().playEffect(loc, Effect.STEP_SOUND, Material.DIRT.getId());
+
+			for (Player player : UtilPlayer.getNearby(getLocation(), 3, true))
+			{
+				getBoss().getEvent().getDamageManager().NewDamageEvent(player, getEntity(), null, DamageCause.CONTACT,
+						6 * getBoss().getDifficulty(), true, true, false, "Iron Wizard Protection", "Iron Wizard Protection");
+				UtilAction.velocity(player, UtilAlg.getTrajectory(getEntity(), player), 1, true, 0.3, 0, 0.3, false);
+			}
+		}
+
+		if (_tick < 20 * 30)
+		{
+			int key = UtilEnt.getNewEntityId();
+			int value = UtilEnt.getNewEntityId();
+
+			Location loc = null;
+
+			for (int i = 0; i < 30; i++)
+			{
+				double angle = (2 * Math.PI) / UtilMath.random.nextDouble();
+				double x = 1.7 * Math.cos(angle);
+				double z = 1.7 * Math.sin(angle);
+
+				loc = getLocation().add(x, 1 + (UtilMath.random.nextDouble() * 1.6), z);
+				boolean found = false;
+
+				for (Location l : _blocksLoc.values())
+				{
+					if (l.distance(loc) < 0.3)
+					{
+						found = true;
+						break;
+					}
+				}
+
+				if (found)
+				{
+					loc = null;
+				}
+				else
+				{
+					break;
+				}
+			}
+
+			if (loc != null)
+			{
+				_blocks.put(key, value);
+				_blocksLoc.put(key, loc);
+				// _blocksExplode.put(key, System.currentTimeMillis() + UtilMath.r(800) + 100);
+				_blockMaterial.put(key, UtilMath.random.nextBoolean() ? Material.DIRT : Material.STONE);
+
+				Packet[] packets = new Packet[3];
+
+				PacketPlayOutSpawnEntityLiving packet1 = new PacketPlayOutSpawnEntityLiving();
+
+				DataWatcher watcher = new DataWatcher(null);
+				watcher.a(0, (byte) 32);
+				watcher.a(1, 0);
+
+				packet1.a = key;
+				packet1.b = EntityType.SILVERFISH.getTypeId();
+				packet1.c = (int) Math.floor(loc.getX() * 32);
+				packet1.d = (int) Math.floor((loc.getY() - 0.125) * 32);
+				packet1.e = (int) Math.floor(loc.getZ() * 32);
+				packet1.l = watcher;
+
+				packets[0] = packet1;
+
+				PacketPlayOutSpawnEntity packet2 = new PacketPlayOutSpawnEntity(((CraftEntity) getEntity()).getHandle(), 70,
+						_blockMaterial.get(key).getId());
+
+				packet2.a = value;
+
+				packet2.b = (int) Math.floor(loc.getX() * 32);
+				packet2.c = (int) Math.floor(loc.getY() * 32);
+				packet2.d = (int) Math.floor(loc.getZ() * 32);
+
+				packets[1] = packet2;
+
+				PacketPlayOutAttachEntity packet3 = new PacketPlayOutAttachEntity();
+
+				packet3.b = value;
+				packet3.c = key;
+
+				packets[2] = packet3;
+
+				for (Player player : UtilPlayer.getNearby(getLocation(), 70))
+				{
+					UtilPlayer.sendPacket(player, packets);
+				}
+			}
+		}
+
+		/*Iterator<Integer> itel = _blocksExplode.keySet().iterator();
+		
+		while (itel.hasNext())
+		{
+			int key = itel.next();
+		
+			if (_blocksExplode.get(key) < System.currentTimeMillis())
+			{
+				itel.remove();*/
+		if (_tick % 25 == 0)
+		{
+			for (int i = 0; i < 3; i++)
+				getLocation().getWorld().playSound(getLocation(), Sound.DIG_GRASS, 3, 2);
+
+			for (int key : new ArrayList<Integer>(_blocksLoc.keySet()))
+			{
+
+				PacketPlayOutEntityDestroy destroyPacket = new PacketPlayOutEntityDestroy(new int[]
+					{
+							key, _blocks.remove(key)
+					});
+
+				for (Player player : UtilServer.getPlayers())
+				{
+					UtilPlayer.sendPacket(player, destroyPacket);
+				}
+
+				Location loc = _blocksLoc.remove(key);
+
+				FallingBlock falling = loc.getWorld().spawnFallingBlock(loc, _blockMaterial.remove(key), (byte) 0);
+
+				_fallingBlocks.add(falling);
+
+				Vector vec = UtilAlg.getTrajectory(getLocation().add(0, 1, 0), loc);
+
+				vec.setY(Math.max(0.05, vec.getY()));
+
+				falling.setVelocity(vec);
+
+				loc.getWorld().playEffect(loc, Effect.STEP_SOUND, Material.DIRT.getId());
+			}
+		}
+
+		_tick++;
+	}
+
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		Iterator<FallingBlock> fallingIterator = _fallingBlocks.iterator();
+
+		while (fallingIterator.hasNext())
+		{
+			FallingBlock cur = fallingIterator.next();
+
+			if (cur.isDead() || !cur.isValid() || cur.getTicksLived() > 400
+					|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+			{
+				fallingIterator.remove();
+
+				Block block = cur.getLocation().getBlock();
+				block.setTypeIdAndData(0, (byte) 0, true);
+				cur.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, cur.getBlockId());
+
+				// Expire
+				if (cur.getTicksLived() > 400
+						|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+				{
+					cur.remove();
+					continue;
+				}
+
+				cur.remove();
+				continue;
+			}
+
+			double distanceToEntity = 0.0D;
+			LivingEntity victim = null;
+
+			net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) cur).getHandle();
+			Vec3D vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			Vec3D vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY,
+					nmsEntity.locZ + nmsEntity.motZ);
+
+			MovingObjectPosition finalObjectPosition = nmsEntity.world.rayTrace(vec3d, vec3d1, false, true, false);
+			vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY, nmsEntity.locZ + nmsEntity.motZ);
+
+			if (finalObjectPosition != null)
+			{
+				vec3d1 = new Vec3D(finalObjectPosition.pos.a, finalObjectPosition.pos.b, finalObjectPosition.pos.c);
+			}
+
+			for (Object entity : ((CraftWorld) cur.getWorld()).getHandle().getEntities(((CraftEntity) cur).getHandle(),
+					((CraftEntity) cur).getHandle().getBoundingBox().a(((CraftEntity) cur).getHandle().motX,
+							((CraftEntity) cur).getHandle().motY, ((CraftEntity) cur).getHandle().motZ).grow(2, 2, 2)))
+			{
+				Entity bukkitEntity = ((net.minecraft.server.v1_8_R3.Entity) entity).getBukkitEntity();
+
+				if (bukkitEntity instanceof LivingEntity)
+				{
+					LivingEntity ent = (LivingEntity) bukkitEntity;
+
+					// Avoid Self
+					if (ent.equals(getEntity()))
+						continue;
+
+					// Creative or Spec
+					if (ent instanceof Player)
+						if (((Player) ent).getGameMode() == GameMode.CREATIVE || UtilPlayer.isSpectator(ent))
+							continue;
+
+					// float f1 = (float)(nmsEntity.boundingBox.a() * 0.6f);
+					AxisAlignedBB axisalignedbb1 = ((CraftEntity) ent).getHandle().getBoundingBox().grow(1F, 1F, 1F);
+					MovingObjectPosition entityCollisionPosition = axisalignedbb1.a(vec3d, vec3d1);
+
+					if (entityCollisionPosition != null)
+					{
+						double d1 = vec3d.distanceSquared(entityCollisionPosition.pos);
+						if ((d1 < distanceToEntity) || (distanceToEntity == 0.0D))
+						{
+							victim = ent;
+							distanceToEntity = d1;
+						}
+					}
+				}
+			}
+
+			if (victim != null)
+			{
+				cur.getWorld().playEffect(victim.getEyeLocation().subtract(0, 0.5, 0), Effect.STEP_SOUND, cur.getBlockId());
+
+				// if (canDamage(victim))
+				{
+					getBoss().getEvent().getDamageManager().NewDamageEvent((LivingEntity) victim, getEntity(), null,
+							DamageCause.CONTACT, 6 * getBoss().getDifficulty(), true, true, false, "Blocky Iron Wizard Aura",
+							"Blocky Iron Wizard Aura");
+				}
+
+				fallingIterator.remove();
+				cur.remove();
+
+				Vector vec = UtilAlg.getTrajectory(getEntity(), victim);
+				vec.setY(0).normalize();
+
+				double strength = 1;
+
+				if (!(victim instanceof Player) || !((Player) victim).isBlocking())
+				{
+					strength = 1.3;
+				}
+
+				UtilAction.velocity(victim, vec, strength, true, 0, 0.2, 1, true);
+			}
+			else if (finalObjectPosition != null)
+			{
+				Block block = cur.getWorld().getBlockAt(((int) finalObjectPosition.pos.a), ((int) finalObjectPosition.pos.b), ((int) finalObjectPosition.pos.c));
+
+				if (!UtilBlock.airFoliage(block) && !block.isLiquid())
+				{
+					nmsEntity.motX = ((float) (finalObjectPosition.pos.a - nmsEntity.locX));
+					nmsEntity.motY = ((float) (finalObjectPosition.pos.b - nmsEntity.locY));
+					nmsEntity.motZ = ((float) (finalObjectPosition.pos.c - nmsEntity.locZ));
+					float f2 = MathHelper.sqrt(
+							nmsEntity.motX * nmsEntity.motX + nmsEntity.motY * nmsEntity.motY + nmsEntity.motZ * nmsEntity.motZ);
+					nmsEntity.locX -= nmsEntity.motX / f2 * 0.0500000007450581D;
+					nmsEntity.locY -= nmsEntity.motY / f2 * 0.0500000007450581D;
+					nmsEntity.locZ -= nmsEntity.motZ / f2 * 0.0500000007450581D;
+
+					cur.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, cur.getBlockId());
+
+					fallingIterator.remove();
+					cur.remove();
+				}
+			}
+			else
+			{
+				UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.STONE, 0),
+						cur.getLocation().add(0, 0.5, 0), 0.3F, 0.3F, 0.3F, 0, 2, UtilParticle.ViewDist.NORMAL,
+						UtilServer.getPlayers());
+			}
+		}
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return false;
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemExplosiveBlock.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemExplosiveBlock.java
new file mode 100644
index 000000000..de9121c43
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemExplosiveBlock.java
@@ -0,0 +1,590 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.itemstack.ItemBuilder;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+import net.minecraft.server.v1_8_R3.AxisAlignedBB;
+import net.minecraft.server.v1_8_R3.DataWatcher;
+import net.minecraft.server.v1_8_R3.EntityIronGolem;
+import net.minecraft.server.v1_8_R3.MathHelper;
+import net.minecraft.server.v1_8_R3.MovingObjectPosition;
+import net.minecraft.server.v1_8_R3.Packet;
+import net.minecraft.server.v1_8_R3.PacketPlayOutAttachEntity;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntity;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy;
+import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntity;
+import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntityLiving;
+import net.minecraft.server.v1_8_R3.Vec3D;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Effect;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftIronGolem;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.util.Vector;
+
+public class GolemExplosiveBlock extends BossAbility<GolemCreature, IronGolem>
+{
+	private HashMap<Integer, Vector> _blocksLocation = new HashMap<Integer, Vector>();
+	private Location _center;
+	private int _explosionsLeft;
+	private FallingBlock _fallingBlock;
+	private HashMap<Integer, Integer> _fallingBlocks = new HashMap<Integer, Integer>();
+	private ArrayList<Item> _items = new ArrayList<Item>();
+	private int _strength;
+	private Player _target;
+	private int _tick;
+
+	public GolemExplosiveBlock(GolemCreature creature, int strength)
+	{
+		super(creature);
+
+		_strength = strength;
+		_center = getLocation().add(0, 3, 0);
+		_target = getTarget();
+
+		if (_target != null)
+		{
+			UtilEnt.CreatureLook(getEntity(), _target);
+		}
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return _fallingBlock != null;
+	}
+
+	private int clamp(int value)
+	{
+		if (value < -127)
+			return -127;
+
+		if (value > 127)
+			return 127;
+
+		return value;
+	}
+
+	@Override
+	public Player getTarget()
+	{
+		HashMap<Player, Double> locs = new HashMap<Player, Double>();
+
+		for (Player player : UtilServer.getPlayers())
+		{
+			double dist = player.getLocation().distance(_center);
+
+			if (dist < 30)
+			{
+				double score = (dist > 10 ? 30 - dist : 10);
+
+				for (Player p : UtilServer.getPlayers())
+				{
+					if (player.getLocation().distance(p.getLocation()) < 4)
+					{
+						score += 7;
+					}
+				}
+
+				if (player.hasLineOfSight(getEntity()))
+				{
+					score += 10;
+				}
+
+				locs.put(player, score);
+			}
+		}
+
+		Player lowest = null;
+
+		for (Entry<Player, Double> entry : locs.entrySet())
+		{
+			if (lowest == null || locs.get(lowest) > locs.get(entry.getKey()))
+			{
+				lowest = entry.getKey();
+			}
+		}
+
+		return lowest;
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _target == null || (_fallingBlock != null && !_fallingBlock.isValid() && _explosionsLeft == 0);
+	}
+
+	@EventHandler
+	public void onDamage(CustomDamageEvent event)
+	{
+		if (event.GetDamageeEntity().equals(getEntity()))
+		{
+			if (_tick >= 40 + (40 * _strength) && _tick <= 50 + (40 * _strength))
+			{
+				event.SetCancelled("Iron Wizard charging bomb");
+			}
+
+			event.SetKnockback(false);
+		}
+	}
+
+	public void onExplode(final Location loc)
+	{
+		for (int i = 0; i < _strength * 2; i++)
+		{
+			if (i == 0)
+			{
+				onSubExplode(loc);
+			}
+			else
+			{
+				_explosionsLeft++;
+
+				Bukkit.getScheduler().scheduleSyncDelayedTask(getBoss().getEvent().getPlugin(), new Runnable()
+				{
+					public void run()
+					{
+						onSubExplode(loc);
+						_explosionsLeft--;
+					}
+				}, 2 * i);
+			}
+		}
+	}
+
+	public void onSubExplode(Location loc)
+	{
+		for (int i = 0; i < 2; i++)
+		{
+			Location l = loc.clone().add(UtilMath.r(_strength * 4) - (_strength * 2), UtilMath.r(_strength * 2),
+					UtilMath.r(_strength * 4) - (_strength * 2));
+
+		/*	CustomExplosion explosion = new CustomExplosion(getGolem().getEvent().getDamageManager(), getGolem().getEvent()
+					.getEventManager().getClans().getExplosion(), l, _strength * 0.8F, "Golem Explosive Block");
+
+			explosion.setPlayer(getEntity(), false);
+
+			explosion.setDamageBlocks(false);
+
+			explosion.explode();*/
+
+			UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, l, _strength * 3, 1, _strength * 3, 0, _strength * 4,
+					ViewDist.LONG, UtilServer.getPlayers());
+		}
+	}
+
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		if (_fallingBlock == null)
+		{
+			return;
+		}
+
+		if (_fallingBlock.isDead()
+				|| !_fallingBlock.isValid()
+				|| _fallingBlock.getTicksLived() > 400
+				|| !_fallingBlock.getWorld().isChunkLoaded(_fallingBlock.getLocation().getBlockX() >> 4,
+						_fallingBlock.getLocation().getBlockZ() >> 4))
+		{
+			Block block = _fallingBlock.getLocation().getBlock();
+			block.setTypeIdAndData(0, (byte) 0, true);
+			_fallingBlock.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, _fallingBlock.getBlockId());
+
+			// Expire
+			if (_fallingBlock.getTicksLived() > 400
+					|| !_fallingBlock.getWorld().isChunkLoaded(_fallingBlock.getLocation().getBlockX() >> 4,
+							_fallingBlock.getLocation().getBlockZ() >> 4))
+			{
+				_fallingBlock.remove();
+				return;
+			}
+
+			_fallingBlock.remove();
+			return;
+		}
+
+		double distanceToEntity = 0.0D;
+		LivingEntity victim = null;
+
+		net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) _fallingBlock).getHandle();
+		Vec3D vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+		Vec3D vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY, nmsEntity.locZ + nmsEntity.motZ);
+
+		MovingObjectPosition finalObjectPosition = nmsEntity.world.rayTrace(vec3d, vec3d1, false, true, false);
+		vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+		vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY, nmsEntity.locZ + nmsEntity.motZ);
+
+		if (finalObjectPosition != null)
+		{
+			vec3d1 = new Vec3D(finalObjectPosition.pos.a, finalObjectPosition.pos.b, finalObjectPosition.pos.c);
+		}
+
+		for (Object entity : ((CraftWorld) _fallingBlock.getWorld()).getHandle().getEntities(
+				((CraftEntity) _fallingBlock).getHandle(),
+				((CraftEntity) _fallingBlock).getHandle().getBoundingBox().a(((CraftEntity) _fallingBlock).getHandle().motX,
+						((CraftEntity) _fallingBlock).getHandle().motY, ((CraftEntity) _fallingBlock).getHandle().motZ).grow(2,
+						2, 2)))
+		{
+			Entity bukkitEntity = ((net.minecraft.server.v1_8_R3.Entity) entity).getBukkitEntity();
+
+			if (bukkitEntity instanceof LivingEntity)
+			{
+				LivingEntity ent = (LivingEntity) bukkitEntity;
+
+				// Avoid Self
+				if (ent.equals(getEntity()))
+					continue;
+
+				// Creative or Spec
+				if (ent instanceof Player)
+					if (((Player) ent).getGameMode() == GameMode.CREATIVE || UtilPlayer.isSpectator(ent))
+						continue;
+
+				// float f1 = (float)(nmsEntity.boundingBox.a() * 0.6f);
+				AxisAlignedBB axisalignedbb1 = ((CraftEntity) ent).getHandle().getBoundingBox().grow(1F, 1F, 1F);
+				MovingObjectPosition entityCollisionPosition = axisalignedbb1.a(vec3d, vec3d1);
+
+				if (entityCollisionPosition != null)
+				{
+					double d1 = vec3d.distanceSquared(entityCollisionPosition.pos);
+					if ((d1 < distanceToEntity) || (distanceToEntity == 0.0D))
+					{
+						victim = ent;
+						distanceToEntity = d1;
+					}
+				}
+			}
+		}
+
+		if (victim != null)
+		{
+			onExplode(victim.getEyeLocation());
+
+			_fallingBlock.remove();
+		}
+		else if (finalObjectPosition != null)
+		{
+			Block block = _fallingBlock.getWorld()
+					.getBlockAt(((int) finalObjectPosition.pos.a), ((int) finalObjectPosition.pos.b), ((int) finalObjectPosition.pos.c));
+
+			if (!UtilBlock.airFoliage(block) && !block.isLiquid())
+			{
+				nmsEntity.motX = ((float) (finalObjectPosition.pos.a - nmsEntity.locX));
+				nmsEntity.motY = ((float) (finalObjectPosition.pos.b - nmsEntity.locY));
+				nmsEntity.motZ = ((float) (finalObjectPosition.pos.c - nmsEntity.locZ));
+				float f2 = MathHelper.sqrt(nmsEntity.motX * nmsEntity.motX + nmsEntity.motY * nmsEntity.motY + nmsEntity.motZ
+						* nmsEntity.motZ);
+				nmsEntity.locX -= nmsEntity.motX / f2 * 0.0500000007450581D;
+				nmsEntity.locY -= nmsEntity.motY / f2 * 0.0500000007450581D;
+				nmsEntity.locZ -= nmsEntity.motZ / f2 * 0.0500000007450581D;
+
+				onExplode(block.getLocation().add(0.5, 0.5, 0.5));
+
+				_fallingBlock.remove();
+			}
+		}
+		else
+		{
+			UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.STONE, 0),
+					_fallingBlock.getLocation().add(0, 0.5, 0), 0.3F, 0.3F, 0.3F, 0, 2, UtilParticle.ViewDist.NORMAL,
+					UtilServer.getPlayers());
+		}
+	}
+
+	@Override
+	public void setFinished()
+	{
+		int[] ids = new int[_fallingBlocks.size() * 2];
+
+		int index = 0;
+
+		for (Entry<Integer, Integer> entry : _fallingBlocks.entrySet())
+		{
+			ids[index] = entry.getKey();
+			ids[index + 1] = entry.getValue();
+			index += 2;
+		}
+
+		PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(ids);
+
+		for (Player player : Bukkit.getOnlinePlayers())
+		{
+			UtilPlayer.sendPacket(player, packet);
+		}
+
+		for (Item item : _items)
+		{
+			item.remove();
+		}
+
+		if (_fallingBlock != null)
+		{
+			_fallingBlock.remove();
+		}
+	}
+
+	@Override
+	public void tick()
+	{
+		IronGolem entity = getEntity();
+
+		Iterator<Item> itel = _items.iterator();
+
+		while (itel.hasNext())
+		{
+			Item item = itel.next();
+
+			Vector vec = item.getVelocity();
+			Location loc = item.getLocation();
+
+			if (item.getTicksLived() > 100 || vec.getY() <= 0 || loc.distance(_center) > loc.add(vec).distance(_center)
+					|| UtilEnt.isGrounded(item))
+			{
+				itel.remove();
+			}
+		}
+
+		// This spawns a floating block
+		if (_tick >= 20 && _tick % 60 == 0 && _fallingBlocks.size() < _strength)
+		{
+			int id = UtilEnt.getNewEntityId();
+			int id2 = UtilEnt.getNewEntityId();
+
+			_fallingBlocks.put(id, id2);
+			_blocksLocation.put(id, _center.toVector());
+
+			Packet[] packets = new Packet[3];
+
+			PacketPlayOutSpawnEntityLiving packet1 = new PacketPlayOutSpawnEntityLiving();
+
+			DataWatcher watcher = new DataWatcher(null);
+			watcher.a(0, (byte) 32);
+			watcher.a(1, 0);
+
+			packet1.a = id;
+			packet1.b = EntityType.SILVERFISH.getTypeId();
+			packet1.c = (int) Math.floor(_center.getX() * 32);
+			packet1.d = (int) Math.floor((_center.getY() - 0.125) * 32);
+			packet1.e = (int) Math.floor(_center.getZ() * 32);
+			packet1.l = watcher;
+
+			packets[0] = packet1;
+
+			PacketPlayOutSpawnEntity packet2 = new PacketPlayOutSpawnEntity(((CraftEntity) entity).getHandle(), 70,
+					Material.DIRT.getId());
+
+			packet2.a = id2;
+
+			packet2.b = (int) Math.floor(_center.getX() * 32);
+			packet2.c = (int) Math.floor(_center.getY() * 32);
+			packet2.d = (int) Math.floor(_center.getZ() * 32);
+
+			packets[1] = packet2;
+
+			PacketPlayOutAttachEntity packet3 = new PacketPlayOutAttachEntity();
+
+			packet3.b = id2;
+			packet3.c = id;
+
+			packets[2] = packet3;
+
+			for (Player player : UtilServer.getPlayers())
+			{
+				if (player.getLocation().distance(_center) < 80)
+				{
+					UtilPlayer.sendPacket(player, packets);
+				}
+			}
+		}
+
+		// This spawns a item that flies above the golem's head and disappears
+		if (UtilMath.r(6) == 0 && _tick < 40 + (_strength * 40))
+		{
+			double angle = ((2 * Math.PI) / 30) * UtilMath.r(30);
+			double x = 5 * Math.cos(angle);
+			double z = 5 * Math.sin(angle);
+			Location loc = _center.clone().add(x, -3, z);
+
+			Material mat = null;
+
+			switch (UtilMath.r(3))
+			{
+			case 0:
+				mat = Material.DIRT;
+				break;
+			case 1:
+				mat = Material.STONE;
+				break;
+			case 2:
+				mat = Material.COBBLESTONE;
+				break;
+			default:
+				break;
+			}
+
+			Item item = loc.getWorld().dropItem(loc, new ItemBuilder(mat).setTitle(System.currentTimeMillis() + "").build());
+
+			item.setPickupDelay(999999);
+
+			Vector vec = UtilAlg.getTrajectory(_center, item.getLocation());
+			
+			vec.normalize().multiply(5);
+
+			item.setVelocity(vec);
+
+			// TODO Fix velocity
+
+			_items.add(item);
+		}
+
+		// 10 being when items no longer fly in, 0 being when its shot.
+		int ticksTillFired = (60 + (40 * _strength)) - _tick;
+
+		if (ticksTillFired > 20)
+		{
+			int strength = (int) Math.floor(_tick / 20D);
+
+			int nine = 8 - strength;
+
+			if (_tick % nine == 0)
+			{
+				_center.getWorld().playSound(_center, Sound.DIG_GRASS, strength + 1, 1F);
+			}
+		}
+		else if (ticksTillFired < 0)
+		{
+			if (_tick % 3 == 0)
+			{
+				_center.getWorld().playSound(_fallingBlock.getLocation(), Sound.WOOD_CLICK, _strength + 1, 0.4F);
+			}
+		}
+
+		// The location the falling blocks need to stick by
+		Vector blockCenter = _center.toVector();
+
+		if (ticksTillFired >= 0 && ticksTillFired <= 20)
+		{
+			Vector vec = entity.getLocation().add(entity.getLocation().getDirection().setY(0).normalize().multiply(1.2))
+					.add(0, 1, 0).toVector();
+
+			blockCenter = UtilAlg.getTrajectory(_center.toVector(), blockCenter);
+			vec.multiply(ticksTillFired / 10D);
+
+			_center.getWorld().playSound(_center, Sound.DIG_SNOW, _strength + 1, 0);
+		}
+		else if (_fallingBlock != null)
+		{
+			blockCenter = _fallingBlock.getLocation().add(0, 0.5, 0).toVector();
+		}
+
+		// Move the fake floating blocks
+		for (Entry<Integer, Integer> entry : _fallingBlocks.entrySet())
+		{
+			int id = entry.getKey();
+			Vector vec = _blocksLocation.get(id);
+
+			int x = clamp((int) ((blockCenter.getX() - vec.getX()) * 32) + (UtilMath.r(8) - 4));
+			int y = clamp((int) ((blockCenter.getY() - vec.getY()) * 32) + (UtilMath.r(8) - 4));
+			int z = clamp((int) ((blockCenter.getZ() - vec.getZ()) * 32) + (UtilMath.r(8) - 4));
+
+			vec.add(new Vector(x, y, z));
+
+			PacketPlayOutEntity.PacketPlayOutRelEntityMove packet = new PacketPlayOutEntity.PacketPlayOutRelEntityMove();
+
+			packet.a = id;
+
+			packet.b = (byte) x;
+			packet.c = (byte) y;
+			packet.d = (byte) z;
+
+			for (Player player : UtilServer.getPlayers())
+			{
+				if (player.getLocation().distance(_center) < 70)
+				{
+					UtilPlayer.sendPacket(player, packet);
+
+					UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.STONE, 0),
+							vec.toLocation(_center.getWorld()), 0.7F, 0.7F, 0.7F, 0, 11, ViewDist.NORMAL, player);
+				}
+			}
+		}
+
+		if (ticksTillFired == 0)
+		{
+			int id = _fallingBlocks.keySet().iterator().next();
+
+			PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(new int[]
+				{
+						id, _fallingBlocks.get(id)
+				});
+
+			for (Player player : Bukkit.getOnlinePlayers())
+			{
+				UtilPlayer.sendPacket(player, packet);
+			}
+
+			_fallingBlocks.remove(id);
+
+			_fallingBlock = _center.getWorld().spawnFallingBlock(_blocksLocation.get(id).toLocation(_center.getWorld()),
+					Material.STONE, (byte) 0);
+
+			Vector vec1 = _fallingBlock.getLocation().toVector();
+			Vector vec2 = _target.getLocation().toVector();
+
+			Vector vec = UtilAlg.calculateVelocity(vec1, vec2, (int) (vec1.distanceSquared(vec2) / 4));
+
+			_fallingBlock.setVelocity(vec);
+
+			EntityIronGolem golem = ((CraftIronGolem) entity).getHandle();
+
+			golem.world.broadcastEntityEffect(golem, (byte) 4);
+		}
+
+		_tick++;
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemMeleeAttack.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemMeleeAttack.java
new file mode 100644
index 000000000..9171cec25
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemMeleeAttack.java
@@ -0,0 +1,93 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import net.minecraft.server.v1_8_R3.EntityIronGolem;
+
+import org.bukkit.Sound;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftIronGolem;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+public class GolemMeleeAttack extends BossAbility<GolemCreature, IronGolem>
+{
+	private boolean _attacked;
+
+	public GolemMeleeAttack(GolemCreature creature)
+	{
+		super(creature);
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return true;
+	}
+
+	@Override
+	public int getCooldown()
+	{
+		return 20;
+	}
+
+	@Override
+	public Player getTarget()
+	{
+		return getTarget(4);
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _attacked;
+	}
+
+	@Override
+	public void setFinished()
+	{
+	}
+
+	@Override
+	public void tick()
+	{
+		_attacked = true;
+
+		for (Player target : UtilPlayer.getNearby(getLocation(), 4, true))
+		{
+			if (target.getVelocity().length() > 0.5)
+			{
+				continue;
+			}
+
+			UtilEnt.CreatureLook(getEntity(), target);
+
+			getBoss().getEvent().getDamageManager().NewDamageEvent(target, getEntity(), null, DamageCause.ENTITY_ATTACK,
+					10 * getBoss().getDifficulty(), false, true, false, "Iron Wizard Melee Attack", "Iron Wizard Melee Attack");
+
+			Vector vec = getLocation().getDirection();
+			vec.setY(0).normalize().setY(0.5).multiply(2.4);
+
+			UtilAction.velocity(target, vec);
+
+			getBoss().getEvent().getCondition().Factory().Falling("Iron Wizard Throw", target, getEntity(), 3, false, false);
+
+			target.getWorld().playSound(target.getLocation(), Sound.IRONGOLEM_THROW, 3, 0.9F);
+
+			EntityIronGolem golem = ((CraftIronGolem) getEntity()).getHandle();
+
+			golem.world.broadcastEntityEffect(golem, (byte) 4);
+		}
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return _attacked;
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemRumble.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemRumble.java
new file mode 100644
index 000000000..06c22b096
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemRumble.java
@@ -0,0 +1,242 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import java.util.ArrayList;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import net.minecraft.server.v1_8_R3.EntityIronGolem;
+
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftIronGolem;
+import org.bukkit.entity.Damageable;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+/**
+ * Rumble is where the golem picks a target then starts playing a animation for a second where its obviously preparing to use it.
+ * Copy this from Wizards
+ */
+public class GolemRumble extends BossAbility<GolemCreature, IronGolem>
+{
+	private Location _loc;
+	private int _ticks;
+	private int _travelled;
+	private Vector _vec;
+	private int _width = 1;
+	private Location _target;
+
+	public GolemRumble(GolemCreature creature)
+	{
+		super(creature);
+
+		Player target = getTarget();
+
+		if (target != null)
+		{
+			_target = target.getLocation();
+
+			UtilEnt.CreatureLook(getEntity(), _target);
+		}
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return _ticks >= 20;
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _travelled > 35;
+	}
+
+	@Override
+	public void setFinished()
+	{
+	}
+
+	@Override
+	public void tick()
+	{
+		if (_ticks++ < 14)
+		{
+			IronGolem entity = getEntity();
+			EntityIronGolem golem = ((CraftIronGolem) entity).getHandle();
+
+			golem.world.broadcastEntityEffect(golem, (byte) 4);
+
+			if (_ticks % 2 == 0)
+			{
+				entity.getWorld().playSound(entity.getLocation(), Sound.IRONGOLEM_THROW, 3, 2F);
+			}
+		}
+		else if (_ticks % 2 == 0)
+		{
+			int oldWidth = _width;
+
+			if ((_width <= 3 || _ticks % 4 == 0) && _width <= 6)
+			{
+				_width++;
+			}
+
+			Location newLoc;
+			boolean validBlock = false;
+			ArrayList<Block> current = new ArrayList<Block>();
+
+			if (_vec == null)
+			{
+				_vec = _target.subtract(getLocation()).toVector().setY(0).normalize();// .multiply(0.5);
+				_loc = getLocation().subtract(0, 1, 0).getBlock().getLocation().add(0, 0.99, 0);
+				newLoc = _loc;
+				current.add(_loc.getBlock());
+
+				validBlock = true;
+			}
+			else
+			{ // Move rumble
+				newLoc = _loc.clone().add(_vec);
+
+				// Check if the rumble needs to go up or drop a block or two
+				for (int y : new int[]
+					{
+							0, 1, -1
+					})
+				{
+					for (int a = 1; a <= 2; a++)
+					{
+						Block b = newLoc.clone().add(_vec.clone().multiply(a)).getBlock().getRelative(0, y, 0);
+
+						if (UtilBlock.solid(b) && !UtilBlock.solid(b.getRelative(0, 1, 0)))
+						{
+							validBlock = true;
+							newLoc.add(0, y, 0);
+
+							break;
+						}
+					}
+
+					if (validBlock)
+					{
+						break;
+					}
+				}
+
+				for (int width = -_width; width <= _width; width++)
+				{
+					if (Math.abs(width) <= oldWidth)
+					{
+						Block b = _loc.clone().add(UtilAlg.getRight(_vec).multiply(width)).getBlock();
+
+						if (!current.contains(b))
+						{
+							current.add(b);
+						}
+					}
+
+					if (validBlock)
+					{
+						Block b = newLoc.clone().add(UtilAlg.getRight(_vec).multiply(width)).getBlock();
+
+						if (!current.contains(b))
+						{
+							current.add(b);
+
+							b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, b.getTypeId());
+						}
+					}
+				}
+			}
+
+			UtilEnt.CreatureLook(getEntity(), _loc);
+
+			for (Entity entity : getEntity().getWorld().getEntities())
+			{
+				if (entity instanceof Damageable && !UtilPlayer.isSpectator(entity) && entity != getEntity())
+				{
+					Block b = entity.getLocation().getBlock();
+					boolean canDamage = false;
+
+					for (int y = -1; y <= 0; y++)
+					{
+						if (current.contains(b.getRelative(0, y, 0)))
+						{
+							canDamage = true;
+							break;
+						}
+					}
+
+					if (!canDamage)
+					{
+						continue;
+					}
+
+					if (canDamage(entity))
+					{
+						getBoss().getEvent().getDamageManager().NewDamageEvent((LivingEntity) entity, getEntity(), null,
+								DamageCause.CONTACT, 8 * getBoss().getDifficulty(), false, true, false, "Iron Wizard Rumble",
+								"Iron Wizard Rumble");
+					}
+
+					UtilAction.velocity(entity, _vec.clone(), 1.5, true, 0, 0.2, 1, true);
+
+					if (entity instanceof Player)
+					{
+						getBoss().getEvent().getCondition().Factory().Slow("Rumble", (LivingEntity) entity, getEntity(), 3, 1,
+								false, false, false, false);
+					}
+				}
+			}
+
+			if (_travelled++ > 35 || !validBlock)
+			{
+				_travelled = 100;
+			}
+
+			_loc = newLoc;
+		}
+	}
+
+	public Player getTarget()
+	{
+		Player target = null;
+		double dist = 0;
+
+		for (Player player : UtilPlayer.getNearby(getLocation(), 30, true))
+		{
+			if (!player.hasLineOfSight(getEntity()))
+			{
+				continue;
+			}
+
+			double d = player.getLocation().distance(getLocation());
+
+			if (d > 2 && (target == null || dist > d))
+			{
+				target = player;
+				dist = d;
+			}
+		}
+
+		return target;
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return _ticks < 14;
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemRupture.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemRupture.java
new file mode 100644
index 000000000..ba93748e5
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemRupture.java
@@ -0,0 +1,358 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftIronGolem;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.inventory.InventoryPickupItemEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.core.common.util.UtilTime;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import net.minecraft.server.v1_8_R3.EntityIronGolem;
+
+public class GolemRupture extends BossAbility<GolemCreature, IronGolem>
+{
+	private ArrayList<Entry<Location, Location>> _ruptures = new ArrayList<Entry<Location, Location>>();
+	private HashMap<Location, Long> _ruptureTime = new HashMap<Location, Long>();
+	private ArrayList<String> _targetted = new ArrayList<String>();
+	private int _rupturesLeft;
+	private int _tick;
+	private ArrayList<Item> _items = new ArrayList<Item>();
+	private int _ticksFinished;
+
+	public GolemRupture(GolemCreature creature)
+	{
+		super(creature);
+
+		if (creature.getHealthPercent() > 0.75)
+		{
+			_rupturesLeft = 2;
+		}
+		else if (creature.getHealthPercent() > 0.5)
+		{
+			_rupturesLeft = 5;
+		}
+		else
+		{
+			_rupturesLeft = 10;
+		}
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return false;
+	}
+
+	@EventHandler
+	public void HopperPickup(InventoryPickupItemEvent event)
+	{
+		if (_items.contains(event.getItem()))
+			event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void ItemDestroy(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		if (_items.isEmpty())
+			return;
+
+		Iterator<Item> itemIterator = _items.iterator();
+
+		while (itemIterator.hasNext())
+		{
+			Item item = itemIterator.next();
+
+			if (item.isDead() || !item.isValid())
+			{
+				item.remove();
+				itemIterator.remove();
+			}
+			else if (UtilEnt.isGrounded(item) || item.getTicksLived() > 60)
+			{
+				item.getWorld().playEffect(item.getLocation(), Effect.STEP_SOUND, item.getItemStack().getTypeId());
+				item.remove();
+				itemIterator.remove();
+			}
+		}
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _rupturesLeft <= 0 && _ruptures.isEmpty() && --_ticksFinished <= 0;
+	}
+
+	@Override
+	public void setFinished()
+	{
+		for (Item item : _items)
+		{
+			item.remove();
+		}
+	}
+
+	@Override
+	public void tick()
+	{
+		Iterator<Entry<Location, Location>> itel = _ruptures.iterator();
+
+		while (itel.hasNext())
+		{
+			Entry<Location, Location> entry = itel.next();
+
+			if (entry.getKey().distance(entry.getValue()) > 0)
+			{
+				Vector vec = entry.getValue().toVector().subtract(entry.getKey().toVector());
+
+				if (vec.length() > 1)
+				{
+					vec = vec.normalize();
+				}
+
+				entry.getKey().add(vec);
+			}
+
+			if (entry.getKey().distance(entry.getValue()) < 0.1)
+			{
+				if (!_ruptureTime.containsKey(entry.getKey()))
+				{
+					_ruptureTime.put(entry.getKey(), System.currentTimeMillis());
+				}
+				else if (UtilTime.elapsed(_ruptureTime.get(entry.getKey()), 150))
+				{
+					itel.remove();
+
+					explodeRupture(entry.getKey());
+				}
+			}
+		}
+
+		if (_tick % 10 == 0 && _rupturesLeft > 0)
+		{
+			_rupturesLeft--;
+
+			Location loc = getLocation().add(UtilMath.random.nextFloat() - 0.5, 0, UtilMath.random.nextFloat() - 0.5);
+
+			loc.setY(loc.getBlockY());
+
+			for (int y = 0; y > -3; y--)
+			{
+				if (!UtilBlock.airFoliage(loc.getBlock().getRelative(0, y, 0)))
+				{
+					loc.setY(loc.getY() + y);
+					break;
+				}
+			}
+
+			Player player = getTarget();
+
+			if (player != null)
+			{
+				_targetted.add(player.getName());
+
+				Location target = player.getLocation();
+				target.setY(loc.getY());
+
+				_ruptures.add(new HashMap.SimpleEntry(loc, target));
+				
+				UtilEnt.CreatureLook(getEntity(), player.getLocation());
+				
+				EntityIronGolem golem = ((CraftIronGolem) getEntity()).getHandle();
+
+				golem.world.broadcastEntityEffect(golem, (byte) 4);
+			}
+			else
+			{
+				_rupturesLeft = 0;
+			}
+		}
+
+		for (Entry<Location, Location> entry : _ruptures)
+		{
+			entry.getKey().getWorld().playSound(entry.getKey(), Sound.DIG_GRAVEL, 2.5F, 0.9F);
+
+			// if (_tick % 3 == 0)
+			{
+				UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.DIRT, 0),
+						entry.getKey().clone().add(0, 1.1, 0), 1F, 0, 1F, 0, 70, ViewDist.NORMAL, UtilServer.getPlayers());
+			}
+		}
+
+		_tick++;
+	}
+
+	@Override
+	public Player getTarget()
+	{
+		Player target = null;
+		double dist = 0;
+
+		for (Player player : UtilPlayer.getNearby(getLocation(), 30, true))
+		{
+			if (!player.hasLineOfSight(getEntity()))
+			{
+				continue;
+			}
+
+			if (_targetted.contains(player.getName()))
+			{
+				continue;
+			}
+
+			double d = player.getLocation().distance(getLocation());
+
+			if (d < 7)
+			{
+				continue;
+			}
+
+			boolean valid = true;
+
+			for (Entry<Location, Location> loc : _ruptures)
+			{
+				if (loc.getValue().distance(player.getLocation()) < 1.5)
+				{
+					valid = false;
+					break;
+				}
+			}
+
+			if (!valid)
+			{
+				continue;
+			}
+
+			if (target == null || dist > d)
+			{
+				target = player;
+				dist = d;
+			}
+		}
+
+		return target;
+	}
+
+	private void explodeRupture(Location loc)
+	{
+		loc.add(0, 1.1, 0);
+		loc.setX(loc.getBlockX() + 0.5);
+		loc.setZ(loc.getBlockZ() + 0.5);
+
+		// Fling
+		HashMap<LivingEntity, Double> targets = UtilEnt.getInRadius(loc, 3.5);
+		for (LivingEntity cur : targets.keySet())
+		{
+			// Velocity
+			UtilAction.velocity(cur,
+					UtilAlg.getTrajectory2d(loc.toVector().add(new Vector(0.5, 0, 0.5)), cur.getLocation().toVector()),
+					0.8 + 0.8 * targets.get(cur), true, 0, 0.4 + 1.0 * targets.get(cur), 1.4, true);
+
+			// Condition
+			getBoss().getEvent().getCondition().Factory().Falling("Rupture", cur, getEntity(), 10, false, true);
+
+			// Damage Event
+			getBoss().getEvent().getDamageManager().NewDamageEvent(cur, getEntity(), null, DamageCause.CUSTOM,
+					8 * getBoss().getDifficulty(), false, true, false, "Iron Wizard", "Rupture");
+		}
+
+		ArrayList<Block> blocks = new ArrayList<Block>();
+
+		for (int x = -3; x <= 3; x++)
+		{
+			for (int z = -3; z <= 3; z++)
+			{
+				for (int y = 0; y <= 1; y++)
+				{
+					for (int i = 0; i < 2; i++)
+					{
+						if (Math.sqrt(x * x + z * z + y * y) <= 3)
+						{
+							blocks.add(loc.clone().add(x, y, z).getBlock());
+						}
+					}
+				}
+			}
+		}
+
+		Collections.shuffle(blocks);
+
+		// Blocks
+		int done = 0;
+		Iterator<Block> itel = blocks.iterator();
+
+		while (done < 30 && itel.hasNext())
+		{
+			Block block = itel.next();
+
+			Vector vec = new Vector(Math.random() - 0.5, Math.random() - 0.5, Math.random() - 0.5).normalize();
+
+			if (!UtilBlock.airFoliage(block))
+				continue;
+
+			// Add Directional
+			vec.add(UtilAlg.getTrajectory(loc.getBlock().getLocation(), block.getLocation().add(0.5, 0, 0.5)));
+
+			// Add Up
+			vec.add(new Vector(0, 1.6, 0));
+
+			vec.normalize();
+
+			// Scale
+			vec.multiply(0.1 + 0.3 * Math.random() + 0.6);
+
+			// Block!
+			Item item = loc.getWorld().dropItem(block.getLocation().add(0.5, 0, 0.5), new ItemStack(Material.DIRT.getId(), 0));
+			item.setVelocity(vec);
+			item.setPickupDelay(50000);
+			_items.add(item);
+
+			// Effect
+			loc.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, Material.DIRT.getId());
+
+			done++;
+		}
+
+		_ticksFinished = 20;
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemSlam.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemSlam.java
new file mode 100644
index 000000000..a98f67bfd
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemSlam.java
@@ -0,0 +1,261 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.inventory.InventoryPickupItemEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.Vector;
+
+public class GolemSlam extends BossAbility<GolemCreature, IronGolem>
+{
+	private ArrayList<Item> _items = new ArrayList<Item>();
+	private int _ticksFinished;
+	private int _stage;
+	private Vector _target;
+	private int _ticksJumped;
+
+	public GolemSlam(GolemCreature creature)
+	{
+		super(creature);
+
+		Player target = getTarget();
+
+		if (target != null)
+		{
+			_target = UtilAlg.calculateVelocity(getLocation().toVector(),
+					target.getLocation().toVector().setY(getLocation().getY()), 2, getEntity());
+		}
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return !UtilEnt.isGrounded(getEntity()) && _stage == 1;
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _stage == 2 && --_ticksFinished <= 0;
+	}
+
+	@Override
+	public void setFinished()
+	{
+		for (Item item : _items)
+		{
+			item.remove();
+		}
+	}
+
+	@Override
+	public void tick()
+	{
+		Entity entity = getEntity();
+
+		if (_stage == 0)
+		{
+			UtilEnt.CreatureLook(getEntity(), getLocation().add(_target));
+
+			entity.getWorld().playSound(entity.getLocation(), Sound.IRONGOLEM_THROW, 4, 0);
+
+			entity.setVelocity(_target);
+			_stage++;
+		}
+		else if (_stage == 1)
+		{
+			_ticksJumped++;
+
+			if (_ticksJumped > 4 && getLocation().subtract(0, 0.2, 0).getBlock().getType() != Material.AIR)
+			{
+				explodeRupture(getLocation());
+
+				_stage = 2;
+			}
+		}
+	}
+
+	@EventHandler
+	public void HopperPickup(InventoryPickupItemEvent event)
+	{
+		if (_items.contains(event.getItem()))
+			event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void ItemDestroy(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		if (_items.isEmpty())
+			return;
+
+		Iterator<Item> itemIterator = _items.iterator();
+
+		while (itemIterator.hasNext())
+		{
+			Item item = itemIterator.next();
+
+			if (item.isDead() || !item.isValid())
+			{
+				item.remove();
+				itemIterator.remove();
+			}
+			else if (UtilEnt.isGrounded(item) || item.getTicksLived() > 60)
+			{
+				item.getWorld().playEffect(item.getLocation(), Effect.STEP_SOUND, item.getItemStack().getTypeId());
+				item.remove();
+				itemIterator.remove();
+			}
+		}
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return true;
+	}
+
+	@Override
+	public Player getTarget()
+	{
+		Player target = null;
+		double dist = 0;
+
+		for (Player player : UtilPlayer.getNearby(getLocation(), 30, true))
+		{
+			if (!player.hasLineOfSight(getEntity()))
+			{
+				continue;
+			}
+
+			double d = player.getLocation().distance(getLocation());
+
+			if (d < 10)
+			{
+				continue;
+			}
+
+			if (target == null || dist > d)
+			{
+				target = player;
+				dist = d;
+			}
+		}
+
+		return target;
+	}
+
+	private void explodeRupture(Location loc)
+	{
+		loc.add(0, 1.1, 0);
+		loc.setX(loc.getBlockX() + 0.5);
+		loc.setZ(loc.getBlockZ() + 0.5);
+
+		// Fling
+		HashMap<LivingEntity, Double> targets = UtilEnt.getInRadius(loc, 3.5);
+		for (LivingEntity cur : targets.keySet())
+		{
+			if (cur.equals(getEntity()))
+			{
+				continue;
+			}
+
+			// Velocity
+			UtilAction.velocity(cur,
+					UtilAlg.getTrajectory2d(loc.toVector().add(new Vector(0.5, 0, 0.5)), cur.getLocation().toVector()),
+					0.8 + 0.8 * targets.get(cur), true, 0, 0.4 + 1.0 * targets.get(cur), 1.4, true);
+
+			// Condition
+			getBoss().getEvent().getCondition().Factory().Falling("Rupture", cur, getEntity(), 10, false, true);
+
+			// Damage Event
+			getBoss().getEvent().getDamageManager().NewDamageEvent(cur, getEntity(), null, DamageCause.CUSTOM,
+					8 * getBoss().getDifficulty(), false, true, false, "Iron Wizard", "Rupture");
+		}
+
+		ArrayList<Block> blocks = new ArrayList<Block>();
+
+		for (int x = -3; x <= 3; x++)
+		{
+			for (int z = -3; z <= 3; z++)
+			{
+				for (int y = 0; y <= 1; y++)
+				{
+					for (int i = 0; i < 2; i++)
+					{
+						if (Math.sqrt(x * x + z * z + y * y) <= 3)
+						{
+							blocks.add(loc.clone().add(x, y, z).getBlock());
+						}
+					}
+				}
+			}
+		}
+
+		Collections.shuffle(blocks);
+
+		// Blocks
+		int done = 0;
+		Iterator<Block> itel = blocks.iterator();
+
+		while (done < 30 && itel.hasNext())
+		{
+			Block block = itel.next();
+
+			Vector vec = new Vector(Math.random() - 0.5, Math.random() - 0.5, Math.random() - 0.5).normalize();
+
+			if (!UtilBlock.airFoliage(block))
+				continue;
+
+			// Add Directional
+			vec.add(UtilAlg.getTrajectory(loc.getBlock().getLocation(), block.getLocation().add(0.5, 0, 0.5)));
+
+			// Add Up
+			vec.add(new Vector(0, 1.6, 0));
+
+			vec.normalize();
+
+			// Scale
+			vec.multiply(0.1 + 0.3 * Math.random() + 0.6);
+
+			// Block!
+			Item item = loc.getWorld().dropItem(block.getLocation().add(0.5, 0, 0.5), new ItemStack(Material.DIRT.getId(), 0));
+			item.setVelocity(vec);
+			item.setPickupDelay(50000);
+			_items.add(item);
+
+			// Effect
+			loc.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, Material.DIRT.getId());
+
+			done++;
+		}
+
+		_ticksFinished = 20;
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemWallExplode.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemWallExplode.java
new file mode 100644
index 000000000..2f16403f1
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemWallExplode.java
@@ -0,0 +1,416 @@
+package mineplex.minecraft.game.core.boss.ironwizard.abilities;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilShapes;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import net.minecraft.server.v1_8_R3.AxisAlignedBB;
+import net.minecraft.server.v1_8_R3.MathHelper;
+import net.minecraft.server.v1_8_R3.MovingObjectPosition;
+import net.minecraft.server.v1_8_R3.Vec3D;
+
+import org.bukkit.Effect;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+public class GolemWallExplode extends BossAbility<GolemCreature, IronGolem>
+{
+	private HashMap<BlockFace, ArrayList<Block>> _blockWalls = new HashMap<BlockFace, ArrayList<Block>>();
+	private ArrayList<String> _dontTarget = new ArrayList<String>();
+	private ArrayList<FallingBlock> _fallingBlocks = new ArrayList<FallingBlock>();
+	private int _maxTimes = UtilMath.r(2) + 1;
+	private int _tick;
+	private int _timesDone;
+	private HashMap<BlockFace, Long> _wallTimers = new HashMap<BlockFace, Long>();
+
+	public GolemWallExplode(GolemCreature creature)
+	{
+		super(creature);
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return true;
+	}
+
+	@Override
+	public int getCooldown()
+	{
+		return 20;
+	}
+
+	private float getMod(int div)
+	{
+		return UtilMath.random.nextFloat() / div;
+	}
+
+	@Override
+	public Player getTarget()
+	{
+		for (Player player : UtilPlayer.getNearby(getLocation(), 15, true))
+		{
+			if (_dontTarget.contains(player.getName()))
+			{
+				continue;
+			}
+
+			if (player.getLocation().distance(getLocation()) <= 4)
+			{
+				continue;
+			}
+
+			return player;
+		}
+
+		return null;
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _wallTimers.isEmpty() && _fallingBlocks.isEmpty() && _timesDone >= _maxTimes;
+	}
+
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		Iterator<FallingBlock> fallingIterator = _fallingBlocks.iterator();
+
+		while (fallingIterator.hasNext())
+		{
+			FallingBlock cur = fallingIterator.next();
+
+			if (cur.isDead() || !cur.isValid() || cur.getTicksLived() > 400
+					|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+			{
+				fallingIterator.remove();
+
+				Block block = cur.getLocation().getBlock();
+				block.setTypeIdAndData(0, (byte) 0, true);
+				cur.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, cur.getBlockId());
+
+				// Expire
+				if (cur.getTicksLived() > 400
+						|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+				{
+					cur.remove();
+					continue;
+				}
+
+				cur.remove();
+				continue;
+			}
+
+			double distanceToEntity = 0.0D;
+			LivingEntity victim = null;
+
+			net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) cur).getHandle();
+			Vec3D vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			Vec3D vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY,
+					nmsEntity.locZ + nmsEntity.motZ);
+
+			MovingObjectPosition finalObjectPosition = nmsEntity.world.rayTrace(vec3d, vec3d1, false, true, false);
+			vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY, nmsEntity.locZ + nmsEntity.motZ);
+
+			if (finalObjectPosition != null)
+			{
+				vec3d1 = new Vec3D(finalObjectPosition.pos.a, finalObjectPosition.pos.b, finalObjectPosition.pos.c);
+			}
+
+			for (Object entity : ((CraftWorld) cur.getWorld()).getHandle().getEntities(((CraftEntity) cur).getHandle(),
+					((CraftEntity) cur).getHandle().getBoundingBox().a(((CraftEntity) cur).getHandle().motX,
+							((CraftEntity) cur).getHandle().motY, ((CraftEntity) cur).getHandle().motZ).grow(2, 2, 2)))
+			{
+				Entity bukkitEntity = ((net.minecraft.server.v1_8_R3.Entity) entity).getBukkitEntity();
+
+				if (bukkitEntity instanceof LivingEntity)
+				{
+					LivingEntity ent = (LivingEntity) bukkitEntity;
+
+					// Avoid Self
+					if (ent.equals(getEntity()))
+						continue;
+
+					// Creative or Spec
+					if (ent instanceof Player)
+						if (((Player) ent).getGameMode() == GameMode.CREATIVE || UtilPlayer.isSpectator(ent))
+							continue;
+
+					// float f1 = (float)(nmsEntity.boundingBox.a() * 0.6f);
+					AxisAlignedBB axisalignedbb1 = ((CraftEntity) ent).getHandle().getBoundingBox().grow(1F, 1F, 1F);
+					MovingObjectPosition entityCollisionPosition = axisalignedbb1.a(vec3d, vec3d1);
+
+					if (entityCollisionPosition != null)
+					{
+						double d1 = vec3d.distanceSquared(entityCollisionPosition.pos);
+						if ((d1 < distanceToEntity) || (distanceToEntity == 0.0D))
+						{
+							victim = ent;
+							distanceToEntity = d1;
+						}
+					}
+				}
+			}
+
+			if (victim != null)
+			{
+				cur.getWorld().playEffect(victim.getEyeLocation().subtract(0, 0.5, 0), Effect.STEP_SOUND, cur.getBlockId());
+
+				if (canDamage(victim))
+				{
+					getBoss().getEvent().getDamageManager().NewDamageEvent((LivingEntity) victim, getEntity(), null,
+							DamageCause.CONTACT, 10 * getBoss().getDifficulty(), true, true, false, "Iron Wizard Wall Explosion",
+							"Iron Wizard Wall Explosion");
+				}
+
+				cur.remove();
+				fallingIterator.remove();
+
+				Vector vec = cur.getVelocity();
+
+				UtilAction.velocity(victim, vec, 1.5, true, 0, 0.2, 1, true);
+			}
+			else if (finalObjectPosition != null)
+			{
+				Block block = cur.getWorld().getBlockAt(((int) finalObjectPosition.pos.a), ((int) finalObjectPosition.pos.b), ((int) finalObjectPosition.pos.c));
+
+				if (!UtilBlock.airFoliage(block) && !block.isLiquid())
+				{
+					nmsEntity.motX = ((float) (finalObjectPosition.pos.a - nmsEntity.locX));
+					nmsEntity.motY = ((float) (finalObjectPosition.pos.b - nmsEntity.locY));
+					nmsEntity.motZ = ((float) (finalObjectPosition.pos.c - nmsEntity.locZ));
+					float f2 = MathHelper.sqrt(
+							nmsEntity.motX * nmsEntity.motX + nmsEntity.motY * nmsEntity.motY + nmsEntity.motZ * nmsEntity.motZ);
+					nmsEntity.locX -= nmsEntity.motX / f2 * 0.0500000007450581D;
+					nmsEntity.locY -= nmsEntity.motY / f2 * 0.0500000007450581D;
+					nmsEntity.locZ -= nmsEntity.motZ / f2 * 0.0500000007450581D;
+
+					cur.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, cur.getBlockId());
+					cur.remove();
+					fallingIterator.remove();
+				}
+			}
+			else
+			{
+				UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.STONE, 0),
+						cur.getLocation().add(0, 0.5, 0), 0.3F, 0.3F, 0.3F, 0, 2, UtilParticle.ViewDist.NORMAL,
+						UtilServer.getPlayers());
+			}
+		}
+	}
+
+	@Override
+	public void setFinished()
+	{
+		for (FallingBlock block : _fallingBlocks)
+		{
+			block.remove();
+		}
+
+		for (ArrayList<Block> list : _blockWalls.values())
+		{
+			for (Block b : list)
+			{
+				b.setType(Material.AIR);
+			}
+		}
+	}
+
+	@Override
+	public void tick()
+	{
+		if (_tick++ % 30 == 0 && _timesDone < _maxTimes)
+		{
+			_dontTarget.clear();
+
+			_timesDone++;
+
+			for (int i = 0; i < 10; i++)
+			{
+				Player target = getTarget();
+
+				if (target == null)
+				{
+					if (_dontTarget.isEmpty())
+					{
+						_timesDone = _maxTimes;
+					}
+				}
+				else
+				{
+					_dontTarget.add(target.getName());
+
+					UtilEnt.CreatureLook(getEntity(), target);
+
+					BlockFace face = UtilShapes.getFacing(getLocation().getYaw());
+
+					if (_wallTimers.containsKey(face))
+					{
+						continue;
+					}
+
+					ArrayList<Block> blocks = new ArrayList<Block>();
+
+					Location loc = getLocation().getBlock().getLocation().add(0.5, 0, 0.5);
+
+					int mul = (face.getModX() != 0 && face.getModZ() != 0) ? 2 : 3;
+
+					loc.add(face.getModX() * mul, 0, face.getModZ() * mul);
+
+					Block b = loc.getBlock();
+
+					BlockFace sideFace = UtilShapes.getSideBlockFaces(face, true)[0];
+					boolean invalid = false;
+
+					for (int mult = -3; mult <= 3; mult++)
+					{
+						Block block = b;
+
+						if (Math.abs(mult) < 3)
+						{
+							block = block.getRelative(face);
+						}
+
+						block = block.getRelative(sideFace, mult);
+
+						if (Math.abs(mult) == 3 && face.getModX() != 0 && face.getModZ() != 0)
+						{
+							block = block.getRelative(UtilShapes.getSideBlockFaces(face, false)[mult < 0 ? 0 : 1]);
+						}
+
+						if (!UtilAlg.HasSight(getLocation(), block.getLocation()))
+						{
+							invalid = true;
+							break;
+						}
+
+						Block under = block.getRelative(0, -1, 0);
+
+						if (!UtilBlock.solid(under))
+						{
+							continue;
+						}
+
+						for (int y = 0; y <= 1; y++)
+						{
+							block = block.getRelative(0, y, 0);
+
+							if (block.getType() != Material.AIR)
+							{
+								invalid = true;
+								break;
+							}
+
+							blocks.add(block);
+						}
+
+						if (invalid)
+						{
+							break;
+						}
+					}
+
+					if (invalid)
+					{
+						continue;
+					}
+
+					for (Block block : blocks)
+					{
+						block.setType(block.getWorld().getBlockAt(block.getX(), b.getY() - 1, block.getZ()).getType());
+						block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, block.getTypeId());
+					}
+
+					_blockWalls.put(face, blocks);
+					_wallTimers.put(face, System.currentTimeMillis());
+					break;
+				}
+			}
+		}
+
+		Iterator<Entry<BlockFace, ArrayList<Block>>> itel = _blockWalls.entrySet().iterator();
+		boolean doExplode = false;
+
+		while (itel.hasNext())
+		{
+			Entry<BlockFace, ArrayList<Block>> entry = itel.next();
+			BlockFace face = entry.getKey();
+
+			if (UtilTime.elapsed(_wallTimers.get(face), 1000))
+			{
+				doExplode = true;
+				itel.remove();
+				_wallTimers.remove(face);
+
+				for (Block b : entry.getValue())
+				{
+					FallingBlock block = getEntity().getWorld().spawnFallingBlock(b.getLocation().add(0.5, 0, 0.5), b.getType(),
+							(byte) 0);
+
+					block.setDropItem(false);
+
+					int index = entry.getValue().indexOf(b);
+
+					BlockFace f = index == 8 || index == 9 ? BlockFace.SELF
+							: UtilShapes.getSideBlockFaces(face, true)[index > 6 ? 0 : 1];
+
+					block.setVelocity(new Vector((face.getModX() * 0.6) + (f.getModX() * (0.05 + getMod(10))), 0.2 + getMod(15),
+							(face.getModZ() * 0.6) + (f.getModZ() * (0.05 + getMod(10)))));
+
+					_fallingBlocks.add(block);
+
+					b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, b.getTypeId());
+					b.setType(Material.AIR);
+				}
+			}
+		}
+
+		if (doExplode)
+		{
+			onUpdate(new UpdateEvent(UpdateType.TICK));
+		}
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return false;
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/SlimeBoss.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/SlimeBoss.java
new file mode 100755
index 000000000..570fb0039
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/SlimeBoss.java
@@ -0,0 +1,110 @@
+package mineplex.minecraft.game.core.boss.slimeking;
+
+import java.io.File;
+import java.io.IOException;
+
+import mineplex.core.blockrestore.BlockRestore;
+import mineplex.core.common.block.schematic.Schematic;
+import mineplex.core.common.block.schematic.UtilSchematic;
+import mineplex.core.disguise.DisguiseManager;
+import mineplex.core.projectile.ProjectileManager;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.EventMap;
+import mineplex.minecraft.game.core.boss.EventState;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+import mineplex.minecraft.game.core.boss.slimeking.creature.SlimeCreature;
+import mineplex.minecraft.game.core.condition.ConditionManager;
+import mineplex.minecraft.game.core.damage.DamageManager;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.util.Vector;
+
+public class SlimeBoss extends WorldEvent
+{
+	private static final int MAX_SIZE = 16;
+	private static final int MIN_SIZE = 2;
+
+	public SlimeBoss(DisguiseManager disguiseManager, ProjectileManager projectileManager, DamageManager damageManager,
+			BlockRestore blockRestore, ConditionManager conditionManager, Location cornerLocation)
+	{
+		super(disguiseManager, projectileManager, damageManager, blockRestore, conditionManager, "Slime King", cornerLocation, "schematic/ClansSlime.schematic");
+	}
+
+	@Override
+	protected void customStart()
+	{
+		Bukkit.broadcastMessage("Custom Start");
+		spawnSlime(getCenterLocation(), MAX_SIZE);
+		setState(EventState.LIVE);
+		announceStart();
+	}
+
+	/**
+	 * Check if this slime boss has been defeated
+	 */
+	private void checkDeath()
+	{
+		if (getCreatures().size() == 0)
+		{
+			setState(EventState.COMPLETE);
+			Bukkit.broadcastMessage("FINISHED!");
+		}
+	}
+
+	@Override
+	public void removeCreature(EventCreature creature)
+	{
+		super.removeCreature(creature);
+
+		if (creature instanceof SlimeCreature)
+		{
+			splitSlime(((SlimeCreature) creature));
+			checkDeath();
+		}
+	}
+
+	private int getSplitSize(int slimeSize)
+	{
+		return slimeSize / 2;
+	}
+
+	private int getSplitCount(int slimeSize)
+	{
+		return slimeSize <= 8 ? 4 : 2;
+	}
+
+	private double getMaxSlimeHealth(int slimeSize)
+	{
+		return slimeSize * 20;
+	}
+
+	private int getEnrageTicks(int slimeSize)
+	{
+		return 40 * slimeSize;
+	}
+
+	public void splitSlime(SlimeCreature slime)
+	{
+		int splitCount = getSplitCount(slime.getSize());
+		int splitSize = getSplitSize(slime.getSize());
+
+		if (splitSize >= MIN_SIZE)
+		{
+			for (int i = 0; i < splitCount; i++)
+			{
+				Location location = slime.getEntity().getLocation();
+				SlimeCreature creature = spawnSlime(location, splitSize);
+				creature.getEntity().setVelocity(new Vector(Math.random(), 0.1, Math.random()).multiply(0.5));
+			}
+		}
+	}
+
+	private SlimeCreature spawnSlime(Location location, int size)
+	{
+		SlimeCreature slimeCreature = new SlimeCreature(this, location, size, getMaxSlimeHealth(size), getEnrageTicks(size));
+		registerCreature(slimeCreature);
+		return slimeCreature;
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/AbsorbAbility.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/AbsorbAbility.java
new file mode 100644
index 000000000..75c0b6e3d
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/AbsorbAbility.java
@@ -0,0 +1,69 @@
+package mineplex.minecraft.game.core.boss.slimeking.ability;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.minecraft.game.core.boss.slimeking.creature.SlimeCreature;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.util.Vector;
+
+public class AbsorbAbility extends SlimeAbility
+{
+	private int _ticksPerPulse;
+	private int _pulseMax;
+	private int _pulseCount;
+	private int _maxDistance;
+
+	public AbsorbAbility(SlimeCreature slime)
+	{
+		super(slime);
+		_ticksPerPulse = 20;
+		_pulseMax = 10;
+		_pulseCount = 0;
+		_maxDistance = 20;
+	}
+
+	@Override
+	public void tickCustom()
+	{
+		if (getTicks() % _ticksPerPulse == 0)
+		{
+			pulse();
+			_pulseCount++;
+
+			if (_pulseCount >= _pulseMax)
+			{
+				setIdle(true);
+			}
+		}
+	}
+
+	private void pulse()
+	{
+		HashMap<Player, Double> playerMap = UtilPlayer.getInRadius(getSlime().getEntity().getLocation(), _maxDistance);
+
+		for (Map.Entry<Player, Double> entry : playerMap.entrySet())
+		{
+			Player player = entry.getKey();
+			double distance = entry.getValue();
+
+			Vector dir = UtilAlg.getTrajectory2d(player, getSlime().getEntity());
+			dir.multiply(0.4);
+			dir.setY(0.1);
+			player.setVelocity(dir);
+			getSlime().getEvent().getDamageManager().NewDamageEvent(player, getSlime().getEntity(), null,
+					EntityDamageEvent.DamageCause.MAGIC, getDamage(distance), false, false, false, getSlime().getEvent().getName(), "Absorb");
+		}
+	}
+
+	private double getDamage(double distance)
+	{
+		double mult = _maxDistance - distance;
+
+		return mult * 0.25;
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/LeapAbility.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/LeapAbility.java
new file mode 100644
index 000000000..126e22be5
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/LeapAbility.java
@@ -0,0 +1,63 @@
+package mineplex.minecraft.game.core.boss.slimeking.ability;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.minecraft.game.core.boss.slimeking.creature.SlimeCreature;
+
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
+public class LeapAbility extends SlimeAbility
+{
+	private Player _target;
+	private int _jumpTick;
+
+	public LeapAbility(SlimeCreature slime)
+	{
+		super(slime);
+		_target = UtilPlayer.getRandomTarget(slime.getEntity().getLocation(), 30);
+		_jumpTick = 20;
+
+		// Only attempt to find a target once for this ability!
+		if (_target == null)
+		{
+			setIdle(true);
+		}
+	}
+
+	@Override
+	public void tickCustom()
+	{
+		if (_target != null)
+		{
+			if (getTicks() == _jumpTick)
+			{
+				// Jump
+				Vector dir = UtilAlg.getTrajectory2d(getSlime().getEntity(), _target);
+				UtilAction.velocity(getSlime().getEntity(), dir, 2, false, 0, 0.5, 0.5, true);
+			}
+			else if (getTicks() > _jumpTick)
+			{
+				if (getSlime().getEntity().isOnGround())
+				{
+					setIdle(true);
+				}
+				else if (getSlime().isEnraged())
+				{
+					World world = getSlime().getEntity().getWorld();
+					Block block = world.getHighestBlockAt(getSlime().getEntity().getLocation()).getRelative(BlockFace.UP);
+
+					if (block.getType() == Material.AIR)
+					{
+						block.setType(Material.FIRE);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/RocketAbility.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/RocketAbility.java
new file mode 100644
index 000000000..2675c0530
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/RocketAbility.java
@@ -0,0 +1,157 @@
+package mineplex.minecraft.game.core.boss.slimeking.ability;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.projectile.IThrown;
+import mineplex.core.projectile.ProjectileManager;
+import mineplex.core.projectile.ProjectileUser;
+import mineplex.core.updater.UpdateType;
+import mineplex.minecraft.game.core.boss.slimeking.creature.SlimeCreature;
+
+import org.bukkit.Location;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Slime;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.util.Vector;
+
+public class RocketAbility extends SlimeAbility implements IThrown
+{
+	private int _rocketCount;
+	private int _rocketsFired;
+	private int _rocketsHit;
+	private LinkedList<ShotData> _shots;
+
+	public RocketAbility(SlimeCreature slime)
+	{
+		this(slime, 5);
+	}
+
+	public RocketAbility(SlimeCreature slime, int rocketCount)
+	{
+		super(slime);
+		_rocketCount = rocketCount;
+		_rocketsFired = 0;
+		_rocketsHit = 0;
+		_shots = new LinkedList<ShotData>();
+	}
+
+	@Override
+	public void tickCustom()
+	{
+		if (_rocketsHit >= _rocketCount)
+		{
+			// We're done here!
+			setIdle(true);
+			return;
+		}
+
+		if (_rocketsFired < _rocketCount && getTicks() % 20 == 0)
+		{
+			Player target = UtilPlayer.getRandomTarget(getSlime().getEntity().getLocation(), 20);
+
+			if (target == null && getTicks() > 20 * (_rocketCount + 10))
+			{
+				// Give up on firing more rockets
+				_rocketCount = _rocketsFired;
+			}
+
+			if (target != null) fireRocket(target);
+		}
+
+		tickRockets();
+	}
+
+	private void tickRockets()
+	{
+		Iterator<ShotData> it = _shots.iterator();
+
+		while (it.hasNext())
+		{
+			ShotData next = it.next();
+
+			if (next.getEntity().isDead())
+			{
+				it.remove();
+			}
+			else
+			{
+				Vector v = UtilAlg.getTrajectory(next.getEntity(), next.getTarget());
+				next.getEntity().setVelocity(v.multiply(new Vector(0.3, 0.1, 0.3)));
+			}
+
+		}
+	}
+
+	private void fireRocket(Player target)
+	{
+		Location loc = getSlime().getEntity().getEyeLocation();
+		loc.add(UtilAlg.getTrajectory2d(loc, target.getLocation()).multiply(2));
+		Slime projectile = loc.getWorld().spawn(loc, Slime.class);
+		projectile.setSize(1);
+		_shots.add(new ShotData(projectile, target));
+
+		ProjectileManager pm = getSlime().getProjectileManager();
+		pm.AddThrow(projectile, getSlime().getEntity(), this, -1, true, true, true, false, null, 0, 0, UtilParticle.ParticleType.SLIME, UpdateType.FASTEST, 1F);
+//		Bukkit.broadcastMessage("Shot Slime at target " + target);
+
+		_rocketsFired++;
+	}
+
+	@Override
+	public void Collide(LivingEntity target, Block block, ProjectileUser data)
+	{
+//		Bukkit.broadcastMessage("COLLIDE " + target);
+		UtilParticle.PlayParticle(UtilParticle.ParticleType.LARGE_EXPLODE, data.GetThrown().getLocation(), 0, 0, 0, 0, 1, UtilParticle.ViewDist.LONG, UtilServer.getPlayers());
+		target.getLocation().getWorld().playSound(target.getLocation(), Sound.SPLASH, 1, 2);
+		getSlime().getEvent().getDamageManager().NewDamageEvent(target, getSlime().getEntity(), null,
+				EntityDamageEvent.DamageCause.PROJECTILE, 3 + getSlime().getSize() * 3, true, true, false,
+				getSlime().getName(), "Slime Rocket");
+
+		data.GetThrown().remove();
+		_rocketsHit++;
+	}
+
+	@Override
+	public void Idle(ProjectileUser data)
+	{
+		data.GetThrown().remove();
+		_rocketsHit++;
+	}
+
+	@Override
+	public void Expire(ProjectileUser data)
+	{
+		data.GetThrown().remove();
+		_rocketsHit++;
+	}
+
+	private static class ShotData
+	{
+		private LivingEntity _entity;
+		private LivingEntity _target;
+
+		public ShotData(LivingEntity entity, LivingEntity target)
+		{
+			_entity = entity;
+			_target = target;
+		}
+
+		public LivingEntity getEntity()
+		{
+			return _entity;
+		}
+
+		public LivingEntity getTarget()
+		{
+			return _target;
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/SlamAbility.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/SlamAbility.java
new file mode 100644
index 000000000..31fe87787
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/SlamAbility.java
@@ -0,0 +1,158 @@
+package mineplex.minecraft.game.core.boss.slimeking.ability;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.minecraft.game.core.boss.slimeking.creature.SlimeCreature;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
+public class SlamAbility extends SlimeAbility
+{
+	private int _findAttempts;
+	private boolean _hasTarget;
+	private int _foundTicks;
+	private Player _target;
+	private Location _targetLocation;
+
+	// Timings
+	private final int _lockTick;
+	private final int _jumpTick;
+	private final int _diveTick;
+
+	public SlamAbility(SlimeCreature slime)
+	{
+		this(slime, 40, 60, 80);
+	}
+
+	public SlamAbility(SlimeCreature slime, int lockTick, int jumpTick, int diveTick)
+	{
+		super(slime);
+		_hasTarget = false;
+		_findAttempts = 0;
+		_foundTicks = 0;
+
+		assert (jumpTick > lockTick && diveTick > jumpTick);
+		_lockTick = lockTick;
+		_jumpTick = jumpTick;
+		_diveTick = diveTick;
+	}
+
+	@Override
+	public void tickCustom()
+	{
+		if (!_hasTarget)
+		{
+			if (getTicks() % 20 == 0)
+			{
+				searchForTarget();
+			}
+		}
+		else
+		{
+			int ticks = getTicks() - _foundTicks;
+			if (ticks < _lockTick)
+			{
+				// Follow Target
+				displayTarget(_target.getLocation());
+			}
+			else if (ticks == _lockTick)
+			{
+				// Lock on
+				Bukkit.broadcastMessage("Target Locked");
+				_targetLocation = _target.getLocation();
+			}
+			else if (ticks < _jumpTick)
+			{
+				// Target still locked
+				displayTarget(_targetLocation);
+			}
+			else if (ticks == _jumpTick)
+			{
+				// Target starts jump
+				Bukkit.broadcastMessage("Start Jump");
+			}
+			else if (ticks < _diveTick)
+			{
+				// Target in air
+				displayTarget(_targetLocation);
+
+				Vector direction = UtilAlg.getTrajectory2d(getSlime().getEntity().getLocation(), _targetLocation);
+				direction.multiply(0.4);
+				direction.setY(2 * (1 - ((getTicks() - 100.0) / 60.0)));
+				getSlime().getEntity().setVelocity(direction);
+			}
+			else if (ticks == _diveTick)
+			{
+				displayTarget(_targetLocation);
+
+				// Time to go down!
+				getSlime().getEntity().setVelocity(new Vector(0, -3, 0));
+				getSlime().getEntity().setFallDistance(0);
+			}
+			else if (ticks > _diveTick)
+			{
+				displayTarget(_targetLocation);
+
+				// Check for hitting ground
+				if (getSlime().getEntity().isOnGround())
+				{
+					// We're done here!
+					setIdle(true);
+
+					damageArea(getSlime().getEntity().getLocation());
+
+				}
+			}
+
+		}
+	}
+
+	private void damageArea(Location location)
+	{
+		// TODO Deal more damage based on how close you are to the slime?
+		List<Player> nearPlayers = UtilPlayer.getNearby(location, 4);
+		for (Player player : nearPlayers)
+		{
+			player.damage(4);
+			player.setVelocity(UtilAlg.getTrajectory2d(location, player.getLocation()).setY(0.2));
+		}
+
+		UtilParticle.PlayParticle(UtilParticle.ParticleType.LAVA, location, 2, 0.5F, 2, 0, 100, UtilParticle.ViewDist.LONG, UtilServer.getPlayers());
+		location.getWorld().playSound(location, Sound.ANVIL_LAND, 10, 0.5F);
+	}
+
+	private void displayTarget(Location location)
+	{
+		UtilParticle.PlayParticle(UtilParticle.ParticleType.LAVA, location, 0, 0, 0, 0, 1, UtilParticle.ViewDist.NORMAL, UtilServer.getPlayers());
+	}
+
+	private void searchForTarget()
+	{
+		if (_findAttempts >= 10)
+		{
+			// Just give up! THERE'S NO HOPE
+			setIdle(true);
+			return;
+		}
+
+		Player target = UtilPlayer.getRandomTarget(getSlime().getEntity().getLocation(), 15);
+		if (target != null)
+		{
+			_target = target;
+			_hasTarget = true;
+			_foundTicks = getTicks();
+			Bukkit.broadcastMessage("Target placed on " + _target);
+		}
+
+		_findAttempts++;
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/SlimeAbility.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/SlimeAbility.java
new file mode 100644
index 000000000..f18021878
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/SlimeAbility.java
@@ -0,0 +1,56 @@
+package mineplex.minecraft.game.core.boss.slimeking.ability;
+
+import mineplex.minecraft.game.core.boss.slimeking.creature.SlimeCreature;
+
+public abstract class SlimeAbility
+{
+	private SlimeCreature _slime;
+	private boolean _idle;
+	private int _ticks;
+	private int _idleTicks;
+
+	public SlimeAbility(SlimeCreature slime)
+	{
+		_slime = slime;
+	}
+
+	public final void tick()
+	{
+		if (isIdle())
+		{
+			_idleTicks++;
+		}
+		else
+		{
+			_ticks++;
+			tickCustom();
+		}
+	}
+
+	public int getTicks()
+	{
+		return _ticks;
+	}
+
+	public int getIdleTicks()
+	{
+		return _idleTicks;
+	}
+
+	public boolean isIdle()
+	{
+		return _idle;
+	}
+
+	public SlimeCreature getSlime()
+	{
+		return _slime;
+	}
+
+	public abstract void tickCustom();
+
+	protected void setIdle(boolean idle)
+	{
+		_idle = idle;
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/creature/SlimeCreature.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/creature/SlimeCreature.java
new file mode 100644
index 000000000..068f20380
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/creature/SlimeCreature.java
@@ -0,0 +1,135 @@
+package mineplex.minecraft.game.core.boss.slimeking.creature;
+
+import mineplex.core.projectile.ProjectileManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.slimeking.SlimeBoss;
+import mineplex.minecraft.game.core.boss.slimeking.ability.AbsorbAbility;
+import mineplex.minecraft.game.core.boss.slimeking.ability.LeapAbility;
+import mineplex.minecraft.game.core.boss.slimeking.ability.RocketAbility;
+import mineplex.minecraft.game.core.boss.slimeking.ability.SlamAbility;
+import mineplex.minecraft.game.core.boss.slimeking.ability.SlimeAbility;
+
+import org.bukkit.Location;
+import org.bukkit.entity.MagmaCube;
+import org.bukkit.entity.Slime;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.SlimeSplitEvent;
+
+public class SlimeCreature extends EventCreature<Slime>
+{
+	private SlimeBoss _boss;
+	private SlimeAbility _currentAbility;
+	private boolean _enraged;
+	// Storing size here incase one of the slime states decide to change the slime size
+	private int _size;
+	private int _ticksLived;
+	private int _enrageTicks;
+
+	public SlimeCreature(SlimeBoss boss, Location location, int size, double maxHealth, int enrageTicks)
+	{
+		super(boss, location, "Slime King", true, maxHealth, Slime.class);
+		_boss = boss;
+		_enraged = false;
+		_size = size;
+		_ticksLived = 0;
+		_enrageTicks = enrageTicks;
+
+		spawnEntity();
+	}
+
+	@Override
+	protected void spawnCustom()
+	{
+		getEntity().setSize(_size);
+	}
+
+	public ProjectileManager getProjectileManager()
+	{
+		return _boss.getProjectileManager();
+	}
+
+	@EventHandler
+	public void abilityTick(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		_ticksLived++;
+
+		if (_currentAbility == null || (_currentAbility.isIdle() && _currentAbility.getIdleTicks() > 80))
+		{
+			double rand = Math.random();
+
+			if (rand <= 0.25)
+			{
+				_currentAbility = new SlamAbility(this);
+			}
+			else if (rand <= 0.50 && getSize() >= 8)
+			{
+				_currentAbility = new AbsorbAbility(this);
+			}
+			else if (rand <= 0.75 && getSize() >= 4)
+			{
+				_currentAbility = new RocketAbility(this);
+			}
+			else
+			{
+				_currentAbility = new LeapAbility(this);
+			}
+		}
+
+		// Disable Enrage
+		// if (!_enraged && _ticksLived >= _enrageTicks)
+		// {
+		// setEnraged(true);
+		// }
+
+		_currentAbility.tick();
+	}
+
+	@EventHandler
+	public void onSplit(SlimeSplitEvent event)
+	{
+		if (event.getEntity().equals(getEntity()))
+			event.setCancelled(true);
+	}
+
+	// @EventHandler
+	// public void target(EntityTargetEvent event)
+	// {
+	// if (event.getEntity().equals(getEntity()))
+	// {
+	// Bukkit.broadcastMessage("Target Event");
+	// Player player = UtilPlayer.getRandomTarget(getEntity().getLocation(), 30);
+	// Bukkit.broadcastMessage("Targetting: " + player);
+	// event.setTarget(player);
+	// }
+	// }
+
+	public void setEnraged(boolean enraged)
+	{
+		if (enraged != _enraged)
+		{
+			_enraged = enraged;
+			setEntityClass(_enraged ? MagmaCube.class : Slime.class);
+			spawnEntity();
+		}
+	}
+
+	public boolean isEnraged()
+	{
+		return _enraged;
+	}
+
+	public int getSize()
+	{
+		return _size;
+	}
+
+	@Override
+	public void dieCustom()
+	{
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeBoss.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeBoss.java
new file mode 100644
index 000000000..48a82073f
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeBoss.java
@@ -0,0 +1,64 @@
+package mineplex.minecraft.game.core.boss.snake;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+
+import mineplex.core.blockrestore.BlockRestore;
+import mineplex.core.disguise.DisguiseManager;
+import mineplex.core.projectile.ProjectileManager;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.EventState;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+import mineplex.minecraft.game.core.condition.ConditionManager;
+import mineplex.minecraft.game.core.damage.DamageManager;
+
+public class SnakeBoss extends WorldEvent
+{
+
+	public SnakeBoss(DisguiseManager disguiseManager, ProjectileManager projectileManager, DamageManager damageManager,
+			BlockRestore blockRestore, ConditionManager conditionManager, Location cornerLocation)
+	{
+		super(disguiseManager, projectileManager, damageManager, blockRestore, conditionManager, "Snaaaake", cornerLocation,
+				"schematic/Golem.schematic");
+	}
+
+	@Override
+	protected void customStart()
+	{
+		Bukkit.broadcastMessage("Custom Start");
+		spawn(getCenterLocation());
+		setState(EventState.LIVE);
+		announceStart();
+	}
+
+	/**
+	 * Check if this slime boss has been defeated
+	 */
+	private void checkDeath()
+	{
+		if (getCreatures().size() == 0)
+		{
+			setState(EventState.COMPLETE);
+			Bukkit.broadcastMessage("FINISHED!");
+		}
+	}
+
+	@Override
+	public void removeCreature(EventCreature creature)
+	{
+		super.removeCreature(creature);
+
+		if (creature instanceof SnakeCreature)
+		{
+			checkDeath();
+		}
+	}
+
+	private SnakeCreature spawn(Location location)
+	{
+		SnakeCreature slimeCreature = new SnakeCreature(this, location);
+		registerCreature(slimeCreature);
+		return slimeCreature;
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeCreature.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeCreature.java
new file mode 100644
index 000000000..2b8860455
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeCreature.java
@@ -0,0 +1,234 @@
+package mineplex.minecraft.game.core.boss.snake;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Silverfish;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+import net.minecraft.server.v1_8_R3.Packet;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy;
+
+public class SnakeCreature extends EventCreature<Silverfish>
+{
+	private ArrayList<SnakeSegment> _segments = new ArrayList<SnakeSegment>();
+	private double _seperator = 0.5;
+	private ArrayList<Player> _canSee = new ArrayList<Player>();
+
+	private Location _waypoint;
+	private Vector _velocity = new Vector(0, 0, 0);
+
+	private boolean _enabled = true;
+	
+	private double _speed = 0.75;
+	
+	private int _ticks = 0;
+
+	public SnakeCreature(WorldEvent event, Location spawnLocation)
+	{
+		super(event, spawnLocation, "Serpent Lord", false, 2000, Silverfish.class);
+	}
+
+	@Override
+	protected void spawnCustom()
+	{
+		getEntity().addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, 10000, 0));
+		UtilEnt.Vegetate(getEntity());
+		UtilEnt.ghost(getEntity(), true, false);
+		Vector dir = new Vector(UtilMath.rr(1, true), 0, UtilMath.rr(1, true)).normalize().multiply(_seperator);
+
+		getNewWaypoint();
+
+		for (int i = 0; i < getHealth() / 50; i++)
+		{
+			SnakeSegment tail = new SnakeSegment(getSpawnLocation().toVector().subtract(dir.clone().multiply(-i)),
+					new ItemStack(i == 0 ? Material.DROPPER : Material.BEDROCK));
+
+			_segments.add(tail);
+		}
+	}
+
+	private void getNewWaypoint()
+	{
+		// Bukkit.broadcastMessage("NEW WAYPOINT!");
+		_waypoint = getSpawnLocation().clone().add(Math.random() * 60 - 30, Math.random() * 24 - 16, Math.random() * 60 - 30);
+	}
+
+	@EventHandler
+	public void onSecond(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+		{
+			return;
+		}
+
+		Location loc = _segments.get(0).getLocation().toLocation(getSpawnLocation().getWorld());
+
+		ArrayList<Player> canSee = new ArrayList<Player>();
+
+		for (Player player : loc.getWorld().getPlayers())
+		{
+			if (player.getLocation().distance(loc) < 120)
+			{
+				canSee.add(player);
+			}
+		}
+
+		Iterator<Player> iter2 = _canSee.iterator();
+
+		int[] ids = new int[_segments.size()];
+
+		for (int a = 0; a < _segments.size(); a++)
+		{
+			ids[a] = _segments.get(a).getId();
+		}
+
+		Packet destroy = new PacketPlayOutEntityDestroy(ids);
+
+		while (iter2.hasNext())
+		{
+			Player player = iter2.next();
+			if (!canSee.contains(player))
+			{
+				iter2.remove();
+				UtilPlayer.sendPacket(player, destroy);
+			}
+		}
+		for (Player player : canSee)
+		{
+			if (!_canSee.contains(player))
+			{
+				_canSee.add(player);
+
+				for (SnakeSegment tail : _segments)
+				{
+					UtilPlayer.sendPacket(player, tail.getSpawn());
+				}
+			}
+		}
+	}
+
+	@Override
+	public void dieCustom()
+	{
+		int[] ids = new int[_segments.size()];
+
+		for (int a = 0; a < _segments.size(); a++)
+		{
+			ids[a] = _segments.get(a).getId();
+		}
+
+		Packet destroy = new PacketPlayOutEntityDestroy(ids);
+
+		for (Player player : _canSee)
+		{
+			UtilPlayer.sendPacket(player, destroy);
+		}
+	}
+
+	@EventHandler
+	public void onTickMove(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK || !_enabled)
+		{
+			return;
+		}
+
+		ArrayList<Packet> packets = new ArrayList<Packet>();
+
+		for (int i = 0 ; i < _segments.size() ; i++)
+		{
+			SnakeSegment seg = _segments.get(i);
+
+			Vector vec = seg.getLocation().clone();
+
+			if (i == 0)
+			{
+				Vector direction = UtilAlg.getTrajectory(vec, _waypoint.toVector());
+
+			
+				_velocity.add(direction.multiply(0.1 * _speed));
+				
+				if (_velocity.length() > _speed)
+					_velocity.normalize().multiply(_speed);
+
+				// Bukkit.broadcastMessage("Loc: " + UtilWorld.vecToStrClean(moveTo));
+
+				vec.add(_velocity);
+
+				// Bukkit.broadcastMessage("Loc: " + UtilWorld.vecToStrClean(vec));
+
+				if (UtilMath.offset(vec, _waypoint.toVector()) < 6)
+				{
+					getNewWaypoint();
+				}
+			}
+			else
+			{
+				Vector infront = _segments.get(i - 1).getLocation();
+				Vector behind = _segments.get(i - 1).getLastLocation();
+				
+				vec = infront.clone().add(UtilAlg.getTrajectory(infront, behind).multiply(_seperator));
+			}
+			
+			Block block = _waypoint.getWorld().getBlockAt(seg.getLocation().getBlockX(),seg.getLocation().getBlockY(),seg.getLocation().getBlockZ()).getRelative(BlockFace.UP);
+			if (block.getType() != Material.AIR && UtilBlock.isVisible(block))
+			{
+				block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, block.getType());
+			}
+
+			packets.addAll(Arrays.asList(seg.moveEntity(vec)));
+		}
+
+		Packet[] packetArray = packets.toArray(new Packet[0]);
+
+		for (Player player : _canSee)
+		{
+			UtilPlayer.sendPacket(player, packetArray);
+		}
+	}
+
+	@EventHandler
+	public void command(PlayerCommandPreprocessEvent event)
+	{
+		if (event.getMessage().contains("speed"))
+		{
+			try
+			{
+				_speed = Double.parseDouble(event.getMessage().split(" ")[1]);
+				
+				Bukkit.broadcastMessage("SPEED " + _speed);
+			}
+			catch (Exception e)
+			{
+				
+			}
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeSegment.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeSegment.java
new file mode 100644
index 000000000..2ce42ca68
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeSegment.java
@@ -0,0 +1,174 @@
+package mineplex.minecraft.game.core.boss.snake;
+
+import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack;
+import org.bukkit.entity.EntityType;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
+import net.minecraft.server.v1_8_R3.DataWatcher;
+import net.minecraft.server.v1_8_R3.Packet;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntity;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntityEquipment;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntityMetadata;
+import net.minecraft.server.v1_8_R3.PacketPlayOutEntityTeleport;
+import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntityLiving;
+
+public class SnakeSegment
+{
+	private int _entityId = UtilEnt.getNewEntityId();
+	private Vector _entityLocation;
+	private Vector _entityLastLocation;
+	private ItemStack _item;
+	private Vector _prevDir = new Vector();
+
+	public SnakeSegment(Vector location, ItemStack item)
+	{
+		_entityLocation = location.clone();
+		_item = item;
+	}
+
+	public int getId()
+	{
+		return _entityId;
+	}
+
+	public Packet[] moveEntity(Vector newLocation)
+	{
+		_entityLastLocation = _entityLocation.clone();
+		
+		Vector toMove = newLocation.clone().subtract(_entityLocation);
+		Packet packet1;
+
+		int x = (int) Math.floor(32 * toMove.getX());
+		int y = (int) Math.floor(32 * toMove.getY());
+		int z = (int) Math.floor(32 * toMove.getZ());
+
+		if (x >= -128 && x <= 127 && y >= -128 && y <= 127 && z >= -128 && z <= 127)
+		{
+			_entityLocation.add(new Vector(x / 32D, y / 32D, z / 32D));
+
+			PacketPlayOutEntity.PacketPlayOutRelEntityMoveLook relMove = new PacketPlayOutEntity.PacketPlayOutRelEntityMoveLook();
+
+			relMove.a = getId();
+			relMove.b = (byte) x;
+			relMove.c = (byte) y;
+			relMove.d = (byte) z;
+			// relMove.e = (byte) (int) (UtilAlg.GetYaw(toMove) * 256.0F / 360.0F);
+			// relMove.f = (byte) (int) (UtilAlg.GetPitch(toMove) * 256.0F / 360.0F);
+
+			packet1 = relMove;
+		}
+		else
+		{
+			_entityLocation = newLocation.clone();
+
+			x = (int) Math.floor(_entityLocation.getX() * 32);
+			y = (int) Math.floor(_entityLocation.getY() * 32);
+			z = (int) Math.floor(_entityLocation.getZ() * 32);
+
+			PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport();
+			teleportPacket.a = getId();
+			teleportPacket.b = x;
+			teleportPacket.c = y;
+			teleportPacket.d = z;
+			// teleportPacket.e = (byte) (int) (UtilAlg.GetYaw(toMove) * 256.0F / 360.0F);
+			// teleportPacket.f = (byte) (int) (UtilAlg.GetPitch(toMove) * 256.0F / 360.0F);
+
+			packet1 = teleportPacket;
+		}
+
+		Vector vec = new Vector(UtilAlg.GetPitch(toMove), UtilAlg.GetYaw(toMove), 0);
+
+		if (vec.equals(_prevDir))
+		{
+			return new Packet[]
+				{
+						packet1
+				};
+		}
+
+		_prevDir = vec;
+
+		DataWatcher watcher = new DataWatcher(null);
+		watcher.a(0, (byte) 32);
+		watcher.a(1, 0);
+		watcher.a(10, (byte) 0);
+
+		watcher.a(11, vec);
+
+		for (int i = 12; i < 17; i++)
+		{
+			watcher.a(i, new Vector(0, 0, 0));
+		}
+
+		PacketPlayOutEntityMetadata meta = new PacketPlayOutEntityMetadata();
+
+		meta.a = getId();
+		meta.b = watcher.c();
+
+		return new Packet[]
+			{
+					packet1, meta
+			};
+	}
+
+	public Vector getLocation()
+	{
+		return _entityLocation.clone();
+	}
+	
+	public Vector getLastLocation()
+	{
+		return _entityLastLocation.clone();
+	}
+
+	public Packet[] getSpawn()
+	{
+		PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving();
+
+		DataWatcher watcher = new DataWatcher(null);
+		watcher.a(1, 0);
+
+		packet.a = getId();
+		packet.c = (int) Math.floor(_entityLocation.getX() * 32);
+		packet.d = (int) Math.floor(_entityLocation.getY() * 32);
+		packet.e = (int) Math.floor(_entityLocation.getZ() * 32);
+		packet.l = watcher;
+
+		if (_item != null)
+		{
+			watcher.a(0, (byte) 32);
+			watcher.a(10, (byte) 0);
+
+			for (int i = 11; i < 17; i++)
+			{
+				watcher.a(i, new Vector(0, 0, 0));
+			}
+
+			packet.b = 30;
+
+			PacketPlayOutEntityEquipment packet2 = new PacketPlayOutEntityEquipment();
+
+			packet2.a = getId();
+			packet2.b = 4;
+			packet2.c = CraftItemStack.asNMSCopy(_item);
+
+			return new Packet[]
+				{
+						packet, packet2
+				};
+		}
+		else
+		{
+			watcher.a(0, (byte) 0);
+			packet.b = EntityType.MAGMA_CUBE.getTypeId();
+
+			return new Packet[]
+				{
+						packet
+				};
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/SpiderBoss.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/SpiderBoss.java
new file mode 100644
index 000000000..cf2a16e35
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/SpiderBoss.java
@@ -0,0 +1,185 @@
+package mineplex.minecraft.game.core.boss.spider;
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.entity.ItemSpawnEvent;
+
+import mineplex.core.blockrestore.BlockRestore;
+import mineplex.core.disguise.DisguiseManager;
+import mineplex.core.projectile.ProjectileManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.EventState;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import mineplex.minecraft.game.core.condition.ConditionManager;
+import mineplex.minecraft.game.core.damage.DamageManager;
+
+public class SpiderBoss extends WorldEvent
+{
+	private HashMap<Block, Double> _webDurability = new HashMap<Block, Double>();
+
+	public SpiderBoss(DisguiseManager disguiseManager, ProjectileManager projectileManager, DamageManager damageManager,
+			BlockRestore blockRestore, ConditionManager conditionManager, Location cornerLocation)
+	{
+		super(disguiseManager, projectileManager, damageManager, blockRestore, conditionManager, "Brood Mother", cornerLocation,
+				"schematic/Golem.schematic");
+	}
+
+	@EventHandler
+	public void onWebDura(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		for (Player player : getCenterLocation().getWorld().getPlayers())
+		{
+			if (!getEventMap().isInMap(player.getLocation()))
+			{
+				continue;
+			}
+
+			loop: for (double x = -0.3; x <= 0.3; x += 0.6)
+			{
+				for (double z = -0.3; z <= 0.3; z += 0.6)
+				{
+					for (double y = -0.9; y <= 0.9; y += 1.8)
+					{
+						Block block = player.getLocation().add(x, 0.9 + y, z).getBlock();
+
+						if (block.getType() != Material.WEB)
+						{
+							continue;
+						}
+
+						if (!_webDurability.containsKey(block))
+						{
+							_webDurability.put(block, 0D);
+						}
+
+						_webDurability.put(block, _webDurability.get(block) + 0.1);
+
+						if (_webDurability.get(block) > 1)
+						{
+							_webDurability.remove(block);
+
+							block.setType(Material.AIR);
+							block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, Material.WEB);
+						}
+
+						break loop;
+					}
+				}
+			}
+		}
+
+		Iterator<Block> itel = _webDurability.keySet().iterator();
+
+		while (itel.hasNext())
+		{
+			Block block = itel.next();
+
+			_webDurability.put(block, _webDurability.get(block) - 0.01);
+
+			if (_webDurability.get(block) < 0)
+			{
+				itel.remove();
+			}
+		}
+	}
+
+	@EventHandler
+	public void onBreak(BlockBreakEvent event)
+	{
+		Block block = event.getBlock();
+
+		if (!getEventMap().isInMap(block.getLocation()))
+		{
+			return;
+		}
+
+		if (block.getType() != Material.WEB)
+		{
+			return;
+		}
+
+		_webDurability.remove(block);
+
+		event.setCancelled(false);
+	}
+
+	@EventHandler
+	public void onString(ItemSpawnEvent event)
+	{
+		if (!getEventMap().isInMap(event.getLocation()))
+		{
+			return;
+		}
+
+		if (event.getEntity().getItemStack().getType() != Material.STRING)
+		{
+			return;
+		}
+
+		event.setCancelled(true);
+	}
+
+	@Override
+	protected void customStart()
+	{
+		Bukkit.broadcastMessage("Custom Start");
+		spawnGolem(getCenterLocation());
+		setState(EventState.LIVE);
+		announceStart();
+	}
+
+	/**
+	 * Check if this slime boss has been defeated
+	 */
+	private void checkDeath()
+	{
+		if (getCreatures().size() == 0)
+		{
+			setState(EventState.COMPLETE);
+			Bukkit.broadcastMessage("FINISHED!");
+		}
+	}
+
+	@Override
+	public void removeCreature(EventCreature creature)
+	{
+		super.removeCreature(creature);
+
+		if (creature instanceof GolemCreature)
+		{
+			checkDeath();
+		}
+	}
+
+	public SpiderMinionCreature spawnMinion(Location location)
+	{
+		SpiderMinionCreature slimeCreature = new SpiderMinionCreature(this, location, 5);
+		registerCreature(slimeCreature);
+		return slimeCreature;
+	}
+
+	private SpiderCreature spawnGolem(Location location)
+	{
+		SpiderCreature slimeCreature = new SpiderCreature(this, location, 2500);
+		registerCreature(slimeCreature);
+		return slimeCreature;
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/SpiderCreature.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/SpiderCreature.java
new file mode 100644
index 000000000..8c813ed28
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/SpiderCreature.java
@@ -0,0 +1,453 @@
+package mineplex.minecraft.game.core.boss.spider;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Pig;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.disguise.disguises.DisguiseSpider;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.ironwizard.GolemCreature;
+import mineplex.minecraft.game.core.boss.spider.attacks.SpiderCeilingCling;
+import mineplex.minecraft.game.core.boss.spider.attacks.SpiderEggScatter;
+import mineplex.minecraft.game.core.boss.spider.attacks.SpiderEggplosm;
+import mineplex.minecraft.game.core.boss.spider.attacks.SpiderPoisonBarrage;
+import mineplex.minecraft.game.core.boss.spider.attacks.SpiderWebBarrage;
+import mineplex.minecraft.game.core.boss.spider.attacks.SpiderWebStomp;
+import mineplex.minecraft.game.core.condition.Condition.ConditionType;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class SpiderCreature extends EventCreature<Pig>
+{
+	private ArrayList<BossAbility> _currentAbilities = new ArrayList<BossAbility>();
+	private int _lastAbility;
+	private long _lastWalked;
+	private long _reverseWalk;
+	private Location _standing;
+	private Vector _afkWalk = new Vector();
+	private HashMap<Class, Long> _cooldowns = new HashMap<Class, Long>();
+	private long _lastAttack;
+
+	public SpiderCreature(SpiderBoss boss, Location location, double maxHealth)
+	{
+		super(boss, location, "Brood Mother", true, maxHealth, Pig.class);
+
+		spawnEntity();
+	}
+
+	@Override
+	public void setEntity(Pig entity)
+	{
+		super.setEntity(entity);
+
+		if (entity != null)
+		{
+			DisguiseSpider disguise = new DisguiseSpider(getEntity());
+
+			((SpiderBoss) getEvent()).getDisguiseManager().disguise(disguise);
+		}
+	}
+
+	@Override
+	protected void spawnCustom()
+	{
+		UtilEnt.Vegetate(getEntity());
+	}
+
+	@Override
+	public void dieCustom()
+	{
+	}
+
+	@EventHandler
+	public void onTick(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		Iterator<BossAbility> itel = _currentAbilities.iterator();
+		boolean canDoNew = _currentAbilities.size() < 3;
+
+		while (itel.hasNext())
+		{
+			BossAbility ability = itel.next();
+
+			if (ability.hasFinished())
+			{
+				itel.remove();
+				ability.setFinished();
+				_lastAbility = 20;// _currentAbility.getCooldown();
+
+				HandlerList.unregisterAll(ability);
+				System.out.print("Unregistered spider ability " + ability.getClass().getSimpleName());
+
+				_cooldowns.put(ability.getClass(), System.currentTimeMillis() + (ability.getCooldown() * 1000));
+			}
+			else if (ability.inProgress())
+			{
+				canDoNew = false;
+				_lastAbility = 20;// _currentAbility.getCooldown();
+			}
+		}
+
+		if (_lastAbility-- <= 0 && canDoNew && UtilBlock.solid(getEntity().getLocation().getBlock().getRelative(BlockFace.DOWN)))
+		{
+			HashMap<Class, Integer> weight = new HashMap<Class, Integer>();
+			HashMap<Player, Double> dist = new HashMap<Player, Double>();
+
+			for (Player player : UtilPlayer.getNearby(getEntity().getLocation(), 50, true))
+			{
+				if (player.hasLineOfSight(getEntity()))
+				{
+					dist.put(player, player.getLocation().distance(getEntity().getLocation()));
+				}
+			}
+
+			if (!dist.isEmpty())
+			{
+				{// Eggsplosm
+					ArrayList<Player> players = getPlayers(dist, 30);
+
+					if (getEvent().getCreatures().size() < 5 && !players.isEmpty())
+					{
+						weight.put(SpiderEggplosm.class, 4);
+					}
+				}
+
+				{ // Ceiling Cling
+					if (getEvent().getCreatures().size() < 5)
+					{
+						weight.put(SpiderCeilingCling.class, 2);
+					}
+				}
+
+				{ // Poison barrage
+					if (!getPlayers(dist, 10, 30).isEmpty())
+					{
+						weight.put(SpiderPoisonBarrage.class, 4);
+					}
+				}
+
+				{// Spider egg scatter
+					if (getEvent().getCreatures().size() < 5 && !getPlayers(dist, 20, 40).isEmpty())
+					{
+						weight.put(SpiderEggScatter.class, 4);
+					}
+				}
+
+				{ // Spider web barrage
+					if (!getPlayers(dist, 30).isEmpty())
+					{
+						weight.put(SpiderWebBarrage.class, 4);
+					}
+				}
+
+				{ // Spider web stomp
+					if (!getPlayers(dist, 20).isEmpty())
+					{
+						weight.put(SpiderWebStomp.class, 4);
+					}
+				}
+			}
+
+			for (BossAbility ability : _currentAbilities)
+			{
+				weight.remove(ability.getClass());
+			}
+
+			for (Class c : _cooldowns.keySet())
+			{
+				if (_cooldowns.get(c) > System.currentTimeMillis())
+				{
+					weight.remove(c);
+				}
+			}
+
+			BossAbility ability = null;
+
+			if (!weight.isEmpty())
+			{
+				int i = 0;
+
+				for (Integer entry : weight.values())
+				{
+					i += entry;
+				}
+
+				loop: for (int a = 0; a < 10; a++)
+				{
+					int luckyNumber = UtilMath.r(i);
+
+					for (Entry<Class, Integer> entry : weight.entrySet())
+					{
+						luckyNumber -= entry.getValue();
+
+						if (luckyNumber <= 0)
+						{
+							try
+							{
+								ability = (BossAbility) entry.getKey().getConstructor(SpiderCreature.class).newInstance(this);
+
+								if (ability.getTarget() == null || ability.hasFinished())
+								{
+									ability = null;
+								}
+								else
+								{
+									break loop;
+								}
+							}
+							catch (Exception ex)
+							{
+								ex.printStackTrace();
+							}
+
+							break;
+						}
+					}
+				}
+			}
+
+			if (ability != null && ability.getTarget() != null)
+			{
+
+				Bukkit.getPluginManager().registerEvents(ability, getEvent().getPlugin());
+
+				System.out.print("Spider boss is using " + ability.getClass().getSimpleName());
+
+				_currentAbilities.add(ability);
+			}
+
+			_lastAbility = 10;
+		}
+
+		boolean canMove = true;
+
+		for (BossAbility ability : _currentAbilities)
+		{
+			ability.tick();
+
+			if (!ability.canMove())
+			{
+				canMove = false;
+			}
+		}
+
+		if (canMove && System.currentTimeMillis() % 20000 > 2000)
+		{
+			for (double x = -.5; x <= .5; x += 1)
+			{
+				for (double y = 0; y <= 1; y += 1)
+				{
+					for (double z = -.5; z <= .5; z += 1)
+					{
+						Block block = getEntity().getLocation().add(x, y, z).getBlock();
+
+						if (block.getType() == Material.WEB)
+						{
+							block.setType(Material.AIR);
+						}
+					}
+				}
+			}
+
+			if (UtilBlock.solid(getEntity().getLocation().getBlock().getRelative(BlockFace.DOWN))
+					|| getEntity().getVelocity().length() > 0.1)
+			{
+
+				Player target = null;
+				double dist = 0;
+				boolean canAttack = UtilTime.elapsed(_lastAttack, 1300);
+
+				for (Player player : UtilPlayer.getNearby(getEntity().getLocation(), 50, true))
+				{
+					if (!player.hasLineOfSight(getEntity()))
+					{
+						continue;
+					}
+
+					double d = player.getLocation().distance(getEntity().getLocation());
+
+					if ((canAttack || d > 1.5) && (d < 7 || d > 15) && (target == null || (d < 50 && dist > d)))
+					{
+						target = player;
+						dist = d;
+					}
+				}
+
+				if (target != null && dist < 1.5 && canAttack)
+				{
+					// UtilEnt.CreatureMoveFast(getEntity(), target.getLocation(), 1F);
+
+					_lastAttack = System.currentTimeMillis();
+					Vector vec = UtilAlg.getTrajectory2d(getEntity(), target);
+
+					vec.multiply(0.5).setY(0.4);
+
+					getEntity().setVelocity(vec);
+
+					getEvent().getCondition().Factory()
+							.Confuse("Brood Mother Bite", target, getEntity(), 4, 0, false, true, true);
+					getEvent().getCondition().Factory()
+							.Blind("Brood Mother Bite", target, getEntity(), 1.5, 0, false, true, true);
+					getEvent().getCondition().Factory()
+							.Slow("Brood Mother Bite", target, getEntity(), 4, 0, false, true, true, true);
+
+					getEvent().getDamageManager().NewDamageEvent(target, getEntity(), null, DamageCause.ENTITY_ATTACK,
+							2 * getDifficulty(), true, false, false, "Brood Mother Attack", "Brood Mother Attack");
+					return;
+				}
+
+				Vector vec = null;
+				boolean superWalk = false;
+
+				if (target != null)
+				{
+					vec = target.getLocation().subtract(getEntity().getLocation()).toVector();
+					vec.setY(getEntity().getLocation().getY());
+
+					double len = vec.length();
+
+					vec.setX(vec.getX() * (UtilMath.random.nextDouble() / 3D));
+					vec.setZ(vec.getZ() * (UtilMath.random.nextDouble() / 3D));
+
+					vec.multiply(len);
+
+					if (target != null && dist < 8)
+					{
+						vec.multiply(-1);
+						superWalk = true;
+					}
+
+					if (!UtilAlg.HasSight(getEntity().getLocation(),
+							getEntity().getLocation().add(vec.clone().normalize().multiply(2))))
+					{
+						_reverseWalk = System.currentTimeMillis();
+					}
+
+					if (!UtilTime.elapsed(_reverseWalk, 4000))
+					{
+						vec.multiply(-1);
+					}
+
+				}
+				else if (!UtilTime.elapsed(_lastWalked, 7000))
+				{
+					vec = _afkWalk;
+				}
+				else if (UtilTime.elapsed(_lastWalked, 12000))
+				{
+					_afkWalk = new Vector();
+
+					for (int i = 0; i < 10; i++)
+					{
+						Vector vector = new Vector(UtilMath.r(20) - 10, 0, UtilMath.r(20) - 10);
+
+						if (UtilAlg.HasSight(getEntity().getLocation(),
+								getEntity().getLocation().add(vector.clone().normalize().multiply(2))))
+						{
+							vec = _afkWalk = vector;
+							break;
+						}
+					}
+
+					_lastWalked = System.currentTimeMillis();
+				}
+
+				if (vec != null)
+				{
+					// if (vec.length() > 1)
+					{
+						UtilEnt.CreatureMoveFast(getEntity(), getEntity().getLocation().add(vec), (target != null ? 1.8F : 1.1F)
+								+ (superWalk ? 0.4F : 0));
+					}
+				}
+			}
+
+			_standing = getEntity().getLocation();
+		}
+		else if (_standing != null)
+		{
+			Location l = getEntity().getLocation();
+
+			_standing.setYaw(l.getYaw());
+			_standing.setPitch(l.getPitch());
+			_standing.setY(l.getY());
+
+			getEntity().teleport(_standing);
+		}
+	}
+
+	private ArrayList<Player> getPlayers(HashMap<Player, Double> map, double maxDist)
+	{
+		return getPlayers(map, 0, maxDist);
+	}
+
+	private ArrayList<Player> getPlayers(final HashMap<Player, Double> map, double minDist, double maxDist)
+	{
+		ArrayList<Player> list = new ArrayList<Player>();
+
+		for (Player p : map.keySet())
+		{
+			if (map.get(p) >= minDist && map.get(p) <= maxDist)
+			{
+				list.add(p);
+			}
+		}
+
+		Collections.sort(list, new Comparator<Player>()
+		{
+
+			@Override
+			public int compare(Player o1, Player o2)
+			{
+				return Double.compare(map.get(o2), map.get(o1));
+			}
+		});
+
+		return list;
+	}
+
+	@EventHandler
+	public void noFallDamage(CustomDamageEvent event)
+	{
+		if (getEntity() == null)
+			return;
+
+		if (!event.GetDamageeEntity().equals(getEntity()))
+			return;
+
+		DamageCause cause = event.GetCause();
+
+		if (cause == DamageCause.FALL)
+			event.SetCancelled("Cancel");
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/SpiderMinionCreature.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/SpiderMinionCreature.java
new file mode 100644
index 000000000..255f2406e
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/SpiderMinionCreature.java
@@ -0,0 +1,145 @@
+package mineplex.minecraft.game.core.boss.spider;
+
+import java.util.HashMap;
+
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Sound;
+import org.bukkit.entity.Pig;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Silverfish;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.disguise.disguises.DisguiseCaveSpider;
+import mineplex.core.disguise.disguises.DisguiseSpider;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class SpiderMinionCreature extends EventCreature<Pig>
+{
+	private long _lastAttack;
+	private Location _moveTo;
+
+	public SpiderMinionCreature(SpiderBoss boss, Location location, double maxHealth)
+	{
+		super(boss, location, "Spider Minion", true, maxHealth, Pig.class);
+
+		spawnEntity();
+	}
+
+	@EventHandler
+	@Override
+	public void update(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		if (getEntity() == null || getEntity().isDead() || !getEntity().isValid())
+		{
+			remove();
+		}
+	}
+
+	@Override
+	protected void spawnCustom()
+	{
+		UtilEnt.Vegetate(getEntity(), true);
+
+		getEntity().setVelocity(new Vector(UtilMath.rr(0.5, true), 0.4, UtilMath.rr(0.4, true)));
+
+		DisguiseCaveSpider disguise = new DisguiseCaveSpider(getEntity());
+
+		getEvent().getDisguiseManager().disguise(disguise);
+	}
+
+	@Override
+	public void dieCustom()
+	{
+	}
+
+	@EventHandler
+	public void onTick(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		if (UtilMath.r(150) == 0)
+		{
+			getEntity().getWorld().playSound(getEntity().getLocation(), Sound.SPIDER_IDLE, 2.5F, 1);
+		}
+
+		Location loc = getEntity().getLocation();
+
+		Player target = null;
+
+		HashMap<Player, Double> players = UtilPlayer.getInRadius(loc, 30);
+
+		for (Player player : players.keySet())
+		{
+			if (player.hasLineOfSight(getEntity()) && !UtilPlayer.isSpectator(player)
+					&& player.getGameMode() != GameMode.CREATIVE && (target == null || players.get(player) < players.get(target)))
+			{
+				target = player;
+			}
+		}
+
+		if (target == null)
+		{
+			if (UtilTime.elapsed(_lastAttack, 6000))
+			{
+				_lastAttack = System.currentTimeMillis();
+				_moveTo = loc.clone().add(UtilMath.rr(3, true), 0, UtilMath.rr(3, true));
+			}
+
+			if (_moveTo != null && _moveTo.distance(loc) > 0.2)
+			{
+				_moveTo.setY(loc.getY());
+				UtilEnt.CreatureMoveFast(getEntity(), _moveTo, 1.2F);
+			}
+
+			return;
+		}
+
+		UtilEnt.CreatureMoveFast(getEntity(), target.getLocation(), 1.6F);
+
+		if (UtilTime.elapsed(_lastAttack, 3000) && target.getLocation().distance(loc) < 2)
+		{
+			_lastAttack = System.currentTimeMillis();
+			Vector vec = UtilAlg.getTrajectory2d(getEntity(), target);
+			vec.multiply(0.4).setY(0.3);
+
+			getEntity().setVelocity(vec);
+
+			getEvent().getCondition().Factory().Blind("Spider Minion Bite", target, getEntity(), 1.5, 0, false, true, true);
+			getEvent().getDamageManager().NewDamageEvent(target, getEntity(), null, DamageCause.ENTITY_ATTACK,
+					2 * getDifficulty(), true, false, false, "Spider Minion Attack", "Spider Minion Attack");
+		}
+	}
+
+	@EventHandler
+	public void noFallDamage(CustomDamageEvent event)
+	{
+		if (getEntity() == null)
+			return;
+
+		if (!event.GetDamageeEntity().equals(getEntity()))
+			return;
+
+		DamageCause cause = event.GetCause();
+
+		if (cause == DamageCause.FALL)
+			event.SetCancelled("Cancel");
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderCeilingCling.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderCeilingCling.java
new file mode 100644
index 000000000..01f28b569
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderCeilingCling.java
@@ -0,0 +1,218 @@
+package mineplex.minecraft.game.core.boss.spider.attacks;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilShapes;
+import mineplex.minecraft.game.core.boss.spider.SpiderCreature;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+
+public class SpiderCeilingCling extends SpiderEggAbility
+{
+	private double _startedHealth;
+	private boolean _isClinging;
+	private int _tick;
+	private Location _clingTo;
+	private double _lastY;
+	private int _eggsToLay = UtilMath.r(10) + 10;
+	private boolean _upsideDown;
+
+	public SpiderCeilingCling(SpiderCreature creature)
+	{
+		super(creature);
+
+		_startedHealth = creature.getHealth();
+
+		for (int i = 0; i < 10; i++)
+		{
+			Location loc = getLocation().add(UtilMath.rr(10, true), 12, UtilMath.rr(10, true));
+
+			if (UtilAlg.HasSight(getLocation(), loc))
+			{
+				while (loc.getBlock().getRelative(BlockFace.UP).getType() == Material.AIR)
+				{
+					loc.add(0, 1, 0);
+				}
+
+				if (UtilAlg.HasSight(getLocation(), loc))
+				{
+					_clingTo = loc;
+					break;
+				}
+			}
+		}
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return !_isClinging;
+	}
+
+	@Override
+	public int getCooldown()
+	{
+		return 90;
+	}
+
+	public Player getTarget()
+	{
+		List<Player> targets = UtilPlayer.getNearby(getLocation(), 35, true);
+
+		Collections.shuffle(targets);
+
+		for (Player player : targets)
+		{
+			if (UtilAlg.HasSight(getLocation(), player))
+			{
+				return player;
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _clingTo == null;
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return true;
+	}
+
+	@EventHandler
+	public void onKnockback(CustomDamageEvent event)
+	{
+		if (!event.GetDamageeEntity().equals(getEntity()))
+		{
+			return;
+		}
+
+		if (!_isClinging)
+		{
+			return;
+		}
+
+		event.SetKnockback(false);
+	}
+
+	@Override
+	public void setFinished()
+	{
+		if (_upsideDown)
+		{
+			getBoss().setUseName(true);
+			getBoss().setShowHealthName(true);
+			getBoss().setName(null);
+		}
+
+		setEggsFinished();
+	}
+
+	@Override
+	public void tick()
+	{
+		if (!_isClinging && _upsideDown)
+		{
+			if (Math.abs(getLocation().getY() - _lastY) < 0.05)
+			{
+				_isClinging = true;
+			}
+
+			_lastY = getLocation().getY();
+		}
+
+		if (_isClinging && _upsideDown)
+		{
+			getEntity().setVelocity(new Vector(0, 1, 0));
+
+			if (getBoss().getEvent().getCreatures().size() <= 3
+					&& (_tick > 30 * 20 || _startedHealth - getBoss().getHealth() > 150 || getEggs() == 0))
+			{
+				_isClinging = false;
+				_clingTo = null;
+			}
+		}
+
+		if (!_isClinging && _clingTo != null)
+		{
+			int i = 0;
+
+			for (Location loc : UtilShapes.getLinesDistancedPoints(getLocation(), _clingTo, 0.3))
+			{
+				if (i++ % 3 == _tick % 3)
+				{
+					UtilParticle.PlayParticle(ParticleType.FIREWORKS_SPARK, loc, 0F, 0F, 0F, 0, 1, ViewDist.NORMAL,
+							UtilServer.getPlayers());
+				}
+			}
+
+			if (_eggsToLay > 0)
+			{
+				if (_tick % 3 == 0)
+				{
+					Vector vec = new Vector(UtilMath.rr(1, true), UtilMath.rr(0.5, false), UtilMath.rr(1, true)).normalize()
+							.multiply(0.7).setY(0.4 + (UtilMath.rr(0.4, false)));
+
+					UtilEnt.CreatureLook(getEntity(), getLocation().add(vec));
+
+					shootEgg(vec);
+
+					_eggsToLay--;
+				}
+			}
+
+			if (_eggsToLay < 3)
+			{
+				if (!_upsideDown)
+				{
+					_upsideDown = true;
+
+					getBoss().setUseName(false);
+					getBoss().setShowHealthName(false);
+					getBoss().setName("Dinnerbone");
+				}
+
+				getEntity().setVelocity(UtilAlg.getTrajectory(getLocation(), _clingTo).multiply(0.4));
+			}
+		}
+
+		_tick++;
+	}
+
+	@EventHandler
+	public void onDamage(CustomDamageEvent event)
+	{
+		if (!event.GetDamageeEntity().equals(getEntity()))
+		{
+			return;
+		}
+
+		if (event.GetCause() != DamageCause.FALL)
+		{
+			return;
+		}
+
+		event.SetCancelled("Cancelled");
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderEggAbility.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderEggAbility.java
new file mode 100644
index 000000000..9636a1da6
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderEggAbility.java
@@ -0,0 +1,228 @@
+package mineplex.minecraft.game.core.boss.spider.attacks;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import org.bukkit.Effect;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Pig;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.spider.SpiderBoss;
+import mineplex.minecraft.game.core.boss.spider.SpiderCreature;
+import net.minecraft.server.v1_8_R3.MathHelper;
+import net.minecraft.server.v1_8_R3.MovingObjectPosition;
+import net.minecraft.server.v1_8_R3.Vec3D;
+
+public abstract class SpiderEggAbility extends BossAbility<SpiderCreature, Pig>
+{
+	private HashMap<Block, Long> _eggs = new HashMap<Block, Long>();
+	private ArrayList<FallingBlock> _fallingBlocks = new ArrayList<FallingBlock>();
+
+	public SpiderEggAbility(SpiderCreature creature)
+	{
+		super(creature);
+	}
+
+	@EventHandler
+	public void onMove(PlayerMoveEvent event)
+	{
+		if (UtilPlayer.isSpectator(event.getPlayer()))
+			return;
+
+		if (event.getPlayer().getGameMode() == GameMode.CREATIVE)
+			return;
+
+		Block block = event.getTo().getBlock().getRelative(BlockFace.DOWN);
+
+		if (!_eggs.containsKey(block))
+		{
+			return;
+		}
+
+		_eggs.remove(block);
+
+		block.setType(Material.AIR);
+		block.getWorld().playSound(block.getLocation(), Sound.DIG_SNOW, 2.5F, 0F);
+		block.getWorld().playSound(block.getLocation(), Sound.BURP, 2.5F, 1.5F);
+
+		UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.SNOW_BLOCK, 0),
+				block.getLocation().add(0.5, 0.4, 0.5), 0.4F, 0.4F, 0.4F, 0, 40, ViewDist.NORMAL, UtilServer.getPlayers());
+
+		UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.DRAGON_EGG, 0),
+				block.getLocation().add(0.5, 0.6, 0.5), 0.6F, 0.5F, 0.6F, 0, 80, ViewDist.NORMAL, UtilServer.getPlayers());
+
+	}
+
+	public boolean hasEggsFinished()
+	{
+		return getEggs() == 0;
+	}
+
+	public void setEggsFinished()
+	{
+		for (FallingBlock block : _fallingBlocks)
+		{
+			block.remove();
+		}
+
+		for (Block b : _eggs.keySet())
+		{
+			b.setType(Material.AIR);
+		}
+	}
+
+	protected void shootEgg(Vector vector)
+	{
+		FallingBlock block = getLocation().getWorld().spawnFallingBlock(getLocation(), Material.DRAGON_EGG, (byte) 0);
+		block.setDropItem(false);
+		block.setVelocity(vector);
+
+		_fallingBlocks.add(block);
+
+		getLocation().getWorld().playSound(getLocation(), Sound.SHEEP_SHEAR, 2.5F, 0F);
+	}
+
+	@EventHandler
+	public void onEggTeleport(BlockFromToEvent event)
+	{
+		if (!_eggs.containsKey(event.getBlock()))
+		{
+			return;
+		}
+
+		event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void onEggyUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		Iterator<Entry<Block, Long>> itel = _eggs.entrySet().iterator();
+
+		while (itel.hasNext())
+		{
+			Entry<Block, Long> entry = itel.next();
+
+			if (entry.getValue() < System.currentTimeMillis())
+			{
+				itel.remove();
+				entry.getKey().setType(Material.AIR);
+
+				entry.getKey().getWorld()
+						.playEffect(entry.getKey().getLocation(), Effect.STEP_SOUND, Material.DRAGON_EGG.getId());
+
+				((SpiderBoss) getBoss().getEvent()).spawnMinion(entry.getKey().getLocation().add(0.5, 0.5, 0.5));
+			}
+		}
+
+		Iterator<FallingBlock> fallingIterator = _fallingBlocks.iterator();
+
+		while (fallingIterator.hasNext())
+		{
+			FallingBlock cur = fallingIterator.next();
+
+			if (cur.isDead() || !cur.isValid()  || cur.getVelocity().length() < 0.05 || cur.getTicksLived() > 400
+					|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+			{
+				fallingIterator.remove();
+
+				Block block = cur.getLocation().getBlock();
+
+				if ((UtilBlock.airFoliage(block) || block.getType() == Material.DRAGON_EGG)
+						&& block.getRelative(BlockFace.DOWN).getType() != Material.DRAGON_EGG)
+				{
+					block.setType(Material.DRAGON_EGG);
+					_eggs.put(block, System.currentTimeMillis() + 10000 + UtilMath.r(10000));
+				}
+
+				// Expire
+				if (cur.getTicksLived() > 400
+						|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+				{
+					cur.remove();
+					continue;
+				}
+
+				cur.remove();
+				continue;
+			}
+
+			net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) cur).getHandle();
+			Vec3D vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			Vec3D vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY, nmsEntity.locZ
+					+ nmsEntity.motZ);
+
+			MovingObjectPosition finalObjectPosition = nmsEntity.world.rayTrace(vec3d, vec3d1, false, true, false);
+			vec3d = new Vec3D(nmsEntity.locX, nmsEntity.locY, nmsEntity.locZ);
+			vec3d1 = new Vec3D(nmsEntity.locX + nmsEntity.motX, nmsEntity.locY + nmsEntity.motY, nmsEntity.locZ + nmsEntity.motZ);
+
+			if (finalObjectPosition != null)
+			{
+				vec3d1 = new Vec3D(finalObjectPosition.pos.a, finalObjectPosition.pos.b, finalObjectPosition.pos.c);
+			}
+
+			if (finalObjectPosition != null)
+			{
+				Block block = cur.getWorld().getBlockAt(((int) finalObjectPosition.pos.a), ((int) finalObjectPosition.pos.b), ((int) finalObjectPosition.pos.c));
+
+				if (!UtilBlock.airFoliage(block) && !block.isLiquid())
+				{
+					nmsEntity.motX = ((float) (finalObjectPosition.pos.a - nmsEntity.locX));
+					nmsEntity.motY = ((float) (finalObjectPosition.pos.b - nmsEntity.locY));
+					nmsEntity.motZ = ((float) (finalObjectPosition.pos.c - nmsEntity.locZ));
+					float f2 = MathHelper.sqrt(nmsEntity.motX * nmsEntity.motX + nmsEntity.motY * nmsEntity.motY + nmsEntity.motZ
+							* nmsEntity.motZ);
+					nmsEntity.locX -= nmsEntity.motX / f2 * 0.0500000007450581D;
+					nmsEntity.locY -= nmsEntity.motY / f2 * 0.0500000007450581D;
+					nmsEntity.locZ -= nmsEntity.motZ / f2 * 0.0500000007450581D;
+
+					if ((UtilBlock.airFoliage(block) || block.getType() == Material.DRAGON_EGG)
+							&& block.getRelative(BlockFace.DOWN).getType() != Material.DRAGON_EGG)
+					{
+						block.setType(Material.DRAGON_EGG);
+						_eggs.put(block, System.currentTimeMillis() + 10000 + UtilMath.r(10000));
+					}
+
+					fallingIterator.remove();
+					cur.remove();
+				}
+			}
+			else
+			{
+				UtilParticle.PlayParticle(ParticleType.BLOCK_DUST.getParticle(Material.STONE, 0), cur.getLocation()
+						.add(0, 0.5, 0), 0.3F, 0.3F, 0.3F, 0, 2, UtilParticle.ViewDist.NORMAL, UtilServer.getPlayers());
+			}
+		}
+	}
+
+	public int getEggs()
+	{
+		return _fallingBlocks.size() + _eggs.size();
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderEggScatter.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderEggScatter.java
new file mode 100644
index 000000000..b6ea531a6
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderEggScatter.java
@@ -0,0 +1,80 @@
+package mineplex.minecraft.game.core.boss.spider.attacks;
+
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.minecraft.game.core.boss.spider.SpiderCreature;
+
+public class SpiderEggScatter extends SpiderEggAbility
+{
+	private int _eggsToSpray = 25;
+	private float _yaw;
+	private float _addYaw;
+	private int _tick;
+
+	public SpiderEggScatter(SpiderCreature creature)
+	{
+		super(creature);
+
+		_eggsToSpray = 6 + UtilMath.r(5);
+
+		_addYaw = (360F / _eggsToSpray) / 4;
+	}
+
+	public int getCooldown()
+	{
+		return 120;
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return _eggsToSpray <= 0;
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return _eggsToSpray > 0 || !hasEggsFinished();
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _eggsToSpray <= 0 && hasEggsFinished();
+	}
+
+	@Override
+	public void setFinished()
+	{
+		setEggsFinished();
+	}
+
+	@Override
+	public void tick()
+	{
+		if (_eggsToSpray <= 0)
+		{
+			return;
+		}
+
+		UtilEnt.CreatureLook(getEntity(), 0, _yaw);
+
+		_yaw += _addYaw;
+
+		if (_tick % 4 == 0 && _eggsToSpray > 0)
+		{
+			_eggsToSpray--;
+
+			Vector vec = getEntity().getLocation().getDirection();
+
+			vec.setY(0).normalize().multiply(0.7 + UtilMath.rr(0.16, false)).setY(0.4 + (UtilMath.rr(0.4, false)));
+
+			shootEgg(vec);
+		}
+
+		_tick++;
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderEggplosm.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderEggplosm.java
new file mode 100644
index 000000000..c1dd81bfc
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderEggplosm.java
@@ -0,0 +1,72 @@
+package mineplex.minecraft.game.core.boss.spider.attacks;
+
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.minecraft.game.core.boss.spider.SpiderCreature;
+
+public class SpiderEggplosm extends SpiderEggAbility
+{
+	private int _eggsToSpray = 25;
+	private float _yaw;
+	private float _addYaw;
+
+	public SpiderEggplosm(SpiderCreature creature)
+	{
+		super(creature);
+
+		_eggsToSpray = 20 + (int) Math.ceil(15 * (1 - creature.getHealthPercent()));
+
+		_addYaw = 360F / _eggsToSpray;
+	}
+
+	public int getCooldown()
+	{
+		return 120;
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return _eggsToSpray <= 0;
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return _eggsToSpray > 0 || !hasEggsFinished();
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _eggsToSpray <= 0 && hasEggsFinished();
+	}
+
+	@Override
+	public void setFinished()
+	{
+		setEggsFinished();
+	}
+
+	@Override
+	public void tick()
+	{
+		if (_eggsToSpray > 0)
+		{
+			_eggsToSpray--;
+
+			UtilEnt.CreatureLook(getEntity(), 0, _yaw);
+
+			_yaw += _addYaw;
+
+			Vector vec = getEntity().getLocation().getDirection();
+
+			vec.setY(0).normalize().multiply(0.7).setY(0.4 + (UtilMath.rr(0.4, false)));
+
+			shootEgg(vec);
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderPoison.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderPoison.java
new file mode 100644
index 000000000..ec57283bb
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderPoison.java
@@ -0,0 +1,68 @@
+package mineplex.minecraft.game.core.boss.spider.attacks;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.disguise.disguises.DisguiseSlime;
+import mineplex.core.projectile.IThrown;
+import mineplex.core.projectile.ProjectileUser;
+import mineplex.minecraft.game.core.boss.EventCreature;
+
+public class SpiderPoison implements IThrown
+{
+	private EventCreature _boss;
+
+	public SpiderPoison(EventCreature boss, Entity item)
+	{
+		_boss = boss;
+
+		boss.getEvent().getProjectileManager().AddThrow(item, boss.getEntity(), this, -1, true, true, true, false, 2f);
+	}
+
+	@Override
+	public void Collide(LivingEntity target, Block block, ProjectileUser data)
+	{
+		if (target instanceof Player)
+		{
+			_boss.getEvent().getCondition().Factory()
+					.Poison("Brood Mother Poison", target, _boss.getEntity(), 2, 1, false, true, false);
+
+			_boss.getEvent()
+					.getDamageManager()
+					.NewDamageEvent(target, _boss.getEntity(), null, DamageCause.PROJECTILE, 2, true, false, false,
+							"Brood Mother Poison", "Brood Mother Poison");
+		}
+
+		burst(data);
+	}
+
+	@Override
+	public void Idle(ProjectileUser data)
+	{
+		burst(data);
+	}
+
+	private void burst(ProjectileUser data)
+	{
+		data.GetThrown().remove();
+
+		UtilParticle.PlayParticle(ParticleType.ICON_CRACK.getParticle(Material.SLIME_BALL, 0), data.GetThrown().getLocation(),
+				0.3F, 0.3F, 0.3F, 0, 30, ViewDist.NORMAL, UtilServer.getPlayers());
+	}
+
+	@Override
+	public void Expire(ProjectileUser data)
+	{
+		burst(data);
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderPoisonBarrage.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderPoisonBarrage.java
new file mode 100644
index 000000000..1e44b90f9
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderPoisonBarrage.java
@@ -0,0 +1,146 @@
+package mineplex.minecraft.game.core.boss.spider.attacks;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.Pig;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.spider.SpiderCreature;
+
+public class SpiderPoisonBarrage extends BossAbility<SpiderCreature, Pig>
+{
+	private int _poisonAmount = UtilMath.r(20) + 30;
+	private int _tick;
+	private float _yawToFace;
+
+	public SpiderPoisonBarrage(SpiderCreature creature)
+	{
+		super(creature);
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return _poisonAmount <= 0;
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return _poisonAmount > 0;
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _poisonAmount <= 0;
+	}
+
+	@Override
+	public void setFinished()
+	{
+	}
+
+	@Override
+	public int getCooldown()
+	{
+		return 100;
+	}
+
+	/*@Override
+	public Player getTarget()
+	{
+		return getTarget(1, 30);
+	}*/
+
+	@Override
+	public void tick()
+	{
+		if (_tick == 0)
+		{
+			Player target = getTarget();
+
+			if (target != null)
+			{
+				UtilEnt.CreatureLook(getEntity(), target);
+
+				Vector vec = UtilAlg.getTrajectory(getEntity(), target);
+
+				_yawToFace = UtilAlg.GetYaw(vec);
+			}
+		}
+
+		{
+			Location loc = getEntity().getEyeLocation().add(getLocation().getDirection().setY(0).normalize().multiply(0.4));
+
+			UtilParticle.PlayParticle(ParticleType.ICON_CRACK.getParticle(Material.SLIME_BALL, 0), loc, 0.3F, 0.3F, 0.3F, 0, 30,
+					ViewDist.NORMAL, UtilServer.getPlayers());
+		}
+
+		if (_tick > 30)
+		{
+			Player target = getTarget();
+
+			if (target != null)
+			{
+				Vector vec = UtilAlg.getTrajectory(getEntity(), target);
+
+				_yawToFace = UtilAlg.GetYaw(vec);
+			}
+
+			float currentYaw = getLocation().getYaw();
+
+			if ((int) currentYaw != (int) _yawToFace)
+			{
+				// How much should the yaw change if we go either direction, would it be faster if we subtracted or added?
+				float added = ((_yawToFace + 720) - currentYaw) % 360;
+				float subtracted = /*-*/((currentYaw + 720) - _yawToFace) % 360;
+
+				float diff = Math.max(-10, Math.min(10, added > subtracted ? -subtracted : added));
+
+				float newYaw = (currentYaw + diff + 720) % 360;
+
+				UtilEnt.CreatureLook(getEntity(), 0, newYaw);
+
+				System.out.print("Current yaw: " + currentYaw + ", Yaw to face: " + _yawToFace + ", New Yaw: " + newYaw
+						+ ", Add: " + added + ", Subtracted: " + subtracted);
+			}
+
+			if (_tick % 2 == 0)
+			{
+				Vector vec = getLocation().getDirection();
+
+				vec.setX(vec.getX() + UtilMath.rr(0.09, true));
+				vec.setZ(vec.getZ() + UtilMath.rr(0.09, true));
+
+				vec.setY(0).normalize().multiply(1 + UtilMath.rr(0.2, true));
+				vec.setY(0.35 + UtilMath.rr(0.3, false));
+
+				Item item = getLocation().getWorld()
+						.dropItem(getLocation().add(0, 0.5, 0), new ItemStack(Material.EMERALD_BLOCK));
+
+				item.setVelocity(vec);
+
+				new SpiderPoison(getBoss(), item);
+
+				getLocation().getWorld().playSound(getLocation(), Sound.CREEPER_HISS, 2, 0F);
+
+				_poisonAmount--;
+			}
+		}
+
+		_tick++;
+	}
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderWebBarrage.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderWebBarrage.java
new file mode 100644
index 000000000..1e0eab120
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderWebBarrage.java
@@ -0,0 +1,149 @@
+package mineplex.minecraft.game.core.boss.spider.attacks;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.spider.SpiderCreature;
+
+public class SpiderWebBarrage extends BossAbility
+{
+	private int _canShoot;
+	private ArrayList<FallingBlock> _fallingBlocks = new ArrayList<FallingBlock>();
+	private int _tick;
+
+	public SpiderWebBarrage(SpiderCreature creature)
+	{
+		super(creature);
+
+		_canShoot = (int) (40 + ((1 - creature.getHealthPercent()) * 50));
+
+		Player target = getTarget();
+
+		if (target != null)
+		{
+			UtilEnt.CreatureLook(getEntity(), target);
+		}
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return _canShoot <= 0;
+	}
+
+	@Override
+	public int getCooldown()
+	{
+		return 120;
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return _canShoot > 0 || !_fallingBlocks.isEmpty();
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _canShoot <= 0 && _fallingBlocks.isEmpty();
+	}
+
+	@Override
+	public void setFinished()
+	{
+		for (FallingBlock block : _fallingBlocks)
+		{
+			block.remove();
+		}
+	}
+
+	public Player getTarget()
+	{
+		return getTarget(10, 30);
+	}
+
+	@Override
+	public void tick()
+	{
+		if (_canShoot > 0 && _tick % 2 == 0)
+		{
+			_canShoot--;
+
+			Vector vec = getLocation().getDirection().setY(0).normalize();
+
+			vec.add(new Vector(UtilMath.rr(0.45, true), 0, UtilMath.rr(0.45, true))).normalize();
+
+			vec.setY(0.8).multiply(0.75 + UtilMath.rr(0.3, true));
+
+			FallingBlock block = getLocation().getWorld().spawnFallingBlock(getLocation(), Material.WEB, (byte) 0);
+			block.setDropItem(false);
+
+			_fallingBlocks.add(block);
+
+			block.setVelocity(vec);
+			
+			getLocation().getWorld().playSound(getLocation(), Sound.FIZZ, 3, 2F);
+		}
+
+		_tick++;
+	}
+
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		Iterator<FallingBlock> fallingIterator = _fallingBlocks.iterator();
+
+		while (fallingIterator.hasNext())
+		{
+			FallingBlock cur = fallingIterator.next();
+
+			if (cur.isDead() || !cur.isValid() || cur.getVelocity().length() < 0.05 || cur.getTicksLived() > 400
+					|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+			{
+				fallingIterator.remove();
+
+				Block block = cur.getLocation().getBlock();
+
+				if (UtilBlock.airFoliage(block) || block.getType() == Material.WEB)
+				{
+					block.setType(Material.WEB);
+				}
+
+				// Expire
+				if (cur.getTicksLived() > 400
+						|| !cur.getWorld().isChunkLoaded(cur.getLocation().getBlockX() >> 4, cur.getLocation().getBlockZ() >> 4))
+				{
+					cur.remove();
+					continue;
+				}
+
+				cur.remove();
+				continue;
+			}
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderWebStomp.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderWebStomp.java
new file mode 100644
index 000000000..9ea40cfc9
--- /dev/null
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/spider/attacks/SpiderWebStomp.java
@@ -0,0 +1,88 @@
+package mineplex.minecraft.game.core.boss.spider.attacks;
+
+import org.bukkit.Effect;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilMath;
+import mineplex.minecraft.game.core.boss.BossAbility;
+import mineplex.minecraft.game.core.boss.EventCreature;
+import mineplex.minecraft.game.core.boss.spider.SpiderCreature;
+
+/**
+ * A attack where webs appear all around the spider in a kinda maze formation, making it hard to approach it.
+ */
+public class SpiderWebStomp extends BossAbility
+{
+	private int _tick;
+
+	public SpiderWebStomp(SpiderCreature creature)
+	{
+		super(creature);
+	}
+
+	@Override
+	public int getCooldown()
+	{
+		return 120;
+	}
+
+	@Override
+	public boolean canMove()
+	{
+		return true;
+	}
+
+	@Override
+	public boolean inProgress()
+	{
+		return true;
+	}
+
+	@Override
+	public boolean hasFinished()
+	{
+		return _tick > 40;
+	}
+
+	@Override
+	public void setFinished()
+	{
+	}
+
+	public Player getTarget()
+	{
+		if (!UtilEnt.isGrounded(getEntity()))
+		{
+			return null;
+		}
+
+		return super.getTarget();
+	}
+
+	@Override
+	public void tick()
+	{
+		if (_tick++ == 0)
+		{
+			int amount = UtilMath.r(60) + 60;
+
+			for (int i = 0; i < amount; i++)
+			{
+				Block block = getLocation().getBlock().getRelative((int) UtilMath.rr(UtilMath.r(16) + 4, true), 0,
+						(int) UtilMath.rr(UtilMath.r(16) + 4, true));
+
+				if (block.getType() != Material.AIR)
+				{
+					continue;
+				}
+
+				block.setType(Material.WEB);
+				block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, Material.WEB);
+			}
+		}
+	}
+
+}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatLog.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatLog.java
index 6fce4fe6d..752b71fa6 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatLog.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatLog.java
@@ -56,7 +56,7 @@ public class CombatLog
 		// Set Last
 		LastDamager = comp;
 		_lastDamaged = System.currentTimeMillis();
-		_lastCombat = System.currentTimeMillis();
+//		_lastCombat = System.currentTimeMillis();
 	}
 
 	public CombatComponent GetEnemy(String name, LivingEntity ent)
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java
index e9201d8a4..a255415e5 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java
@@ -414,7 +414,7 @@ public class CombatManager extends MiniPlugin
 		log.SetAssists(assists);
 
 		// Event
-		CombatDeathEvent deathEvent = new CombatDeathEvent(event, Get(event.getEntity().getName()), log);
+		CombatDeathEvent deathEvent = new CombatDeathEvent(event, Get(event.getEntity().getName()), log, "killed");
 		UtilServer.getServer().getPluginManager().callEvent(deathEvent);
 
 		//XXX Death MSG
@@ -443,7 +443,7 @@ public class CombatManager extends MiniPlugin
 					UtilPlayer.message(
 							cur,
 							F.main("Death",
-									deadPlayer + C.cGray + " killed by "
+									deadPlayer + C.cGray + " " + deathEvent.getKilledWord() + " by "
 											+ killPlayer + C.cGray + " with "
 											+ F.item(weapon) + "."));
 				}
@@ -462,7 +462,7 @@ public class CombatManager extends MiniPlugin
 									F.main("Death",
 											deadPlayer
 											+ C.cGray
-											+ " killed by "
+											+ " " + deathEvent.getKilledWord() + " by "
 											+ F.name(log.GetLastDamager()
 													.GetReason()))
 													+ C.cGray + ".");
@@ -474,7 +474,7 @@ public class CombatManager extends MiniPlugin
 									F.main("Death",
 											deadPlayer
 											+ C.cGray
-											+ " killed by "
+											+ " " + deathEvent.getKilledWord() + " by "
 											+ F.name(log.GetAttackers()
 													.getFirst().GetName()))
 													+ C.cGray + ".");
@@ -510,9 +510,9 @@ public class CombatManager extends MiniPlugin
 				String weapon = log.GetKiller().GetLastDamageSource();
 
 				Player killer = UtilPlayer.searchExact(log.GetKiller().GetName());
-				UtilPlayer.message(killer, F.main("Death", "You killed " + F.elem(deadPlayer) + " with " + F.item(weapon) + "."));
+				UtilPlayer.message(killer, F.main("Death", "You " + deathEvent.getKilledWord() + " " + F.elem(deadPlayer) + " with " + F.item(weapon) + "."));
 				
-				UtilPlayer.message(event.getEntity(), F.main("Death", killPlayer + C.cGray + " killed you with " + F.item(weapon) + "."));
+				UtilPlayer.message(event.getEntity(), F.main("Death", killPlayer + C.cGray + " " + deathEvent.getKilledWord() + " you with " + F.item(weapon) + "."));
 
 			}
 			else
@@ -524,7 +524,7 @@ public class CombatManager extends MiniPlugin
 
 				else
 				{
-					UtilPlayer.message(event.getEntity(), F.main("Death", "You were killed by " + 
+					UtilPlayer.message(event.getEntity(), F.main("Death", "You were " + deathEvent.getKilledWord() + " by " +
 							F.name(log.GetAttackers().getFirst().GetName())) + C.cGray + ".");
 				}
 			}
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/event/CombatDeathEvent.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/event/CombatDeathEvent.java
index c72ec4408..1d776889a 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/event/CombatDeathEvent.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/event/CombatDeathEvent.java
@@ -10,33 +10,35 @@ import org.bukkit.event.entity.EntityDeathEvent;
 
 public class CombatDeathEvent extends Event
 {
-    private static final HandlerList handlers = new HandlerList();
-    private EntityDeathEvent _event;
-    private ClientCombat _clientCombat;
-    private CombatLog _log;
-    private DeathMessageType _messageType = DeathMessageType.Detailed;
-    
-    public CombatDeathEvent(EntityDeathEvent event, ClientCombat clientCombat, CombatLog log)
-    {
-        _event = event;
-        _clientCombat = clientCombat;
-        _log = log;
-    }
+	private static final HandlerList handlers = new HandlerList();
+	private EntityDeathEvent _event;
+	private ClientCombat _clientCombat;
+	private CombatLog _log;
+	private DeathMessageType _messageType = DeathMessageType.Detailed;
+	private String _killedWord;
+
+	public CombatDeathEvent(EntityDeathEvent event, ClientCombat clientCombat, CombatLog log, String killedWord)
+	{
+		_event = event;
+		_clientCombat = clientCombat;
+		_log = log;
+		_killedWord = killedWord;
+	}
  
-    public HandlerList getHandlers()
-    {
-        return handlers;
-    }
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
  
-    public static HandlerList getHandlerList()
-    {
-        return handlers;
-    }
-    
-    public ClientCombat GetClientCombat()
-    {
-    	return _clientCombat;
-    }
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+
+	public ClientCombat GetClientCombat()
+	{
+		return _clientCombat;
+	}
 
 	public CombatLog GetLog() 
 	{
@@ -57,4 +59,14 @@ public class CombatDeathEvent extends Event
 	{
 		return _messageType;
 	}
+
+	public String getKilledWord()
+	{
+		return _killedWord;
+	}
+
+	public void setKilledWord(String killedWord)
+	{
+		_killedWord = killedWord;
+	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/Condition.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/Condition.java
index c5fec0f14..b84ac5cd0 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/Condition.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/Condition.java
@@ -2,9 +2,11 @@ package mineplex.minecraft.game.core.condition;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
+import net.minecraft.server.v1_8_R3.MobEffect;
 
 public class Condition 
 {
@@ -12,6 +14,7 @@ public class Condition
 	{
 		CLOAK,
 		SHOCK,
+		POISON_SHOCK,
 		SILENCE,
 		BURNING,
 		FALLING,
@@ -19,6 +22,7 @@ public class Condition
 		INVULNERABLE,
 		EXPLOSION,
 		FIRE_ITEM_IMMUNITY,
+		ARCADE_HUNGER_DISABLE,
 
 		CUSTOM,
 
@@ -124,14 +128,23 @@ public class Condition
 		{
 			PotionEffectType type = PotionEffectType.getByName(_type.toString());
 
-			//Remove
-			_ent.removePotionEffect(type);
+			boolean remove = false;
+			for (PotionEffect effect : _ent.getActivePotionEffects())
+			{
+				if (effect.getType() == type && effect.getAmplifier() != _mult)
+					remove = true;
+			}
+
+			// Remove
+			if (remove)
+				_ent.removePotionEffect(type);
 
 			//Add
+			PotionEffect effect = new PotionEffect(type, _ticks, _mult, _ambient);
 			if (_ticks == -1)
 				_ent.addPotionEffect(new PotionEffect(type, 72000, _mult, _ambient), true);
 			else
-				_ent.addPotionEffect(new PotionEffect(type, _ticks, _mult, _ambient), true);
+				((CraftLivingEntity) _ent).getHandle().addEffect(new MobEffect(effect.getType().getId(), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), true));
 		}
 		catch (Exception e)
 		{
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionEffect.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionEffect.java
index 1aae61285..74e3f7473 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionEffect.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionEffect.java
@@ -346,16 +346,42 @@ public class ConditionEffect implements Listener
 
 		LivingEntity ent = event.GetDamageeEntity();
 		if (ent == null)	return;
-
+		
+		//Ignore Poison Shock
+		Condition poisonShock = Manager.GetActiveCondition(ent, ConditionType.POISON_SHOCK);
+		if (poisonShock != null)	
+		{
+			event.SetCancelled("Poison Shock - Poison Cancel");
+			return;
+		}
+		
 		Condition condition = Manager.GetActiveCondition(ent, ConditionType.POISON);
-		if (condition == null)	return;
-
+		if (condition == null)	
+			return;		
 		//Damage
 		event.SetDamager(condition.GetSource());
 		event.AddMod(UtilEnt.getName(condition.GetSource()), condition.GetReason(), 0, true);
 		event.SetIgnoreArmor(true);
 		event.SetKnockback(false);
 	}
+	
+	@EventHandler
+	public void PoisonShock(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		for (LivingEntity ent : Manager.GetActiveConditions().keySet())
+		{
+			Condition condition = Manager.GetActiveCondition(ent, ConditionType.POISON_SHOCK);
+			if (condition == null || condition.GetSource() == null)	
+				continue;
+			
+			Manager.getDamagerManager().NewDamageEvent(ent, condition.GetSource(), null, 
+					DamageCause.CUSTOM, 0.1, false, true, false,
+					condition.GetSource().getName(), "Poison");
+		}
+	}
 
 	@EventHandler
 	public void Fall(CustomDamageEvent event)
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java
index 1b33dc14f..e6fac9836 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java
@@ -5,7 +5,6 @@ import mineplex.minecraft.game.core.condition.conditions.*;
 
 import org.bukkit.Material;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.potion.PotionEffect;
 import org.bukkit.util.Vector;
 
 public class ConditionFactory
@@ -246,6 +245,14 @@ public class ConditionFactory
 				Material.SLIME_BALL, (byte)14, showIndicator, ambient)); 
 	}
 	
+	public Condition PoisonShock(String reason, LivingEntity ent, LivingEntity source, 
+			double duration, boolean extend)
+	{		
+		return Manager.AddCondition(new Condition(Manager, reason, ent, source, 
+				ConditionType.POISON_SHOCK, 0, (int)(20 * duration), extend, 
+				Material.SLIME_BALL, (byte)14, false, false)); 
+	}
+	
 	public Condition Confuse(String reason, LivingEntity ent, LivingEntity source,
 			double duration, int mult, boolean extend, boolean showIndicator, boolean ambient)
 	{
@@ -277,4 +284,12 @@ public class ConditionFactory
 				ConditionType.HEALTH_BOOST, mult, (int)(20 * duration), extend, 
 				Material.APPLE, (byte)0, showIndicator, ambient)); 
 	}
+	
+	public Condition ArcadeHungerDisable(String reason, LivingEntity ent, LivingEntity source, 
+			double duration, boolean extend)
+	{
+		return Manager.AddCondition(new Condition(Manager, reason, ent, source, 
+				ConditionType.ARCADE_HUNGER_DISABLE, 0, (int)(20 * duration), extend, 
+				Material.COAL, (byte)0, false, false)); 
+	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionManager.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionManager.java
index 99489adfe..82f16e341 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionManager.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionManager.java
@@ -18,6 +18,7 @@ import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilTime.TimeUnit;
 import mineplex.minecraft.game.core.condition.Condition.ConditionType;
 import mineplex.minecraft.game.core.condition.events.ConditionApplyEvent;
+import mineplex.minecraft.game.core.damage.DamageManager;
 
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -39,6 +40,8 @@ public class ConditionManager extends MiniPlugin
 	private ConditionFactory _factory;
 	private ConditionApplicator _applicator;
 	protected ConditionEffect Effect;
+	
+	private DamageManager _damageManager;
 
 	private WeakHashMap<LivingEntity, LinkedList<Condition>> _conditions = new WeakHashMap<LivingEntity, LinkedList<Condition>>();
 	private WeakHashMap<LivingEntity, LinkedList<ConditionActive>> _activeConditions = new WeakHashMap<LivingEntity, LinkedList<ConditionActive>>();
@@ -53,6 +56,16 @@ public class ConditionManager extends MiniPlugin
 		Applicator();
 		Effect();
 	} 
+	
+	public void setDamageManager(DamageManager damageManager)
+	{
+		_damageManager = damageManager;
+	}
+	
+	public DamageManager getDamagerManager()
+	{
+		return _damageManager;
+	}
 
 	public ConditionFactory Factory()
 	{
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
index a37aaa311..ef2f17d9b 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
@@ -93,6 +93,10 @@ public class CustomDamageEvent extends Event implements Cancellable
 		_damageMult.add(new DamageChange(source, reason, mod, useAttackName));
 	}
 
+	public void AddMod(String source, double mod)
+	{
+		AddMod(source, new String(), mod, false);
+	}
 
 	public void AddMod(String source, String reason, double mod, boolean useAttackName)
 	{
@@ -285,6 +289,30 @@ public class CustomDamageEvent extends Event implements Cancellable
 	{
 		return _knockbackMod;
 	}
+	
+	public double getKnockbackValue()
+	{
+		double value = 0.0d;
+		
+		for (double knockback : _knockbackMod.values())
+		{
+			value += knockback;
+		}
+		
+		return value;
+	}
+	
+	/**
+	 * Invert knockback modifier values to their negative counterparts.
+	 */
+	public void invertKnockback()
+	{
+		for (String key : _knockbackMod.keySet())
+		{
+			double value = _knockbackMod.get(key);
+			_knockbackMod.put(key, -value);
+		}
+	}
 
 	public ArrayList<String> GetCancellers() 
 	{
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
index 6ff2a3dec..af1525e2a 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
@@ -23,7 +23,6 @@ import net.minecraft.server.v1_8_R3.DamageSource;
 import net.minecraft.server.v1_8_R3.EntityHuman;
 import net.minecraft.server.v1_8_R3.EntityLiving;
 
-import org.bukkit.Bukkit;
 import org.bukkit.EntityEffect;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -46,8 +45,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 
-import com.sun.jndi.ldap.ManageReferralControl;
-
 public class DamageManager extends MiniPlugin
 {
 	private CombatManager _combatManager;
@@ -176,15 +173,7 @@ public class DamageManager extends MiniPlugin
 	{
 		NewDamageEvent(damagee, damager, proj, null, cause, damage, knockback, ignoreRate, ignoreArmor, source, reason, cancelled);
 	}
-
-	public void NewDamageEvent(LivingEntity damagee, LivingEntity damager, Projectile proj, Location knockbackOrigin, 
-			DamageCause cause, double damage, boolean knockback, boolean ignoreRate, boolean ignoreArmor,
-			String source, String reason, boolean cancelled)
-	{	
-		_plugin.getServer().getPluginManager().callEvent(new CustomDamageEvent(damagee, damager, proj, knockbackOrigin, cause,
-				damage, knockback, ignoreRate, ignoreArmor, source, reason, cancelled));
-	}
-
+	
 	public void NewDamageEvent(LivingEntity damagee, LivingEntity damager, Projectile proj, Location knockbackOrigin, 
 			DamageCause cause, double damage, boolean knockback, boolean ignoreRate, boolean ignoreArmor,
 			String source, String reason)
@@ -193,6 +182,14 @@ public class DamageManager extends MiniPlugin
 				reason, false);
 	}
 
+	public void NewDamageEvent(LivingEntity damagee, LivingEntity damager, Projectile proj, Location knockbackOrigin, 
+			DamageCause cause, double damage, boolean knockback, boolean ignoreRate, boolean ignoreArmor,
+			String source, String reason, boolean cancelled)
+	{	
+		_plugin.getServer().getPluginManager().callEvent(new CustomDamageEvent(damagee, damager, proj, knockbackOrigin, cause,
+				damage, knockback, ignoreRate, ignoreArmor, source, reason, cancelled));
+	}	
+
 	@EventHandler(priority = EventPriority.LOW)
 	public void CancelDamageEvent(CustomDamageEvent event)
 	{
@@ -335,8 +332,10 @@ public class DamageManager extends MiniPlugin
 				}
 			}
 		}
-
-		DisplayDamage(event);
+			
+		// TODO: What is this required for? Players with books in regular games are spammed. Is it meant for debugging?
+		// TODO: Temporarily commenting out
+		//DisplayDamage(event);
 	}
 
 	private void Damage(CustomDamageEvent event) 
@@ -379,7 +378,7 @@ public class DamageManager extends MiniPlugin
 			event.GetDamageeEntity().playEffect(EntityEffect.HURT);
 
 			//Sticky Arrow
-			if (event.GetCause() == DamageCause.PROJECTILE)
+			if (event.GetCause() == DamageCause.PROJECTILE && event.GetProjectile() != null && event.GetProjectile() instanceof Arrow)
 				((CraftLivingEntity)event.GetDamageeEntity()).getHandle().o(((CraftLivingEntity)event.GetDamageeEntity()).getHandle().bv() + 1);
 
 			//Knockback
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/compatibility/NpcProtectListener.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/compatibility/NpcProtectListener.java
index be808bdf8..c150c2225 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/compatibility/NpcProtectListener.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/compatibility/NpcProtectListener.java
@@ -19,7 +19,9 @@ public class NpcProtectListener implements Listener
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void CustomDamage(CustomDamageEvent event)
 	{
-    	if (event.GetDamageeEntity() != null && _npcManager.getNpcByEntity(event.GetDamageeEntity()) != null)
+    	if (_npcManager.isNpc(event.GetDamageeEntity()))
+    	{
     		event.SetCancelled("NPC");
+    	}
 	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
index 2472908f2..d5c86a91f 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
@@ -39,7 +39,7 @@ import net.minecraft.server.v1_8_R3.World;
 
 public class CustomExplosion extends Explosion
 {
-	private Player _owner;
+	private org.bukkit.entity.LivingEntity _owner;
 	private boolean _damageOwner;
 	private World _world;
 	private DamageManager _manager;
@@ -160,7 +160,7 @@ public class CustomExplosion extends Explosion
 		return this;
 	}
 
-	public CustomExplosion setPlayer(Player player, boolean damageExplosionOwner)
+	public CustomExplosion setPlayer(org.bukkit.entity.LivingEntity player, boolean damageExplosionOwner)
 	{
 		_owner = player;
 		_damageOwner = damageExplosionOwner;
@@ -317,7 +317,7 @@ public class CustomExplosion extends Explosion
 	        this._world.addParticle(EnumParticle.EXPLOSION_HUGE, this.posX, this.posY, this.posZ, 1.0D, 0.0D, 0.0D, new int[0]);
 	      else {
 	        this._world.addParticle(EnumParticle.EXPLOSION_LARGE, this.posX, this.posY, this.posZ, 1.0D, 0.0D, 0.0D, new int[0]);
-	      }
+		}
 
 		if (_damageBlocks)
 		{
@@ -337,7 +337,7 @@ public class CustomExplosion extends Explosion
 				}
 			}
 
-			ExplosionEvent event = _owner == null ? new ExplosionEvent(blockList) : new ExplosionEvent(blockList, _owner);
+			ExplosionEvent event = _owner == null || !(_owner instanceof Player) ? new ExplosionEvent(blockList) : new ExplosionEvent(blockList, (Player) _owner);
 			this._world.getServer().getPluginManager().callEvent(event);
 
 			this.getBlocks().clear();
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/Fire.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/Fire.java
index 02f555f83..4f51c650c 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/Fire.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/Fire.java
@@ -42,9 +42,9 @@ public class Fire extends MiniPlugin
 		_damageManager = damageManager;
 	}
 
-	public void Add(Item item, LivingEntity owner, double expireTime, double delayTime, double burnTime, double damage, String skillName)
+	public void Add(Item item, LivingEntity owner, double expireTime, double delayTime, double burnTime, double damage, String skillName, boolean hitSelf)
 	{
-		_fire.put(item, new FireData(owner, expireTime, delayTime, burnTime, damage, skillName));
+		_fire.put(item, new FireData(owner, expireTime, delayTime, burnTime, damage, skillName, hitSelf));
 		item.setPickupDelay(0);
 	}
 
@@ -60,13 +60,13 @@ public class Fire extends MiniPlugin
 		{
 			if (!_fire.get(fire).IsPrimed())
 				continue;
-			
+
 			if (fire.getLocation().getBlock().isLiquid())
 			{
 				collided.put(fire, null);
 				continue;
 			}
-			
+
 			for (LivingEntity ent : fire.getWorld().getEntitiesByClass(LivingEntity.class))
 			{
 				if (ent instanceof Player)
@@ -75,13 +75,13 @@ public class Fire extends MiniPlugin
 
 				if (ent.hasPotionEffect(PotionEffectType.FIRE_RESISTANCE))
 					continue;
-				
+
 				if (ent.getLocation().getBlock().getTypeId() == 8 || ent.getLocation().getBlock().getTypeId() == 9)
 					continue;
-				
-				if (ent.equals(_fire.get(fire).GetOwner()))
+
+				if (!_fire.get(fire).canHitOwner() && ent.equals(_fire.get(fire).GetOwner()))
 					continue; 
-				
+
 				if (_conditionManager.HasCondition(ent, ConditionType.FIRE_ITEM_IMMUNITY, null))
 				{
 					continue; 
@@ -110,24 +110,25 @@ public class Fire extends MiniPlugin
 
 		if (!_fire.containsKey(fire))
 			return;
-
-		if (_fire.get(fire).GetOwner().equals(player))
-			return;
 		
 		event.setCancelled(true);
+
+		if (!_fire.get(fire).canHitOwner() && _fire.get(fire).GetOwner().equals(player))
+			return;
+
 		
 		if (((CraftPlayer)player).getHandle().spectating)
 			return;
-		
+
 		if (player.hasPotionEffect(PotionEffectType.FIRE_RESISTANCE))
 			return;
-		
+
 		if (player.getLocation().getBlock().getTypeId() == 8 || player.getLocation().getBlock().getTypeId() == 9)
 			return;
 
 		if (!_fire.get(fire).IsPrimed())
 			return;
-		
+
 		if (_conditionManager.HasCondition(player, ConditionType.FIRE_ITEM_IMMUNITY, null))
 		{
 			return;
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/FireData.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/FireData.java
index a06baaa29..79709c8bf 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/FireData.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/FireData.java
@@ -10,8 +10,9 @@ public class FireData
 	private double _burnTime;
 	private double _damage;
 	private String _skillName;
+	private boolean _hitOwner;
 	
-	public FireData(LivingEntity owner, double expireTime, double delayTime, double burnTime, double damage, String skillName)
+	public FireData(LivingEntity owner, double expireTime, double delayTime, double burnTime, double damage, String skillName, boolean hitSelf)
 	{
 		_owner = owner;
 		_expireTime = System.currentTimeMillis() + (long)(1000 * expireTime);
@@ -19,6 +20,7 @@ public class FireData
 		_burnTime = burnTime;
 		_damage = damage;
 		_skillName = skillName;
+		_hitOwner = hitSelf;
 	}
 	
 	public LivingEntity GetOwner()
@@ -50,4 +52,9 @@ public class FireData
 	{
 		return System.currentTimeMillis() > _expireTime;
 	}
+	
+	public boolean canHitOwner()
+	{
+		return _hitOwner;
+	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/mechanics/Weapon.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/mechanics/Weapon.java
index a601abc1f..7ec1d3c53 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/mechanics/Weapon.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/mechanics/Weapon.java
@@ -110,6 +110,13 @@ public class Weapon extends MiniPlugin
 		if (item.getType().getMaxDurability() == 0)
 			return;
 
+		if (UtilGear.isArmor(item))
+			return;
+
+		// Don't mess with unbreakable items
+		if (item.getItemMeta() != null && item.getItemMeta().spigot().isUnbreakable())
+			return;
+
 		item.setDurability((short) (item.getDurability() + 1));
 
 		if (item.getDurability() >= item.getType().getMaxDurability())
diff --git a/Plugins/Mineplex.Queuer/src/mineplex/queuer/Queuer.java b/Plugins/Mineplex.Queuer/src/mineplex/queuer/Queuer.java
index 331d025a2..09fee8b15 100644
--- a/Plugins/Mineplex.Queuer/src/mineplex/queuer/Queuer.java
+++ b/Plugins/Mineplex.Queuer/src/mineplex/queuer/Queuer.java
@@ -9,208 +9,55 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.Set;
+import java.util.UUID;
 
 import mineplex.serverdata.Region;
+import mineplex.serverdata.commands.ServerTransfer;
+import mineplex.serverdata.commands.TransferCommand;
+import mineplex.serverdata.data.DedicatedServer;
+import mineplex.serverdata.data.ServerGroup;
+import mineplex.serverdata.servers.ConnectionData;
+import mineplex.serverdata.servers.ServerManager;
+import mineplex.serverdata.servers.ServerRepository;
+import mineplex.serverprocesses.GenericRunnable;
+import mineplex.serverprocesses.ProcessManager;
+import mineplex.serverprocesses.ProcessRunner;
 
 public class Queuer
 {
+	public static final int MIN_QUEUE_WAIT = 0;	// The number of seconds required in queue before creating a new match for a party.
+	
 	private static QueueRepository _repo;
+	private static ServerRepository _serverRepository;
+	private static Set<Match> _pendingMatches;	// Set of all matches awaiting players
+	private static int _matchId = 0;
+	private static int _matchesMade = 0;
+	private static int _updates = 0;
+	private static int _partyId = 0;
+	private static int _serverId = 0;
 	
 	public static void main (String args[])
 	{
 		Region region = (!new File("eu.dat").exists()) ? Region.US : Region.EU;
-		
+		_serverRepository = ServerManager.getServerRepository(region);
 		_repo = new QueueRepository(region);
-		
-		HashMap<Integer, Integer> playerVarianceMap = new HashMap<Integer, Integer>();
-		HashMap<Integer, Match> playerPrepMatchMap = new HashMap<Integer, Match>();
-		Set<Match> matches = new HashSet<Match>();
-		
-		QueuePartySorter partySorter = new QueuePartySorter();
-		
-		int matchId = 1;
+		_pendingMatches = new HashSet<Match>();
 		
 		while (true)
-		{
-			int matchesMade = 0;
-			matchId %= 1500;
+		{			
+			_updates++;
+			updateQueuer();
+			ProcessManager.getInstance().updateProcesses();
 			
-			List<Integer> assignedMatchIdChecked = new ArrayList<Integer>();
-			Map<Integer, QueueParty> queueParties = _repo.getMappedQueueParties();
-			
-			int matchPlayerCount = 2;
-			
-			System.out.println("Checking " + queueParties.size() + " queues...");
-			for (QueueParty queueParty : queueParties.values())
-			{
-				int partyId = queueParty.getId();
-				int variance = playerVarianceMap.containsKey(partyId) ? playerVarianceMap.get(partyId) : 0;
-				variance += 25;
-				playerVarianceMap.put(partyId, variance);
-				
-				if (queueParty.hasAssignedMatch())
-				{
-					for (Match match : matches)
-					{
-						if (Math.abs(match.getAverageElo() - queueParty.getAverageElo()) <= variance)
-						{
-							if (playerPrepMatchMap.containsKey(partyId))
-							{
-								if (playerPrepMatchMap.get(partyId) == match)
-									break;
-								
-								playerPrepMatchMap.get(partyId).quitQueueParty(queueParty);
-							}
-							
-							match.joinQueueParty(queueParty);
-							playerPrepMatchMap.put(partyId, match);
-							
-							log("Found prep match for '" + queueParty.getId() + "'");
-							break;
-						}
-					}
-					
-					if (!playerPrepMatchMap.containsKey(partyId))
-					{
-						Match match = new Match(matchId++, queueParty.getAverageElo(), queueParty);
-						
-						playerPrepMatchMap.put(partyId, match);
-						matches.add(match);
-					}
-				}
-				else if (!assignedMatchIdChecked.contains(queueParty.getAssignedMatch()))
-				{
-					int assignedMatchId = queueParty.getAssignedMatch();
-					log("Checking if match '" + assignedMatchId + "' is ready.");
-					//List<String> matchStatuses = _repo.getMatchStatuses(queueRecord.AssignedMatch);
-					Collection<QueueParty> joinedParties = _repo.getJoinedQueueParties(assignedMatchId);
-					boolean matchReady = true;
-					boolean matchDeny = false;
-					
-					for (QueueParty joinedParty : joinedParties)
-					{
-						String partyState = joinedParty.getState();
-						if (partyState.equalsIgnoreCase("Deny"))
-						{
-							matchDeny = true;
-							matchReady = false;
-							break;
-						}
-						else if (!partyState.equalsIgnoreCase("Ready"))
-						{
-							matchReady = false;
-						}
-					}
-					
-					if (matchReady)
-					{
-						_repo.startMatch(assignedMatchId);	
-						_repo.deleteAssignedParties(assignedMatchId);
-						
-						System.out.println("Starting match '" + assignedMatchId + "'");
-					}
-					else if (matchDeny)
-					{				
-						_repo.deleteMatch(assignedMatchId);
-					}
-					
-					assignedMatchIdChecked.add(assignedMatchId);
-				}
-			}
-			
-			System.out.println("Checking " + matches.size() + " matches...");
-			
-			// Check for and kick off invites for ready matches
-			for (Iterator<Match> matchIterator = matches.iterator(); matchIterator.hasNext();)
-			{
-				Match match = matchIterator.next();
-				
-				// Don't give me crap about not using iterator...can't cuz of stupid thing.
-				Set<QueueParty> partiesToRemove = new HashSet<QueueParty>();
-				
-				for (QueueParty queueParty : match.getParties())
-				{
-					if (!queueParties.containsKey(queueParty.getId()))
-					{
-						log("Removing matchStatus : " + queueParty.getId());
-						partiesToRemove.add(queueParty);
-						
-						if (match.isWaitingForInvites())
-						{
-							_repo.deleteMatch(match.getId());
-							match.setWaitingForInvites(false);
-						}
-					}
-				}
-				
-				for (QueueParty party : partiesToRemove)
-				{
-					match.quitQueueParty(party);
-				}
-				
-				if (match.isWaitingForInvites())
-				{
-					if ((match.getWaitDuration()) > 15000)
-					{
-						for (QueueParty queueParty : match.getParties())
-						{
-							if (!queueParty.getState().equalsIgnoreCase("Ready"))
-							{
-								_repo.deleteQueueParty(queueParty.getId());
-							}
-						}
-						
-						_repo.deleteMatch(match.getId());
-						match.setWaitingForInvites(false);
-					}
-					
-					continue;
-				}
-				
-				if (match.getPlayerCount() >= matchPlayerCount)
-				{
-					List<QueueParty> partyList = new ArrayList<QueueParty>(match.getParties());
-					Collections.sort(partyList, partySorter);
-
-					int playerCount = 0;
-					for (QueueParty party : partyList)
-					{
-						if (playerCount + party.getPlayerCount() > matchPlayerCount)
-						{
-							match.quitQueueParty(party);
-							playerPrepMatchMap.remove(party.getId());
-							log("Oops hit player cap, can't fit you in this match.");
-							continue;
-						}
-						
-						playerCount += party.getPlayerCount();
-					}
-
-					if (playerCount == matchPlayerCount)
-					{
-						log("Sent match invites for '" + match.getId() + "'");
-						
-						for (QueueParty party : match.getParties())
-						{
-							playerPrepMatchMap.remove(party.getId());
-							_repo.assignMatch(party, match);
-						}
-						
-						match.setWaitingForInvites(true);
-						matchesMade++;
-					}
-				}
-				else if (match.getPlayerCount() == 0)
-				{
-					matchIterator.remove();
-				}
-			}
+			log("Total pending matches after update: " + _pendingMatches.size());
+			log("Total queued parties after update: " + _repo.getQueueParties().size());
 			
 			try
 			{
-				if (matchesMade > 0)
-					System.out.println("Made " + matchesMade + " matches.");
+				if (_matchesMade > 0)
+					System.out.println("Made " + _matchesMade + " matches.");
 				
 				Thread.sleep(1000);
 			} 
@@ -222,6 +69,305 @@ public class Queuer
 		
 		
 	}
+		
+	/**
+	 * Tick & update the Queuer as a whole, making one whole pass through all queued players and pending matches to
+	 * assign matches to parties and start matches.
+	 */
+	private static void updateQueuer()
+	{
+		// Update the status of each queue party, searching for best matchings and assigning matches to parties.
+		for (QueueParty queueParty : _repo.getQueueParties())
+		{
+			updateParty(queueParty);
+		}
+		
+		// Update all matches, and remove pending matches if they are finished.
+		Iterator<Match> iterator = _pendingMatches.iterator();
+		while (iterator.hasNext())
+		{
+			Match match = iterator.next();
+			boolean matchFinished = updateMatch(match);
+			
+			// Remove match if it is completed/finished
+			if (matchFinished) iterator.remove();
+		}
+	}
+	
+	/**
+	 * Update the status of a {@link QueueParty} by attempting to locate the best resulting
+	 * {@code Match} available, or creating a new one if required.
+	 * @param queueParty - the queue party to be updated for matchmaking purposes.
+	 */
+	private static void updateParty(QueueParty queueParty)
+	{
+		int queueDuration = (int) queueParty.getQueueDuration() / 1000;	// Queue duration in seconds
+		Match bestMatch = getBestMatch(queueParty);
+		
+		if (queueParty.hasAssignedMatch())
+		{
+			// TODO: If player has been waiting too long in current game and there is a better match, join that!
+		}
+		else
+		{
+			if (bestMatch != null)						// Assign party into best match!
+			{
+				bestMatch.joinQueueParty(queueParty);
+				_repo.assignMatch(queueParty, bestMatch);
+			}
+			else if (queueDuration >= MIN_QUEUE_WAIT)	// Create a new match for others to join!
+			{
+				Match match = new Match(_matchId++, queueParty.getServerGroup(), queueParty);
+				_pendingMatches.add(match);
+				_repo.assignMatch(queueParty, match);
+			}
+		}
+	}
+	
+	/**
+	 * Update a {@link Match} by verifying it's player statuses, sending out invites
+	 * and managing a Match from creation to deletion.
+	 * @param match - the match to be updated.
+	 * @return true, if the match is no longer required (successful or otherwise) and should be removed, false otherwise.
+	 */
+	private static boolean updateMatch(Match match)
+	{
+		// Remove queued parties that have left queue/match
+		// Don't give me crap about not using iterator...can't cuz of stupid thing.
+		Set<QueueParty> partiesToRemove = new HashSet<QueueParty>();
+		for (QueueParty queueParty : match.getParties())
+		{
+			int partyId = queueParty.getId();
+			if (!_repo.queuePartyExists(partyId))
+			{
+				log("Removing matchStatus : " + queueParty.getId());
+				partiesToRemove.add(queueParty);
+				
+				if (match.isWaitingForInvites())
+				{
+					_repo.deleteMatch(match.getId());
+					match.setWaitingForInvites(false);
+				}
+			}
+		}
+		for (QueueParty party : partiesToRemove)
+		{
+			match.quitQueueParty(party);
+		}
+		
+		// If match took too long to find players, or is empty, quit match.
+		if (match.getPlayerCount() == 0)
+		{
+			return true;	// Match is empty, remove from pending matches.
+		}
+		
+		// If match sent invites and is waiting for too long (15 seconds), kick players who didn't
+		// accept and keep looking
+		// Otherwise if everyone accepted, start game!
+		if (match.isWaitingForInvites())
+		{
+			boolean matchReady = true;
+			for (QueueParty party : _repo.getJoinedQueueParties(match.getId()))
+			{
+				if (!party.isReady())
+				{
+					matchReady = false;
+				}
+			}
+			
+			if (!matchReady && match.getWaitDuration() > 500)
+			{
+				matchReady = true;
+			}
+			
+			if (match.isReady())	// Invites accepted, MinecraftServer started, and players transferred.
+			{
+				return true;
+			}
+			else if (matchReady)	// Players accepted invites, start match!
+			{
+				startMatch(match);
+				return false;
+			}
+			else if (match.getWaitDuration() > 15000)
+			{
+				for (QueueParty queueParty : match.getParties())
+				{
+					if (!queueParty.isReady())
+					{
+						_repo.deleteQueueParty(queueParty.getId());
+					}
+				}
+				
+				_repo.deleteMatch(match.getId());
+				match.setWaitingForInvites(false);
+			}
+			
+			return false;
+		}
+		
+		// Match has filled up, send out invites!
+		if (match.getOpenSlots() ==  0)
+		{			
+			for (QueueParty party : match.getParties())
+			{
+				_repo.sendInvite(party);
+			}
+			
+			match.setWaitingForInvites(true);
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * @param queueParty - the party for whom a match is being searched.
+	 * @return the best matching {@link Match} for the {@code queueParty}, if an acceptable {@link Match}
+	 * could be found, null otherwise.
+	 */
+	private static Match getBestMatch(QueueParty queueParty)
+	{
+		Match best = null;
+		int minEloDelta = 0;
+		int variance = getSearchVariance(queueParty);
+		
+		for (Match match : _pendingMatches)
+		{
+			if (match.getOpenSlots() >= queueParty.getPlayerCount())
+			{
+				int eloDelta = getEloDelta(queueParty, match);
+				if (eloDelta <= variance && (eloDelta < minEloDelta || best == null))
+				{
+					best = match;
+					minEloDelta = eloDelta;
+				}
+			}
+		}
+		
+		return best;
+	}
+	
+	/**
+	 * @param r1 
+	 * @param r2
+	 * @return the ELO point delta (difference) between two {@link Ranked} objects.
+	 */
+	private static int getEloDelta(Ranked r1, Ranked r2)
+	{
+		return Math.abs(r1.getElo() - r2.getElo());
+	}
+	
+	public static boolean startMatch(Match match)
+	{
+		ServerGroup group = match.getServerGroup();
+		DedicatedServer bestServer = getBestDedicatedServer(group);
+		startServer(bestServer, group, match);
+		return true;
+	}
+	
+	/**
+	 * Transfer all players queue'd into a {@link Match} to one server.
+	 * @param match - the match whose queue'd players are to be transferred
+	 * @param serverName - the name of the server to transfer the players to
+	 */
+	public static void transferPlayers(Match match, String serverName)
+	{
+		// Transfer players to the server
+		for (QueueParty queueParty : _repo.getJoinedQueueParties(match.getId()))
+		{
+			for (String playerName : queueParty.getPlayers())
+			{
+				// Execute a transfer command 
+				ServerTransfer serverTransfer = new ServerTransfer(playerName, serverName);
+				TransferCommand transferCommand = new TransferCommand(serverTransfer);
+				transferCommand.publish();
+			}
+		}
+		
+		// Server transfers sent out, match has started!
+		_matchesMade++;
+
+		// Delete queue parties for players who've been matched
+		for (QueueParty queueParty : match.getParties())
+		{
+			if (!queueParty.isReady())
+			{
+				_repo.deleteQueueParty(queueParty.getId());
+			}
+		}
+		match.setReady(true);	// Ready to be deleted/removed
+	}
+	
+	/**
+	 * @return newly generated unique server id.
+	 */
+	public static int generateServerId()
+	{
+		return _serverId++;
+	}
+	
+	private static void startServer(final DedicatedServer serverSpace, final ServerGroup serverGroup, final Match match)
+	{
+		String cmd = "/home/mineplex/easyRemoteStartServerCustom.sh";
+		final String groupPrefix = serverGroup.getPrefix();
+		final String serverName = serverSpace.getName();
+		final String serverAddress = serverSpace.getPublicAddress();
+		final int serverId = generateServerId();
+
+		ProcessRunner pr = new ProcessRunner(new String[] {"/bin/sh", cmd, serverAddress, serverSpace.getPrivateAddress(), (serverGroup.getPortSection() + serverId) + "", serverGroup.getRequiredRam() + "", serverGroup.getWorldZip(), serverGroup.getPlugin(), serverGroup.getConfigPath(), serverGroup.getName(), serverGroup.getPrefix() + "-" + serverId, serverSpace.isUsRegion() ? "true" : "false", serverGroup.getAddNoCheat() + "" });
+		pr.start(new GenericRunnable<Boolean>()		
+		{
+			public void run(Boolean error)
+			{
+				if (!error)
+				{
+					// Successfully started server, now transfer players
+					transferPlayers(match, serverName);
+				}
+				else
+				{
+					// TODO: Error in starting server for ELO match, try again or disband queued match?
+					log("[" + serverName + ":" + serverAddress + " Free Resources; CPU " + serverSpace.getAvailableCpu() + " RAM " + serverSpace.getAvailableRam() + "MB] Errored " + serverName + "(" + groupPrefix+ "-" + serverId + ")");
+				}
+
+			}
+		});
+		
+		ProcessManager.getInstance().addProcess(pr);		
+		serverSpace.incrementServerCount(serverGroup);
+	}
+	
+	private static DedicatedServer getBestDedicatedServer(ServerGroup serverGroup)
+	{
+		Collection<DedicatedServer> dedicatedServers = _serverRepository.getDedicatedServers();
+		DedicatedServer bestServer = null;
+		
+		for (DedicatedServer serverData : dedicatedServers)
+		{
+			if (serverData.getAvailableRam() > serverGroup.getRequiredRam() 
+					&& serverData.getAvailableCpu() > serverGroup.getRequiredCpu())
+			{
+				if (bestServer == null || serverData.getServerCount(serverGroup) < bestServer.getServerCount(serverGroup))
+				{
+					bestServer = serverData;
+				}
+			}
+		}
+		
+		return bestServer;
+	}
+	
+	/**
+	 * @param party - the party whose ELO search variance is being fetched.
+	 * @return the variance in ELO search parameters for {@code party}.
+	 * I.E: Queuer searches for potential matches in [party.elo - variance, party.elo + variance] ELO range.
+	 */
+	private static int getSearchVariance(QueueParty party)
+	{
+		int seconds = (int) party.getQueueDuration() / 1000;	// Duration of queue in seconds
+		
+		return seconds * 10;	// 5 ELO variance for every second in queue
+	}
 	
 	private static void log(String message)
 	{
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Region.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Region.java
index 5bc846b37..957c7a479 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Region.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Region.java
@@ -14,6 +14,7 @@ public enum Region
 	EU,
 	ALL;
 	
+	
 	/**
 	 * @return the geographical {@link Region} of the current running process.
 	 */
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java
index 2a50ea3b9..5258c948e 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java
@@ -32,6 +32,7 @@ public class Utility
 	// Public static jedis pool for interacting with central default jedis repo.
 	private static JedisPool _masterPool;
 	private static JedisPool _slavePool;
+	private static final Object _poolLock = new Object();
 
 	/**
 	 * @param object - the (non-null) object to serialize
@@ -49,6 +50,8 @@ public class Utility
 	 */
 	public static <T> T deserialize(String serializedData, Class<T> type)
 	{
+		if (serializedData == null) return null;
+		
 		return _gson.fromJson(serializedData, type);
 	}
 
@@ -99,24 +102,28 @@ public class Utility
 	 * @return a newly instantiated {@link JedisPool} connected to the provided {@link ConnectionData} repository.
 	 */
 	public static JedisPool generatePool(ConnectionData connData)
-	{
-	    String key = getConnKey(connData);
-	    JedisPool pool = _pools.get(key);
-	    if (pool == null)
+	{	    
+	    synchronized(_poolLock)
 	    {
-	        JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
-	        jedisPoolConfig.setMaxWaitMillis(1000);
-	        jedisPoolConfig.setMinIdle(5);
-	        jedisPoolConfig.setTestOnBorrow(true);
+		    String key = getConnKey(connData);
+		    JedisPool pool = _pools.get(key);
+		    
+	    	if (pool == null)
+		    {
+		        JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
+		        jedisPoolConfig.setMaxWaitMillis(1000);
+		        jedisPoolConfig.setMinIdle(5);
+		        jedisPoolConfig.setTestOnBorrow(true);
 
-	        jedisPoolConfig.setMaxTotal(20);
-	        jedisPoolConfig.setBlockWhenExhausted(true);
+		        jedisPoolConfig.setMaxTotal(20);
+		        jedisPoolConfig.setBlockWhenExhausted(true);
 
-	        pool = new JedisPool(jedisPoolConfig, connData.getHost(), connData.getPort());
-	        _pools.put(key, pool);
+		        pool = new JedisPool(jedisPoolConfig, connData.getHost(), connData.getPort());
+		        _pools.put(key, pool);
+		    }
+	    	
+	    	return pool;
 	    }
-
-	    return pool;
 	}
 
 	/**
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/commands/AnnouncementCommand.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/commands/AnnouncementCommand.java
index d7c8d87d6..ebb8804ac 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/commands/AnnouncementCommand.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/commands/AnnouncementCommand.java
@@ -4,14 +4,17 @@ package mineplex.serverdata.commands;
 public class AnnouncementCommand extends ServerCommand
 {
 	private boolean _displayTitle;
+	private String _rank;
 	private String _message;
 	
 	public boolean getDisplayTitle() { return _displayTitle; }
+	public String getRank() { return _rank; }
 	public String getMessage() { return _message; }
 	
-	public AnnouncementCommand(boolean displayTitle, String message)
+	public AnnouncementCommand(boolean displayTitle, String rank, String message)
 	{
 		_displayTitle = displayTitle;
+		_rank = rank;
 		_message = message;
 	}
 	
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/commands/ServerCommandManager.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/commands/ServerCommandManager.java
index 31341ae10..29abc70ce 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/commands/ServerCommandManager.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/commands/ServerCommandManager.java
@@ -84,12 +84,12 @@ public class ServerCommandManager
 		{
 			public void run()
 			{
+				String commandType = serverCommand.getClass().getSimpleName();
+				String serializedCommand = Utility.serialize(serverCommand);
 				Jedis jedis = _writePool.getResource();
 				
 				try
 				{
-					String commandType = serverCommand.getClass().getSimpleName();
-					String serializedCommand = Utility.serialize(serverCommand);
 					jedis.publish(SERVER_COMMANDS_CHANNEL + ":" + commandType, serializedCommand);
 				}
 				catch (JedisConnectionException exception)
@@ -157,6 +157,11 @@ public class ServerCommandManager
 		System.out.println("Registered : " + commandName);
 	}
 	
+	public void registerCommandType(Class<? extends ServerCommand> commandType, CommandCallback callback)
+	{
+		registerCommandType(commandType.getSimpleName(), commandType, callback);
+	}
+	
 	public void registerCommandType(String commandName, Class<? extends ServerCommand> commandType)
 	{
 		registerCommandType(commandName, commandType, null);
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/Data.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/Data.java
index 34bb2ddda..d0e0c943b 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/Data.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/Data.java
@@ -1,6 +1,5 @@
 package mineplex.serverdata.data;
 
-
 public interface Data
 {
 	/**
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/PlayerServerInfo.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/PlayerServerInfo.java
new file mode 100644
index 000000000..f4a0be4f4
--- /dev/null
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/PlayerServerInfo.java
@@ -0,0 +1,25 @@
+package mineplex.serverdata.data;
+
+public class PlayerServerInfo implements Data
+{
+
+	private String _playerName;
+	public String getPlayerName() { return _playerName; }
+	
+	private String _lastServer;
+	public String getLastServer() { return _lastServer; }
+	public void setLastServer(String lastServer) { _lastServer = lastServer; }
+	
+	public PlayerServerInfo(String playerName, String lastServer)
+	{
+		_playerName = playerName;
+		_lastServer = lastServer;
+	}
+	
+	@Override
+	public String getDataId() 
+	{
+		return _playerName;
+	}
+
+}
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/redis/RedisConfig.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/redis/RedisConfig.java
index cd841fc6f..913db74ef 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/redis/RedisConfig.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/redis/RedisConfig.java
@@ -16,7 +16,7 @@ public class RedisConfig
 	
 	// The connections managed by this configuration
 	private List<ConnectionData> _connections;
-	
+	 
 	/**
 	 * Class constructor
 	 * @param connections
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/redis/RedisServerRepository.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/redis/RedisServerRepository.java
index 971c8dd24..50b3bee6a 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/redis/RedisServerRepository.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/redis/RedisServerRepository.java
@@ -311,6 +311,12 @@ public class RedisServerRepository implements ServerRepository
 			{
 				Map<String, String> data = response.get();
 				
+				if (data.entrySet().size() == 0) 
+				{
+					System.out.println("Encountered empty map! Skipping...");
+					continue;
+				}
+				
 				try
 				{
 					ServerGroup serverGroup = new ServerGroup(data, serverStatuses);
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/serialization/RuntimeTypeAdapterFactory.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/serialization/RuntimeTypeAdapterFactory.java
new file mode 100644
index 000000000..5a6238618
--- /dev/null
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/serialization/RuntimeTypeAdapterFactory.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package mineplex.serverdata.serialization;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.internal.Streams;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+
+/**
+ * Adapts values whose runtime type may differ from their declaration type. This
+ * is necessary when a field's type is not the same type that GSON should create
+ * when deserializing that field. For example, consider these types:
+ * <pre>   {@code
+ *   abstract class Shape {
+ *     int x;
+ *     int y;
+ *   }
+ *   class Circle extends Shape {
+ *     int radius;
+ *   }
+ *   class Rectangle extends Shape {
+ *     int width;
+ *     int height;
+ *   }
+ *   class Diamond extends Shape {
+ *     int width;
+ *     int height;
+ *   }
+ *   class Drawing {
+ *     Shape bottomShape;
+ *     Shape topShape;
+ *   }
+ * }</pre>
+ * <p>Without additional type information, the serialized JSON is ambiguous. Is
+ * the bottom shape in this drawing a rectangle or a diamond? <pre>   {@code
+ *   {
+ *     "bottomShape": {
+ *       "width": 10,
+ *       "height": 5,
+ *       "x": 0,
+ *       "y": 0
+ *     },
+ *     "topShape": {
+ *       "radius": 2,
+ *       "x": 4,
+ *       "y": 1
+ *     }
+ *   }}</pre>
+ * This class addresses this problem by adding type information to the
+ * serialized JSON and honoring that type information when the JSON is
+ * deserialized: <pre>   {@code
+ *   {
+ *     "bottomShape": {
+ *       "type": "Diamond",
+ *       "width": 10,
+ *       "height": 5,
+ *       "x": 0,
+ *       "y": 0
+ *     },
+ *     "topShape": {
+ *       "type": "Circle",
+ *       "radius": 2,
+ *       "x": 4,
+ *       "y": 1
+ *     }
+ *   }}</pre>
+ * Both the type field name ({@code "type"}) and the type labels ({@code
+ * "Rectangle"}) are configurable.
+ *
+ * <h3>Registering Types</h3>
+ * Create a {@code RuntimeTypeAdapter} by passing the base type and type field
+ * name to the {@link #of} factory method. If you don't supply an explicit type
+ * field name, {@code "type"} will be used. <pre>   {@code
+ *   RuntimeTypeAdapter<Shape> shapeAdapter
+ *       = RuntimeTypeAdapter.of(Shape.class, "type");
+ * }</pre>
+ * Next register all of your subtypes. Every subtype must be explicitly
+ * registered. This protects your application from injection attacks. If you
+ * don't supply an explicit type label, the type's simple name will be used.
+ * <pre>   {@code
+ *   shapeAdapter.registerSubtype(Rectangle.class, "Rectangle");
+ *   shapeAdapter.registerSubtype(Circle.class, "Circle");
+ *   shapeAdapter.registerSubtype(Diamond.class, "Diamond");
+ * }</pre>
+ * Finally, register the type adapter in your application's GSON builder:
+ * <pre>   {@code
+ *   Gson gson = new GsonBuilder()
+ *       .registerTypeAdapter(Shape.class, shapeAdapter)
+ *       .create();
+ * }</pre>
+ * Like {@code GsonBuilder}, this API supports chaining: <pre>   {@code
+ *   RuntimeTypeAdapter<Shape> shapeAdapter = RuntimeTypeAdapterFactory.of(Shape.class)
+ *       .registerSubtype(Rectangle.class)
+ *       .registerSubtype(Circle.class)
+ *       .registerSubtype(Diamond.class);
+ * }</pre>
+ */
+public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
+  private final Class<?> baseType;
+  private final String typeFieldName;
+  private final Map<String, Class<?>> labelToSubtype = new LinkedHashMap<String, Class<?>>();
+  private final Map<Class<?>, String> subtypeToLabel = new LinkedHashMap<Class<?>, String>();
+
+  private RuntimeTypeAdapterFactory(Class<?> baseType, String typeFieldName) {
+    if (typeFieldName == null || baseType == null) {
+      throw new NullPointerException();
+    }
+    this.baseType = baseType;
+    this.typeFieldName = typeFieldName;
+  }
+
+  /**
+   * Creates a new runtime type adapter using for {@code baseType} using {@code
+   * typeFieldName} as the type field name. Type field names are case sensitive.
+   */
+  public static <T> RuntimeTypeAdapterFactory<T> of(Class<T> baseType, String typeFieldName) {
+    return new RuntimeTypeAdapterFactory<T>(baseType, typeFieldName);
+  }
+
+  /**
+   * Creates a new runtime type adapter for {@code baseType} using {@code "type"} as
+   * the type field name.
+   */
+  public static <T> RuntimeTypeAdapterFactory<T> of(Class<T> baseType) {
+    return new RuntimeTypeAdapterFactory<T>(baseType, "type");
+  }
+
+  /**
+   * Registers {@code type} identified by {@code label}. Labels are case
+   * sensitive.
+   *
+   * @throws IllegalArgumentException if either {@code type} or {@code label}
+   *     have already been registered on this type adapter.
+   */
+  public RuntimeTypeAdapterFactory<T> registerSubtype(Class<? extends T> type, String label) {
+    if (type == null || label == null) {
+      throw new NullPointerException();
+    }
+    if (subtypeToLabel.containsKey(type) || labelToSubtype.containsKey(label)) {
+      throw new IllegalArgumentException("types and labels must be unique");
+    }
+    labelToSubtype.put(label, type);
+    subtypeToLabel.put(type, label);
+    return this;
+  }
+
+  /**
+   * Registers {@code type} identified by its {@link Class#getSimpleName simple
+   * name}. Labels are case sensitive.
+   *
+   * @throws IllegalArgumentException if either {@code type} or its simple name
+   *     have already been registered on this type adapter.
+   */
+  public RuntimeTypeAdapterFactory<T> registerSubtype(Class<? extends T> type) {
+    return registerSubtype(type, type.getSimpleName());
+  }
+
+  public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
+    if (type.getRawType() != baseType) {
+      return null;
+    }
+
+    final Map<String, TypeAdapter<?>> labelToDelegate
+        = new LinkedHashMap<String, TypeAdapter<?>>();
+    final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate
+        = new LinkedHashMap<Class<?>, TypeAdapter<?>>();
+    for (Map.Entry<String, Class<?>> entry : labelToSubtype.entrySet()) {
+      TypeAdapter<?> delegate = gson.getDelegateAdapter(this, TypeToken.get(entry.getValue()));
+      labelToDelegate.put(entry.getKey(), delegate);
+      subtypeToDelegate.put(entry.getValue(), delegate);
+    }
+
+    return new TypeAdapter<R>() {
+      @Override public R read(JsonReader in) throws IOException {
+        JsonElement jsonElement = Streams.parse(in);
+        JsonElement labelJsonElement = jsonElement.getAsJsonObject().remove(typeFieldName);
+        if (labelJsonElement == null) {
+          throw new JsonParseException("cannot deserialize " + baseType
+              + " because it does not define a field named " + typeFieldName);
+        }
+        String label = labelJsonElement.getAsString();
+        @SuppressWarnings("unchecked") // registration requires that subtype extends T
+        TypeAdapter<R> delegate = (TypeAdapter<R>) labelToDelegate.get(label);
+        if (delegate == null) {
+          throw new JsonParseException("cannot deserialize " + baseType + " subtype named "
+              + label + "; did you forget to register a subtype?");
+        }
+        return delegate.fromJsonTree(jsonElement);
+      }
+
+      @Override public void write(JsonWriter out, R value) throws IOException {
+          if(value!=null) {
+              Class<?> srcType = value.getClass();
+              String label = subtypeToLabel.get(srcType);
+              @SuppressWarnings("unchecked") // registration requires that subtype extends T
+                      TypeAdapter<R> delegate = (TypeAdapter<R>) subtypeToDelegate.get(srcType);
+              if (delegate == null) {
+                  throw new JsonParseException("cannot serialize " + srcType.getName()
+                          + "; did you forget to register a subtype?");
+              }
+              JsonObject jsonObject = delegate.toJsonTree(value).getAsJsonObject();
+              if (jsonObject.has(typeFieldName)) {
+                  throw new JsonParseException("cannot serialize " + srcType.getName()
+                          + " because it already defines a field named " + typeFieldName);
+              }
+              JsonObject clone = new JsonObject();
+              clone.add(typeFieldName, new JsonPrimitive(label));
+              for (Map.Entry<String, JsonElement> e : jsonObject.entrySet()) {
+                  clone.add(e.getKey(), e.getValue());
+              }
+              Streams.write(clone, out);
+          }else{
+              out.nullValue();
+          }
+      }
+    };
+  }
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/servers/ServerRepository.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/servers/ServerRepository.java
index 37b119766..51f5ad8b9 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/servers/ServerRepository.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/servers/ServerRepository.java
@@ -17,6 +17,7 @@ import mineplex.serverdata.data.ServerGroup;
 public interface ServerRepository 
 {
 	
+	
 	/**
 	 * @return a newly instanced snapshot {@link Collection} of all currently active
 	 * {@link MinecraftServer}s in the repository.
diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java
index 36c62ffe5..bd4760a6c 100644
--- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java
+++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java
@@ -6,6 +6,7 @@ import org.bukkit.entity.Player;
 
 import mineplex.core.account.CoreClient;
 import mineplex.core.command.CommandBase;
+import mineplex.core.common.CurrencyType;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UUIDFetcher;
@@ -43,7 +44,7 @@ public class GemHunterCommand extends CommandBase<SalesPackageManager>
 				
 				if (client != null)
 				{
-					Plugin.getDonationManager().PurchaseUnknownSalesPackage(null, playerName, client.getAccountId(), "Gem Hunter Level " + amount, false, 0, false);
+					Plugin.getDonationManager().PurchaseUnknownSalesPackage(null, playerName, client.getAccountId(), "Gem Hunter Level " + amount, CurrencyType.Gems, 0, false);
 					Plugin.getStatsManager().incrementStat(client.getAccountId(), "Global.GemsEarned", experience);
 					caller.sendMessage(F.main(Plugin.getName(), "Added Level " + amount + " Gem Hunter to " + playerName + "'s account!"));
 				}
diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/ItemCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/ItemCommand.java
index a7760bad9..3fce1fd15 100644
--- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/ItemCommand.java
+++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/ItemCommand.java
@@ -6,6 +6,7 @@ import org.bukkit.entity.Player;
 
 import mineplex.core.account.CoreClient;
 import mineplex.core.command.CommandBase;
+import mineplex.core.common.CurrencyType;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.Callback;
 import mineplex.core.common.util.F;
@@ -72,7 +73,7 @@ public class ItemCommand extends CommandBase<SalesPackageManager>
 								}
 							}, uuid, itemName, amount);
 						}
-					}, playerName, client.getAccountId(), (amount == 1 ? itemName : itemName + " " + amount), false, 0, false);
+					}, playerName, client.getAccountId(), (amount == 1 ? itemName : itemName + " " + amount), CurrencyType.Gems, 0, false);
 				}
 				else
 					caller.sendMessage(F.main(Plugin.getName(), "Couldn't find " + playerName + "'s account!"));
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
index 0c60a3745..7a710683b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
@@ -112,7 +112,7 @@ public class Arcade extends JavaPlugin
 		Creature creature = new Creature(this);
 		ServerStatusManager serverStatusManager = new ServerStatusManager(this, _clientManager, new LagMeter(this, _clientManager));
 		LeaderboardManager leaderboardManager = new LeaderboardManager(this, _clientManager);
-		Teleport teleport = new Teleport(this);		
+		Teleport teleport = new Teleport(this, _clientManager);
 		Portal portal = new Portal(this, _clientManager, serverStatusManager.getCurrentServerName());
 		new FileUpdater(this, portal, serverStatusManager.getCurrentServerName(), serverStatusManager.getRegion());
 		PacketHandler packetHandler = new PacketHandler(this);
@@ -136,7 +136,7 @@ public class Arcade extends JavaPlugin
 		BlockRestore blockRestore = new BlockRestore(this);
 		
 		ProjectileManager projectileManager = new ProjectileManager(this);
-		HologramManager hologramManager = new HologramManager(this);
+		HologramManager hologramManager = new HologramManager(this, packetHandler);
 		
 		//Inventory
 		InventoryManager inventoryManager = new InventoryManager(this, _clientManager);
@@ -147,9 +147,9 @@ public class Arcade extends JavaPlugin
 		cosmeticManager.setInterfaceSlot(7);
 		cosmeticManager.disableTeamArmor();
 
-		new GlobalPacketManager(this, _clientManager, serverStatusManager);
-
 		GiveawayManager giveawayManager = new GiveawayManager(this, _clientManager, serverStatusManager);
+
+		new GlobalPacketManager(this, _clientManager, serverStatusManager, inventoryManager, _donationManager, petManager, statsManager, giveawayManager);
 		
 		//Arcade Manager  
 		PollManager pollManager = new PollManager(this, _clientManager, _donationManager);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
index c814e5fec..a29c226fe 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -41,9 +41,7 @@ import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.movement.Movement;
 import mineplex.core.notifier.NotificationManager;
 import mineplex.core.npc.NpcManager;
-import mineplex.core.packethandler.IPacketHandler;
 import mineplex.core.packethandler.PacketHandler;
-import mineplex.core.packethandler.PacketInfo;
 import mineplex.core.party.PartyManager;
 import mineplex.core.pet.PetManager;
 import mineplex.core.poll.PollManager;
@@ -61,7 +59,6 @@ import mineplex.core.status.ServerStatusManager;
 import mineplex.core.task.TaskManager;
 import mineplex.core.teleport.Teleport;
 import mineplex.core.timing.TimingManager;
-import mineplex.core.titangiveaway.TitanGiveawayManager;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.classcombat.Class.ClassManager;
 import mineplex.minecraft.game.classcombat.Condition.SkillConditionManager;
@@ -104,10 +101,10 @@ import nautilus.game.arcade.managers.GameSpectatorManager;
 import nautilus.game.arcade.managers.GameStatManager;
 import nautilus.game.arcade.managers.GameTournamentManager;
 import nautilus.game.arcade.managers.GameWorldManager;
-import nautilus.game.arcade.managers.HolidayManager;
 import nautilus.game.arcade.managers.IdleManager;
 import nautilus.game.arcade.managers.MiscManager;
 import nautilus.game.arcade.shop.ArcadeShop;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
@@ -235,16 +232,19 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		_explosionManager = new Explosion(plugin, _blockRestore);
 		_explosionManager.SetDebris(false);
 
-		if (serverConfig.GameList.contains(GameType.ChampionsDominate)
-			|| serverConfig.GameList.contains(GameType.ChampionsTDM)
-			|| serverConfig.GameList.contains(GameType.ChampionsCTF))
-		{
-			_conditionManager = new SkillConditionManager(plugin);
-		}
-		else
-		{
-			_conditionManager = new ConditionManager(plugin);
-		}
+		_conditionManager = new SkillConditionManager(plugin);
+
+		//Dont see a reason to ever just use the normal one
+//		if (serverConfig.GameList.contains(GameType.ChampionsDominate)
+//			|| serverConfig.GameList.contains(GameType.ChampionsTDM)
+//			|| serverConfig.GameList.contains(GameType.ChampionsCTF))
+//		{
+//			_conditionManager = new SkillConditionManager(plugin);
+//		}
+//		else
+//		{
+//			_conditionManager = new ConditionManager(plugin);
+//		}
 		
 		_clientManager = clientManager;
 		_serverStatusManager = serverStatusManager;
@@ -254,7 +254,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		_damageManager = damageManager;
 		_damageManager.UseSimpleWeaponDamage = true;
 		_damageManager.setConditionManager(_conditionManager);
-		
+		_conditionManager.setDamageManager(_damageManager);
+
 		_disguiseManager = disguiseManager;
 
 		_donationManager = donationManager;
@@ -713,6 +714,9 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		{
 			event.setMotd(ChatColor.YELLOW + "In Progress" + extrainformation);
 		}
+
+		if (this.getPlugin().getConfig().getString("serverstatus.group").equalsIgnoreCase("Testing"))
+			event.setMotd(ChatColor.GOLD + "Private Mineplex Test Server");
 	}
 
 	@EventHandler
@@ -1233,6 +1237,25 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		}
 	}
 
+	@EventHandler
+	public void disableGadget(PlayerJoinEvent event)
+	{
+		updateGadgetEnabled();
+	}
+
+	@EventHandler
+	public void disableGadget(PlayerQuitEvent event)
+	{
+		updateGadgetEnabled();
+	}
+
+	private void updateGadgetEnabled()
+	{
+		// Disables gadgets if player count is greater than 40
+		int playerCount = UtilServer.getPlayers().length;
+		getCosmeticManager().getGadgetManager().setGadgetEnabled(playerCount <= 40);
+	}
+
 	/*public void saveBasicStats(final Game game)
 	{
 		if (!IsTournamentServer())
@@ -1335,7 +1358,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 	
 	public void toggleChampionsModules(GameType gameType)
 	{
-		boolean isChamps = gameType == GameType.ChampionsDominate || gameType == GameType.ChampionsTDM || gameType == GameType.ChampionsCTF;
+		boolean isChamps = gameType == GameType.ChampionsDominate || gameType == GameType.ChampionsTDM || gameType == GameType.ChampionsCTF || gameType == GameType.BossBattles;
 
 		if (_enabled == isChamps)
 		{
@@ -1496,7 +1519,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 
 				for (Player player : Bukkit.getOnlinePlayers())
 				{
-					player.setResourcePack("http://www.chivebox.com/file/c/empty.zip");
+					player.setResourcePack("http://file.mineplex.com/ResReset.zip");
 				}
 			}
 			else
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
index 47fe8ccf4..bbde4499e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
@@ -7,6 +7,7 @@ import mineplex.core.game.GameDisplay;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.games.baconbrawl.BaconBrawl;
 import nautilus.game.arcade.game.games.barbarians.Barbarians;
+import nautilus.game.arcade.game.games.bossbattles.BossBattles;
 import nautilus.game.arcade.game.games.bridge.Bridge;
 import nautilus.game.arcade.game.games.build.Build;
 import nautilus.game.arcade.game.games.cards.Cards;
@@ -34,6 +35,7 @@ import nautilus.game.arcade.game.games.micro.Micro;
 import nautilus.game.arcade.game.games.milkcow.MilkCow;
 import nautilus.game.arcade.game.games.minestrike.MineStrike;
 import nautilus.game.arcade.game.games.mineware.MineWare;
+import nautilus.game.arcade.game.games.monsterleague.MonsterLeague;
 import nautilus.game.arcade.game.games.monstermaze.MonsterMaze;
 import nautilus.game.arcade.game.games.oldmineware.OldMineWare;
 import nautilus.game.arcade.game.games.paintball.Paintball;
@@ -68,13 +70,13 @@ public enum GameType
 	//Mini
 	BaconBrawl(BaconBrawl.class, GameDisplay.BaconBrawl),
 	Barbarians(Barbarians.class, GameDisplay.Barbarians),
+	BossBattles(BossBattles.class, GameDisplay.BossBattles),
 	Bridge(Bridge.class, GameDisplay.Bridge),
 	CastleSiege(CastleSiege.class, GameDisplay.CastleSiege),
 	ChampionsCTF(ChampionsCTF.class, GameDisplay.ChampionsCTF),
 	ChampionsDominate(ChampionsDominate.class, GameDisplay.ChampionsDominate),
-	//ChampionsMOBA(ChampionsMOBA.class, "Champions MOBA", "Champions", Material.SKULL_ITEM, (byte)0, GameCategory.CHAMPIONS, 7),
 	ChampionsTDM(ChampionsTDM.class, GameDisplay.ChampionsTDM),
-	Christmas(Christmas.class, GameDisplay.Christmas, "http://chivebox.com/file/c/xmas.zip", true),
+	Christmas(Christmas.class, GameDisplay.Christmas, "http://file.mineplex.com/ResChristmas.zip", true),
 	DeathTag(DeathTag.class, GameDisplay.DeathTag),
 	DragonEscape(DragonEscape.class, GameDisplay.DragonEscape),
 	DragonEscapeTeams(DragonEscapeTeams.class, GameDisplay.DragonEscapeTeams),
@@ -83,16 +85,15 @@ public enum GameType
 	DragonsTeams(DragonsTeams.class, GameDisplay.DragonsTeams),
 	Draw(Draw.class, GameDisplay.Draw),
 	Evolution(Evolution.class, GameDisplay.Evolution),
-	//FlappyBird(FlappyBird.class, "Flappy Bird", Material.FEATHER, (byte)0, GameCategory.ARCADE, 17),
 	Gravity(Gravity.class, GameDisplay.Gravity),
-	Halloween(Halloween.class, GameDisplay.Halloween, "http://chivebox.com/file/c/hh.zip", true),
+	Halloween(Halloween.class, GameDisplay.Halloween, "http://file.mineplex.com/ResHalloween.zip", true),
 	HideSeek(HideSeek.class, GameDisplay.HideSeek),
 	HoleInTheWall(HoleInTheWall.class, GameDisplay.HoleInTheWall),
 	Horse(Horse.class, GameDisplay.Horse),
 	Lobbers(BombLobbers.class, GameDisplay.Lobbers),
 	Micro(Micro.class, GameDisplay.Micro),
 	MilkCow(MilkCow.class, GameDisplay.MilkCow),
-	MineStrike(MineStrike.class, GameDisplay.MineStrike, "http://chivebox.com/file/c/assets.zip", true),// Temp set to CHAMPIONS to fix UI bug
+	MineStrike(MineStrike.class, GameDisplay.MineStrike, "http://chivebox.com/mineplex/ResMinestrike.zip", true),
 	MineWare(MineWare.class, GameDisplay.MineWare),
 	OldMineWare(OldMineWare.class, GameDisplay.OldMineWare),
 	Paintball(Paintball.class, GameDisplay.Paintball),
@@ -118,13 +119,16 @@ public enum GameType
 	TurfWars(TurfForts.class, GameDisplay.TurfWars),
 	UHC(UHC.class, GameDisplay.UHC),
 	WitherAssault(WitherGame.class, GameDisplay.WitherAssault),
-	Wizards(Wizards.class, GameDisplay.Wizards, "http://chivebox.com/file/c/ResWizards.zip", true),
+	Wizards(Wizards.class, GameDisplay.Wizards, "http://file.mineplex.com/ResWizards.zip", true),
 	ZombieSurvival(ZombieSurvival.class, GameDisplay.ZombieSurvival),
 	Build(Build.class, GameDisplay.Build),
 	Cards(Cards.class, GameDisplay.Cards),
 	Skywars(SoloSkywars.class, GameDisplay.Skywars),
 	SkywarsTeams(TeamSkywars.class, GameDisplay.SkywarsTeams, new GameType[]{GameType.Skywars}, false),
 	MonsterMaze(MonsterMaze.class, GameDisplay.MonsterMaze),
+	MonsterLeague(MonsterLeague.class, GameDisplay.MonsterLeague),
+	
+//	BouncyBalls(BouncyBalls.class, GameDisplay.BouncyBalls),
 	
 	Event(EventGame.class, GameDisplay.Event, new GameType[]{
 		GameType.BaconBrawl, GameType.Barbarians, GameType.Bridge, GameType.Build, GameType.Build,
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/KitUnlockCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/KitUnlockCommand.java
index cae387d71..443ae6bb9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/KitUnlockCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/KitUnlockCommand.java
@@ -10,7 +10,7 @@ public class KitUnlockCommand extends CommandBase<ArcadeManager>
 {
 	public KitUnlockCommand(ArcadeManager plugin)
 	{
-		super(plugin, Rank.OWNER, new Rank[] {Rank.YOUTUBE, Rank.TWITCH, Rank.JNR_DEV}, new String[] {"youtube", "twitch", "kits"});
+		super(plugin, Rank.OWNER, new Rank[] {Rank.YOUTUBE, Rank.YOUTUBE_SMALL, Rank.TWITCH, Rank.JNR_DEV}, new String[] {"youtube", "twitch", "kits"});
 	}
 
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java
index 499fe8063..2d45496ae 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java
@@ -18,12 +18,15 @@ public class StartCommand extends CommandBase<ArcadeManager>
 	@Override
 	public void Execute(Player caller, String[] args)
 	{
-		if (Plugin.GetGame() == null)
+		if (Plugin.GetGame() == null || Plugin.GetGame().GetState() == GameState.Loading)
+		{
+			caller.sendMessage(C.cRed + C.Bold + "Game is loading...");
 			return;
-		
+		}
+
 		if (Plugin.GetGame().GetState() != GameState.Recruit)
 		{
-			caller.sendMessage("Game is already in progress...");
+			caller.sendMessage(C.cRed + C.Bold + "Game is already in progress...");
 			return;
 		}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index 23dc523e1..7616b98ad 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -195,7 +195,8 @@ public abstract class Game implements Listener
 	public boolean AutomaticRespawn = true;
 
 	public double DeathSpectateSecs = 0;
-
+	public boolean DeathTeleport = true;
+	
 	public boolean QuitOut = true;
 	public boolean QuitDropItems = false;
 
@@ -209,6 +210,7 @@ public abstract class Game implements Listener
 	public int WorldWaterDamage = 0;
 	public boolean WorldBoundaryKill = true;
 	public boolean WorldBlockBurn = false;
+	public boolean WorldBlockGrow = false;
 	public boolean WorldFireSpread = false;
 	public boolean WorldLeavesDecay = false;
 	public boolean WorldSoilTrample = false;
@@ -300,6 +302,8 @@ public abstract class Game implements Listener
 	public boolean DeadBodiesDeath = true;
 	public int DeadBodiesExpire = -1;
 
+	public boolean FixSpawnFacing = true;
+
 	private IPacketHandler _useEntityPacketHandler;
 	private int _deadBodyCount;
 	private NautHashMap<String, Entity> _deadBodies = new NautHashMap<String, Entity>();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
index 6527ec0ea..ddbd4f68c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
@@ -113,12 +113,15 @@ public class GameTeam
 
 	private Location fixFacing(Location loc)
 	{
-		float yaw = UtilAlg.GetYaw(UtilAlg.getTrajectory2d(loc, Host.GetSpectatorLocation()));
-
-		yaw = (int) (yaw / 90) * 90;
-
-		loc = loc.clone();
-		loc.setYaw(yaw);
+		if (Host.FixSpawnFacing)
+		{
+			float yaw = UtilAlg.GetYaw(UtilAlg.getTrajectory2d(loc, Host.GetSpectatorLocation()));
+	
+			yaw = (int) (yaw / 90) * 90;
+	
+			loc = loc.clone();
+			loc.setYaw(yaw);
+		}
 
 		return loc;
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BattleBoss.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BattleBoss.java
new file mode 100644
index 000000000..ac364d49c
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BattleBoss.java
@@ -0,0 +1,42 @@
+package nautilus.game.arcade.game.games.bossbattles;
+
+import mineplex.minecraft.game.core.boss.ironwizard.GolemBoss;
+import mineplex.minecraft.game.core.boss.slimeking.SlimeBoss;
+import mineplex.minecraft.game.core.boss.snake.SnakeBoss;
+import mineplex.minecraft.game.core.boss.spider.SpiderBoss;
+import nautilus.game.arcade.game.games.bossbattles.displays.*;
+
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+public enum BattleBoss
+{
+	GOLEM(GolemBoss.class, IronWizardDisplay.class),
+
+	SNAKE(SnakeBoss.class, SnakeDisplay.class),
+
+	SLIME(SlimeBoss.class, SlimeKingDisplay.class),
+
+	SPIDER(SpiderBoss.class, SpiderDisplay.class);
+
+	private Class _bossClass;
+	private Class<? extends BossDisplay> _bossDisplay;
+
+	private BattleBoss(Class bossClass,
+			Class<? extends BossDisplay> displayClass)
+	{
+		_bossClass = bossClass;
+		_bossDisplay = displayClass;
+	}
+
+	public Class getBoss()
+	{
+		return _bossClass;
+	}
+
+	public Class<? extends BossDisplay> getBossDisplay()
+	{
+		return _bossDisplay;
+	}
+
+}
\ No newline at end of file
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BossBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BossBattles.java
new file mode 100644
index 000000000..ca6253aab
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BossBattles.java
@@ -0,0 +1,336 @@
+package nautilus.game.arcade.game.games.bossbattles;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilShapes;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.boss.EventState;
+import mineplex.minecraft.game.core.boss.WorldEvent;
+import mineplex.minecraft.game.core.boss.slimeking.SlimeBoss;
+import mineplex.minecraft.game.core.boss.spider.SpiderBoss;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.TeamGame;
+import nautilus.game.arcade.game.games.bossbattles.displays.BossDisplay;
+import nautilus.game.arcade.game.games.champions.kits.KitAssassin;
+import nautilus.game.arcade.game.games.champions.kits.KitBrute;
+import nautilus.game.arcade.game.games.champions.kits.KitKnight;
+import nautilus.game.arcade.game.games.champions.kits.KitMage;
+import nautilus.game.arcade.game.games.champions.kits.KitRanger;
+import nautilus.game.arcade.kit.Kit;
+
+public class BossBattles extends TeamGame
+{
+	private WorldEvent _currentBoss;
+	private BattleBoss _chosenBoss =BattleBoss.SPIDER;
+//	BattleBoss.values()[UtilMath.r(BattleBoss.values().length)];
+	private ArrayList<BossDisplay> _displays = new ArrayList<BossDisplay>();
+
+	public BossBattles(ArcadeManager manager)
+	{ 
+		super(manager, GameType.BossBattles, new Kit[]
+		{
+				new KitBrute(manager), new KitRanger(manager),
+				new KitKnight(manager), new KitMage(manager),
+				new KitAssassin(manager),
+		}, new String[]
+		{
+			"Fight some bosses"
+		});
+
+		HungerSet = 20;
+		CreatureAllowOverride = true;
+		PrepareFreeze = false;
+	}
+
+	@EventHandler
+	public void onSpawn(CreatureSpawnEvent event)
+	{
+		if (event.getSpawnReason() != event.getSpawnReason().CUSTOM)
+			event.setCancelled(true);
+	}
+
+	@Override
+	public boolean isInsideMap(Player player)
+	{
+		return true;
+	}
+
+	@EventHandler
+	public void checkBossIsDead(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+		{
+			return;
+		}
+
+		if (_currentBoss == null)
+		{
+			return;
+		}
+
+		if (GetPlayers(true).isEmpty())
+		{
+			_currentBoss.cancel();
+		}
+
+		if (_currentBoss.getState() != EventState.COMPLETE
+				&& _currentBoss.getState() != EventState.CANCELLED)
+		{
+			return;
+		}
+
+		endCurrentBoss();
+	}
+
+	@Override
+	public void EndCheck()
+	{
+		if (!IsLive())
+			return;
+
+		if (GetPlayers(true).size() <= 0 || _currentBoss == null
+				|| _currentBoss.getState() == EventState.CANCELLED
+				|| _currentBoss.getState() == EventState.COMPLETE)
+		{
+			endCurrentBoss();
+
+			super.EndCheck();
+		}
+	}
+
+	private void endCurrentBoss()
+	{
+		if (_currentBoss == null)
+		{
+			return;
+		}
+
+		HandlerList.unregisterAll(_currentBoss);
+
+		// If the event was cancelled, we don't need to run a cleanup
+		if (_currentBoss.getState() != EventState.CANCELLED)
+			_currentBoss.cleanup();
+	}
+
+	public void setPicked(Player player, BattleBoss battleBoss)
+	{
+		_chosenBoss = battleBoss;
+
+		Announce(C.cGold + C.Bold + player.getName() + " has chosen the boss "
+				+ battleBoss.name() + "!");
+	}
+
+	@EventHandler
+	public void onGameOver(GameStateChangeEvent event)
+	{
+		if (event.GetState() == GameState.Live
+				|| event.GetState() == GameState.Prepare)
+		{
+			return;
+		}
+
+		if (_currentBoss == null)
+		{
+			return;
+		}
+
+		endCurrentBoss();
+	}
+
+	@EventHandler
+	public void onGameLoadingOver(GameStateChangeEvent event)
+	{
+		if (event.GetState() == GameState.Recruit)
+		{
+			return;
+		}
+
+		for (BossDisplay display : _displays)
+		{
+			HandlerList.unregisterAll(display);
+			display.removeHologram();
+			display.removeBoss();
+		}
+
+		_displays.clear();
+	}
+
+	@EventHandler(priority = EventPriority.HIGH)
+	public void onPrepare(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Prepare)
+		{
+			return;
+		}
+
+		double distAway = Math.max(_currentBoss.getSchematic().getWidth(),
+				_currentBoss.getSchematic().getLength()) / 2;
+
+		distAway += Math.min(20, distAway * 0.2);
+
+		for (Location loc : GetTeamList().get(0).GetSpawns())
+		{
+			double maxDist = loc.toVector().setY(0).length();
+
+			Vector vec = UtilAlg.getTrajectory2d(new Vector(), loc.toVector());
+
+			loc.setX(0);
+			loc.setZ(0);
+
+			loc.add(vec.multiply(Math.min(maxDist, distAway)));
+
+			vec.normalize().multiply(-1);
+
+			boolean foundSafe = false;
+
+			for (int i = 0; i < 50; i++)
+			{
+				for (int y = 200; y > 0; y--)
+				{
+					loc.setY(y);
+
+					if (UtilBlock.solid(loc.getBlock().getRelative(0, -1, 0)))
+					{
+						foundSafe = true;
+						break;
+					}
+				}
+
+				if (foundSafe)
+				{
+					break;
+				}
+
+				loc.add(vec);
+			}
+		}
+	}
+
+	@EventHandler
+	public void onGamePrepare(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Recruit)
+		{
+			return;
+		}
+
+		int i = 0;
+		ArrayList<Location> locations = UtilShapes.getPointsInCircle(
+				new Location(UtilWorld.getWorld("world"), 0, 104, 0),
+				BattleBoss.values().length, 4.5);
+
+		for (BattleBoss boss : BattleBoss.values())
+		{
+			try
+			{
+				Location loc = locations.get(i).clone();
+
+				loc.setDirection(UtilAlg.getTrajectory(loc, Manager.GetLobby()
+						.GetSpawn()));
+
+				Constructor<? extends BossDisplay> constructor = boss
+						.getBossDisplay().getConstructor(BossBattles.class,
+								BattleBoss.class, Location.class);
+
+				BossDisplay bossDisplay = constructor.newInstance(this,
+						BattleBoss.values()[i], loc);
+
+				bossDisplay.start();
+				bossDisplay.spawnHologram();
+
+				Bukkit.getPluginManager().registerEvents(bossDisplay,
+						getArcadeManager().getPlugin());
+
+				_displays.add(bossDisplay);
+
+				System.out.print("Registered "
+						+ bossDisplay.getClass().getSimpleName());
+			}
+			catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+
+			i++;
+		}
+	}
+
+	@EventHandler
+	public void onGameStarted(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Prepare)
+		{
+			return;
+		}
+
+		setNewBoss(_chosenBoss);
+	}
+
+	@EventHandler
+	public void onGameLive(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Live)
+		{
+			return;
+		}
+
+		_currentBoss.start();
+
+		Bukkit.getPluginManager().registerEvents(_currentBoss,
+				getArcadeManager().getPlugin());
+	}
+
+	public WorldEvent createInstance(Class clazz, Location centerLocation)
+	{
+		WorldEvent worldEvent = null;
+
+		try
+		{
+			for (Constructor<?> con : clazz.getConstructors())
+			{
+
+				worldEvent = (WorldEvent) con.newInstance(getArcadeManager()
+						.GetDisguise(), getArcadeManager().GetProjectile(),
+						getArcadeManager().GetDamage(), getArcadeManager()
+								.GetBlockRestore(), getArcadeManager()
+								.GetCondition(), centerLocation);
+				break;
+			}
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
+
+		return worldEvent;
+	}
+
+	private void setNewBoss(BattleBoss boss)
+	{
+		_currentBoss = createInstance(boss.getBoss(), new Location(
+				WorldData.World, 0, 6, 0));
+
+		_currentBoss.setArcadeGame(true);
+		_currentBoss.setDifficulty(0.6);
+
+		_currentBoss.loadMap();
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/BossDisplay.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/BossDisplay.java
new file mode 100644
index 000000000..73343fa16
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/BossDisplay.java
@@ -0,0 +1,114 @@
+package nautilus.game.arcade.game.games.bossbattles.displays;
+
+import nautilus.game.arcade.game.games.bossbattles.BattleBoss;
+import nautilus.game.arcade.game.games.bossbattles.BossBattles;
+
+import java.util.ArrayList;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.hologram.Hologram;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+
+public abstract class BossDisplay implements Listener
+{
+	private Location _bossLocation;
+	protected BossBattles Plugin;
+	private BattleBoss _boss;
+	private Hologram _hologram;
+	private ArrayList<Entity> _entities = new ArrayList<Entity>();
+
+	public BossDisplay(BossBattles plugin, BattleBoss boss, Location location)
+	{
+		Plugin = plugin;
+		_boss = boss;
+		_bossLocation = location;
+	}
+
+	@EventHandler
+	public void onEntityInteractEvent(PlayerInteractEntityEvent event)
+	{
+		if (_entities.contains(event.getRightClicked()))
+		{
+			setChosen(event.getPlayer());
+		}
+	}
+
+	public void addEntity(Entity entity)
+	{
+		_entities.add(entity);
+	}
+
+	@EventHandler
+	public void preventMovement(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+		{
+			return;
+		}
+
+		for (Entity entity : _entities)
+		{
+			Location loc = entity.getLocation();
+
+			if (loc.distance(_bossLocation) > 0.1)
+			{
+				loc = _bossLocation.clone();
+				loc.setY(entity.getLocation().getY());
+				loc.setDirection(
+						UtilAlg.getTrajectory2d(entity.getLocation(), loc));
+
+				entity.teleport(loc);
+			}
+		}
+	}
+
+	public abstract String getDisplayName();
+
+	public Location getLocation()
+	{
+		return _bossLocation;
+	}
+
+	public void setChosen(Player player)
+	{
+		Plugin.setPicked(player, _boss);
+	}
+
+	public void removeBoss()
+	{
+		for (Entity entity : _entities)
+		{
+			entity.remove();
+		}
+	}
+
+	public abstract void start();
+
+	public void spawnHologram()
+	{
+		_hologram = new Hologram(Plugin.getArcadeManager().getHologramManager(),
+				getHologramLocation(), getDisplayName());
+
+		_hologram.start();
+	}
+
+	public Hologram getHologram()
+	{
+		return _hologram;
+	}
+
+	public void removeHologram()
+	{
+		_hologram.stop();
+	}
+
+	public abstract Location getHologramLocation();
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/IronWizardDisplay.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/IronWizardDisplay.java
new file mode 100644
index 000000000..614728267
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/IronWizardDisplay.java
@@ -0,0 +1,55 @@
+package nautilus.game.arcade.game.games.bossbattles.displays;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilEnt;
+import nautilus.game.arcade.game.games.bossbattles.BattleBoss;
+import nautilus.game.arcade.game.games.bossbattles.BossBattles;
+
+import org.bukkit.Location;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+
+public class IronWizardDisplay extends BossDisplay
+{
+	private IronGolem _golem;
+
+	public IronWizardDisplay(BossBattles plugin, BattleBoss boss,
+			Location location)
+	{
+		super(plugin, boss, location);
+	}
+
+	@Override
+	public void start()
+	{
+		_golem = (IronGolem) getLocation().getWorld().spawnEntity(getLocation(),
+				EntityType.IRON_GOLEM);
+		_golem.teleport(getLocation());
+		UtilEnt.Vegetate(_golem);
+
+		addEntity(_golem);
+	}
+
+	@Override
+	public String getDisplayName()
+	{
+		return C.cGray + "Iron Wizard";
+	}
+
+	@Override
+	public Location getHologramLocation()
+	{
+		return _golem.getEyeLocation().add(0, 0.3, 0);
+	}
+
+	@Override
+	public void spawnHologram()
+	{
+		super.spawnHologram();
+
+		getHologram().setFollowEntity(_golem);
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/SlimeKingDisplay.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/SlimeKingDisplay.java
new file mode 100644
index 000000000..a2da07725
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/SlimeKingDisplay.java
@@ -0,0 +1,59 @@
+package nautilus.game.arcade.game.games.bossbattles.displays;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilEnt;
+import nautilus.game.arcade.game.games.bossbattles.BattleBoss;
+import nautilus.game.arcade.game.games.bossbattles.BossBattles;
+
+import org.bukkit.Location;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.Slime;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+
+public class SlimeKingDisplay extends BossDisplay
+{
+	private Slime _slime;
+
+	public SlimeKingDisplay(BossBattles plugin, BattleBoss boss,
+			Location location)
+	{
+		super(plugin, boss, location);
+	}
+
+	@Override
+	public void start()
+	{
+		_slime = (Slime) getLocation().getWorld().spawnEntity(getLocation(),
+				EntityType.SLIME);
+		_slime.setSize(4);
+
+		_slime.teleport(getLocation());
+
+		UtilEnt.Vegetate(_slime);
+
+		addEntity(_slime);
+	}
+
+	@Override
+	public String getDisplayName()
+	{
+		return C.cDGreen + "Slime King";
+	}
+
+	@Override
+	public void spawnHologram()
+	{
+		super.spawnHologram();
+
+		getHologram().setFollowEntity(_slime);
+	}
+
+	@Override
+	public Location getHologramLocation()
+	{
+		return _slime.getEyeLocation().add(0, 0.1, 0);
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/SnakeDisplay.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/SnakeDisplay.java
new file mode 100644
index 000000000..44a373b6f
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/SnakeDisplay.java
@@ -0,0 +1,58 @@
+package nautilus.game.arcade.game.games.bossbattles.displays;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilEnt;
+import nautilus.game.arcade.game.games.bossbattles.BattleBoss;
+import nautilus.game.arcade.game.games.bossbattles.BossBattles;
+
+import org.bukkit.Location;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.Sheep;
+import org.bukkit.entity.Slime;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+
+public class SnakeDisplay extends BossDisplay
+{
+	private Sheep _sheep;
+
+	public SnakeDisplay(BossBattles plugin, BattleBoss boss, Location location)
+	{
+		super(plugin, boss, location);
+	}
+
+	@Override
+	public void start()
+	{
+		_sheep = (Sheep) getLocation().getWorld().spawnEntity(getLocation(),
+				EntityType.SHEEP);
+
+		_sheep.teleport(getLocation());
+
+		UtilEnt.Vegetate(_sheep);
+
+		addEntity(_sheep);
+	}
+
+	@Override
+	public String getDisplayName()
+	{
+		return C.cDGreen + "SNAAAAAAAAAAAAAAAAAKE";
+	}
+
+	@Override
+	public void spawnHologram()
+	{
+		super.spawnHologram();
+
+		getHologram().setFollowEntity(_sheep);
+	}
+
+	@Override
+	public Location getHologramLocation()
+	{
+		return _sheep.getEyeLocation().add(0, 0.1, 0);
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/SpiderDisplay.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/SpiderDisplay.java
new file mode 100644
index 000000000..1afd06f6a
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/displays/SpiderDisplay.java
@@ -0,0 +1,42 @@
+package nautilus.game.arcade.game.games.bossbattles.displays;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilEnt;
+import nautilus.game.arcade.game.games.bossbattles.BattleBoss;
+import nautilus.game.arcade.game.games.bossbattles.BossBattles;
+
+public class SpiderDisplay extends BossDisplay
+{
+
+	public SpiderDisplay(BossBattles plugin, BattleBoss boss, Location location)
+	{
+		super(plugin, boss, location);
+	}
+
+	@Override
+	public String getDisplayName()
+	{
+		return C.cDBlue + "Brood Mother";
+	}
+
+	@Override
+	public void start()
+	{
+		Entity entity = getLocation().getWorld().spawnEntity(getLocation(),
+				EntityType.SPIDER);
+
+		UtilEnt.Vegetate(entity);
+		this.addEntity(entity);
+	}
+
+	@Override
+	public Location getHologramLocation()
+	{
+		return getLocation().clone().add(0, 2, 0);
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java
index 864b585b8..c6a53e65b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java
@@ -889,7 +889,7 @@ public class CastleSiege extends TeamGame
 		UtilParticle.PlayParticle(ParticleType.FIREWORKS_SPARK, event.getClickedBlock().getLocation().add(0.5, 0.5, 0.5), 0, 0, 0, 0, 1,
 				ViewDist.LONG, UtilServer.getPlayers());
 		event.getClickedBlock().getWorld().playSound(event.getClickedBlock().getLocation(), Sound.NOTE_STICKS, 2f, 1f);
-		Manager.GetBlockRestore().Add(event.getClickedBlock(), 0, (byte)0, 1000);
+		Manager.GetBlockRestore().add(event.getClickedBlock(), 0, (byte) 0, 1000);
 	}
 
 	@EventHandler
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java
index 1399f1486..209a620ab 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java
@@ -1,7 +1,9 @@
 package nautilus.game.arcade.game.games.champions;
 
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.inventory.data.Item;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.combat.DeathMessageType;
@@ -21,8 +23,11 @@ import nautilus.game.arcade.stats.ClutchStatTracker;
 import nautilus.game.arcade.stats.ElectrocutionStatTracker;
 import nautilus.game.arcade.stats.KillReasonStatTracker;
 import nautilus.game.arcade.stats.SeismicSlamStatTracker;
+import nautilus.game.arcade.stats.SpecialWinStatTracker;
 import nautilus.game.arcade.stats.TheLongestShotStatTracker;
 
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -59,6 +64,8 @@ public class ChampionsCTF extends CaptureTheFlag
 		Manager.GetDamage().UseSimpleWeaponDamage = false;
 		Manager.getCosmeticManager().setHideParticles(true);
 		
+		Manager.getClassManager().GetItemFactory().getProximityManager().setProxyLimit(6);
+		
 		this.StrictAntiHack = true;
 		
 		InventoryOpenChest = true;
@@ -76,10 +83,11 @@ public class ChampionsCTF extends CaptureTheFlag
 				new TheLongestShotStatTracker(this),
 				new SeismicSlamStatTracker(this),
 				new CapturesStatTracker(this, "Captures"),
-				new ClutchStatTracker(this, "Clutch")
+				new ClutchStatTracker(this, "Clutch"),
+				new SpecialWinStatTracker(this, "SpecialWin")
 		);
 		
-		new ChampsFixer(this);
+		new ChampionsFixes(this);
 	} 
 	
 	@Override    
@@ -140,4 +148,19 @@ public class ChampionsCTF extends CaptureTheFlag
 			}
 		}
 	}
+	
+	@EventHandler
+	public void cleanProximities(UpdateEvent event)
+	{
+		if (!IsLive())
+			return;
+		
+		if (event.getType() != UpdateType.FAST)
+			return;
+		
+		for (Location loc : getLocations(true))
+		{
+			Manager.getClassManager().GetItemFactory().getProximityManager().clean(loc, 12);
+		}
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
index ad16ae542..be521f530 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
@@ -59,6 +59,8 @@ public class ChampionsDominate extends Domination
 		Manager.GetDamage().UseSimpleWeaponDamage = false;
 		Manager.getCosmeticManager().setHideParticles(true);
 		
+		Manager.getClassManager().GetItemFactory().getProximityManager().setProxyLimit(6);
+		
 		this.StrictAntiHack = true;
 		
 		InventoryOpenChest = true;
@@ -77,7 +79,7 @@ public class ChampionsDominate extends Domination
 				new SeismicSlamStatTracker(this)
 		);
 		
-		new ChampsFixer(this);
+		new ChampionsFixes(this);
 	} 
 	  
 	@Override    
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampsFixer.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsFixes.java
similarity index 81%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampsFixer.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsFixes.java
index 4208ae91f..6fca5b150 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampsFixer.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsFixes.java
@@ -1,6 +1,9 @@
 package nautilus.game.arcade.game.games.champions;
 
+import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilServer;
+import mineplex.core.inventory.data.Item;
+import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.classcombat.Skill.Skill;
 import nautilus.game.arcade.events.GameStateChangeEvent;
@@ -9,6 +12,8 @@ import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.Game.GameState;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -18,11 +23,11 @@ import org.bukkit.event.block.BlockDamageEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryType;
 
-public class ChampsFixer implements Listener
+public class ChampionsFixes implements Listener
 {
 	private Game _host;
 	
-	public ChampsFixer(Game game)
+	public ChampionsFixes(Game game)
 	{
 		_host = game;
 		Bukkit.getPluginManager().registerEvents(this, _host.getArcadeManager().getPlugin());
@@ -34,7 +39,7 @@ public class ChampsFixer implements Listener
 		if (event.GetGame() != _host)
 			return;
 		
-		if (event.GetState() == GameState.Dead)
+		if (event.GetState() == GameState.End || event.GetState() == GameState.Dead)
 			HandlerList.unregisterAll(this);
 	}
 	
@@ -51,7 +56,7 @@ public class ChampsFixer implements Listener
 			return;
 		
 		event.setCancelled(true);
-		event.setCancelMessage("You cannot change kits while holding someone in Dwarf Toss!");
+		event.setCancelMessage("You cannot change kits while using Dwarf Toss!");
 	}
 	
 	@EventHandler(priority = EventPriority.HIGHEST)
@@ -67,11 +72,14 @@ public class ChampsFixer implements Listener
 	}
 	
 	@EventHandler
-	public void onUpdate(UpdateEvent event)
+	public void resetSkillsWhileInInventory(UpdateEvent event)
 	{
 		if (!_host.IsLive())
 			return;
 		
+		if (event.getType() != UpdateType.FAST)
+			return;
+		
 		for (Player player : UtilServer.getPlayers())
 		{
 			if (player.getOpenInventory() == null || player.getOpenInventory().getTopInventory() == null)
@@ -97,5 +105,4 @@ public class ChampsFixer implements Listener
 	{
 		event.setCancelled(true);
 	}
-
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java
index 36b48a1c6..f4cd3ea49 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java
@@ -59,6 +59,8 @@ public class ChampionsTDM extends TeamDeathmatch
 
 		this.Manager.GetDamage().UseSimpleWeaponDamage = false;
 		Manager.getCosmeticManager().setHideParticles(true);
+		
+		Manager.getClassManager().GetItemFactory().getProximityManager().setProxyLimit(6);
 
 		this.StrictAntiHack = true;
 		
@@ -77,7 +79,7 @@ public class ChampionsTDM extends TeamDeathmatch
 				new SeismicSlamStatTracker(this)
 		);
 		
-		new ChampsFixer(this);
+		new ChampionsFixes(this);
 	}       
 	
 	@Override    
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java
index c4e43e84b..d2d8dd2e8 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
 
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
@@ -85,8 +84,7 @@ public class CaptureTheFlag extends TeamGame
 	private HashMap<Player, List<ItemStack>> _hotbars = new HashMap<Player, List<ItemStack>>();
 	private HashMap<Player, ItemStack> _helmets = new HashMap<Player, ItemStack>();
 	
-	private boolean _redFlickerStage = false;
-	private boolean _blueFlickerStage = false;
+	private boolean _flickerStage = false;
 	
 	public CaptureTheFlag(ArcadeManager manager, GameType type, Kit[] kits)
 	{ 
@@ -224,8 +222,8 @@ public class CaptureTheFlag extends TeamGame
 			for (Resupply resupply : _resupply) 
 				resupply.Update();
 			
-			getFlag(true).handleBottomInfo(_redFlickerStage, ChatColor.RED);
-			getFlag(false).handleBottomInfo(_blueFlickerStage, ChatColor.AQUA);
+			getFlag(true).handleBottomInfo(_flickerStage, ChatColor.RED);
+			getFlag(false).handleBottomInfo(_flickerStage, ChatColor.AQUA);
 		}
 		else if (event.getType() == UpdateType.SEC)
 			for (Flag flag : _flags)
@@ -407,6 +405,28 @@ public class CaptureTheFlag extends TeamGame
 		return null;
 	}
 	
+	public List<Location> getLocations(boolean base)
+	{
+		List<Location> locs = new ArrayList<Location>();
+		if (base)
+		{
+			locs.add(_blueFlag);
+			locs.add(_redFlag);
+		}
+		else
+		{
+			locs.add(getFlag(true).getPlacedLocation());
+			locs.add(getFlag(false).getPlacedLocation());
+		}
+		
+		return locs;
+	}
+	
+	public int getScoreDifference()
+	{
+		return Math.abs(_blueScore - _redScore);
+	}
+	
 	@Override
 	@EventHandler
 	public void ScoreboardUpdate(UpdateEvent event)
@@ -432,22 +452,21 @@ public class CaptureTheFlag extends TeamGame
 		
 		String redMessage = "Flag Dropped";
 		if (getFlag(true).isAtHome())
-		{
 			redMessage = "Flag Safe";
-			_redFlickerStage = false;
-		}
+		
 		if (getFlag(true).getCarrier() != null)
 			redMessage = "Flag Taken";
 		
-		if (_redFlickerStage)
+		if (_flickerStage)
 		{
-			Scoreboard.Write(C.cRed + redMessage);
-			_redFlickerStage = false;
+			if (!getFlag(true).isAtHome())
+				Scoreboard.Write(C.cRed + redMessage);
+			else
+				Scoreboard.Write(redMessage);
 		}
 		else
 		{
 			Scoreboard.Write(redMessage);
-			_redFlickerStage = true;
 		}
 		//Flag in play stuff
 		
@@ -457,23 +476,27 @@ public class CaptureTheFlag extends TeamGame
 		
 		String blueMessage = "Flag Dropped";
 		if (getFlag(false).isAtHome())
-		{
 			blueMessage = "Flag Safe";
-			_blueFlickerStage = false;
-		}
-		if (getFlag(false).getCarrier() != null)
-			blueMessage = "Flag Taken";
 		
-		if (_blueFlickerStage)
+		if (getFlag(false).getCarrier() != null)
 		{
-			Scoreboard.Write(C.cAqua + blueMessage);
-			_blueFlickerStage = false;
+			blueMessage = "Flag Taken";
+		}
+		
+		if (_flickerStage)
+		{
+			if (!getFlag(false).isAtHome())
+				Scoreboard.Write(C.cAqua + blueMessage);
+			else
+				Scoreboard.Write(blueMessage);
 		}
 		else
 		{
 			Scoreboard.Write(blueMessage);
-			_blueFlickerStage = true;
 		}
+		
+		_flickerStage = !_flickerStage;
+		
 		//Flag in play stuff
 		
 		Scoreboard.WriteBlank();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/ctf_data/Flag.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/ctf_data/Flag.java
index 08417f095..2774de9e1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/ctf_data/Flag.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/ctf_data/Flag.java
@@ -275,7 +275,7 @@ public class Flag
 			loc.add(0, 1, 0);
 		
 		_flagBlock = loc.getBlock();
-		_host.getArcadeManager().getClassManager().GetSkillFactory().BlockRestore().Restore(_flagBlock);
+		_host.getArcadeManager().getClassManager().GetSkillFactory().BlockRestore().restore(_flagBlock);
 		
 		_priorBlock = loc.getBlock().getType();
 		
@@ -410,10 +410,13 @@ public class Flag
 					
 					if (!_host.isAtHome(_team.GetColor() == ChatColor.RED ? ChatColor.BLUE : ChatColor.RED))
 					{
-						if (Recharge.Instance.use(player, "No Cap Message", 1000, false, false))
-							UtilTextMiddle.display("", C.cRed + "Your flag must be at home to capture!", player);
-						
-						return;
+						if (_host.getArcadeManager().IsTournamentServer())
+						{
+							if (Recharge.Instance.use(player, "No Cap Message", 1000, false, false))
+								UtilTextMiddle.display("", C.cRed + "Your flag must be at home to capture!", player);
+							
+							return;
+						}
 					}
 					
 					_host.resetInventory(player);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java
index 11253f420..a3970305c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java
@@ -9,7 +9,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Color;
 import org.bukkit.Effect;
-import org.bukkit.FireworkEffect;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -36,21 +35,16 @@ import mineplex.core.common.util.F;
 import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilBlock;
-import mineplex.core.common.util.UtilEvent;
 import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilFirework;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilTime;
-import mineplex.core.data.BlockData;
+import mineplex.core.common.block.BlockData;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
-import mineplex.minecraft.game.core.combat.CombatComponent;
-import mineplex.minecraft.game.core.combat.CombatDamage;
-import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
@@ -588,7 +582,7 @@ public class DragonEscape extends SoloGame
 		
 		_tunneled.put(new BlockData(event.getBlock()), player);
 	
-		Manager.GetBlockRestore().Add(event.getBlock(), 0, (byte)0, 2400);
+		Manager.GetBlockRestore().add(event.getBlock(), 0, (byte) 0, 2400);
 
 		UtilInv.remove(player, Material.DIAMOND_PICKAXE, (byte)0, 1);
 	}
@@ -599,8 +593,8 @@ public class DragonEscape extends SoloGame
 		if (event.isCancelled())
 			return;
 				
-		Manager.GetBlockRestore().Add(event.getBlock(), 
-				event.getPlayer().getItemInHand().getType().getId(), event.getPlayer().getItemInHand().getData().getData(), 
+		Manager.GetBlockRestore().add(event.getBlock(),
+				event.getPlayer().getItemInHand().getType().getId(), event.getPlayer().getItemInHand().getData().getData(),
 				event.getBlockReplacedState().getTypeId(), event.getBlockReplacedState().getRawData(), 2400);
 	}
 	
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
index 487202f0c..dd31d4703 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
@@ -1247,7 +1247,7 @@ public class EventModule extends MiniPlugin
 			for (int i = 0 ; i < count ; i++)
 			{
 				Manager.GetGame().CreatureAllowOverride = true;
-				entSet.add(Manager.GetCreature().SpawnEntity(caller.getTargetBlock((HashSet<Byte>)null, 0).getLocation().add(0.5, 1, 0.5), type));
+				entSet.add(Manager.GetCreature().SpawnEntity(caller.getTargetBlock((HashSet<Byte>)null, 150).getLocation().add(0.5, 1, 0.5), type));
 				Manager.GetGame().CreatureAllowOverride = false;
 			}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkBlockTossEVO.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkBlockTossEVO.java
index ff3419b10..e1d90d398 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkBlockTossEVO.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkBlockTossEVO.java
@@ -90,7 +90,7 @@ public class PerkBlockTossEVO extends Perk implements IThrown
 		if (UtilBlock.usable(grab))
 			return;
 
-		if (!UtilBlock.airFoliage(grab.getRelative(BlockFace.UP)) || Manager.GetBlockRestore().Contains(grab.getRelative(BlockFace.UP)))
+		if (!UtilBlock.airFoliage(grab.getRelative(BlockFace.UP)) || Manager.GetBlockRestore().contains(grab.getRelative(BlockFace.UP)))
 		{
 			UtilPlayer.message(player, F.main("Game", "You may not pick up that block!"));
 			return;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkFlamingSwordEVO.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkFlamingSwordEVO.java
index 8f38ff279..6db08334c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkFlamingSwordEVO.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkFlamingSwordEVO.java
@@ -129,7 +129,7 @@ public class PerkFlamingSwordEVO extends Perk
 	{
 		//Fire
 		Item fire = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.BLAZE_POWDER));
-		Manager.GetFire().Add(fire, player, 0.7, 0, 0.5, 1, "Inferno");
+		Manager.GetFire().Add(fire, player, 0.7, 0, 0.5, 1, "Inferno", false);
 
 		fire.teleport(player.getEyeLocation());
 		double x = 0.07 - (UtilMath.r(14)/100d);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkWebEVO.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkWebEVO.java
index 03aeaa0d8..a1ef621a3 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkWebEVO.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkWebEVO.java
@@ -119,6 +119,6 @@ public class PerkWebEVO extends Perk implements IThrown
 		if (loc.getBlock().getType() != Material.AIR)
 			return;
 		
-		Manager.GetBlockRestore().Add(loc.getBlock(), 30, (byte)0, 4000);
+		Manager.GetBlockRestore().add(loc.getBlock(), 30, (byte)0, 4000);
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
index d4a083d94..2906a56e7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 
+import mineplex.core.common.CurrencyType;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilBlock;
@@ -427,7 +428,7 @@ public class Halloween extends SoloGame
 					if (!player.isOnline())
 						continue;
 					
-					Manager.GetDonation().PurchaseUnknownSalesPackage(null, player.getName(), Manager.GetClients().Get(player).getAccountId(), "Decrepit Warhorse", false, 0, true);
+					Manager.GetDonation().PurchaseUnknownSalesPackage(null, player.getName(), Manager.GetClients().Get(player).getAccountId(), "Decrepit Warhorse", CurrencyType.Coins, 0, true);
 				}
 			}
 			
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/waves/WaveBase.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/waves/WaveBase.java
index 13d88b358..3a8a07c4a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/waves/WaveBase.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/waves/WaveBase.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
@@ -15,7 +14,6 @@ import nautilus.game.arcade.game.games.halloween.HalloweenAudio;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilBlockText;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilTextMiddle;
 
@@ -104,18 +102,18 @@ public abstract class WaveBase
 		
 		//Beacon
 		Block block = total.toLocation(locs.get(0).getWorld()).getBlock().getRelative(BlockFace.DOWN);
-		Host.Manager.GetBlockRestore().Add(block, 138, (byte)0, _duration);
+		Host.Manager.GetBlockRestore().add(block, 138, (byte) 0, _duration);
 		
 		for (int x=-1 ; x<=1 ; x++)
 			for (int z=-1 ; z<=1 ; z++)
-				Host.Manager.GetBlockRestore().Add(block.getRelative(x, -1, z), 42, (byte)0, _duration);
+				Host.Manager.GetBlockRestore().add(block.getRelative(x, -1, z), 42, (byte) 0, _duration);
 		
 		//Clear Laser
 		while (block.getY() < 250)
 		{
 			block = block.getRelative(BlockFace.UP);
 			if (block.getType() != Material.AIR)
-				Host.Manager.GetBlockRestore().Add(block, 0, (byte)0, _duration);
+				Host.Manager.GetBlockRestore().add(block, 0, (byte) 0, _duration);
 		}
 	}
 	
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
index 093077d5c..1024a5338 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
@@ -116,6 +116,10 @@ import net.minecraft.server.v1_8_R3.EntityArrow;
 
 public class MineStrike extends TeamGame
 {
+	public static float RECOIL = 0.8f;
+	public static float CONE = 0.7f;
+	public static float MOVE_PENALTY = 0.8f;
+	
 	public static class PlayerHeadshotEvent extends PlayerEvent
 	{
 		private static final HandlerList handlers = new HandlerList();
@@ -207,10 +211,12 @@ public class MineStrike extends TeamGame
 	private HashSet<Entity> _defusalDropped = new HashSet<Entity>();
 
 	private HashMap<Location, Long> _incendiary = new HashMap<Location, Long>();
+	private HashMap<Block, Long> _smokeBlocks = new HashMap<Block, Long>();
 
 	private Bomb _bomb = null;
 	private Item _bombItem = null;
 	private Player _bombHolder = null;
+	private long _bombHolderLastMove = 0;
 
 	private Player _bombPlanter;
 	private Player _bombDefuser;
@@ -261,6 +267,8 @@ public class MineStrike extends TeamGame
 
 		this.ItemDrop = true;
 
+		this.DeathTeleport = false;
+		
 		this.InventoryClick = true;
 
 		this.JoinInProgress = true;
@@ -280,7 +288,7 @@ public class MineStrike extends TeamGame
 				"Sprinting heavily decreases accuracy",
 				"Jumping massively decreases accuracy",
 				"Crouching increases accuracy",
-				"Left-Click to roll Grenades",
+				"Left-Click to drop Grenades",
 				"Right-Click to throw Grenades",
 				"Burst Fire for greater accuracy",
 				"Sniper Rifles are only accurate while scoped",
@@ -356,7 +364,7 @@ public class MineStrike extends TeamGame
 				event.getPlayer().getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.IRON_AXE, (byte)0, 1, "Knife"));	
 
 				//Armor
-				giveTeamArmor(event.getPlayer(), Color.fromRGB(255, 0, 0));
+				giveTeamArmor(event.getPlayer(), Color.fromRGB(255, 75, 75));
 			}
 		}
 		else if (team.GetColor() == ChatColor.AQUA)
@@ -369,10 +377,10 @@ public class MineStrike extends TeamGame
 				gun.giveToPlayer(event.getPlayer(), true);
 
 				//Knife
-				event.getPlayer().getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.IRON_SWORD, (byte)0, 1, "Knife"));
+				event.getPlayer().getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.IRON_AXE, (byte)0, 1, "Knife"));
 
 				//Armor
-				giveTeamArmor(event.getPlayer(), Color.fromRGB(0, 0, 255));
+				giveTeamArmor(event.getPlayer(), Color.fromRGB(125, 200, 255));
 			}
 		}
 
@@ -385,6 +393,8 @@ public class MineStrike extends TeamGame
 	{
 		//Dont Get Hit By Bullets
 		((CraftPlayer) event.getEntity()).getHandle().spectating = true;
+		
+		Manager.GetCondition().Factory().Blind("Ghost", event.getEntity(), event.getEntity(), 2.5, 0, false, false, false);
 	}
 
 //	public void disguiseSneak(Player player, GameTeam team)
@@ -530,6 +540,7 @@ public class MineStrike extends TeamGame
 
 		player.playSound(player.getLocation(), Sound.NOTE_PLING, 1f, 2f);
 		_bombHolder = player;
+		_bombHolderLastMove = System.currentTimeMillis();
 
 		if (_bombItem != null)
 		{
@@ -602,6 +613,17 @@ public class MineStrike extends TeamGame
 	{
 		_incendiary.put(loc, endTime);
 	}
+	
+	@SuppressWarnings("deprecation")
+	public void registerSmokeBlock(Block block, long endTime)
+	{
+		if (block.getType() == Material.AIR || block.getType() == Material.PORTAL || block.getType() == Material.FIRE)
+		{
+			block.setTypeIdAndData(90, (byte)UtilMath.r(2), false);
+			
+			_smokeBlocks.put(block, endTime);
+		}
+	}
 
 	public Gun getGunInHand(Player player, ItemStack overrideStack)
 	{
@@ -717,6 +739,12 @@ public class MineStrike extends TeamGame
 	
 		if (grenade == null)
 			return;
+		
+		if (!UtilTime.elapsed(GetStateTime(), 10000))
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot throw Grenades yet."));
+			return;
+		}
 
 		grenade.throwGrenade(event.getPlayer(), UtilEvent.isAction(event, ActionType.L), this);
 		event.setCancelled(true);
@@ -1217,8 +1245,6 @@ public class MineStrike extends TeamGame
 
 						//Effect
 						damagee.getWorld().playSound(damagee.getLocation(), Sound.IRONGOLEM_DEATH, 1f, 1f);	
-
-						event.SetKnockback(false);
 					}
 					//Standard
 					else
@@ -1227,9 +1253,9 @@ public class MineStrike extends TeamGame
 						event.AddMod(damager.getName(), "Knife", 6 - event.GetDamage(), false);
 
 						event.GetDamageeEntity().getWorld().playSound(event.GetDamageeEntity().getLocation(), Sound.BAT_HURT, 1f, 1f);
-
-						event.AddKnockback("Knife", 1.2);
 					}
+					
+					event.SetKnockback(false);
 				}
 			}
 
@@ -1291,12 +1317,11 @@ public class MineStrike extends TeamGame
 			if (Armor.isArmor(event.GetDamageePlayer().getInventory().getHelmet()) || 
 					(_scoped.containsKey(event.GetDamageePlayer()) && UtilGear.isMat(_scoped.get(event.GetDamageePlayer()), Material.LEATHER_HELMET)))
 			{
-				event.AddMod(event.GetDamageePlayer().getName(), "Helmet", -damage*1, false);
+				event.AddMod(event.GetDamageePlayer().getName(), "Helmet", -damage*0.5, false);
 				event.GetDamageePlayer().getWorld().playSound(event.GetDamageePlayer().getEyeLocation(), Sound.SPIDER_DEATH, 1f, 1f);
 			}
 			else
 			{
-
 				event.GetDamageePlayer().getWorld().playSound(event.GetDamageePlayer().getEyeLocation(), Sound.SLIME_ATTACK, 1f, 1f);
 			}
 		}
@@ -1368,16 +1393,16 @@ public class MineStrike extends TeamGame
 
 	public boolean hitBody(Player player, Location loc)
 	{
-		return UtilMath.offset2d(loc, player.getLocation()) < 0.6 &&	//0.6 is ideal
-				loc.getY() > player.getLocation().getY() &&
-				loc.getY() < player.getEyeLocation().getY() - 0.1;
+		return UtilMath.offset2d(loc, player.getLocation()) < 0.6 &&	
+				loc.getY() >= player.getLocation().getY() &&
+				loc.getY() <= player.getEyeLocation().getY();
 	}
 
 	public boolean hitHead(Player player, Location loc)
 	{
-		return UtilMath.offset2d(loc, player.getLocation()) < 0.2 &&	//0.3 was old value, too large
-				loc.getY() >= player.getEyeLocation().getY() - 0.1 &&
-				loc.getY() < player.getEyeLocation().getY() + 0.1;		//0.2 was old value, too large
+		return UtilMath.offset2d(loc, player.getLocation()) < 0.2 &&	
+				loc.getY() >= player.getEyeLocation().getY() + 0.0 &&
+				loc.getY() < player.getEyeLocation().getY() + 0.2;		
 	}
 
 
@@ -1404,6 +1429,9 @@ public class MineStrike extends TeamGame
 			if (event.GetLog().GetLastDamager().GetReason().contains("AWP"))
 				amount = 100;
 
+			else if (event.GetLog().GetLastDamager().GetReason().contains("PP-Bizon"))
+				amount = 600;
+			
 			else if (event.GetLog().GetLastDamager().GetReason().contains("Nova"))
 				amount = 900;
 
@@ -1476,14 +1504,6 @@ public class MineStrike extends TeamGame
 			UtilParticle.PlayParticle(ParticleType.CRIT, grenadeItem.getLocation(), 0, 0, 0, 0, 1,
 					ViewDist.NORMAL, UtilServer.getPlayers());
 
-			//Expired
-			if (!grenadeItem.isValid() || grenadeItem.getTicksLived() > 400)
-			{
-				grenadeItem.remove();
-				grenadeIterator.remove();
-				continue;
-			}
-
 			//Completed
 			Grenade grenade = _grenadesThrown.get(grenadeItem);
 			if (grenade.update(this, grenadeItem))
@@ -1601,7 +1621,7 @@ public class MineStrike extends TeamGame
 		_bombPlanter.setExp(Math.min(_bombPlanter.getExp() + 0.017f, 0.99999f));
 
 		if (Math.random() > 0.90)
-			_bombPlanter.getWorld().playSound(_bombPlanter.getLocation(), Sound.NOTE_PLING, 1f, 3f);
+			_bombPlanter.getWorld().playSound(_bombPlanter.getLocation(), Sound.NOTE_PLING, 2f, 3f);
 
 		UtilTextMiddle.display(C.cRed + C.Bold + "Planting Bomb", UtilTextMiddle.progress(_bombPlanter.getExp()), 0, 10, 0, _bombPlanter);
 
@@ -1655,11 +1675,15 @@ public class MineStrike extends TeamGame
 	{
 		for (Player player : GetTeam(ChatColor.AQUA).GetPlayers(true))
 		{
-			Block block = player.getTargetBlock((HashSet<Byte>) null, 5);
+			HashSet<Material> ignoreBlocks = new HashSet<Material>();
+			ignoreBlocks.add(Material.AIR);
+			ignoreBlocks.add(Material.PORTAL);
+			
+			Block block = player.getTargetBlock(ignoreBlocks, 5);
 
 			if (block == null || !_bomb.isBlock(block))
 				continue;
-
+	
 			if (UtilMath.offset(player.getLocation(), block.getLocation().add(0.5, 0, 0.5)) > 3)
 				continue;
 
@@ -1700,15 +1724,19 @@ public class MineStrike extends TeamGame
 		if (_bombDefuser == null)
 			return;
 
-		Block block = _bombDefuser.getTargetBlock((HashSet<Byte>) null, 5);
-
+		HashSet<Material> ignoreBlocks = new HashSet<Material>();
+		ignoreBlocks.add(Material.AIR);
+		ignoreBlocks.add(Material.PORTAL);
+		
+		Block block = _bombDefuser.getTargetBlock(ignoreBlocks, 5);
+		
 		if (!IsAlive(_bombDefuser) || block == null || !_bomb.isBlock(block)  || !_bombDefuser.isOnline() || UtilMath.offset(_bombDefuser.getLocation(), block.getLocation().add(0.5, 0, 0.5)) > 3)
 		{
 			_bombDefuser.setExp(0f);
-			_bombDefuser = null;
+			_bombDefuser = null;			
 			return;
 		}
-
+		
 		//Kit or Not?
 		float defuseRate = 0.005f;
 		if (UtilGear.isMat(_bombDefuser.getInventory().getItem(8), Material.SHEARS))
@@ -2146,7 +2174,12 @@ public class MineStrike extends TeamGame
 
 		//Incendiary
 		_incendiary.clear();
-		Manager.GetBlockRestore().RestoreAll();
+		Manager.GetBlockRestore().restoreAll();
+
+		//Smoke
+		for (Block block : _smokeBlocks.keySet())
+			block.setType(Material.AIR);
+		_smokeBlocks.clear();
 
 		//Restock Ammo
 		for (Gun gun : _gunsEquipped.keySet())
@@ -2398,6 +2431,47 @@ public class MineStrike extends TeamGame
 				loc.getWorld().playSound(loc, Sound.PIG_DEATH, 1f, 1f);
 		}
 	}
+	
+	@EventHandler
+	public void gunUpdate(UpdateEvent event)
+	{
+		if (!IsLive())
+			return;
+		
+		if (event.getType() != UpdateType.TICK)
+			return;
+		
+		for (Gun gun : _gunsEquipped.keySet())
+		{
+			gun.displayAmmo(_gunsEquipped.get(gun));
+		}	
+	}
+	
+	@EventHandler
+	public void smokeUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		Iterator<Block> smokeIterator = _smokeBlocks.keySet().iterator();
+
+		while (smokeIterator.hasNext())
+		{
+			Block block = smokeIterator.next();
+
+			if (System.currentTimeMillis() > _smokeBlocks.get(block))
+			{
+				if (block.getType() == Material.PORTAL)
+					block.setTypeIdAndData(0, (byte)0, false);
+				
+				smokeIterator.remove();
+			}
+			else if (block.getType() == Material.AIR)
+			{
+				block.setTypeIdAndData(90, (byte)UtilMath.r(2), false);
+			}
+		}
+	}
 
 	@EventHandler
 	public void bombBurnUpdate(UpdateEvent event)
@@ -2706,7 +2780,7 @@ public class MineStrike extends TeamGame
 	public void fireDamage(CustomDamageEvent event)
 	{
 		if (event.GetCause() == DamageCause.FIRE)
-			event.AddMod(this.GetName(), "Fire", 3, false);
+			event.AddMod(this.GetName(), "Fire", 1, false);
 	}
 
 	@EventHandler
@@ -2758,6 +2832,48 @@ public class MineStrike extends TeamGame
 			_shopManager.addMoney(event.getPlayer(), 16000, "Debug");
 			event.setCancelled(true);
 		}
+		
+		if (event.getMessage().contains("recoil"))
+		{
+			try
+			{
+				MineStrike.RECOIL = Float.parseFloat(event.getMessage().split(" ")[1]);
+				this.Announce(C.cPurple + C.Bold + "Recoil Bloom: " + ChatColor.RESET + (int)(MineStrike.RECOIL * 100) + "%");
+			}
+			catch (Exception e)
+			{
+				
+			}
+			event.setCancelled(true);
+		}
+		
+		if (event.getMessage().contains("cone"))
+		{
+			try
+			{
+				MineStrike.CONE = Float.parseFloat(event.getMessage().split(" ")[1]);
+				this.Announce(C.cPurple + C.Bold + "Cone of Fire: " + ChatColor.RESET + (int)(MineStrike.CONE * 100) + "%");
+			}
+			catch (Exception e)
+			{
+				
+			}
+			event.setCancelled(true);
+		}
+		
+		if (event.getMessage().contains("move"))
+		{
+			try
+			{
+				MineStrike.MOVE_PENALTY = Float.parseFloat(event.getMessage().split(" ")[1]);
+				this.Announce(C.cPurple + C.Bold + "Move/Sprint/Jump Penalties: " + ChatColor.RESET + (int)(MineStrike.MOVE_PENALTY * 100) + "%");
+			}
+			catch (Exception e)
+			{
+				
+			}
+			event.setCancelled(true);
+		}
 
 		if (event.getMessage().contains("instant"))
 		{
@@ -2882,4 +2998,126 @@ public class MineStrike extends TeamGame
 			}
 		}
 	}
+	
+	@EventHandler
+	public void bombMove(PlayerMoveEvent event)
+	{
+		if (_bombHolder == null || !event.getPlayer().equals(_bombHolder))
+			return;
+		
+		_bombHolderLastMove = System.currentTimeMillis();
+	}
+	
+	@EventHandler
+	public void bombTimeDrop(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+		
+		if (_freezeTime > 0)
+			_bombHolderLastMove = System.currentTimeMillis();
+		
+		if (_bombHolder != null && UtilTime.elapsed(_bombHolderLastMove, 10000))
+		{
+			_bombHolder.getInventory().remove(Material.GOLD_SWORD);
+						
+			Vector vel = new Vector(Math.random() - 0.5, 0, Math.random() - 0.5);
+			vel.normalize();
+			vel.multiply(0.3);
+			vel.setY(0.2);
+			
+			_bombItem = _bombHolder.getWorld().dropItem(_bombHolder.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte)0, 1, C.cGold + C.Bold + "C4 Explosive"));
+			_bombItem.setVelocity(vel);
+			_bombItem.setPickupDelay(60);
+
+			//Radio
+			playSound(Radio.T_BOMB_DROP, null, GetTeam(_bombHolder));
+			
+			_bombHolder = null;
+		}
+	}
+	
+	@Override
+	public Location GetSpectatorLocation()
+	{
+		if (SpectatorSpawn != null)
+			return SpectatorSpawn;
+
+		Vector vec = new Vector(0, 0, 0);
+		double count = 0;
+
+		for (GameTeam team : this.GetTeamList())
+		{
+			for (Location spawn : team.GetSpawns())
+			{
+				count++;
+				vec.add(spawn.toVector());
+			}
+		}
+
+		SpectatorSpawn = new Location(this.WorldData.World, 0, 0, 0);
+
+		vec.multiply(1d / count);
+
+		SpectatorSpawn.setX(vec.getX());
+		SpectatorSpawn.setY(vec.getY() + 50); //ADD 50
+		SpectatorSpawn.setZ(vec.getZ());
+		
+		// Move Up - Out Of Blocks
+		while (!UtilBlock.airFoliage(SpectatorSpawn.getBlock())
+				|| !UtilBlock.airFoliage(SpectatorSpawn.getBlock().getRelative(BlockFace.UP)))
+		{
+			SpectatorSpawn.add(0, 1, 0);
+		}
+
+		int Up = 0;
+
+		// Move Up - Through Air
+		for (int i = 0; i < 15; i++)
+		{
+			if (UtilBlock.airFoliage(SpectatorSpawn.getBlock().getRelative(BlockFace.UP)))
+			{
+				SpectatorSpawn.add(0, 1, 0);
+				Up++;
+			}
+			else
+			{
+				break;
+			}
+		}
+
+		// Move Down - Out Of Blocks
+		while (Up > 0 && !UtilBlock.airFoliage(SpectatorSpawn.getBlock())
+				|| !UtilBlock.airFoliage(SpectatorSpawn.getBlock().getRelative(BlockFace.UP)))
+		{
+			SpectatorSpawn.subtract(0, 1, 0);
+			Up--;
+		}
+
+		SpectatorSpawn = SpectatorSpawn.getBlock().getLocation().add(0.5, 0.1, 0.5);
+
+		while (SpectatorSpawn.getBlock().getTypeId() != 0 || SpectatorSpawn.getBlock().getRelative(BlockFace.UP).getTypeId() != 0)
+			SpectatorSpawn.add(0, 1, 0);
+
+		return SpectatorSpawn;
+	}
+	
+	@EventHandler
+	public void enableScpResPack(PlayerCommandPreprocessEvent event)
+	{
+		if (event.getMessage().equalsIgnoreCase("/rpoff"))
+		{
+			event.getPlayer().setResourcePack("http://file.mineplex.com/ResReset.zip");
+			
+			UtilPlayer.message(event.getPlayer(), F.main("Resource Pack", "Resource Pack: " + C.cRed + "Disabled"));
+			UtilPlayer.message(event.getPlayer(), F.main("Resource Pack", "Type " + F.elem("/rpon") + " to enable."));
+		}
+		else if (event.getMessage().equalsIgnoreCase("/rpon"))
+		{
+			event.getPlayer().setResourcePack(GetType().getResourcePackUrl());
+			
+			UtilPlayer.message(event.getPlayer(), F.main("Resource Pack", "Resource Pack: " + C.cGreen + "Enabled"));
+			UtilPlayer.message(event.getPlayer(), F.main("Resource Pack", "Type " + F.elem("/rpoff") + " to disable."));
+		}
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/ShopManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/ShopManager.java
index f6bb986f3..a7aab38ff 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/ShopManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/ShopManager.java
@@ -236,14 +236,15 @@ public class ShopManager
 			Host.registerGrenade(grenade, player);
 		}
 
+		//Use 250 instead of 255, to show that its kevlar/helmet
 		else if (item instanceof Helmet)
 		{
-			((Helmet)item).giveToPlayer(player, (team.GetColor() == ChatColor.RED) ? Color.fromRGB(100, 0, 0) : Color.fromRGB(0, 0, 100));
+			((Helmet)item).giveToPlayer(player, (team.GetColor() == ChatColor.RED) ? Color.fromRGB(250, 75, 75) : Color.fromRGB(125, 200, 250));
 		}
 
 		else if (item instanceof Kevlar)
 		{
-			((Kevlar)item).giveToPlayer(player, (team.GetColor() == ChatColor.RED) ? Color.fromRGB(100, 0, 0) : Color.fromRGB(0, 0, 100));
+			((Kevlar)item).giveToPlayer(player, (team.GetColor() == ChatColor.RED) ? Color.fromRGB(250, 75, 75) : Color.fromRGB(125, 200, 250));
 		}
 
 		else if (item instanceof DefusalKit)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/data/Bomb.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/data/Bomb.java
index 65dee38f0..a22be532f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/data/Bomb.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/data/Bomb.java
@@ -34,10 +34,18 @@ public class Bomb
 		
 		Block = planter.getLocation().getBlock();
 		
-		Type = Block.getType();
-		Data = Block.getData();
+		if (Block.getType() != Material.PORTAL)
+		{
+			Type = Block.getType();
+			Data = Block.getData();
+		}
+		else
+		{
+			Type = Material.AIR;
+			Data = 0;
+		}
 		
-		Block.setType(Material.DAYLIGHT_DETECTOR);
+		Block.setTypeIdAndData(Material.DAYLIGHT_DETECTOR.getId(), (byte)0, false);
 		
 		StartTime = System.currentTimeMillis();
 	}
@@ -45,7 +53,7 @@ public class Bomb
 	public boolean update()
 	{
 		if (Block.getType() != Material.DAYLIGHT_DETECTOR)
-			Block.setType(Material.DAYLIGHT_DETECTOR);
+			Block.setTypeIdAndData(Material.DAYLIGHT_DETECTOR.getId(), (byte)0, false);
 		
 		double scale = (double)(System.currentTimeMillis() - StartTime)/(double)BombTime;
 		
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Armor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Armor.java
index 275062ce9..02a40771a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Armor.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/equipment/armor/Armor.java
@@ -54,7 +54,7 @@ public class Armor extends StrikeItem
 		try
 		{
 			LeatherArmorMeta meta = (LeatherArmorMeta)stack.getItemMeta();
-			return (meta.getColor().getBlue() == 100 || meta.getColor().getRed() == 100);
+			return (meta.getColor().getBlue() == 250 || meta.getColor().getRed() == 250);
 		}
 		catch (Exception e)
 		{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
index 9558b55f9..493d836ba 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
@@ -74,6 +74,19 @@ public abstract class FireGrenadeBase extends Grenade
 			if (!UtilBlock.solid(block.getRelative(BlockFace.DOWN)))
 				continue;
 			
+			//Smoke
+			boolean nearSmoke = false;
+			for (Block other : UtilBlock.getSurrounding(block, false))
+			{
+				if (other.getType() == Material.PORTAL)
+				{
+					nearSmoke = true;
+					break;
+				}
+			}
+			if (nearSmoke)
+				continue;
+			
 			UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(game.Manager.getPlugin(), new Runnable()
 			{
 				public void run()
@@ -81,10 +94,10 @@ public abstract class FireGrenadeBase extends Grenade
 					if (round == game.getRound() && !game.isFreezeTime())
 					{
 						double time = _baseTime + blocks.get(block) * _baseTime;
-						game.Manager.GetBlockRestore().Add(block, 51, (byte)0, (long) time);
-					}
+						game.Manager.GetBlockRestore().add(block, 51, (byte)0, (long) time);
 				}
-			}, 60 - (int)(60d * blocks.get(block)));
+				}
+			}, 30 - (int)(30d * blocks.get(block)));
 		}
 		
 		//Initial Burn Sound
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FlashBang.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FlashBang.java
index 33e041f9e..21c4d3dab 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FlashBang.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FlashBang.java
@@ -7,6 +7,7 @@ import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilFirework;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTime;
 import nautilus.game.arcade.game.GameTeam;
 import nautilus.game.arcade.game.games.minestrike.MineStrike;
 import nautilus.game.arcade.game.games.minestrike.Radio;
@@ -34,7 +35,7 @@ public class FlashBang extends Grenade
 	@Override
 	public boolean updateCustom(MineStrike game, Entity ent)
 	{
-		if (ent.getTicksLived() > 40)
+		if (UtilTime.elapsed(_throwTime, 2000))
 		{
 			FireworkEffect effect = FireworkEffect.builder().flicker(true).withColor(Color.WHITE).with(Type.BALL_LARGE).trail(false).build();
 			UtilFirework.playFirework(ent.getLocation().add(0, 0.5, 0), effect);
@@ -46,7 +47,7 @@ public class FlashBang extends Grenade
 					continue;
 				
 				//Line of Sight
-				Location loc = player.getEyeLocation();
+				Location loc = player.getEyeLocation(); 
 				
 				boolean sight = true;
 				while (UtilMath.offset(loc, ent.getLocation()) > 0.5)
@@ -68,8 +69,8 @@ public class FlashBang extends Grenade
 				double flashIntensity = 2 - UtilMath.offset(player.getEyeLocation().add(player.getLocation().getDirection()), eyeToGrenade);
 				
 				//Duration
-				double duration = (2 + (3 * (players.get(player)))) * flashIntensity;
-				duration += 1;
+				double duration = (2 + (2 * (players.get(player)))) * flashIntensity;
+				duration = (Math.min(5, duration));
 		
 				//Blind
 				game.Manager.GetCondition().Factory().Blind(getName(), player, _thrower, duration, 0, false, false, false);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Grenade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Grenade.java
index 595c303ea..f8110807b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Grenade.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Grenade.java
@@ -19,6 +19,7 @@ import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTime;
 import nautilus.game.arcade.game.games.minestrike.MineStrike;
 import nautilus.game.arcade.game.games.minestrike.items.StrikeItem;
 import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType;
@@ -75,6 +76,8 @@ public abstract class Grenade extends StrikeItem
 	
 	protected int _limit;
 	
+	protected long _throwTime = 0;
+	
 	public Grenade(String name, String[] desc, int cost, int gemCost, Material skin, int limit)
 	{
 		super(StrikeItemType.GRENADE, name, desc, cost, gemCost, skin);
@@ -87,7 +90,7 @@ public abstract class Grenade extends StrikeItem
 		int alreadyHas = 0;
 		int bestSlot = -1;
 		
-		for (int i = 3 ; i < 7 ; i++)
+		for (int i = 6 ; i >= 3 ; i--)
 		{
 			if (UtilInv.IsItem(player.getInventory().getItem(i), getSkin(), (byte) -1))
 				alreadyHas++;
@@ -154,14 +157,19 @@ public abstract class Grenade extends StrikeItem
 		
 		//Sound
 		playSound(game, player);
+		
+		_throwTime = System.currentTimeMillis();
 	}
 	
 	public boolean update(MineStrike game, Entity ent)
 	{
-		//Invalid
-		if (!ent.isValid())
+		if (UtilTime.elapsed(_throwTime, 20000))
 			return true;
 		
+		//Invalid (Burned)
+		if (!ent.isValid())
+			return updateCustom(game, ent);
+		
 		//Rebound Off Blocks
 		rebound(ent);
 		
@@ -174,9 +182,14 @@ public abstract class Grenade extends StrikeItem
 	
 	public void rebound(Entity ent)
 	{
-		if (UtilEnt.isGrounded(ent) || ent.getVelocity().length() < 0.1 || ent.getTicksLived() < 4)
+		if (UtilEnt.isGrounded(ent) || ent.getVelocity().length() < 0.1 || !UtilTime.elapsed(_throwTime, 200))
 			return;
 		
+		if (Math.abs(_vel.getX()) < 0.1 && Math.abs(_vel.getX()) < 0.1)
+		{
+			return;
+		}
+		
 		/*
 		 * What we must do here, is record the velocity every tick. 
 		 * Then when it collides, we get the velocity from a few ticks before and apply it, reversing the direction of collision.
@@ -184,8 +197,8 @@ public abstract class Grenade extends StrikeItem
 		 */
 		
 		//X Rebound
-		if ((_vel.getX() > 0.05 && ent.getLocation().getX() - _lastLoc.getX() <= 0) ||
-			(_vel.getX() < 0.05 && ent.getLocation().getX() - _lastLoc.getX() >= 0))
+		if ((_vel.getX() > 0.1 && ent.getLocation().getX() - _lastLoc.getX() <= 0) ||
+			(_vel.getX() < 0.1 && ent.getLocation().getX() - _lastLoc.getX() >= 0))
 		{
 			_vel = _velHistory.get(0);
 			_vel.setX(-_vel.getX());
@@ -197,8 +210,8 @@ public abstract class Grenade extends StrikeItem
 		}
 		
 		//Z Rebound
-		else if ((_vel.getZ() > 0.05 && ent.getLocation().getZ() - _lastLoc.getZ() <= 0) ||
-				 (_vel.getZ() < 0.05 && ent.getLocation().getZ() - _lastLoc.getZ() >= 0))
+		else if ((_vel.getZ() > 0.1 && ent.getLocation().getZ() - _lastLoc.getZ() <= 0) ||
+				 (_vel.getZ() < 0.1 && ent.getLocation().getZ() - _lastLoc.getZ() >= 0))
 		{
 			_vel = _velHistory.get(0);
 			_vel.setZ(-_vel.getZ());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java
index cf422687b..02c7b7300 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/HighExplosive.java
@@ -6,6 +6,7 @@ import java.util.List;
 
 import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.core.common.util.UtilPlayer;
@@ -35,7 +36,7 @@ public class HighExplosive extends Grenade
 	@Override
 	public boolean updateCustom(MineStrike game, Entity ent)
 	{
-		if (ent.getTicksLived() > 40)
+		if (UtilTime.elapsed(_throwTime, 2000))
 		{
 			UtilParticle.PlayParticle(ParticleType.HUGE_EXPLOSION,
 					ent.getLocation(), 0, 0, 0, 0, 1,
@@ -43,7 +44,7 @@ public class HighExplosive extends Grenade
 			ent.getWorld().playSound(ent.getLocation(),
 					Sound.EXPLODE, 3f, 0.8f);
 
-			HashMap<Player, Double> players = UtilPlayer.getInRadius(ent.getLocation(), 10);
+			HashMap<Player, Double> players = UtilPlayer.getInRadius(ent.getLocation(), 9);
 			List<Player> damagedPlayers = new ArrayList<>();
 			for (Player player : players.keySet())
 			{
@@ -51,7 +52,7 @@ public class HighExplosive extends Grenade
 					continue;
 				
 				// Damage Event
-				game.Manager.GetDamage().NewDamageEvent(player, _thrower, null,
+				game.Manager.GetDamage().NewDamageEvent(player, _thrower, null, ent.getLocation(),
 						DamageCause.CUSTOM, 1 + (players.get(player) * 18),
 						true, true, false, _thrower.getName(), getName());
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
index 1857f7a30..dbbd4dddb 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
@@ -1,7 +1,12 @@
 package nautilus.game.arcade.game.games.minestrike.items.grenades;
 
+import java.util.HashMap;
+
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
 import nautilus.game.arcade.game.GameTeam;
@@ -12,11 +17,15 @@ import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 public class Smoke extends Grenade
 {
+	private boolean _createdBlocks = false;
+	
 	public Smoke()
 	{
 		super("Smoke",  new String[] 
@@ -27,24 +36,62 @@ public class Smoke extends Grenade
 	}
 
 	@Override
-	public boolean updateCustom(MineStrike game, Entity ent)
+	public boolean updateCustom(final MineStrike game, Entity ent)
 	{
-		if (ent.getTicksLived() > 60)
+		if (UtilTime.elapsed(_throwTime, 2000) && (UtilEnt.isGrounded(ent) || !ent.isValid()))
 		{
-			UtilParticle.PlayParticle(ParticleType.HUGE_EXPLOSION, ent.getLocation(), 0.3f, 0.3f, 0.3f, 0, 1,
+//			UtilParticle.PlayParticle(ParticleType.HUGE_EXPLOSION, ent.getLocation(), 0.3f, 0.3f, 0.3f, 0, 1,
+//					ViewDist.MAX, UtilServer.getPlayers());
+
+			UtilParticle.PlayParticle(ParticleType.CLOUD, ent.getLocation(), 1.5f, 1.5f, 1.5f, 0, 100,
 					ViewDist.MAX, UtilServer.getPlayers());
-			
+
+
 			ent.getWorld().playSound(ent.getLocation(), Sound.FIZZ, 0.1f, 0.1f);
-			
-			for (Location loc : game.Manager.GetBlockRestore().RestoreBlockAround(Material.FIRE, ent.getLocation(), 5))
+
+			//Remove Fire
+			for (Location loc : game.Manager.GetBlockRestore().restoreBlockAround(Material.FIRE, ent.getLocation(), 5))
 			{
 				loc.getWorld().playSound(loc, Sound.FIZZ, 1f, 1f);
 			}
 			
+			//Smoke Blocks
+			if (!_createdBlocks)
+			{
+				final HashMap<Block, Double> blocks = UtilBlock.getInRadius(ent.getLocation().add(0, 1, 0), 4d);
+				final int round = game.getRound();
+				for (final Block block : blocks.keySet())
+				{
+					if (block.getType() != Material.AIR && block.getType() != Material.PORTAL && block.getType() != Material.FIRE)
+						continue;
+										
+					UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(game.Manager.getPlugin(), new Runnable()
+					{
+						public void run()
+						{
+							if (round == game.getRound() && !game.isFreezeTime())
+							{
+								//18 seconds
+								long duration = (long) (15000 + blocks.get(block) * 3000);
+								
+								game.registerSmokeBlock(block, System.currentTimeMillis() + duration);
+							}
+						}
+					}, 10 - (int)(10d * blocks.get(block)));
+				}
+				
+				_createdBlocks = true;
+			}
+
+			ent.getWorld().playSound(ent.getLocation(), Sound.FIZZ, 0.1f, 0.1f);
+			
+			
+			
 			return false;
 		}
 		
-		return ent.getTicksLived() > 360;
+		//18 seconds
+		return UtilTime.elapsed(_throwTime, 18000);
 	}
 	
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
index a01c65619..04016f60a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
@@ -47,6 +47,8 @@ public class Gun extends StrikeItem
 	protected long _lastMoveTime;
 	
 	protected boolean _reloading = false;
+	
+	protected boolean _reloadTick = false;
 
 	public Gun(GunStats gunStats)
 	{
@@ -118,21 +120,31 @@ public class Gun extends StrikeItem
 		}
 			
 		if (!Recharge.Instance.use(player, getName() + " Shoot", _gunStats.getFireRate(), false, false))
+		{
 			return;
+		}
 
 		//Use Ammo
 		_loadedAmmo--;
-		updateWeaponName(player);
+		//updateWeaponName(player);
  
 		//Effect
 		soundFire(player.getLocation());
 
-		//Visual 
+		//Smoke 
 		Location loc = player.getEyeLocation().add(player.getLocation().getDirection().multiply(1.2));
 		loc.add(UtilAlg.getRight(player.getLocation().getDirection()).multiply(0.5));
-		loc.add(UtilAlg.getDown(player.getLocation().getDirection()).multiply(0.3));
-		UtilParticle.PlayParticle(ParticleType.EXPLODE, loc, 0, 0, 0, 0, 1,
+		loc.add(UtilAlg.getDown(player.getLocation().getDirection()).multiply(0.4));
+		UtilParticle.PlayParticle(Math.random() > 0.5 ? ParticleType.ANGRY_VILLAGER : ParticleType.HEART, loc, 0, 0, 0, 0, 1,
 				ViewDist.LONG, UtilServer.getPlayers());
+		
+		//Shell 
+		loc = player.getEyeLocation().add(player.getLocation().getDirection().multiply(0.6));
+		loc.add(UtilAlg.getRight(player.getLocation().getDirection()).multiply(0.7));
+		loc.add(UtilAlg.getDown(player.getLocation().getDirection()).multiply(0.5));
+		UtilParticle.PlayParticle(ParticleType.SPLASH, loc, 0, 0, 0, 0, 1,
+				ViewDist.LONG, UtilServer.getPlayers());
+
 
 		game.registerBullet(fireBullet(player, game));
 		
@@ -164,6 +176,7 @@ public class Gun extends StrikeItem
 		Vector cof = new Vector(Math.random() - 0.5, (Math.random() - 0.2) * (5d/8d), Math.random() - 0.5);
 		cof.normalize();
 		cof.multiply(cone);
+		cof.multiply(MineStrike.CONE);
 
 		cof.add(player.getLocation().getDirection());
 		cof.normalize();
@@ -262,7 +275,7 @@ public class Gun extends StrikeItem
 		}
 		 
 		//Recharge
-		Recharge.Instance.use(player, getName() + " Reload", getReloadTime(), false, true, true);
+		Recharge.Instance.use(player, getName() + " Reload", getReloadTime(), false, true);
 
 		//Sound
 		soundReload(player.getLocation());
@@ -281,17 +294,36 @@ public class Gun extends StrikeItem
 	{
 		updateWeaponName(null);
 	}
+	
+	public void displayAmmo(Player player)
+	{
+		if (!UtilGear.isMat(player.getItemInHand(), getStack().getType()))
+			return;
+		
+		//Weapon Bob during reload
+		if (_reloading)
+			updateWeaponName(player);
+		
+		if (!Recharge.Instance.usable(player, getName() + " Reload"))
+			return;
+		
+		if (_loadedAmmo > 0 || _reserveAmmo > 0)
+			UtilTextBottom.display(C.cGreen + _loadedAmmo + ChatColor.RESET + " / " + C.cYellow + _reserveAmmo, player);
+		else
+			UtilTextBottom.display(C.cRed + "No Ammo", player);
+	}
 
 	public void updateWeaponName(Player player)
 	{
 		ItemMeta meta = getStack().getItemMeta();
-		meta.setDisplayName(ChatColor.RESET + (getOwnerName() == null ? "" : getOwnerName() + "'s ") + C.Bold + getName() + ChatColor.RESET + "   " + C.cGreen + _loadedAmmo + ChatColor.RESET + " / " + C.cYellow + _reserveAmmo);
+		meta.setDisplayName(ChatColor.RESET + (getOwnerName() == null ? "" : getOwnerName() + "'s ") + C.Bold + getName() + (_reloadTick ? ChatColor.RED : ChatColor.WHITE));
 		getStack().setItemMeta(meta);
 		
-		getStack().setAmount(Math.max(1, _loadedAmmo));
-
 		if (player != null)
+		{
 			player.getInventory().setItem(_slot, getStack());
+			_reloadTick = !_reloadTick;
+		}
 	}
 
 	public double getDropOff()
@@ -346,7 +378,7 @@ public class Gun extends StrikeItem
 		_reserveAmmo = Math.max(0, ammo - _gunStats.getClipSize());
 		
 		//Update
-		updateWeaponName(player);
+		//updateWeaponName(player);
 		
 		//Sound
 		player.getWorld().playSound(player.getEyeLocation(), Sound.PISTON_EXTEND, 1f, 1.6f);
@@ -414,7 +446,7 @@ public class Gun extends StrikeItem
 		_loadedAmmo = _gunStats.getClipSize();
 		_reserveAmmo = _gunStats.getClipReserve() * _gunStats.getClipSize();
 
-		updateWeaponName(player);	
+		//updateWeaponName(player);	
 	}
 	
 	public double getDamage()
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/GunStats.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/GunStats.java
index 1e04ec13a..a7e777c70 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/GunStats.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/GunStats.java
@@ -1,5 +1,6 @@
 package nautilus.game.arcade.game.games.minestrike.items.guns;
 
+import nautilus.game.arcade.game.games.minestrike.MineStrike;
 import nautilus.game.arcade.game.games.minestrike.items.StrikeItemType;
 
 import org.bukkit.Material;
@@ -241,7 +242,6 @@ public enum GunStats
 
 	private double _coneMin;
 	private double _coneMax;
-	private double _coneReduceRate;
 	private double _coneIncreaseRate;
 	
 	private boolean _scope = false;
@@ -375,7 +375,7 @@ public enum GunStats
 	
 	public double getConeIncreaseRate()
 	{
-		return _coneIncreaseRate;
+		return _coneIncreaseRate * MineStrike.RECOIL;
 	}
 	
 	public boolean getScope()
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/GunType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/GunType.java
index 4f35741da..3bdb407ac 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/GunType.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/GunType.java
@@ -1,5 +1,7 @@
 package nautilus.game.arcade.game.games.minestrike.items.guns;
 
+import nautilus.game.arcade.game.games.minestrike.MineStrike;
+
 public enum GunType
 {
 	PISTOL("Pistol", 		0.01, 	0.02, 	0.02,	3f,		0.1),
@@ -38,17 +40,17 @@ public enum GunType
 	
 	public double getMovePenalty()
 	{
-		return _movePenalty;
+		return _movePenalty * MineStrike.MOVE_PENALTY;
 	}
 	
 	public double getSprintPenalty()
 	{
-		return _sprintPentalty;
+		return _sprintPentalty * MineStrike.MOVE_PENALTY;
 	}
 	
 	public double getJumpPenalty()
 	{
-		return _jumpPenalty;
+		return _jumpPenalty * MineStrike.MOVE_PENALTY;
 	}
 
 	public float getVolume()
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Shotgun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Shotgun.java
index 579843cc3..78f565db2 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Shotgun.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Shotgun.java
@@ -43,7 +43,7 @@ public class Shotgun extends Gun
 
 		//Use Ammo
 		_loadedAmmo--;
-		updateWeaponName(player); 
+		//updateWeaponName(false); 
 		
 		//Effect
 		soundFire(player.getLocation());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/Ball.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/Ball.java
new file mode 100644
index 000000000..5b901bc62
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/Ball.java
@@ -0,0 +1,418 @@
+package nautilus.game.arcade.game.games.monsterleague;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilFirework;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.recharge.Recharge;
+import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.games.monsterleague.kits.LeagueKit;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Color;
+import org.bukkit.EntityEffect;
+import org.bukkit.Location;
+import org.bukkit.Sound;
+import org.bukkit.FireworkEffect.Type;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.Slime;
+import org.bukkit.util.Vector;
+
+import sun.rmi.runtime.Log;
+
+public class Ball 
+{
+	private MonsterLeague _host;
+
+	private Location _ballSpawn;
+
+	private Slime _ball;
+	private Vector _ballVel;
+	
+	private boolean _firstSpawn = true;
+	
+	private long _ballDeadTime = -1;
+
+	private GameTeam _lastKickTeam = null;
+	private ArrayList<KickLog> _kickHistory = new ArrayList<KickLog>();
+
+	//Kick
+	protected int _kickTickDelay = 0;
+	
+	//Particle
+	protected Location _lastParticle = null;
+	
+	//Ball Rebound
+	protected boolean _ignoreReboundForTick = false;
+	protected Location _lastLoc = null;
+
+	protected int _reboundX = 0;
+	protected int _reboundY = 0;
+	protected int _reboundZ = 0;
+
+	public Ball(MonsterLeague monsterLeague, Location ballSpawn) 
+	{
+		_host = monsterLeague;
+
+		_ballSpawn = ballSpawn;
+	}
+
+	private void changeBallVelocity(Vector vel, boolean canGoNegativeY) 
+	{
+		_ballVel = vel;
+
+		if (!canGoNegativeY && UtilEnt.isGrounded(_ball) && _ballVel.getY() <= 0)
+			_ballVel.setY(0);
+
+		_ballVel.setY(Math.min(_ballVel.getY(), 1));
+
+		//Rebound Data
+		_lastLoc = _ball.getLocation();
+	}
+
+	public void update() 
+	{
+		//New Ball Needed
+		checkNewBallNeeded();
+
+		//Spawn Ball
+		spawnBallUpdate();
+
+		if (_ball == null)
+			return;
+
+		//Particles
+		displayParticles();
+
+		//Kick
+		kickBallUpdate();
+
+		//Movement/Rebounds/etc
+		ballPhysics();
+
+		//Goal
+		scoreGoalUpdate();
+	}
+
+	private void checkNewBallNeeded() 
+	{
+		if (_ballDeadTime == -1 && (_ball == null || !_ball.isValid()))
+		{
+			if (_ball != null)
+				_ball.remove();
+
+			_ballDeadTime = System.currentTimeMillis();
+		}
+	}
+
+	private void displayParticles() 
+	{
+		if (_lastKickTeam == null)
+		{
+			_lastParticle = _ball.getLocation();
+			return;
+		}
+			
+		while (UtilMath.offset(_ball.getLocation().add(0, 0.5, 0), _lastParticle) > 0.15)
+		{
+			_lastParticle.add(UtilAlg.getTrajectory(_lastParticle, _ball.getLocation().add(0,0.5,0)).multiply(0.15));
+			
+			if (_lastKickTeam.GetColor() == ChatColor.AQUA)
+			{
+				UtilParticle.PlayParticle(ParticleType.RED_DUST, _lastParticle, -1, 1, 1, 1, 0,
+							ViewDist.MAX, UtilServer.getPlayers());
+			}
+			else if (_lastKickTeam.GetColor() == ChatColor.RED)
+			{
+				UtilParticle.PlayParticle(ParticleType.RED_DUST, _lastParticle, 0, 0, 0, 0, 1,
+							ViewDist.MAX, UtilServer.getPlayers());
+			}
+			else if (_lastKickTeam.GetColor() == ChatColor.GREEN)
+			{
+				UtilParticle.PlayParticle(ParticleType.RED_DUST, _lastParticle, 0, 1, 0, 0, 1,
+							ViewDist.MAX, UtilServer.getPlayers());
+			}
+			else if (_lastKickTeam.GetColor() == ChatColor.YELLOW) 
+			{
+				UtilParticle.PlayParticle(ParticleType.RED_DUST, _lastParticle, -1, 1, -1, 0, 1,
+							ViewDist.MAX, UtilServer.getPlayers());
+			}
+		}
+	}
+
+	private void spawnBallUpdate() 
+	{
+		if (_ballDeadTime > 0 && (_firstSpawn || UtilTime.elapsed(_ballDeadTime, 6000)))
+		{
+			//Spawn
+			_host.CreatureAllowOverride = true;
+			_ball =  _ballSpawn.getWorld().spawn(_ballSpawn, Slime.class);
+			_ball.setSize(2);
+
+			UtilEnt.Vegetate(_ball);
+			UtilEnt.ghost(_ball, false, false);
+			_host.CreatureAllowOverride = false;
+
+			_lastParticle = _ball.getLocation();
+
+			//Set Ball to Alive
+			_ballDeadTime = -1;
+
+			//Velocity Downwards
+			changeBallVelocity(new Vector(0,-0.1,0), true);
+
+			//Effect
+			UtilFirework.playFirework(_ballSpawn, Type.BALL, Color.WHITE, true, true);
+			
+			_firstSpawn = false;
+		}
+	}
+
+	private void kickBallUpdate() 
+	{
+		if (_kickTickDelay > 0)
+		{
+			_kickTickDelay--;
+			return;
+		}
+		
+		for (Player player : _host.GetPlayers(true))
+		{
+			if (UtilMath.offset(player, _ball) < 1.5 ||
+				UtilMath.offset(player.getEyeLocation(), _ball.getLocation()) < 1.25)
+			{
+				if (Recharge.Instance.use(player, "Football Kick", 600, false, false))
+				{
+					//Kick Power
+					LeagueKit kit = (LeagueKit)_host.GetKit(player);
+					
+					//Set Ball Velocity
+					changeBallVelocity(player.getLocation().getDirection().multiply(kit.getKickPower()).add(new Vector(0, 0.4, 0)), false);
+
+					//Sound
+					_ball.getWorld().playSound(_ball.getLocation(), Sound.ZOMBIE_WOOD, 0.5f, 1.5f);
+
+					//Effect
+					UtilParticle.PlayParticle(ParticleType.SLIME, 
+							_ball.getLocation(), 
+							0, 0, 0, 0, 5, ViewDist.NORMAL, UtilServer.getPlayers());
+
+					//Flash Ball
+					_ball.playEffect(EntityEffect.HURT);
+
+					//Zero Player Vel
+					UtilAction.zeroVelocity(player);
+
+					//Record
+					_lastKickTeam = _host.GetTeam(player);
+					_kickHistory.add(0, new KickLog(player, _lastKickTeam));
+
+					//Ignore Rebound
+					_ignoreReboundForTick = true;
+					
+					//This creates a small delay that no one else can kick it.
+					_kickTickDelay = 2;
+					
+					return;
+				}
+			}
+		}
+	}
+
+	private void ballPhysics() 
+	{
+		//Wind Drag
+		_ballVel = _ballVel.multiply(0.99);
+
+		//Ground Drag
+		if (UtilEnt.isGrounded(_ball))
+			_ballVel = _ballVel.multiply(0.97);
+
+		if (!_ignoreReboundForTick)
+		{
+			double lenience = 0.1;
+			
+			//Rebound Y
+			if (_ballVel.getY() > 0.15 && _ball.getLocation().getY() <= _lastLoc.getY() || 
+					_ballVel.getY() < -lenience && _ball.getLocation().getY() >= _lastLoc.getY())
+			{
+				_reboundY++;
+
+				if (_reboundY > 1)
+				{
+					_ballVel.setY(_ballVel.getY() * -1);
+
+					_ballVel = _ballVel.multiply(_ballVel.getY() > 0 ? 0.9 : 0.75); //Lose extra when bouncing on ground.
+
+					//Sound
+					_ball.getWorld().playSound(_ball.getLocation(), Sound.ZOMBIE_WOOD, 0.5f, 1.5f);
+
+					//Effect
+					UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, _ball.getLocation(), 0, 0, 0, 0, 1, ViewDist.NORMAL, UtilServer.getPlayers());
+					
+					_reboundY = 0;
+				}
+			}
+			else
+			{
+				_reboundY = 0;
+			}
+
+			
+			if (UtilEnt.isGrounded(_ball))
+			{
+				//lenience = 0.1;
+			}
+
+			//Rebound X
+			if (_ballVel.getX() > lenience && _ball.getLocation().getX() <= _lastLoc.getX() || 
+					_ballVel.getX() < -lenience && _ball.getLocation().getX() >= _lastLoc.getX())
+			{
+				_reboundX++;
+
+				if (_reboundX > 1)
+				{
+					_ballVel.setX(_ballVel.getX() * -1);
+					_ballVel = _ballVel.multiply(0.9);
+
+					//Sound
+					_ball.getWorld().playSound(_ball.getLocation(), Sound.ZOMBIE_WOOD, 0.5f, 1.5f);
+
+					//Effect
+					UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, _ball.getLocation(), 0, 0, 0, 0, 1, ViewDist.NORMAL, UtilServer.getPlayers());
+					
+					_reboundX = 0;
+				}
+			}
+			else
+			{
+				_reboundX = 0;
+			}
+
+			//Rebound Z
+			if (_ballVel.getZ() > lenience && _ball.getLocation().getZ() <= _lastLoc.getZ() || 
+					_ballVel.getZ() < -lenience && _ball.getLocation().getZ() >= _lastLoc.getZ())
+			{
+				_reboundZ++;
+
+				if (_reboundZ > 1)
+				{
+					_ballVel.setZ(_ballVel.getZ() * -1);
+					_ballVel = _ballVel.multiply(0.9);
+
+					//Sound
+					_ball.getWorld().playSound(_ball.getLocation(), Sound.ZOMBIE_WOOD, 0.5f, 1.5f);
+
+					//Effect
+					UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, _ball.getLocation(), 0, 0, 0, 0, 1, ViewDist.NORMAL, UtilServer.getPlayers());
+					
+					_reboundZ = 0;
+				}
+			}
+			else
+			{
+				_reboundZ = 0;
+			}
+		}
+
+		//Gravity
+		if (!UtilEnt.isGrounded(_ball))
+			_ballVel.setY(_ballVel.getY() - 0.04);
+
+		//Store Current Location
+		_lastLoc = _ball.getLocation();
+
+		_ignoreReboundForTick = false;
+
+		//Move Ball
+		_ball.setVelocity(_ballVel);
+	}
+
+	private boolean scoreGoalUpdate() 
+	{
+		for (GameTeam team : _host.GetTeamList())
+		{
+			if (!_host.getGoalRegions().containsKey(team))
+				continue;
+
+			if (_host.getGoalRegions().get(team).contains(_ball.getLocation().getBlock()))
+			{
+				//Score
+				if (!_host.scoreGoal(team, this))
+					return false;
+
+				//Effect
+				UtilFirework.playFirework(_ball.getLocation(), Type.BALL, team.GetColorBase(), true, true);
+
+				//Clean
+				_ball.remove();
+				_ball = null;
+
+				_lastLoc = null;
+
+				_lastKickTeam = null;
+				_kickHistory.clear();
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public Player getLastKickerNotOnTeam(GameTeam goalTeam) 
+	{
+		for (KickLog log : _kickHistory)
+		{
+			if (log.Team.equals(goalTeam))
+				continue;
+
+			return log.Player;
+		}
+
+		return _kickHistory.get(0).Player;
+	}
+
+	public void arrowHit(LivingEntity ent, Projectile proj) 
+	{
+		if (_ball != null && _ball.equals(ent))
+		{			
+			Player player = (Player)proj.getShooter();
+			
+			changeBallVelocity(proj.getVelocity().multiply(0.6), true);
+	
+			//Sound
+			_ball.getWorld().playSound(_ball.getLocation(), Sound.ZOMBIE_WOOD, 0.5f, 1.5f);
+
+			//Effect
+			UtilParticle.PlayParticle(ParticleType.SLIME, 
+					_ball.getLocation(), 
+					0, 0, 0, 0, 5, ViewDist.NORMAL, UtilServer.getPlayers());
+
+			//Flash Ball
+			_ball.playEffect(EntityEffect.HURT);
+
+			//Zero Player Vel
+			UtilAction.zeroVelocity(player);
+
+			//Record
+			_lastKickTeam = _host.GetTeam(player);
+			_kickHistory.add(0, new KickLog(player, _lastKickTeam));
+
+			//Ignore Rebound
+			_ignoreReboundForTick = true;
+		}
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/KickLog.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/KickLog.java
new file mode 100644
index 000000000..192590c20
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/KickLog.java
@@ -0,0 +1,18 @@
+package nautilus.game.arcade.game.games.monsterleague;
+
+import nautilus.game.arcade.game.GameTeam;
+import org.bukkit.entity.Player;
+
+public class KickLog 
+{
+	Player Player;
+	GameTeam Team;
+	long Time;
+	
+	public KickLog(Player player, GameTeam team)
+	{
+		Player = player;
+		Team = team;
+		Time = System.currentTimeMillis();
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/MonsterLeague.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/MonsterLeague.java
new file mode 100644
index 000000000..adc100bb1
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/MonsterLeague.java
@@ -0,0 +1,248 @@
+package nautilus.game.arcade.game.games.monsterleague;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Slime;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.ProjectileHitEvent;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.TeamGame;
+import nautilus.game.arcade.game.games.monsterleague.kits.*;
+import nautilus.game.arcade.kit.Kit;
+
+public class MonsterLeague extends TeamGame
+{
+	private HashMap<GameTeam, ArrayList<Block>> _teamGoalRegions = new HashMap<GameTeam, ArrayList<Block>>();
+	private HashMap<GameTeam, Integer> _teamScores = new HashMap<GameTeam, Integer>();
+
+	private ArrayList<Ball> _balls = new ArrayList<Ball>();
+	
+	private int _scoreToWin = 5;
+
+	public MonsterLeague(ArcadeManager manager) 
+	{
+		super(manager, GameType.MonsterLeague,
+
+				new Kit[]
+						{
+				new KitSkeleton(manager),
+				new KitGolem(manager),
+				new KitEnderman(manager),
+						},
+
+						new String[]
+								{
+				"CHEESE IZ DELISH"
+								});
+
+		this.PrepareFreeze = false;
+		this.DamagePvP = false;
+		this.HungerSet = 20;
+		this.HealthSet = 20;
+		
+		this.DeathOut = false;
+		
+		this.TeamArmor = true;
+		this.TeamArmorHotbar = true;
+	}
+
+	//Supports anywhere from 2-4 teams on a map
+	@Override
+	public void ParseData() 
+	{
+		//parse200 56 73 14 129
+		
+		//Scores
+		for (GameTeam team : GetTeamList())
+		{
+			_teamScores.put(team, 0);
+		}
+		
+		//Red
+		if (GetTeam(ChatColor.RED) != null)
+		{
+			ArrayList<Block> goalBlocks = new ArrayList<Block>();
+
+			for (Location loc : WorldData.GetCustomLocs("" + Material.REDSTONE_ORE.getId()))
+			{
+				goalBlocks.add(loc.getBlock());
+				loc.getBlock().setType(Material.AIR);
+			}
+
+			_teamGoalRegions.put(GetTeam(ChatColor.RED), goalBlocks);
+		}
+
+		//Blue
+		if (GetTeam(ChatColor.AQUA) != null)
+		{
+			ArrayList<Block> goalBlocks = new ArrayList<Block>();
+
+			for (Location loc : WorldData.GetCustomLocs("" + Material.DIAMOND_ORE.getId()))
+			{
+				goalBlocks.add(loc.getBlock());
+				loc.getBlock().setType(Material.AIR);
+			}
+
+			_teamGoalRegions.put(GetTeam(ChatColor.AQUA), goalBlocks);
+		}
+
+		//Yellow
+		if (GetTeam(ChatColor.YELLOW) != null)
+		{
+			ArrayList<Block> goalBlocks = new ArrayList<Block>();
+
+			for (Location loc : WorldData.GetCustomLocs("" + Material.GOLD_ORE.getId()))
+			{
+				goalBlocks.add(loc.getBlock());
+				loc.getBlock().setType(Material.AIR);
+			}
+
+			_teamGoalRegions.put(GetTeam(ChatColor.YELLOW), goalBlocks);
+		}
+
+		//Green
+		if (GetTeam(ChatColor.GREEN) != null)
+		{
+			ArrayList<Block> goalBlocks = new ArrayList<Block>();
+
+			for (Location loc : WorldData.GetCustomLocs("" + Material.EMERALD_ORE.getId()))
+			{
+				goalBlocks.add(loc.getBlock());
+				loc.getBlock().setType(Material.AIR);
+			}
+
+			_teamGoalRegions.put(GetTeam(ChatColor.GREEN), goalBlocks);
+		}
+		
+		//Support for multiple balls
+		_balls.add(new Ball(this,  WorldData.GetDataLocs("GREEN").get(0)));
+	}
+
+	@EventHandler
+	public void ballUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		if(GetState() != GameState.Live) 
+			return;
+
+		for (Ball ball : _balls)
+			ball.update();
+	}
+
+	public boolean scoreGoal(final GameTeam goalOwnerTeam, final Ball ball)
+	{
+		Player lastKicker = ball.getLastKickerNotOnTeam(goalOwnerTeam);
+		GameTeam kickerTeam = GetTeam(lastKicker);
+		
+		//Dont allow self score (will only happen if NO ONE else kicked it)
+		if (kickerTeam.equals(goalOwnerTeam))
+			return false;
+		
+		//Add Score
+		_teamScores.put(kickerTeam, 1 + _teamScores.get(kickerTeam));
+		
+		//Against for 3+ teams
+		String against = "";
+		if (GetTeamList().size() >= 3)
+		{
+			against = "against " + goalOwnerTeam.GetColor() + goalOwnerTeam.GetName() + ChatColor.RESET + " ";
+		}
+				
+		//Check Win
+		if (_teamScores.get(kickerTeam) > _scoreToWin)
+		{
+			SetCustomWinLine(kickerTeam.GetColor() + lastKicker.getName() + ChatColor.RESET + " scored the final goal " + against + "for " + kickerTeam.GetColor() + kickerTeam.GetName());
+			
+			//Announce
+			AnnounceEnd(kickerTeam);
+
+			for (GameTeam curTeam : GetTeamList())
+			{
+				if (WinnerTeam != null && curTeam.equals(WinnerTeam))
+				{
+					for (Player player : curTeam.GetPlayers(false))
+						AddGems(player, 10, "Winning Team", false, false);
+				}
+
+				for (Player player : curTeam.GetPlayers(false))
+					if (player.isOnline())
+						AddGems(player, 10, "Participation", false, false);
+			}
+
+			//End
+			SetState(GameState.End);
+			
+			return true;
+		}
+	
+		UtilTextMiddle.display("GOAL", 
+				kickerTeam.GetColor() + lastKicker.getName() + C.cWhite + " scored " + against + "for " + kickerTeam.GetColor() + kickerTeam.GetName(), 
+				0, 80, 20, UtilServer.getPlayers());
+		
+		Bukkit.getScheduler().runTaskLater(Manager.getPlugin(), new Runnable() 
+		{
+			@Override
+			public void run() 
+			{
+				String scores = "";
+				
+				for (GameTeam team : GetTeamList())
+				{
+					scores += "" + team.GetColor() + _teamScores.get(team) + ChatColor.RESET + " : ";
+				}
+				
+				if (scores.length() > 0)
+					scores = scores.substring(0, scores.length()-3);
+				
+				UtilTextMiddle.display("SCORES", 
+						scores, 
+						0, 40, 20, UtilServer.getPlayers());
+			}
+		}, 80);
+		
+		return true;
+	}
+
+	public HashMap<GameTeam, ArrayList<Block>> getGoalRegions() 
+	{
+		return _teamGoalRegions;
+	}
+	
+	@EventHandler
+	public void arrowDeflect(CustomDamageEvent event)
+	{		
+		event.SetCancelled("NO DAMAGE");
+		
+		if (!(event.GetDamageeEntity() instanceof Slime))
+			return;
+		
+		if (event.GetProjectile() == null || !(event.GetProjectile() instanceof Arrow) || event.GetProjectile().getShooter() == null)
+			return;
+
+		for (Ball ball : _balls)
+		{
+			ball.arrowHit(event.GetDamageeEntity(), event.GetProjectile());
+		}
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/KitEnderman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/KitEnderman.java
new file mode 100644
index 000000000..20796f801
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/KitEnderman.java
@@ -0,0 +1,55 @@
+package nautilus.game.arcade.game.games.monsterleague.kits;
+
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.C;
+import mineplex.core.disguise.disguises.DisguiseEnderman;
+import mineplex.core.itemstack.ItemStackFactory;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkBlink;
+import nautilus.game.arcade.kit.perks.PerkDoubleJump;
+
+public class KitEnderman extends LeagueKit
+{
+	public KitEnderman(ArcadeManager manager)
+	{
+		super(manager, "Enderman", KitAvailability.Free, 5000,
+
+				new String[] 
+						{
+				"Kick Power: 1.4",
+						}, 
+
+						new Perk[] 
+								{
+				new PerkDoubleJump("Double Jump", 1, 1, true),
+				new PerkBlink("Blink", 32, 16000),
+								}, 
+								EntityType.ENDERMAN,
+								new ItemStack(Material.AIR), 1.4);
+
+	}
+
+	@Override
+	public void GiveItems(Player player) 
+	{
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.EYE_OF_ENDER, (byte)0, 1, 
+				C.cYellow + C.Bold + "Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Blink"));
+//
+//		//Disguise
+//		DisguiseEnderman disguise = new DisguiseEnderman(player);
+//
+//		if (Manager.GetGame().GetTeam(player) != null)		
+//			disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
+//		else			
+//			disguise.setName(player.getName());
+//
+//		disguise.setCustomNameVisible(true);
+//		Manager.GetDisguise().disguise(disguise);
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/KitGolem.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/KitGolem.java
new file mode 100644
index 000000000..9427e6ef2
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/KitGolem.java
@@ -0,0 +1,57 @@
+package nautilus.game.arcade.game.games.monsterleague.kits;
+
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.C;
+import mineplex.core.disguise.disguises.DisguiseIronGolem;
+import mineplex.core.itemstack.ItemStackFactory;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.game.games.monsterleague.perks.PerkStoneWall;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkDoubleJump;
+import nautilus.game.arcade.kit.perks.PerkSlow;
+
+public class KitGolem extends LeagueKit
+{
+	public KitGolem(ArcadeManager manager)
+	{
+		super(manager, "Golem", KitAvailability.Free, 5000,
+
+				new String[] 
+						{
+				"Kick Power: 1.8",
+						}, 
+
+						new Perk[] 
+								{
+				new PerkDoubleJump("Double Jump", 0.8, 0.8, true),
+				new PerkStoneWall(),
+				new PerkSlow(0)
+								}, 
+								EntityType.IRON_GOLEM,
+								new ItemStack(Material.AIR), 1.8);
+
+	}
+
+	@Override
+	public void GiveItems(Player player) 
+	{
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_INGOT, (byte)0, 1, 
+				C.cYellow + C.Bold + "Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Iron Wall"));
+//
+//		//Disguise
+//		DisguiseIronGolem disguise = new DisguiseIronGolem(player);
+//
+//		if (Manager.GetGame().GetTeam(player) != null)		
+//			disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
+//		else			
+//			disguise.setName(player.getName());
+//
+//		disguise.setCustomNameVisible(true);
+//		Manager.GetDisguise().disguise(disguise);
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/KitSkeleton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/KitSkeleton.java
new file mode 100644
index 000000000..461cc10ad
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/KitSkeleton.java
@@ -0,0 +1,54 @@
+package nautilus.game.arcade.game.games.monsterleague.kits;
+
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.C;
+import mineplex.core.disguise.disguises.DisguiseSkeleton;
+import mineplex.core.itemstack.ItemStackFactory;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkDoubleJump;
+import nautilus.game.arcade.kit.perks.PerkFletcher;
+
+public class KitSkeleton extends LeagueKit
+{
+	public KitSkeleton(ArcadeManager manager)
+	{
+		super(manager, "Skeleton", KitAvailability.Free, 5000, 
+
+				new String[] 
+						{
+				"Kick Power: 1",
+						}, 
+
+						new Perk[] 
+								{
+				new PerkDoubleJump("Double Jump", 1.1, 1.1, true),
+				new PerkFletcher(12, 2, true),
+								}, 
+								EntityType.SKELETON,
+								new ItemStack(Material.BOW), 1);
+
+	}
+
+	@Override
+	public void GiveItems(Player player) 
+	{
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW, (byte)0, 1, C.cGreen + C.Bold + "Ball Shooter"));
+		
+//		//Disguise
+//		DisguiseSkeleton disguise = new DisguiseSkeleton(player);
+//
+//		if (Manager.GetGame().GetTeam(player) != null)		
+//			disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
+//		else			
+//			disguise.setName(player.getName());
+//
+//		disguise.setCustomNameVisible(true);
+//		Manager.GetDisguise().disguise(disguise);
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/LeagueKit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/LeagueKit.java
new file mode 100644
index 000000000..fdd6030d9
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/kits/LeagueKit.java
@@ -0,0 +1,29 @@
+package nautilus.game.arcade.game.games.monsterleague.kits;
+
+import org.bukkit.entity.EntityType;
+import org.bukkit.inventory.ItemStack;
+
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.kit.Kit;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+
+public abstract class LeagueKit extends Kit
+{
+	private double _kickPower;
+
+	public LeagueKit(ArcadeManager manager, String name,
+			KitAvailability kitAvailability, int cost, String[] kitDesc,
+			Perk[] kitPerks, EntityType entityType, ItemStack itemInHand,
+			double kickPower) 
+	{
+		super(manager, name, kitAvailability, cost, kitDesc, kitPerks, entityType, itemInHand);
+		
+		_kickPower = kickPower;
+	}
+	
+	public double getKickPower()
+	{
+		return _kickPower;
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/perks/PerkBlink.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/perks/PerkBlink.java
new file mode 100644
index 000000000..75e0654a9
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/perks/PerkBlink.java
@@ -0,0 +1,119 @@
+package nautilus.game.arcade.game.games.monsterleague.perks;
+
+import org.bukkit.Color;
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.Sound;
+import org.bukkit.FireworkEffect.Type;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilFirework;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.recharge.Recharge;
+import nautilus.game.arcade.kit.SmashPerk;
+
+public class PerkBlink extends SmashPerk
+{
+	private double _range = 32;
+	private long _recharge = 24000;
+
+	public PerkBlink(String name, double range, long recharge) 
+	{
+		super("Blink", new String[] 
+				{
+				C.cYellow + "Click" + C.cGray + " to use " + C.cGreen + "Blink"
+				});
+
+		_range = range;
+		_recharge = recharge;
+	}
+
+	@EventHandler
+	public void Blink(PlayerInteractEvent event)
+	{
+		if (event.isCancelled())
+			return;
+
+		if (event.getAction() != Action.LEFT_CLICK_AIR && event.getAction() != Action.LEFT_CLICK_BLOCK &&
+				event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK)
+				return;
+
+		if (UtilBlock.usable(event.getClickedBlock()))
+			return;
+
+		Player player = event.getPlayer();
+		
+		if (isSuperActive(player))
+			return;
+
+		if (!Kit.HasKit(player))
+			return;
+
+		if (!Recharge.Instance.use(player, GetName(), _recharge, true, true))
+			return;
+		
+		Recharge.Instance.setDisplayForce(player, GetName(), true);
+
+		//Smoke Trail
+		Block lastSmoke = player.getLocation().getBlock();
+
+		double curRange = 0;
+		while (curRange <= _range)
+		{
+			Location newTarget = player.getLocation().add(new Vector(0,0.2,0)).add(player.getLocation().getDirection().multiply(curRange));
+
+			if (!UtilBlock.airFoliage(newTarget.getBlock()) || 
+					!UtilBlock.airFoliage(newTarget.getBlock().getRelative(BlockFace.UP)))
+				break;
+
+			//Progress Forwards
+			curRange += 0.2;
+
+			//Smoke Trail
+			if (!lastSmoke.equals(newTarget.getBlock()))
+			{
+				lastSmoke.getWorld().playEffect(lastSmoke.getLocation(), Effect.SMOKE, 4);
+			}
+	
+			lastSmoke = newTarget.getBlock();
+		}
+
+		//Modify Range
+		curRange -= 0.4;
+		if (curRange < 0)
+			curRange = 0;
+
+		//Destination
+		Location loc = player.getLocation().add(player.getLocation().getDirection().multiply(curRange).add(new Vector(0, 0.4, 0)));
+
+		if (curRange > 0)
+		{
+			//Firework
+			UtilFirework.playFirework(player.getEyeLocation(), Type.BALL, Color.BLACK, false, false);
+			
+			player.playSound(player.getLocation(), Sound.ENDERMAN_TELEPORT, 1f, 1f);
+			player.teleport(loc);
+			player.playSound(player.getLocation(), Sound.ENDERMAN_TELEPORT, 1f, 1f);
+			
+			//Firework
+			UtilFirework.playFirework(player.getEyeLocation(), Type.BALL, Color.BLACK, false, false);
+		}
+			
+
+		player.setFallDistance(0);
+
+		//Inform
+		UtilPlayer.message(player, F.main("Game", "You used " + F.skill(GetName()) + "."));
+	}
+}
+
+
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/perks/PerkStoneWall.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/perks/PerkStoneWall.java
new file mode 100644
index 000000000..90a678c6a
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monsterleague/perks/PerkStoneWall.java
@@ -0,0 +1,111 @@
+package nautilus.game.arcade.game.games.monsterleague.perks;
+
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.data.IcePathData;
+
+public class PerkStoneWall extends Perk
+{
+	private HashSet<IcePathData> _data = new HashSet<IcePathData>();
+	
+	public PerkStoneWall() 
+	{
+		super("Iron Wall", new String[]  
+				{
+				C.cYellow + "Click" + C.cGray + " to use " + C.cGreen + "Iron Wall"
+				});
+	}
+
+	@EventHandler
+	public void Skill(PlayerInteractEvent event)
+	{
+		if (event.isCancelled())
+			return;
+		
+		if (event.getAction() != Action.LEFT_CLICK_AIR && event.getAction() != Action.LEFT_CLICK_BLOCK &&
+			event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK)
+			return;
+		
+		if (UtilBlock.usable(event.getClickedBlock()))
+			return;
+				
+		Player player = event.getPlayer();
+		
+		if (!Kit.HasKit(player))
+			return;
+		
+		if (!Recharge.Instance.use(player, GetName(), 24000, true, true))
+			return;
+		
+		Recharge.Instance.setDisplayForce(player, GetName(), true);
+		
+		//Get Player Direction
+		Vector dir = null;
+
+		if (Math.abs(player.getLocation().getDirection().getX()) > Math.abs(player.getLocation().getDirection().getZ()))
+		{
+			if (player.getLocation().getDirection().getX() > 0)
+			{
+				dir = new Vector(1,0,0);
+			}
+			else
+			{
+				dir = new Vector(-1,0,0);
+			}
+		}
+		else
+		{
+			if (player.getLocation().getDirection().getZ() > 0)
+			{
+				dir = new Vector(0,0,1);
+			}
+			else
+			{
+				dir = new Vector(0,0,-1);
+			}
+		}
+
+		for (int i=-2 ; i<=2 ; i++)
+			for (int j=-2 ; j<=2 ; j++)
+			{
+				if (Math.abs(i) == 2 && Math.abs(j) == 2)
+					continue;
+				
+				Location loc = player.getEyeLocation().add(player.getLocation().getDirection().multiply(3));
+				loc.add(UtilAlg.getLeft(dir).multiply(i));
+				loc.add(UtilAlg.getUp(dir).multiply(j));
+				
+				Manager.GetBlockRestore().add(loc.getBlock(), Material.IRON_BLOCK.getId(), (byte)0, 4000);
+				
+				loc.getWorld().playEffect(loc, Effect.STEP_SOUND, Material.IRON_BLOCK);
+			}
+		
+		player.getWorld().playSound(player.getLocation(), Sound.IRONGOLEM_DEATH, 2f, 1f);
+				
+		//Inform
+		UtilPlayer.message(player, F.main("Game", "You used " + F.skill(GetName()) + "."));
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java
index 12f0e47f7..ec8a80299 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java
@@ -71,7 +71,7 @@ import nautilus.game.arcade.stats.WinWithoutLosingTeammateStatTracker;
 
 public class Paintball extends TeamGame
 {
-	private HashMap<Player, PlayerCopy> _doubles = new HashMap<Player, PlayerCopy>();
+	private HashMap<Player, PlayerCopyPaintball> _doubles = new HashMap<Player, PlayerCopyPaintball>();
 
 	@SuppressWarnings("unchecked")
 	public Paintball(ArcadeManager manager)
@@ -199,7 +199,7 @@ public class Paintball extends TeamGame
 
 		if (_doubles.containsKey(player))
 		{
-			PlayerCopy copy = _doubles.remove(player);
+			PlayerCopyPaintball copy = _doubles.remove(player);
 			copy.GetEntity().remove();
 			copy.GetHolo().stop();
 		}
@@ -353,7 +353,7 @@ public class Paintball extends TeamGame
 
 		UtilAction.velocity(player, new Vector(0,1.2,0));
 
-		_doubles.put(player, new PlayerCopy(this, player, killer, GetTeam(player).GetColor()));
+		_doubles.put(player, new PlayerCopyPaintball(this, player, killer, GetTeam(player).GetColor()));
 	}
 
 //	@EventHandler
@@ -406,10 +406,10 @@ public class Paintball extends TeamGame
 		if (throwerTeam == null)	return;
 
 		//Revive
-		Iterator<PlayerCopy> copyIterator = _doubles.values().iterator();
+		Iterator<PlayerCopyPaintball> copyIterator = _doubles.values().iterator();
 		while (copyIterator.hasNext())
 		{
-			PlayerCopy copy = copyIterator.next();
+			PlayerCopyPaintball copy = copyIterator.next();
 
 			GameTeam otherTeam = GetTeam(copy.GetPlayer());
 			if (otherTeam == null || !otherTeam.equals(throwerTeam))
@@ -441,7 +441,7 @@ public class Paintball extends TeamGame
 		}
 	}
 
-	public void PlayerIn(final Player player, final PlayerCopy copy)
+	public void PlayerIn(final Player player, final PlayerCopyPaintball copy)
 	{
 		//State
 		SetPlayerState(player, PlayerState.IN);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopyPaintball.java
similarity index 94%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopyPaintball.java
index 591e35e54..84e8336c9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopyPaintball.java
@@ -17,7 +17,7 @@ import mineplex.core.hologram.Hologram;
 import mineplex.core.itemstack.ItemStackFactory;
 import nautilus.game.arcade.game.Game;
 
-public class PlayerCopy 
+public class PlayerCopyPaintball 
 {
 	private Game Host;
 
@@ -26,7 +26,7 @@ public class PlayerCopy
 	private ArmorStand _ent;
 	private Hologram _holo;
 	
-	public PlayerCopy(Game host, Player owner, Player paintedBy, ChatColor nameColor)
+	public PlayerCopyPaintball(Game host, Player owner, Player paintedBy, ChatColor nameColor)
 	{
 		Host = host;
 		
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java
index 769d08b71..5a0457a8d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java
@@ -9,7 +9,6 @@ import org.bukkit.ChatColor;
 import org.bukkit.Color;
 import org.bukkit.Effect;
 import org.bukkit.FireworkEffect;
-import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
index 2fcd7a276..23c7ff8a7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 
+import mineplex.core.common.block.BlockData;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAlg;
@@ -11,7 +12,6 @@ import mineplex.core.common.util.UtilFirework;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.data.BlockData;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java
index 3e40fcc29..1adeb73a4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java
@@ -1,7 +1,6 @@
 package nautilus.game.arcade.game.games.smash.kits;
 
 import org.bukkit.ChatColor;
-import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.EntityType;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
index bf1e6ce2f..492f82da9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
@@ -13,15 +13,11 @@ import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilSound;
-import mineplex.core.common.util.UtilText;
 import mineplex.core.common.util.UtilTextMiddle;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilWorld;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
-import mineplex.core.explosion.ExplosionEvent;
-import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
@@ -35,8 +31,6 @@ import nautilus.game.arcade.game.games.snowfight.kits.KitTactician;
 import nautilus.game.arcade.game.games.snowfight.kits.KitMedic;
 import nautilus.game.arcade.game.games.snowfight.kits.KitSportsman;
 import nautilus.game.arcade.kit.Kit;
-import nautilus.game.arcade.kit.SmashKit;
-import net.minecraft.server.v1_8_R3.EntityFireball;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -48,10 +42,7 @@ import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftFireball;
-import org.bukkit.entity.Egg;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Player;
@@ -59,31 +50,23 @@ import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Snowball;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockDamageEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
-import org.bukkit.event.entity.ProjectileHitEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
-import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.FixedMetadataValue;
-import org.bukkit.potion.Potion;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.potion.PotionType;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader.Array;
 
 public class SnowFight extends TeamGame
 {
 
 	private HashMap<Player, Integer> _tiles;
-	private boolean _meteoroids;
+	private boolean _meteors;
 	private boolean _peace;
 
 	public SnowFight(ArcadeManager manager)
@@ -99,8 +82,8 @@ public class SnowFight extends TeamGame
 
 						new String[]
 								{
-					"Just like... kill your enemies. with snow.",
-					"Be careful if you are on Ice your body will freeze"
+					"Defeat your foes with Snowballs",
+					"Last team alive wins!"
 								});
 
 		this.HungerSet = 20;
@@ -111,7 +94,7 @@ public class SnowFight extends TeamGame
 		this.BlockPlace = true;
 		this.BlockBreakAllow = new HashSet<>(Arrays.asList(Material.FENCE.getId()));
 		this._tiles = new HashMap<Player, Integer>();
-		this._meteoroids = false;
+		this._meteors = false;
 		this._peace = false;
 	}
 
@@ -160,39 +143,42 @@ public class SnowFight extends TeamGame
 	}
 	
 	@EventHandler
-	public void Meteor(UpdateEvent event) {
-		if(event.getType() != UpdateType.TWOSEC)
+	public void Meteor(UpdateEvent event) 
+	{
+		if(event.getType() != UpdateType.FAST)
 			return;
 		
-		if(!IsLive()) 
+		if (!IsLive()) 
 			return;
 		
-		if(System.currentTimeMillis() <= getGameLiveTime() + (15 * 1000))
+		if (System.currentTimeMillis() <= getGameLiveTime() + 10000)
+		{
+			UtilTextMiddle.display(C.cGreen + "Prepare", "Battle in " + UtilTime.MakeStr((getGameLiveTime() + 10000) - System.currentTimeMillis()), 0, 60, 20, UtilServer.getPlayers());
 			return;
+		}
 		
-		if(!_peace)
+		if (!_peace)
 		{
 			for(Player player : GetPlayers(false))
-			{
 				player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 1F, 1F);
-				UtilTextMiddle.display(C.cGold + C.Bold + "Peace Phase ended", "Kill your enemies", player);
-			}
-			this.Announce(C.cRed + C.Bold + "ALERT: " + ChatColor.RESET + C.Bold + "Peace Phase ended");
+			
+			UtilTextMiddle.display(C.cRed + "FIGHT", "Throw your Snowballs!", 0, 60, 20, UtilServer.getPlayers());
+
 			_peace = true;
 		}
 		
 		if(System.currentTimeMillis() <= getGameLiveTime() + (195 * 1000))
 			return;
 		
-		if(!_meteoroids)
+		if(!_meteors)
 		{
 			for(Player player : GetPlayers(false))
 			{
 				player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 1F, 1F);
-				UtilTextMiddle.display(C.cGold + C.Bold + "ICE METEOROIDS!!!", "Avoid the Ice Fields", player);
+				UtilTextMiddle.display(C.cAqua + C.Bold + "Ice Meteors", "Avoid the Ice Fields!", player);
 			}
-			this.Announce(C.cRed + C.Bold + "ALERT: " + ChatColor.RESET + C.Bold + "METEOROIDS START FALLING!");
-			_meteoroids = true;
+
+			_meteors = true;
 		}
 		makeMeteor();
 	}
@@ -345,12 +331,12 @@ public class SnowFight extends TeamGame
 		// Lower
 		if (height >= snowLevel)
 		{
-			block.setTypeIdAndData(0, (byte) 0, true);
+			block.setTypeIdAndData(0, (byte) 0, false);
 			SnowDecrease(block.getRelative(BlockFace.DOWN), height - snowLevel);
 		}
 		else
 		{
-			block.setTypeIdAndData(78, (byte) (snowLevel - height - 1), true);
+			block.setTypeIdAndData(78, (byte) (snowLevel - height - 1), false);
 		}
 	}
 	
@@ -456,7 +442,7 @@ public class SnowFight extends TeamGame
 
 					if (i++ % 6 == 0)
 					{
-						fallingblock.getWorld().playSound(fallingblock.getLocation(), Sound.CAT_HISS, 1.3F, 0F);
+						fallingblock.getWorld().playSound(fallingblock.getLocation(), Sound.CAT_HISS, 0.7F, 0F);
 					}
 				}
 				else
@@ -498,10 +484,11 @@ public class SnowFight extends TeamGame
 			explosion.setDropItems(false);
 			explosion.setBlocksDamagedEqually(true);
 			
-			UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, projectile.getLocation(), 1.0F, 1.0F, 1.0F, 1, 3, ViewDist.MAX, UtilServer.getPlayers());
-			for(Player player : UtilServer.getPlayers()) {
+			//Effect
+			UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, projectile.getLocation(), 0.5f, 0.5f, 0.5f, 0, 5, ViewDist.MAX, UtilServer.getPlayers());
+			for(Player player : UtilServer.getPlayers()) 
 				player.playSound(projectile.getLocation(), Sound.EXPLODE, 1, 1);
-			}
+			
 			
 			boolean fall = true;
 			
@@ -510,7 +497,7 @@ public class SnowFight extends TeamGame
 				if(player instanceof Player)
 				{
 					Player damagee = (Player) player;
-					Bukkit.getPluginManager().callEvent(new CustomDamageEvent(damagee, null, null, null, DamageCause.CUSTOM, damage, false, true, true, "Ice Meteoroid", "Ice Meteoroid", false));
+					Bukkit.getPluginManager().callEvent(new CustomDamageEvent(damagee, null, null, null, DamageCause.CUSTOM, damage, false, true, true, "Ice Meteor", "Ice Meteor", false));
 				}
 			}
 			
@@ -519,6 +506,7 @@ public class SnowFight extends TeamGame
 				if(block.getType() != Material.AIR)
 				{
 					block.setType(Material.ICE);
+					
 					if(block.getRelative(BlockFace.DOWN).getType() == Material.AIR)
 					{
 						// to reduce lag
@@ -611,7 +599,7 @@ public class SnowFight extends TeamGame
 			for (GameTeam team : this.GetTeamList())
 			{			
 				Scoreboard.Write(team.GetColor() + C.Bold + team.GetName());
-				Scoreboard.Write(team.GetColor() + "Alive " + team.GetPlayers(true).size());
+				Scoreboard.Write(team.GetColor() + "" + team.GetPlayers(true).size() + " Alive");
 				Scoreboard.WriteBlank();
 			}
 		}
@@ -620,16 +608,16 @@ public class SnowFight extends TeamGame
 
 		if (time > 0)
 		{
-			Scoreboard.Write(C.cYellow + C.Bold + "Meteoroids:");
+			Scoreboard.Write(C.cYellow + C.Bold + "Meteors");
 			if(IsLive())
 				Scoreboard.Write(UtilTime.MakeStr(time, 0));
 		}
 		else
 		{
-			Scoreboard.Write(C.cGold + C.Bold + "Meteoroids!");
+			Scoreboard.Write(C.cGold + C.Bold + "Meteors!");
 		}	
 
 		Scoreboard.Draw();
 	}
-	
+
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/PlayerCopy.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/PlayerCopyWither.java
similarity index 92%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/PlayerCopy.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/PlayerCopyWither.java
index 8101f2b13..d1348569e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/PlayerCopy.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/PlayerCopyWither.java
@@ -9,14 +9,14 @@ import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilEnt;
 import nautilus.game.arcade.game.Game;
 
-public class PlayerCopy 
+public class PlayerCopyWither 
 {
 	private Game Host;
 	
 	private Skeleton _ent;
 	private Player _owner;
 	
-	public PlayerCopy(Game host, Player owner, ChatColor nameColor)
+	public PlayerCopyWither(Game host, Player owner, ChatColor nameColor)
 	{
 		Host = host;
 		
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
index a79e15922..c224dcedf 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
@@ -34,6 +34,7 @@ import org.bukkit.potion.PotionEffectType;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
+import mineplex.core.common.block.BlockData;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAction;
@@ -47,7 +48,6 @@ import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTextMiddle;
 import mineplex.core.common.util.UtilTime;
-import mineplex.core.data.BlockData;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.condition.Condition.ConditionType;
@@ -81,7 +81,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 
 	private long _gameTime = 300000;
 
-	private HashMap<Player, PlayerCopy> _doubles = new HashMap<Player, PlayerCopy>();
+	private HashMap<Player, PlayerCopyWither> _doubles = new HashMap<Player, PlayerCopyWither>();
 
 	// private int _livesPerPlayer = 3;
 	// private HashMap<Player, Integer> _lives = new HashMap<Player, Integer>();
@@ -261,8 +261,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 			return;
 		}
 		
-		_maxY = GetTeamList().get(1).GetSpawn().getBlockY() - 4;
-		if(event.getBlock().getLocation().getBlockY() < _maxY)
+		if(event.getBlock().getLocation().getBlockY() < _maxY - 4)
 		{
 			event.getPlayer().sendMessage(F.main("BlockChecker", "You may not build under this height!"));
 			event.setCancelled(true);
@@ -286,7 +285,6 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		}
 		
 		Location blockLocation = event.getBlock().getLocation();
-		_maxY = GetTeamList().get(1).GetSpawn().getBlockY() - 3;
 		if(blockLocation.add(0,1,0).getBlock().getType() == Material.AIR)
 		{
 			for(Player humans: _runners.GetPlayers(true))
@@ -305,7 +303,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 			}
 		}
 		
-		if(blockLocation.getBlockY() < _maxY)
+		if(blockLocation.getBlockY() < _maxY - 3)
 		{
 			event.getPlayer().sendMessage(F.main("BlockChecker", "You may not build under this height!"));
 			event.setCancelled(true);
@@ -359,7 +357,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 						{
 							UtilParticle.PlayParticle(ParticleType.FLAME, event.getClickedBlock().getLocation().add(0.5, 0.5, 0.5), 0, 0, 0, 0, 1, ViewDist.LONG, UtilServer.getPlayers());
 							event.getClickedBlock().getWorld().playSound(event.getClickedBlock().getLocation(), Sound.NOTE_STICKS, 2f, 1f);
-							Manager.GetBlockRestore().Add(event.getClickedBlock(), 0, event.getClickedBlock().getData(), 2000);
+							Manager.GetBlockRestore().add(event.getClickedBlock(), 0, event.getClickedBlock().getData(), 2000);
 						}
 					}
 				}.runTaskLater(Manager.getPlugin(), 5);
@@ -423,6 +421,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		if (event.GetState() != GameState.Live)
 			return;
 
+		_maxY = GetTeamList().get(1).GetSpawn().getBlockY();
 		UtilTextMiddle.display(C.cGreen + "Humans Hiding",
 				"15 Seconds until Assault", 10, 80, 10);
 
@@ -445,7 +444,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		{
 			if(!players.isOnline())
 			{
-				PlayerCopy pc = _doubles.get(players);
+				PlayerCopyWither pc = _doubles.get(players);
 				pc.GetEntity().remove();
 				_doubles.remove(players);
 			}
@@ -691,7 +690,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 
 			if (dist < radius)
 			{
-				Manager.GetBlockRestore().Add(data.Block, 0, (byte) 0,
+				Manager.GetBlockRestore().add(data.Block, 0, (byte) 0,
 						data.Material.getId(), data.Data,
 						(long) (6000 * (dist / radius)));
 				dataIt.remove();
@@ -792,7 +791,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 
 		player.setVelocity(new Vector(0, 1.2, 0));
 
-		_doubles.put(player, new PlayerCopy(this, player, ChatColor.YELLOW));
+		_doubles.put(player, new PlayerCopyWither(this, player, ChatColor.YELLOW));
 	}
 	
 	public void playerIn(final Player player, final LivingEntity copy, Player revivedBy)
@@ -877,10 +876,10 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 			return;
 
 		// Revive a copy
-		Iterator<PlayerCopy> copyIterator = _doubles.values().iterator();
+		Iterator<PlayerCopyWither> copyIterator = _doubles.values().iterator();
 		while (copyIterator.hasNext())
 		{
-			PlayerCopy copy = copyIterator.next();
+			PlayerCopyWither copy = copyIterator.next();
 
 			GameTeam otherTeam = GetTeam(copy.GetPlayer());
 			if (otherTeam == null || !otherTeam.equals(throwerTeam))
@@ -926,7 +925,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 	@EventHandler
 	public void skeletonDamage(CustomDamageEvent event)
 	{
-		for (PlayerCopy copy : _doubles.values())
+		for (PlayerCopyWither copy : _doubles.values())
 		{
 			if (copy.GetEntity().equals(event.GetDamageeEntity()))
 			{
@@ -939,7 +938,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 	@EventHandler
 	public void skeletonCombust(EntityCombustEvent event)
 	{
-		for (PlayerCopy copy : _doubles.values())
+		for (PlayerCopyWither copy : _doubles.values())
 		{
 			if (copy.GetEntity().equals(event.getEntity()))
 			{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkArcticAura.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkArcticAura.java
index 6016861d1..6af4ed018 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkArcticAura.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkArcticAura.java
@@ -45,7 +45,7 @@ public class PerkArcticAura extends Perk
 			for (Block block : blocks.keySet())
 			{			
 				//Snow
-				Manager.GetBlockRestore().Snow(block, (byte)1, (byte)1, (long)(duration * (1 + blocks.get(block))), 250, 0);
+				Manager.GetBlockRestore().snow(block, (byte) 1, (byte) 1, (long) (duration * (1 + blocks.get(block))), 250, 0);
 			}
 		}
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlink.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlink.java
index 8d6e783c8..4890bc63e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlink.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlink.java
@@ -19,9 +19,9 @@ import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilFirework;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.recharge.Recharge;
-import nautilus.game.arcade.kit.SmashPerk;
+import nautilus.game.arcade.kit.Perk;
 
-public class PerkBlink extends SmashPerk
+public class PerkBlink extends Perk
 {
 	private String _name = "";
 	private double _range;
@@ -29,7 +29,7 @@ public class PerkBlink extends SmashPerk
 
 	public PerkBlink(String name, double range, long recharge) 
 	{
-		super("Leaper", new String[] 
+		super("name", new String[] 
 				{
 				C.cYellow + "Right-Click" + C.cGray + " with Axe to " + C.cGreen + name
 				});
@@ -45,23 +45,15 @@ public class PerkBlink extends SmashPerk
 		if (event.isCancelled())
 			return;
 
-		if (event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK)
-			return;
+		if (event.getAction() != Action.LEFT_CLICK_AIR && event.getAction() != Action.LEFT_CLICK_BLOCK &&
+				event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK)
+				return;
 
 		if (UtilBlock.usable(event.getClickedBlock()))
 			return;
 
-		if (event.getPlayer().getItemInHand() == null)
-			return;
-
-		if (!event.getPlayer().getItemInHand().getType().toString().contains("_AXE"))
-			return;
-
 		Player player = event.getPlayer();
 		
-		if (isSuperActive(player))
-			return;
-
 		if (!Kit.HasKit(player))
 			return;
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlizzard.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlizzard.java
index 581a9511c..fb8b77d58 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlizzard.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlizzard.java
@@ -130,6 +130,6 @@ public class PerkBlizzard extends Perk
 		if (_snowball.remove(event.getEntity()) == null)
 			return;
 
-		Manager.GetBlockRestore().Snow(event.getEntity().getLocation().getBlock(), (byte)1, (byte)7, 2000, 250, 0);
+		Manager.GetBlockRestore().snow(event.getEntity().getLocation().getBlock(), (byte) 1, (byte) 7, 2000, 250, 0);
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlockRestorer.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlockRestorer.java
index 769df0117..16e17e38d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlockRestorer.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlockRestorer.java
@@ -60,7 +60,7 @@ public class PerkBlockRestorer extends Perk implements IThrown
 		
 		org.bukkit.entity.Item ent = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.COMMAND));
 		UtilAction.velocity(ent, player.getLocation().getDirection(), 1.2, false, 0, 0.2, 10, false);
-		Manager.GetProjectile().AddThrow(ent, player, this, -1, false, false, true, false, 0.5f);
+		Manager.GetProjectile().AddThrow(ent, player, this, -1, false, false, true, true, 0.5f);
 	}
 
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlockToss.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlockToss.java
index 4e759312c..f74e03053 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlockToss.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlockToss.java
@@ -79,7 +79,7 @@ public class PerkBlockToss extends SmashPerk implements IThrown
 		if (!Recharge.Instance.usable(player, GetName()))
 			return;
 
-		if (!UtilBlock.airFoliage(grab.getRelative(BlockFace.UP)) || Manager.GetBlockRestore().Contains(grab.getRelative(BlockFace.UP)))
+		if (!UtilBlock.airFoliage(grab.getRelative(BlockFace.UP)) || Manager.GetBlockRestore().contains(grab.getRelative(BlockFace.UP)))
 		{
 			UtilPlayer.message(player, F.main("Game", "You can only pick up blocks with Air above them."));
 			return;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDoubleJump.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDoubleJump.java
index 018522154..7ca633d75 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDoubleJump.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDoubleJump.java
@@ -101,6 +101,8 @@ public class PerkDoubleJump extends Perk
 				Recharge.Instance.setDisplayForce(player, GetName(), true);
 			}
 		}
+		
+		Recharge.Instance.useForce(player, "Double Jump", 500);
 	} 
 	
 	@EventHandler
@@ -119,6 +121,9 @@ public class PerkDoubleJump extends Perk
 			
 			if (_recharge > 0 && !Recharge.Instance.usable(player, GetName()))
 				continue;
+
+			if (!Recharge.Instance.usable(player, "Double Jump"))
+				continue;
 			
 			if (UtilEnt.isGrounded(player) || UtilBlock.solid(player.getLocation().getBlock().getRelative(BlockFace.DOWN)))
 				player.setAllowFlight(true);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlamingSword.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlamingSword.java
index 9f17c5456..246f488ba 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlamingSword.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlamingSword.java
@@ -111,7 +111,7 @@ public class PerkFlamingSword extends Perk
 
 			//Fire
 			Item fire = cur.getWorld().dropItem(cur.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.BLAZE_POWDER));
-			Manager.GetFire().Add(fire, cur, 0.7, 0, 0.5, 1, "Inferno");
+			Manager.GetFire().Add(fire, cur, 0.7, 0, 0.5, 1, "Inferno", false);
 
 			fire.teleport(cur.getEyeLocation());
 			double x = 0.07 - (UtilMath.r(14)/100d);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIcePath.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIcePath.java
index bfea95ac1..0e87f9d3e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIcePath.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIcePath.java
@@ -90,7 +90,7 @@ public class PerkIcePath extends Perk
 			else
 			{
 				block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, 79);
-				Manager.GetBlockRestore().Add(block, 79, (byte)0, 6000);
+				Manager.GetBlockRestore().add(block, 79, (byte) 0, 6000);
 			}
 		}
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkInferno.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkInferno.java
index 3d04b54bd..ecf9b4bff 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkInferno.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkInferno.java
@@ -106,7 +106,7 @@ public class PerkInferno extends SmashPerk
 
 			//Fire
 			Item fire = cur.getWorld().dropItem(cur.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.BLAZE_POWDER));
-			Manager.GetFire().Add(fire, cur, 0.7, 0, 0.5, 1.25, "Inferno");
+			Manager.GetFire().Add(fire, cur, 0.7, 0, 0.5, 1.25, "Inferno", false);
 
 			fire.teleport(cur.getEyeLocation());
 			double x = 0.07 - (UtilMath.r(14)/100d);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkInfernoFinn.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkInfernoFinn.java
index 2853fa834..892a64af9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkInfernoFinn.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkInfernoFinn.java
@@ -86,7 +86,7 @@ public class PerkInfernoFinn extends Perk
 
 			//Fire
 			Item fire = cur.getWorld().dropItem(cur.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.BLAZE_POWDER));
-			Manager.GetFire().Add(fire, cur, 0.7, 0, 2, 2, "Inferno");
+			Manager.GetFire().Add(fire, cur, 0.7, 0, 2, 2, "Inferno", false);
 
 			fire.teleport(cur.getEyeLocation());
 			double x = 0.07 - (UtilMath.r(14)/100d);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIronShell.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIronShell.java
index dcdbbac20..269396b52 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIronShell.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIronShell.java
@@ -66,7 +66,7 @@ public class PerkIronShell extends Perk
 			if (cur.getY() < block.getLocation().getY())
 				continue;
 			
-			Manager.GetBlockRestore().Add(cur, 42, (byte)0, 12000);
+			Manager.GetBlockRestore().add(cur, 42, (byte) 0, 12000);
 		}
 	
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSpidersNest.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSpidersNest.java
index 7f72477ce..0bd72c5a9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSpidersNest.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSpidersNest.java
@@ -48,7 +48,7 @@ public class PerkSpidersNest extends SmashPerk
 			if (block.getY() < player.getLocation().getY() - 10)
 				continue;
 			
-			Manager.GetBlockRestore().Add(block, 30, (byte)0, (long) (30000 + 5000 * Math.random()));	
+			Manager.GetBlockRestore().add(block, 30, (byte) 0, (long) (30000 + 5000 * Math.random()));
 		}
 		
 		//Regen
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWeb.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWeb.java
index e61587621..2e40fe70d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWeb.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWeb.java
@@ -134,6 +134,6 @@ public class PerkWeb extends Perk implements IThrown
 		Location loc = data.GetThrown().getLocation();
 		data.GetThrown().remove();
 		
-		Manager.GetBlockRestore().Add(loc.getBlock(), 30, (byte)0, 4000);
+		Manager.GetBlockRestore().add(loc.getBlock(), 30, (byte) 0, 4000);
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWebShot.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWebShot.java
index 0fda9bdb4..cbe999d59 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWebShot.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWebShot.java
@@ -93,7 +93,7 @@ public class PerkWebShot extends SmashPerk implements IThrown
 		{
 			data.GetThrown().remove();
 
-			Manager.GetBlockRestore().Add(target.getLocation().getBlock(), 30, (byte)0, 3000);
+			Manager.GetBlockRestore().add(target.getLocation().getBlock(), 30, (byte) 0, 3000);
 			
 			//Damage Event
 			Manager.GetDamage().NewDamageEvent(target, data.GetThrower(), null, 
@@ -126,6 +126,6 @@ public class PerkWebShot extends SmashPerk implements IThrown
 		data.GetThrown().remove();
 
 		if (data.GetThrown().getTicksLived() > 3)
-			Manager.GetBlockRestore().Add(loc.getBlock(), 30, (byte)0, 2000);
+			Manager.GetBlockRestore().add(loc.getBlock(), 30, (byte) 0, 2000);
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherWeb.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherWeb.java
index 161e77251..9e270d6f5 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherWeb.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherWeb.java
@@ -7,8 +7,6 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.util.Vector;
 
@@ -16,10 +14,8 @@ import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilBlock;
-import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilEvent;
 import mineplex.core.common.util.UtilGear;
-import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.itemstack.ItemStackFactory;
@@ -106,6 +102,6 @@ public class PerkWitherWeb extends Perk implements IThrown
 		data.GetThrown().remove();
 
 		if (data.GetThrown().getTicksLived() > 3)
-			Manager.GetBlockRestore().Add(loc.getBlock(), 30, (byte)0, 3000);
+			Manager.GetBlockRestore().add(loc.getBlock(), 30, (byte) 0, 3000);
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWoolBomb.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWoolBomb.java
index 4dc6c0825..5f692fb5d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWoolBomb.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWoolBomb.java
@@ -22,7 +22,6 @@ import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEnt;
-import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
@@ -166,7 +165,7 @@ public class PerkWoolBomb extends Perk implements IThrown
 		//Make Block
 		Block block = thrown.getLocation().getBlock();
 		
-		Manager.GetBlockRestore().Restore(block);
+		Manager.GetBlockRestore().restore(block);
 		
 		_active.put(player, new WoolBombData(block));
 		
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkZombieRot.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkZombieRot.java
index d3da06539..a3869f76f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkZombieRot.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkZombieRot.java
@@ -10,7 +10,6 @@ import org.bukkit.event.EventHandler;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilBlock;
-import mineplex.core.common.util.UtilMath;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.kit.SmashPerk;
@@ -47,7 +46,7 @@ public class PerkZombieRot extends SmashPerk
 					continue;
 				
 				//Snow
-				Manager.GetBlockRestore().Add(block, 159, (byte)12, 3000);
+				Manager.GetBlockRestore().add(block, 159, (byte) 12, 3000);
 			}
 		}
 		
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/data/FissureData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/data/FissureData.java
index 3c3b99a2a..c603782f7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/data/FissureData.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/data/FissureData.java
@@ -9,7 +9,6 @@ import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilWorld;
 import nautilus.game.arcade.kit.perks.PerkFissure;
 
 import org.bukkit.Effect;
@@ -134,11 +133,11 @@ public class FissureData
 		}
 
 		//Boost Column
-		if (block.getTypeId() == 1)		Host.Manager.GetBlockRestore().Add(block, 4, block.getData(), 14000);
-		if (block.getTypeId() == 2)		Host.Manager.GetBlockRestore().Add(block, 3, block.getData(), 14000);
-		if (block.getTypeId() == 98)	Host.Manager.GetBlockRestore().Add(block, 98, (byte)2, 14000);
+		if (block.getTypeId() == 1)		Host.Manager.GetBlockRestore().add(block, 4, block.getData(), 14000);
+		if (block.getTypeId() == 2)		Host.Manager.GetBlockRestore().add(block, 3, block.getData(), 14000);
+		if (block.getTypeId() == 98)	Host.Manager.GetBlockRestore().add(block, 98, (byte) 2, 14000);
 
-		Host.Manager.GetBlockRestore().Add(up, block.getTypeId(), block.getData(), 10000 - (1000 * _height));
+		Host.Manager.GetBlockRestore().add(up, block.getTypeId(), block.getData(), 10000 - (1000 * _height));
 		_height++;
 
 		//Effect
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
index 3b363b453..f0533de91 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
@@ -20,6 +20,7 @@ import mineplex.core.recharge.Recharge;
 import mineplex.core.teleport.event.MineplexTeleportEvent;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.condition.Condition.ConditionType;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
@@ -47,6 +48,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockGrowEvent;
 import org.bukkit.event.block.BlockIgniteEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.block.LeavesDecayEvent;
@@ -64,6 +66,7 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
 import org.bukkit.util.Vector;
 
 public class GameFlagManager implements Listener
@@ -674,8 +677,13 @@ public class GameFlagManager implements Listener
 
 		final Player player = event.getEntity();
 		
+		//Remove all conditions
+		Manager.GetCondition().EndCondition(player, null, null);
+		for (PotionEffect potion : player.getActivePotionEffects())
+			player.removePotionEffect(potion.getType());
+		
 		//Visual
-		Manager.GetCondition().Factory().Blind("Ghost", player, player, 2, 0, false, false, false);
+		Manager.GetCondition().Factory().Blind("Ghost", player, player, 2.5, 0, false, false, false);
 
 		player.setFireTicks(0);
 		player.setFallDistance(0);
@@ -709,7 +717,7 @@ public class GameFlagManager implements Listener
 			} 
 			else
 			{
-				Manager.addSpectator(player, true);
+				Manager.addSpectator(player, game.DeathTeleport);
 			}
 
 			Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable()
@@ -730,7 +738,6 @@ public class GameFlagManager implements Listener
 					time = game.GetTeam(player).GetRespawnTime();
 			
 			UtilInv.Clear(player);
-			Manager.GetCondition().Factory().Blind("Ghost", player, player, 1.5, 0, false, false, false);
 			Manager.GetCondition().Factory().Cloak("Ghost", player, player, time, false, false);
 			player.setAllowFlight(true);
 			player.setFlying(true);
@@ -745,7 +752,7 @@ public class GameFlagManager implements Listener
 			
 			if (!game.IsAlive(player))
 			{
-				Manager.addSpectator(player, true);
+				Manager.addSpectator(player, game.DeathTeleport);
 				return;
 			}
 			
@@ -766,7 +773,7 @@ public class GameFlagManager implements Listener
 					}
 					else
 					{
-						Manager.addSpectator(player, true);
+						Manager.addSpectator(player, game.DeathTeleport);
 					}
 					 
 					player.setFireTicks(0);
@@ -854,6 +861,9 @@ public class GameFlagManager implements Listener
 		if (game.HungerSet != -1)
 			for (Player player : game.GetPlayers(true))
 			{
+				if (Manager.GetCondition().HasCondition(player, ConditionType.ARCADE_HUNGER_DISABLE, null))
+					continue;
+				
 				player.setFoodLevel(game.HungerSet);
 				player.setSaturation(1F);
 			}
@@ -1096,6 +1106,18 @@ public class GameFlagManager implements Listener
 		event.setCancelled(true);
 	}
 	
+	@EventHandler
+	public void WorldBlockBurn(BlockGrowEvent event)
+	{
+		Game game = Manager.GetGame();
+		if (game == null)	return;
+
+		if (game.WorldBlockGrow)
+			return;
+		
+		event.setCancelled(true);
+	}
+	
 	@EventHandler
 	public void WorldFireSpread(BlockIgniteEvent event)
 	{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
index 21d8c6501..7f65cc868 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
@@ -26,7 +26,6 @@ import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.RestartServerEvent;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GamePrepareCountdownCommence;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.events.PlayerPrepareTeleportEvent;
@@ -38,7 +37,6 @@ import nautilus.game.arcade.game.games.uhc.UHC;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Color;
-import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.FireworkEffect.Type;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
index 1849d34f3..24225cd61 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
@@ -183,7 +183,7 @@ public class GameScoreboard
 	{
 		for (ScoreboardElement elem : _elements)
 		{
-			for (String line : elem.GetLines())
+			for (String line : elem.getLines())
 			{
 				ResetScore(line);
 			}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SpecialWinStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SpecialWinStatTracker.java
new file mode 100644
index 000000000..407973ab6
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SpecialWinStatTracker.java
@@ -0,0 +1,46 @@
+package nautilus.game.arcade.stats;
+
+import java.util.List;
+
+import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.Game;
+import nautilus.game.arcade.game.games.common.CaptureTheFlag;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+public class SpecialWinStatTracker extends StatTracker<CaptureTheFlag>
+{
+	private final String _stat;
+
+	public SpecialWinStatTracker(CaptureTheFlag game, String stat)
+	{
+		super(game);
+		_stat = stat;
+	}
+	
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+	public void onGameStateChange(GameStateChangeEvent event)
+	{
+		if (event.GetState() == Game.GameState.End)
+		{
+			if (getGame().getScoreDifference() < 5)
+				return;
+			
+			List<Player> winners = getGame().getWinners();
+			
+			if (winners != null)
+			{
+				for (Player winner : winners)
+					addStat(winner, _stat, 1, false, false);
+			}
+		}
+	}
+	
+	public String getStat()
+	{
+		return _stat;
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.PvP/Nautilus.Game.PvP.iml b/Plugins/Nautilus.Game.PvP/Nautilus.Game.PvP.iml
new file mode 100644
index 000000000..0a2adb96d
--- /dev/null
+++ b/Plugins/Nautilus.Game.PvP/Nautilus.Game.PvP.iml
@@ -0,0 +1,14 @@
+<?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$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="craftbukkit" level="project" />
+    <orderEntry type="module" module-name="Mineplex.Core" />
+    <orderEntry type="module" module-name="Mineplex.Core.Common" />
+  </component>
+</module>
\ No newline at end of file